Commit c758da55 authored by matthieu-rolland's avatar matthieu-rolland
Browse files

use ShopException is group shop is not found

parent 82b1e973
......@@ -31,6 +31,7 @@ use Configuration as ConfigurationLegacy;
use Feature;
use Language;
use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopException;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
use PrestaShopBundle\Exception\NotImplementedException;
use Shop;
......@@ -374,7 +375,18 @@ class Configuration extends ParameterBag implements ShopConfigurationInterface
if (null !== $shopConstraint->getShopGroupId()) {
return $shopConstraint->getShopGroupId()->getValue();
} elseif (null !== $shopConstraint->getShopId()) {
return (int) Shop::getGroupFromShop((int) $shopConstraint->getShopId()->getValue(), true);
$shopGroupId = Shop::getGroupFromShop((int) $shopConstraint->getShopId()->getValue(), true);
// $shopGroupId can must not be false, it would mean that the shop group was not found for the given shop
if ($shopGroupId === false) {
throw new ShopException(
'Shop group with id %s was not found.',
return (int) $shopGroupId;
return null;
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