bdnugget/magento2
1
0 Fork 0
mirror of https://github.com/bdnugget/magento2.git synced 2026-11-07 09:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
143,425 Commits 1 Branch 0 Tags
2.4-develop
Commit Graph
645 Commits
Author SHA1 Message Date
Nishant Rana d60ac944d9 Merge branch '2.4-develop' into AC-10821 2024-02-07 12:53:38 +05:30
Nishant Rana cb954326b4 Merge branch '2.4-develop' into AC-10821 2024-01-18 16:07:02 +05:30
Rajesh Kumar 57f3ca2077 Merge remote-tracking branch 'origin/2.4-develop' into AC-9499 2024-01-17 15:23:39 +05:30
jayrangnani-gl 0aa76db184 AC-10718::PHPUnit 10 upgrade Error: Call to undefined method PHPUnit 10 upgrade Error: Call to undefined method withConsecutive()() - Fix unit tests 2024-01-15 11:41:21 +05:30
Rajesh Kumar c8f94fbac7 AC-9499::Update Symfony dependency packages to the latest LTS versions 6.4 2023-12-15 17:56:34 +05:30
Rajesh Kumar 863c6d1c0d AC-9499::Update Symfony dependency packages to the latest LTS versions 6.4 2023-12-13 16:36:58 +05:30
Rajesh Kumar d83e01def8 AC-9670::Adobe Commerce 2.4.7 core code is compatible with PHP 8.3 2023-11-14 17:51:23 +05:30
Sarmistha Martha 031d8a8b6c Merge remote-tracking branch 'magento-l3/ACP2E-1709' into MAR212023_PR_sarmistha 2023-04-14 00:50:11 +05:30
pradeep1819 7262162d90 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-24 22:45:11 +05:30
pradeep1819 72fcf13359 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-21 07:00:34 +05:30
Dmytro Shevtsov 2920500480 Fix links to docs and Markdown formatting 2023-03-15 16:41:22 -05:00
pradeep1819 438c8276ba ACP2E-1709: error during declarative schema whitelsit generation 2023-03-15 17:55:49 +05:30
pradeep1819 13d1bd2718 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-13 20:26:17 +05:30
pradeep1819 120a95614a ACP2E-1709: error during declarative schema whitelsit generation 2023-03-13 20:25:22 +05:30
pradeep1819 a6edf232ae ACP2E-1709: error during declarative schema whitelsit generation 2023-03-10 10:53:27 +05:30
pradeep1819 647542f668 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-09 13:02:37 +05:30
pradeep1819 c1f1cf5203 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-07 20:23:43 +05:30
pradeep1819 4420bfe4a6 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-06 16:51:18 +05:30
Dmytro Shevtsov 5c026b5926 Update devdocs links 2022-12-20 10:59:16 -06:00
Faizan Shaikh 80497d15f9 AC-6646::Add PHP 8.2 Compatibility Support 2022-09-12 15:14:52 +05:30
Faizan Shaikh 748062480b AC-2841:PHP 7.4 compatibility removal from the codebase 2022-09-12 14:37:38 +05:30
Sergiy Vasiutynskyi 6c18f2e09a AC-2751 updated Symfony to 5.4, fixed related code 2022-06-30 14:26:56 +03:00
Sergiy Vasiutynskyi f7ded81918 AC-3110 fixed logic affected by "RFC: Deprecate passing null" issue 2022-05-25 18:57:31 +03:00
Stanislav Idolov d2c03eb884 ENGCOM-9348: Add README file for CatalogUrlRewrite, update README file for Developer and Csp module #34620 2022-01-31 15:11:58 -06:00
Andrii Beziazychnyi d536ff4db4 Changed restrictions for php to "~7.4.0||~8.1.0" into composer.json files 2021-12-20 14:25:47 +02:00
Maksym Aposov 5dd2b55d30 Merge remote-tracking branch 'commerce/2.4-develop' into platform-health 2021-12-09 09:38:08 -06:00
Karyna 32b5310b60 34441: fix unit tests to be compatible with php 8.1 2021-12-07 17:20:19 +02:00
Ravi Chandra f2daffdc95 Add README file for CatalogUrlRewrite, update README file for Developer and Csp module 2021-11-12 09:36:41 +05:30
andrii.zinkevych fd59832a1e Added PHP 8.1 to require for all modules 2021-11-09 22:59:19 +01:00
Karyna 69508958da Fix phpcs issues that were false-positive 2021-10-15 15:21:55 +03:00
Andrii Beziazychnyi eb89ea8c64 Updated PHP versions in composer files 2021-09-14 12:26:58 +03:00
bohdan-harniuk 9df8b982bf Merge branch 'improvement/ce-33707-update-unit-tests-codebase-to-phpunit-9-3-0' of github.com:anzin/magento2 into update-phpunit-to-9-3 2021-08-12 07:59:45 +03:00
andrii.zinkevych 31406654c0 CE-33707: Fixed code 2021-08-09 14:47:04 +03:00
bohdan-harniuk 39079fd4a9 CE-33707: Upgraded CE codebase to be compatible with the PHPUnit v 9.3.0 2021-08-09 00:00:54 +03:00
andrii.zinkevych 99c5873fb2 CE-33707: Fixed deprecated methods for PHPUnit v9.3.0 2021-08-08 21:43:24 +03:00
Andrii Beziazychnyi 8e6aedc813 CE-32868: Fixed the codebase to take a compatibility 2021-07-20 17:37:05 +03:00
Myroslav Dobra fe053e9780 MC-41213: Update existing Magento 2.4 code to pass Insecure Function phpcs checks 2021-04-07 16:54:33 +03:00
Ihor Sviziev a2b9380986 Use one format in all places for array_merge 
Fix potential issues when no items in array
Convert all array_merge into single format
 2020-09-23 09:17:20 +03:00
