diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php index 6584fdbd21575e6ad0d5e429bee7bd97b7d197cc..c8bc6b34398e0c492f9123cfaeedc8182da23299 100644 --- a/app/code/Magento/Email/Model/BackendTemplate.php +++ b/app/code/Magento/Email/Model/BackendTemplate.php @@ -4,6 +4,7 @@ * See COPYING.txt for license details. */ namespace Magento\Email\Model; + use Magento\Framework\App\Config\ScopeConfigInterface; /** diff --git a/app/code/Magento/Store/Model/Config/Reader/DefaultReader.php b/app/code/Magento/Store/Model/Config/Reader/DefaultReader.php index 911e9bd8ae155e59d0e741d9ba3e4f4863f95b17..189753ef58ad3ffc5eea9876c1f5b257d5adc2f2 100644 --- a/app/code/Magento/Store/Model/Config/Reader/DefaultReader.php +++ b/app/code/Magento/Store/Model/Config/Reader/DefaultReader.php @@ -45,14 +45,14 @@ class DefaultReader implements \Magento\Framework\App\Config\Scope\ReaderInterfa * Read configuration data * * @param null|string $scope - * @throws \Magento\Framework\Exception Exception is thrown when scope other than default is given + * @throws \Magento\Framework\Exception\LocalizedException Exception is thrown when scope other than default is given * @return array */ public function read($scope = null) { $scope = $scope === null ? ScopeConfigInterface::SCOPE_TYPE_DEFAULT : $scope; if ($scope !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT) { - throw new \Magento\Framework\Exception("Only default scope allowed"); + throw new \Magento\Framework\Exception\LocalizedException(__("Only default scope allowed")); } $config = $this->_initialConfig->getData($scope); diff --git a/app/code/Magento/Theme/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php index a158874feff56bbf6d696c7a385d607cc4acb17b..f0cf795f6b4482b9c8ac59bc444e62f4af24f14c 100644 --- a/app/code/Magento/Theme/Model/View/Design.php +++ b/app/code/Magento/Theme/Model/View/Design.php @@ -5,6 +5,7 @@ */ namespace Magento\Theme\Model\View; + use Magento\Framework\App\Config\ScopeConfigInterface; /** diff --git a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php index fd30d5b492fc7e9af0e9eaf12efa47e88bc03cf6..f83337a307eb201a8d5fd2fc8ef9dc8d6005880a 100644 --- a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php +++ b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php @@ -4,6 +4,7 @@ * See COPYING.txt for license details. */ namespace Magento\Payment\Model; + use Magento\Framework\App\Config\ScopeConfigInterface; /** diff --git a/lib/internal/Magento/Framework/App/Config/Value.php b/lib/internal/Magento/Framework/App/Config/Value.php index 64263bc7b69e8b3b6520d6ca65d5251a6cc77d32..92ee527a9c48eb77a35f527c2c471c2507d1b546 100644 --- a/lib/internal/Magento/Framework/App/Config/Value.php +++ b/lib/internal/Magento/Framework/App/Config/Value.php @@ -4,7 +4,6 @@ * See COPYING.txt for license details. */ namespace Magento\Framework\App\Config; -use Magento\Framework\App\Config\ScopeConfigInterface; /** * Config data model