Merge branch 'MAGETWO-32624' into develop

Conflicts:
	app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php

Author: Dale Sikkema

app/code/Magento/Config/Model/Config/ScopeDefiner.php

@@ -39,6 +39,6 @@ public function getScope()
             'store'
         ) ? StoreScopeInterface::SCOPE_STORE : ($this->_request->getParam(
             'website'
-        ) ? StoreScopeInterface::SCOPE_WEBSITE : StoreScopeInterface::SCOPE_DEFAULT);
+        ) ? StoreScopeInterface::SCOPE_WEBSITE : ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
     }
 }

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;
 
 /**

app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php

@@ -63,7 +63,7 @@ protected function setUp()
     public function testAfterSave($value, $oldValue, $eventName)
     {
         $path = 'sales_email/general/async_sending';
-        $scope = \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT;
+        $scope = \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
 
         $this->object->setData(['value' => $value, 'path' => $path, 'scope' => $scope]);
 

app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Grid/AsyncIndexingTest.php

@@ -63,7 +63,7 @@ protected function setUp()
     public function testAfterSave($value, $oldValue, $eventName)
     {
         $path = 'dev/grid/async_indexing';
-        $scope = \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT;
+        $scope = \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
 
         $this->object->setData(['value' => $value, 'path' => $path, 'scope' => $scope]);
 

app/code/Magento/Store/Model/Config/Reader/DefaultReader.php

@@ -8,6 +8,7 @@
 namespace Magento\Store\Model\Config\Reader;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 class DefaultReader implements \Magento\Framework\App\Config\Scope\ReaderInterface
 {
@@ -45,14 +46,14 @@ public function __construct(
      * Read configuration data
      *
      * @param null|string $scope
-     * @throws \Magento\Framework\Exception Exception is thrown when scope other than default is given
+     * @throws 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);

app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php

@@ -6,8 +6,9 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Tax;
 
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Controller\ResultFactory;
+
 
 class IgnoreTaxNotification extends \Magento\Tax\Controller\Adminhtml\Tax
 {

app/code/Magento/Theme/Model/View/Design.php

@@ -5,6 +5,7 @@
  */
 
 namespace Magento\Theme\Model\View;
+
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**

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;
 
 /**

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