Magento Community Engineering b881a6f031 ENGCOM-7280: Fix #27523: throw informative errors in setup:db:generate-patch #27579 
- Merge Pull Request magento/magento2#27579 from korostii/magento2:korostii-patch-27523
 - Merged commits:
   1. 1e8e825abd
   2. 1dd5290fcb
   3. c1d8feffe1
   4. a74f8fe013
   5. f48cd50d9a
   6. 2bc691af85
   7. 89917331fa
   8. 347602ff8f
   9. 75bb2c3537
   10. 7d316d49f3
 2020-08-31 03:29:18 -05:00
Lukasz Bajsarowicz d1d661000e Merge branch '2.4-develop' into feature/failed-patch-information 2020-08-02 17:24:25 +02:00
Magento Community Engineering 8bdb197716 ENGCOM-7874: Fix unit tests with PHPUnit 9 errors #29244 
- Merge Pull Request magento/magento2#29244 from AntonEvers/magento2:fix-unit-tests
 - Merged commits:
   1. 86000cea24
   2. 48f5a92a29
 2020-07-30 06:42:26 -05:00
Lukasz Bajsarowicz 17ae2d92f2 Merge remote-tracking branch 'origin/2.4-develop' into feature/failed-patch-information 
# Conflicts:
#	composer.lock
 2020-07-27 12:00:09 +02:00
Anton Evers 86000cea24 repair \Magento\Captcha\Test\Unit\Model\Customer\Plugin\AjaxLoginTest 
Data providers are executed before setUp.
In previous phpunit versions $this->formIds[0] would just convert to
null, explaining why the logAttempt method was never called.
Fixing this issue leads to different expectations of the test result in
testAroundExecuteCaptchaIsNotRequired. I have adjusted the necessary.

No need to test if this method returns nothing if the return type is
already void

Fix quote unit tests by explicitely declaring methods that are vital
to quote operations. I think it is better to declare these methods
explicitely than to depend on DataObject methods

Update extensionattribute mock

repair partial mock with non-existing method mocking

Revert "Fix quote unit tests by explicitely declaring methods that are vital"

This reverts commit e29506ce3b353d55cbe64d064e863c4969c3d6cd.

fix mock object with non existing method mocks

replace partial mocks with non-existing method mocking
 2020-07-23 14:04:06 +02:00
Pavel Bystritsky f476d89951 Merge branch '2.4-develop' into 2.4.0-sync 
# Conflicts:
#	app/code/Magento/Backend/etc/adminhtml/system.xml
#	app/code/Magento/Backend/i18n/en_US.csv
#	app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
#	app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
#	app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml
#	app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
#	app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
#	app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
#	app/code/Magento/Checkout/Block/Cart/Crosssell.php
#	app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml
#	app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
#	app/code/Magento/Config/Console/Command/ConfigShowCommand.php
#	app/code/Magento/Contact/view/frontend/templates/form.phtml
#	app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAdminCustomerNoItemsInWishlistActionGroup.xml
#	app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
#	app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
#	app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
#	app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml
#	app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
#	app/code/Magento/Theme/etc/di.xml
#	app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
#	composer.lock
#	dev/tests/api-functional/phpunit_graphql.xml.dist
#	dev/tests/api-functional/phpunit_rest.xml.dist
#	dev/tests/api-functional/phpunit_soap.xml.dist
#	dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
#	dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
#	lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
#	lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
 2020-07-21 17:57:16 +03:00
Volodymyr Zaets 15433c43cf Revert "COMOPS-1042: 2.4.0 packaging" 
This reverts commit 19af792cb3.
 2020-07-20 21:41:27 -05:00
mage2-team 19af792cb3 COMOPS-1042: 2.4.0 packaging 
(build 2.4.0.080)
 2020-07-20 09:52:17 -07:00
korostii 75bb2c3537 Fix #27523: fix tests for phpunit9 and php7.4 2020-07-09 23:01:25 +03:00
Denys Korostii 347602ff8f Merge branch '2.4-develop' into korostii-patch-27523 2020-07-09 22:38:07 +03:00
Slava Mankivski fb957b8502 ENGCOM-7588: Generated code is not consistent with Magento requirements and Coding Standard #28351 2020-06-23 20:22:06 -05:00
Slava Mankivski 89917331fa Merge branch '2.4-develop' into korostii-patch-27523 2020-06-23 12:47:41 -05:00