Commit 6ac48680 authored by matthieu-rolland's avatar matthieu-rolland
Browse files

change hasKey strict conditions

parent d94441ec
......@@ -205,12 +205,12 @@ class Configuration extends ParameterBag implements ShopConfigurationInterface
}
$hasKey = ConfigurationLegacy::hasKey($key, null, $shopGroupId, $shopId);
if ($hasKey || $shopConstraint->isStrict()) {
if (null !== $shopId && ($hasKey || $shopConstraint->isStrict())) {
return $hasKey;
}
$hasKey = ConfigurationLegacy::hasKey($key, null, $shopGroupId);
if ($hasKey) {
if (null !== $shopGroupId && ($shopConstraint->isStrict() || $hasKey)) {
return $hasKey;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment