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.

Sign up for GitHub

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

Jump to bottom

[Forwardport] Resolve incorrect scope code selection when the requested scopeCode is null #21633

Merged
merged 4 commits into from
Apr 29, 2019
Merged

[Forwardport] Resolve incorrect scope code selection when the requested scopeCode is null #21633

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc8f909
Resolve incorrect scope code selection when the requested scopeCode i…
matthew-muscat Jul 19, 2018
ca16809
update travis-ci for phpcs static test
matthew-muscat Jul 20, 2018
9e5fdbb
Update null conditional check
matthew-muscat Jul 20, 2018
e2ce243
Merge branch '2.3-develop-mainjline' into 2.3-develop-PR-port-16940
p-bystritsky Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
namespace Magento\Framework\App\Config;

use Magento\Framework\App\ScopeInterface;
use Magento\Framework\App\ScopeResolverPool;

/**
Expand Down Expand Up @@ -34,28 +35,32 @@ public function __construct(ScopeResolverPool $scopeResolverPool)
* Resolve scope code
*
* @param string $scopeType
* @param string $scopeCode
* @param string|null $scopeCode
* @return string
*/
public function resolve($scopeType, $scopeCode)
{
if (isset($this->resolvedScopeCodes[$scopeType][$scopeCode])) {
return $this->resolvedScopeCodes[$scopeType][$scopeCode];
}
if (($scopeCode === null || is_numeric($scopeCode))
&& $scopeType !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT
) {

if ($scopeType !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
$scopeResolver = $this->scopeResolverPool->get($scopeType);
$resolverScopeCode = $scopeResolver->getScope($scopeCode);
} else {
$resolverScopeCode = $scopeCode;
}

if ($resolverScopeCode instanceof \Magento\Framework\App\ScopeInterface) {
if ($resolverScopeCode instanceof ScopeInterface) {
$resolverScopeCode = $resolverScopeCode->getCode();
}

if ($scopeCode === null) {
$scopeCode = $resolverScopeCode;
}

$this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;

return $resolverScopeCode;
}

Expand Down