Merge remote-tracking branch 'falconsce/MAGETWO-63764' into MAGETWO-64335

Author: Yevhen Miroshnychenko

lib/internal/Magento/Framework/App/Scope/Validator.php

@@ -8,8 +8,8 @@
 use InvalidArgumentException;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeResolverPool;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Phrase;
 
 /**
@@ -40,14 +40,14 @@ public function isValid($scope, $scopeCode = null)
         }
 
         if ($scope === ScopeConfigInterface::SCOPE_TYPE_DEFAULT && !empty($scopeCode)) {
-            throw new LocalizedException(new Phrase(
+            throw new ValidatorException(new Phrase(
                 'The "%1" scope can\'t include a scope code. Try again without entering a scope code.',
                 [ScopeConfigInterface::SCOPE_TYPE_DEFAULT]
             ));
         }
 
         if (empty($scope)) {
-            throw new LocalizedException(new Phrase('Enter a scope before proceeding.'));
+            throw new ValidatorException(new Phrase('Enter a scope before proceeding.'));
         }
 
         $this->validateScopeCode($scopeCode);
@@ -56,9 +56,9 @@ public function isValid($scope, $scopeCode = null)
             $scopeResolver = $this->scopeResolverPool->get($scope);
             $scopeResolver->getScope($scopeCode)->getId();
         } catch (InvalidArgumentException $e) {
-            throw new LocalizedException(new Phrase('The "%1" value doesn\'t exist. Enter another value.', [$scope]));
+            throw new ValidatorException(new Phrase('The "%1" value doesn\'t exist. Enter another value.', [$scope]));
         } catch (NoSuchEntityException $e) {
-            throw new LocalizedException(
+            throw new ValidatorException(
                 new Phrase('The "%1" value doesn\'t exist. Enter another value.', [$scopeCode])
             );
         }
@@ -72,16 +72,16 @@ public function isValid($scope, $scopeCode = null)
      *
      * @param string $scopeCode
      * @return void
-     * @throws LocalizedException if scope code is empty or has a wrong format
+     * @throws ValidatorException if scope code is empty or has a wrong format
      */
     private function validateScopeCode($scopeCode)
     {
         if (empty($scopeCode)) {
-            throw new LocalizedException(new Phrase('Enter a scope code before proceeding.'));
+            throw new ValidatorException(new Phrase('Enter a scope code before proceeding.'));
         }
 
         if (!preg_match('/^[a-z]+[a-z0-9_]*$/', $scopeCode)) {
-            throw new LocalizedException(new Phrase(
+            throw new ValidatorException(new Phrase(
                 'The scope code can include only lowercase letters (a-z), numbers (0-9) and underscores (_). '
                 . 'Also, the first character must be a letter.'
             ));

lib/internal/Magento/Framework/App/Scope/ValidatorInterface.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Scope;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\ValidatorException;
 
 /**
  * Interface Validator for validating scope and scope code
@@ -19,7 +19,7 @@ interface ValidatorInterface
      * @param string $scope
      * @param string $scopeCode
      * @return boolean
-     * @throws LocalizedException
+     * @throws ValidatorException
      */
     public function isValid($scope, $scopeCode = null);
 }

lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php

@@ -66,7 +66,7 @@ public function testIsValidDefault()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Magento\Framework\Exception\ValidatorException
      * @expectedExceptionMessage The "default" scope can't include a scope code. Try again without entering a scope
      */
     public function testNotEmptyScopeCodeForDefaultScope()
@@ -75,7 +75,7 @@ public function testNotEmptyScopeCodeForDefaultScope()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Magento\Framework\Exception\ValidatorException
      * @expectedExceptionMessage Enter a scope before proceeding.
      */
     public function testEmptyScope()
@@ -84,7 +84,7 @@ public function testEmptyScope()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Magento\Framework\Exception\ValidatorException
      * @expectedExceptionMessage Enter a scope code before proceeding.
      */
     public function testEmptyScopeCode()
@@ -93,7 +93,7 @@ public function testEmptyScopeCode()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Magento\Framework\Exception\ValidatorException
      * @expectedExceptionMessage The scope code can include only lowercase letters (a-z), numbers (0-9) and underscores
      */
     public function testWrongScopeCodeFormat()
@@ -102,7 +102,7 @@ public function testWrongScopeCodeFormat()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Magento\Framework\Exception\ValidatorException
      * @expectedExceptionMessage The "not_default_scope" value doesn't exist. Enter another value.
      */
     public function testScopeNotExist()
@@ -117,7 +117,7 @@ public function testScopeNotExist()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Magento\Framework\Exception\ValidatorException
      * @expectedExceptionMessage The "not_exist_scope_code" value doesn't exist. Enter another value.
      */
     public function testScopeCodeNotExist()