Skip to content

Sync fork with upstream magento/magento2 2.4-develop#1

Draft
Copilot wants to merge 2 commits into
2.4-developfrom
copilot/update-repo-from-upstream
Draft

Sync fork with upstream magento/magento2 2.4-develop#1
Copilot wants to merge 2 commits into
2.4-developfrom
copilot/update-repo-from-upstream

Conversation

Copy link
Copy Markdown

Copilot AI commented Mar 13, 2026

The fork was 25,871 commits behind magento/magento2:2.4-develop. This PR merges upstream into the fork's 2.4-develop branch to bring it current.

Changes

  • Added magento/magento2 as upstream remote and fetched 2.4-develop
  • Merged upstream into branch via a single merge commit (no conflicts)
  • Net diff: 40,717 files changed, ~821K insertions, ~387K deletions

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Copilot AI changed the title [WIP] Update repository from upstream Sync fork with upstream magento/magento2 2.4-develop Mar 13, 2026
Copilot AI requested a review from RahulKachhadia March 13, 2026 06:51
RahulKachhadia pushed a commit that referenced this pull request Mar 13, 2026
Fixed 3 errors:
1. DateTest: Made providerGetValue() static
2. PaginationProcessorTest: Added setCurPage/setPageSize to onlyMethods
3. CustomizationTest: Replaced self::once()/self::never() with string representations

Error #1: Data Provider method not static
- providerGetValue() → public static function providerGetValue()

Error magento#2: MethodCannotBeConfiguredException for setCurPage/setPageSize
- Added missing methods to onlyMethods() array in AbstractDb mock

Error magento#3: Non-static method self::once() called statically in data provider
- Replaced self::once() → 'once', self::never() → 'never'
- Added MockCreationTrait import
- Used createInvocationMatcher() in test method to convert strings

Pattern: For data providers with matcher expectations, use string
representations and convert them in test methods with createInvocationMatcher()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants