Upstream Merge Conflict (2.4-develop)#67
Merged
Vinai merged 449 commits into2.4-developfrom Dec 5, 2023
Merged
Conversation
- implemented solution - added unit test
-addressed static
- Fixed the CR comments.
…n product view page
- Fixed the issue and added the test coverage.
…ducts it still returns shipping method and address in Cart Quote Graphql response
ACPT-1589: Add GraphQL P1 queries to GraphQlStateTest
- Added the different solution.
- Added the test coverage.
….phtml in Magento_Catalog Module - Implemented category tree AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Implemented Category move, edit and other functionalities AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Functional tests failure AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Functional tests failure AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Fix Static Test Failure AC-2917::Migration from extjs library for pages catalog/category/tree.phtml - Code review comment fixes AC-2917::Bugfix reported in AC-10090 AC-2917::Fixed some irregularities in category tree
…mance-optimizations [LYNX] Performance improvements
Tier4 Kings PR Delivery 11.08.2023
-Fix integration test failure
ACPT-1226: GraphQlStateTest improvements and other fixes
[Hammer - Platform Health Scope]-AC-9665: Update all js library and npm dependency with latest available version
Vinai
approved these changes
Dec 5, 2023
mage-os-ci
pushed a commit
that referenced
this pull request
Feb 6, 2026
…eck functions
Fixed 6 PHPUnit deprecation warnings by replacing deprecated isType() with callback().
Issue: isType('array') and isType('string') are deprecated in PHPUnit 12
Will be removed in PHPUnit 13
Solution: Use callback() with PHP's native type checking functions
Files fixed:
1. EntityAbstractTest.php - 3 tests ✅
- isType('array') → callback('is_array')
2. AlternativeSourceTest.php - 2 tests ✅
- isType('string') → callback('is_string')
3. ThemeTest.php - 1 test ✅
- isType('string') → callback('is_string')
Pattern applied:
❌ OLD (Deprecated):
->with($this->isType('array'))
->with($this->isType('string'))
✅ NEW (PHPUnit 12 compatible):
->with($this->callback('is_array'))
->with($this->callback('is_string'))
The callback() method accepts any PHP callable, including built-in type
checking functions like is_array(), is_string(), is_int(), etc.
This approach is forward-compatible with PHPUnit 13 and follows best
practices for type assertions in mocks.
Commit #67 - Fixed all 6 PHPUnit deprecation warnings
Total Deprecations: 6 → 0 ✅
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
20 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 .github/CONTRIBUTING.md