Upstream Merge Conflict (2.4-develop)#200
Merged
rhoerr merged 9 commits into2.4-developfrom Feb 18, 2026
Merged
Conversation
AC-16423::Switch to laminas/laminas-di and laminas/laminas-server
AC-16236::Upgrade Core Test Framework to PHPUnit 12 and Migrate from PHPUnit 10
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated: a human is required.
Auto-merging composer.json
Auto-merging dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php
Auto-merging dev/tests/integration/testsuite/Magento/CatalogInventory/Observer/SaveInventoryDataObserverTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Customer/Block/Form/EditTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Customer/Block/Form/LoginTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
Auto-merging dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
CONFLICT (content): Merge conflict in dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php
Automatic merge failed; fix conflicts and then commit the result.