Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve incorrect scope code selection when the requested scopeCode is null #16940

Conversation

matthew-muscat
Copy link
Contributor

Description

  • resolves an issue whereby the incorrect scope could be returned when attempting to resolve a scope with a requested scopeCode of null
  • simplify the scope resolver logic to a avoid multiple if conditional checks
  • move scope interface class to an alias of the class
  • update docblock on the expected values available for scopeCode

Resolves #16939

Fixed Issues (if relevant)

  1. Incorrect configuration scope is occasionally returned when attempting to resolve a null scope id #16939: Incorrect configuration scope is occasionally returned when attempting to resolve a null scope id

Manual testing scenarios

  1. See Incorrect configuration scope is occasionally returned when attempting to resolve a null scope id #16939 for steps to repeat issue + confirm issue is not present when these changes are active

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)
  • All automated tests passed successfully (all builds on Travis CI are green)

…s null

- resolves an issue whereby the incorrect scope could be returned when attempting to resolve a scope with a requested scopeCode of null
- simplify the scope resolver logic to a avoid multiple if conditional checks
- move scope interface class to an alias of the class
- update docblock on the expected values available for scopeCode

Signed-off-by: Matthew Muscat <matthew@mamis.com.au>
@magento-cicd2
Copy link
Contributor

magento-cicd2 commented Jul 19, 2018

CLA assistant check
All committers have signed the CLA.

@magento-engcom-team
Copy link
Contributor

Hi @matthew-muscat. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento-engcom-team give me test instance - deploy test instance based on PR changes
  • @magento-engcom-team give me {$VERSION} instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

@matthew-muscat
Copy link
Contributor Author

FYI - Codacy PR quality review is stating the else condition is not required - however this was present prior to my pull request.

@aleron75 aleron75 self-assigned this Jul 20, 2018
$resolverScopeCode = $resolverScopeCode->getCode();
}

if ($scopeCode == null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest changing this statement according to the general rule of preferring the identical comparison operator === over the equal one ==.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aleron75 — confirming this has been done

@magento-engcom-team
Copy link
Contributor

Hi @aleron75, thank you for the review.
ENGCOM-2444 has been created to process this Pull Request

@magento-engcom-team
Copy link
Contributor

@matthew-muscat thank you for contributing. Please accept Community Contributors team invitation here to gain extended permissions for this repository.

@magento-engcom-team
Copy link
Contributor

Hi @matthew-muscat. Thank you for your contribution.
We will aim to release these changes as part of 2.2.8.
Please check the release notes for final confirmation.

Please, consider to port this solution to 2.3 release line.
You may use Porting tool to port commits automatically.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants