Skip to content

Fix #39376: correct LoginAsCustomer admin ID key and ScopeResolver phpdoc#40628

Open
pratik268 wants to merge 3 commits intomagento:2.4-developfrom
pratik268:fix-39376-loginascustomer-adminid-typo
Open

Fix #39376: correct LoginAsCustomer admin ID key and ScopeResolver phpdoc#40628
pratik268 wants to merge 3 commits intomagento:2.4-developfrom
pratik268:fix-39376-loginascustomer-adminid-typo

Conversation

@pratik268
Copy link
Copy Markdown

Description (*)

This PR addresses magento/magento2#39376 by fixing two developer-experience issues in core code:

  1. Corrected the PHPDoc type for Magento\Framework\App\ScopeResolver::$objectManager to ObjectManagerInterface.
  2. Corrected Login As Customer admin-id session key usage in a backward-compatible way:
    • read from getLoggedAsCustomerAdminId() first
    • fallback to legacy typo key getLoggedAsCustomerAdmindId()
    • write both keys in setter to preserve compatibility for existing integrations/session data

Also added unit tests for the getter and setter behavior.

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes [Developer Experience] PHPDoc and Typo #39376

Manual testing scenarios (*)

  1. Run unit tests for LoginAsCustomer model tests.
  2. Verify GetLoggedAsCustomerAdminId::execute() returns value from corrected key when present.
  3. Verify fallback to legacy typo key still works.
  4. Verify SetLoggedAsCustomerAdminId::execute() writes both corrected and legacy keys.

Questions or comments

Unable to run Magento test suite in this environment because PHP runtime is unavailable in the execution container.

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
  • All automated tests passed successfully (all builds are green)

@m2-assistant
Copy link
Copy Markdown

m2-assistant bot commented Mar 26, 2026

Hi @pratik268. Thank you for your contribution!
Here are some useful tips on how you can test your changes using Magento test environment.
❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names.

Allowed build names are:
  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests
  13. Semantic Version Checker

You can find more information about the builds here
ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.


For more details, review the Code Contributions documentation.
Join Magento Community Engineering Slack and ask your questions in #github channel.

@pratik268
Copy link
Copy Markdown
Author

@magento run Unit Tests, Static Tests, Semantic Version Checker

@pratik268
Copy link
Copy Markdown
Author

README update is not applicable for this PR because the changes are limited to core PHPDoc/session-key handling and unit tests; no module README predefined sections are impacted.

@pratik268
Copy link
Copy Markdown
Author

Pushed follow-up commit addressing CI failures:

  • Unit Tests: Magento\Customer\Model\Session does not declare the login-as-customer getters/setters (magic __call), so PHPUnit could not stub them on a plain createMock. Tests now use getMockBuilder(Session::class)->disableOriginalConstructor()->addMethods([...]).
  • Static Tests (copyright): new test files now use Copyright 2026 Adobe per Magento public copyright rules for new files.

@magento run Unit Tests, Static Tests, Semantic Version Checker

@pratik268
Copy link
Copy Markdown
Author

@magento run Unit Tests, Static Tests, Semantic Version Checker

@engcom-Hotel engcom-Hotel added the Priority: P2 A defect with this priority could have functionality issues which are not to expectations. label Mar 31, 2026
@github-project-automation github-project-automation bot moved this to Pending Review in Pull Requests Dashboard Mar 31, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: pending review

Projects

Status: Pending Review

Development

Successfully merging this pull request may close these issues.

[Developer Experience] PHPDoc and Typo

2 participants