Merge remote-tracking branch 'tango/MAGETWO-26762' into MAGETWO-34995

Dmytro Poperechnyy · Dmytro Poperechnyy · commit 4573c0e92ed0 · 2015-03-27T10:39:56.000+02:00
diff --git a/app/code/Magento/Backup/Exception.php b/app/code/Magento/Backup/Exception.php
diff --git a/app/code/Magento/Backup/Model/Backup.php b/app/code/Magento/Backup/Model/Backup.php
@@ -273,20 +273,22 @@ public function deleteFile()
      *
      * @param bool $write
      * @return $this
-     * @throws \Magento\Backup\Exception
+     * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Backup\Exception\NotEnoughPermissions
      */
     public function open($write = false)
     {
         if ($this->getPath() === null) {
-            throw new \Magento\Backup\Exception(__('The backup file path was not specified.'));
+            throw new \Magento\Framework\Exception\InputException(__('The backup file path was not specified.'));
         }
 
         if ($write && $this->varDirectory->isFile($this->_getFilePath())) {
             $this->varDirectory->delete($this->_getFilePath());
         }
         if (!$write && !$this->varDirectory->isFile($this->_getFilePath())) {
-            throw new \Magento\Backup\Exception(__('The backup file "%1" does not exist.', $this->getFileName()));
+            throw new \Magento\Framework\Exception\InputException(
+                __('The backup file "%1" does not exist.', $this->getFileName())
+            );
         }
 
         $mode = $write ? 'wb' . self::COMPRESS_RATE : 'rb';
@@ -311,12 +313,12 @@ public function open($write = false)
      * Get zlib handler
      *
      * @return \Magento\Framework\Filesystem\File\WriteInterface
-     * @throws \Magento\Backup\Exception
+     * @throws \Magento\Framework\Exception\InputException
      */
     protected function _getStream()
     {
         if ($this->_stream === null) {
-            throw new \Magento\Backup\Exception(__('The backup file handler was unspecified.'));
+            throw new \Magento\Framework\Exception\InputException(__('The backup file handler was unspecified.'));
         }
         return $this->_stream;
     }
@@ -347,14 +349,14 @@ public function eof()
      *
      * @param string $string
      * @return $this
-     * @throws \Magento\Backup\Exception
+     * @throws \Magento\Framework\Exception\InputException
      */
     public function write($string)
     {
         try {
             $this->_getStream()->write($string);
         } catch (\Magento\Framework\Filesystem\FilesystemException $e) {
-            throw new \Magento\Backup\Exception(
+            throw new \Magento\Framework\Exception\InputException(
                 __('Something went wrong writing to the backup file "%1".', $this->getFileName())
             );
         }
diff --git a/app/code/Magento/Catalog/Exception.php b/app/code/Magento/Catalog/Exception.php
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
@@ -15,14 +15,15 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
      *
      * @param array|int|null $ids
      * @return void
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($ids = null)
     {
         try {
             $this->reindex();
         } catch (\Exception $e) {
-            throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Row.php
@@ -15,17 +15,18 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
      *
      * @param int|null $id
      * @return void
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute($id = null)
     {
         if (!isset($id) || empty($id)) {
-            throw new \Magento\Catalog\Exception(__('Could not rebuild index for undefined product'));
+            throw new \Magento\Framework\Exception\InputException(__('Could not rebuild index for undefined product'));
         }
         try {
             $this->reindex($id);
         } catch (\Exception $e) {
-            throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Rows.php
@@ -15,17 +15,18 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
      *
      * @param array $ids
      * @return void
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute($ids)
     {
         if (empty($ids)) {
-            throw new \Magento\Catalog\Exception(__('Bad value was supplied.'));
+            throw new \Magento\Framework\Exception\InputException(__('Bad value was supplied.'));
         }
         try {
             $this->reindex($ids);
         } catch (\Exception $e) {
-            throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -365,13 +365,13 @@ public function getTypeIndexers()
      *
      * @param string $productTypeId
      * @return \Magento\Catalog\Model\Resource\Product\Indexer\Price\PriceInterface
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\InputException
      */
     protected function _getIndexer($productTypeId)
     {
         $this->getTypeIndexers();
         if (!isset($this->_indexers[$productTypeId])) {
-            throw new \Magento\Catalog\Exception(__('Unsupported product type "%1".', $productTypeId));
+            throw new \Magento\Framework\Exception\InputException(__('Unsupported product type "%1".', $productTypeId));
         }
         return $this->_indexers[$productTypeId];
     }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
@@ -16,7 +16,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      *
      * @param array|int|null $ids
      * @return void
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute($ids = null)
     {
@@ -32,7 +32,7 @@ public function execute($ids = null)
             }
             $this->_syncData();
         } catch (\Exception $e) {
-            throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Row.php
@@ -16,17 +16,18 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      *
      * @param int|null $id
      * @return void
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute($id = null)
     {
         if (!isset($id) || empty($id)) {
-            throw new \Magento\Catalog\Exception(__('Could not rebuild index for undefined product'));
+            throw new \Magento\Framework\Exception\InputException(__('Could not rebuild index for undefined product'));
         }
         try {
             $this->_reindexRows([$id]);
         } catch (\Exception $e) {
-            throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
@@ -16,17 +16,18 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      *
      * @param array $ids
      * @return void
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute($ids)
     {
         if (empty($ids)) {
-            throw new \Magento\Catalog\Exception(__('Bad value was supplied.'));
+            throw new \Magento\Framework\Exception\InputException(__('Bad value was supplied.'));
         }
         try {
             $this->_reindexRows($ids);
         } catch (\Exception $e) {
-            throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
@@ -86,12 +86,14 @@ public function setTypeId($typeCode)
      * Retrieve Product Type Code
      *
      * @return string
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getTypeId()
     {
         if ($this->_typeId === null) {
-            throw new \Magento\Catalog\Exception(__('A product type is not defined for the indexer.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('A product type is not defined for the indexer.')
+            );
         }
         return $this->_typeId;
     }
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/Factory.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/Factory.php
@@ -34,15 +34,15 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param string $className
      * @param array $data
      * @return \Magento\Catalog\Model\Resource\Product\Indexer\Price\DefaultPrice
-     * @throws \Magento\Catalog\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function create($className, array $data = [])
     {
         $indexerPrice = $this->_objectManager->create($className, $data);
 
         if (!$indexerPrice instanceof \Magento\Catalog\Model\Resource\Product\Indexer\Price\DefaultPrice) {
-            throw new \Magento\Catalog\Exception(
-                $className . ' doesn\'t extends \Magento\Catalog\Model\Resource\Product\Indexer\Price\DefaultPrice'
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('%1 doesn\'t extend \Magento\Catalog\Model\Resource\Product\Indexer\Price\DefaultPrice', $className)
             );
         }
         return $indexerPrice;
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
@@ -93,7 +93,7 @@ protected function initContext(array $additionalParams = [])
         $this->context->expects($this->any())->method('getActionFlag')->will($this->returnValue($actionFlagMock));
         $this->context->expects($this->any())->method('getHelper')->will($this->returnValue($helperDataMock));
 
-        foreach($additionalParams as $property => $object) {
+        foreach ($additionalParams as $property => $object) {
             $this->context->expects($this->any())->method('get' . ucfirst($property))->willReturn($object);
         }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
@@ -36,7 +36,7 @@ public function testExecuteWithAdapterErrorThrowsException()
             $eavSourceFactory
         );
 
-        $this->setExpectedException('\Magento\Catalog\Exception', $exceptionMessage);
+        $this->setExpectedException('Magento\Framework\Exception\LocalizedException', $exceptionMessage);
 
         $model->execute();
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/RowTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/RowTest.php
@@ -21,7 +21,7 @@ public function setUp()
     }
 
     /**
-     * @expectedException \Magento\Catalog\Exception
+     * @expectedException \Magento\Framework\Exception\InputException
      * @expectedExceptionMessage Could not rebuild index for undefined product
      */
     public function testEmptyId()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/RowsTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/RowsTest.php
@@ -21,7 +21,7 @@ public function setUp()
     }
 
     /**
-     * @expectedException \Magento\Catalog\Exception
+     * @expectedException \Magento\Framework\Exception\InputException
      * @expectedExceptionMessage Bad value was supplied.
      */
     public function testEmptyIds()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowTest.php
@@ -21,7 +21,7 @@ public function setUp()
     }
 
     /**
-     * @expectedException \Magento\Catalog\Exception
+     * @expectedException \Magento\Framework\Exception\InputException
      * @expectedExceptionMessage Could not rebuild index for undefined product
      */
     public function testEmptyId()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
@@ -21,7 +21,7 @@ public function setUp()
     }
 
     /**
-     * @expectedException \Magento\Catalog\Exception
+     * @expectedException \Magento\Framework\Exception\InputException
      * @expectedExceptionMessage Bad value was supplied.
      */
     public function testEmptyIds()
diff --git a/app/code/Magento/Checkout/Exception.php b/app/code/Magento/Checkout/Exception.php
@@ -5,6 +5,6 @@
  */
 namespace Magento\Checkout;
 
-class Exception extends \Zend_Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Reports/Exception.php b/app/code/Magento/Reports/Exception.php
diff --git a/app/code/Magento/Sales/Controller/Guest/Reorder.php b/app/code/Magento/Sales/Controller/Guest/Reorder.php
@@ -6,23 +6,7 @@
  */
 namespace Magento\Sales\Controller\Guest;
 
-use Magento\Framework\App\Action;
-use Magento\Framework\Controller\Result\RedirectFactory;
-
 class Reorder extends \Magento\Sales\Controller\AbstractController\Reorder
 {
-    /**
-     * @param Action\Context $context
-     * @param \Magento\Sales\Controller\Guest\OrderLoader $orderLoader
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
-     */
-    public function __construct(
-        Action\Context $context,
-        \Magento\Sales\Controller\Guest\OrderLoader $orderLoader,
-        \Magento\Framework\Registry $registry,
-        RedirectFactory $resultRedirectFactory
-    ) {
-        parent::__construct($context, $orderLoader, $registry, $resultRedirectFactory);
-    }
+
 }
diff --git a/app/code/Magento/Sales/Exception.php b/app/code/Magento/Sales/Exception.php
diff --git a/app/code/Magento/SalesRule/Exception.php b/app/code/Magento/SalesRule/Exception.php
diff --git a/app/code/Magento/Shipping/Exception.php b/app/code/Magento/Shipping/Exception.php
@@ -5,6 +5,6 @@
  */
 namespace Magento\Shipping;
 
-class Exception extends \Zend_Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/dev/tests/integration/testsuite/Magento/TestFixture/Controller/Adminhtml/Noroute.php b/dev/tests/integration/testsuite/Magento/TestFixture/Controller/Adminhtml/Noroute.php
@@ -35,4 +35,13 @@ public function dispatch(RequestInterface $request)
     public function getResponse()
     {
     }
+
+    /**
+     * Get default redirect object
+     *
+     * @return void
+     */
+    public function getDefaultRedirect()
+    {
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/AbstractActionTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/AbstractActionTest.php
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php
diff --git a/lib/internal/Magento/Framework/Data/Collection/Db.php b/lib/internal/Magento/Framework/Data/Collection/Db.php
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php

Original file line number	Diff line number	Diff line change
`@@ -273,20 +273,22 @@ public function deleteFile()`
`273`	`273`	`*`
`274`	`274`	`* @param bool $write`
`275`	`275`	`* @return $this`
`276`		`- * @throws \Magento\Backup\Exception`
	`276`	`+ * @throws \Magento\Framework\Exception\InputException`
`277`	`277`	`* @throws \Magento\Framework\Backup\Exception\NotEnoughPermissions`
`278`	`278`	`*/`
`279`	`279`	`public function open($write = false)`
`280`	`280`	`{`
`281`	`281`	`if ($this->getPath() === null) {`
`282`		`- throw new \Magento\Backup\Exception(__('The backup file path was not specified.'));`
	`282`	`+ throw new \Magento\Framework\Exception\InputException(__('The backup file path was not specified.'));`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`if ($write && $this->varDirectory->isFile($this->_getFilePath())) {`
`286`	`286`	`$this->varDirectory->delete($this->_getFilePath());`
`287`	`287`	`}`
`288`	`288`	`if (!$write && !$this->varDirectory->isFile($this->_getFilePath())) {`
`289`		`- throw new \Magento\Backup\Exception(__('The backup file "%1" does not exist.', $this->getFileName()));`
	`289`	`+ throw new \Magento\Framework\Exception\InputException(`
	`290`	`+ __('The backup file "%1" does not exist.', $this->getFileName())`
	`291`	`+ );`
`290`	`292`	`}`
`291`	`293`
`292`	`294`	`$mode = $write ? 'wb' . self::COMPRESS_RATE : 'rb';`
`@@ -311,12 +313,12 @@ public function open($write = false)`
`311`	`313`	`* Get zlib handler`
`312`	`314`	`*`
`313`	`315`	`* @return \Magento\Framework\Filesystem\File\WriteInterface`
`314`		`- * @throws \Magento\Backup\Exception`
	`316`	`+ * @throws \Magento\Framework\Exception\InputException`
`315`	`317`	`*/`
`316`	`318`	`protected function _getStream()`
`317`	`319`	`{`
`318`	`320`	`if ($this->_stream === null) {`
`319`		`- throw new \Magento\Backup\Exception(__('The backup file handler was unspecified.'));`
	`321`	`+ throw new \Magento\Framework\Exception\InputException(__('The backup file handler was unspecified.'));`
`320`	`322`	`}`
`321`	`323`	`return $this->_stream;`
`322`	`324`	`}`
`@@ -347,14 +349,14 @@ public function eof()`
`347`	`349`	`*`
`348`	`350`	`* @param string $string`
`349`	`351`	`* @return $this`
`350`		`- * @throws \Magento\Backup\Exception`
	`352`	`+ * @throws \Magento\Framework\Exception\InputException`
`351`	`353`	`*/`
`352`	`354`	`public function write($string)`
`353`	`355`	`{`
`354`	`356`	`try {`
`355`	`357`	`$this->_getStream()->write($string);`
`356`	`358`	`} catch (\Magento\Framework\Filesystem\FilesystemException $e) {`
`357`		`- throw new \Magento\Backup\Exception(`
	`359`	`+ throw new \Magento\Framework\Exception\InputException(`
`358`	`360`	`__('Something went wrong writing to the backup file "%1".', $this->getFileName())`
`359`	`361`	`);`
`360`	`362`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,15 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction`
`15`	`15`	`*`
`16`	`16`	`* @param array\|int\|null $ids`
`17`	`17`	`* @return void`
`18`		`- * @throws \Magento\Catalog\Exception`
	`18`	`+ * @throws \Magento\Framework\Exception\LocalizedException`
	`19`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`19`	`20`	`*/`
`20`	`21`	`public function execute($ids = null)`
`21`	`22`	`{`
`22`	`23`	`try {`
`23`	`24`	`$this->reindex();`
`24`	`25`	`} catch (\Exception $e) {`
`25`		`- throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);`
	`26`	`+ throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,18 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction`
`15`	`15`	`*`
`16`	`16`	`* @param int\|null $id`
`17`	`17`	`* @return void`
`18`		`- * @throws \Magento\Catalog\Exception`
	`18`	`+ * @throws \Magento\Framework\Exception\InputException`
	`19`	`+ * @throws \Magento\Framework\Exception\LocalizedException`
`19`	`20`	`*/`
`20`	`21`	`public function execute($id = null)`
`21`	`22`	`{`
`22`	`23`	`if (!isset($id) \|\| empty($id)) {`
`23`		`- throw new \Magento\Catalog\Exception(__('Could not rebuild index for undefined product'));`
	`24`	`+ throw new \Magento\Framework\Exception\InputException(__('Could not rebuild index for undefined product'));`
`24`	`25`	`}`
`25`	`26`	`try {`
`26`	`27`	`$this->reindex($id);`
`27`	`28`	`} catch (\Exception $e) {`
`28`		`- throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);`
	`29`	`+ throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,18 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction`
`15`	`15`	`*`
`16`	`16`	`* @param array $ids`
`17`	`17`	`* @return void`
`18`		`- * @throws \Magento\Catalog\Exception`
	`18`	`+ * @throws \Magento\Framework\Exception\InputException`
	`19`	`+ * @throws \Magento\Framework\Exception\LocalizedException`
`19`	`20`	`*/`
`20`	`21`	`public function execute($ids)`
`21`	`22`	`{`
`22`	`23`	`if (empty($ids)) {`
`23`		`- throw new \Magento\Catalog\Exception(__('Bad value was supplied.'));`
	`24`	`+ throw new \Magento\Framework\Exception\InputException(__('Bad value was supplied.'));`
`24`	`25`	`}`
`25`	`26`	`try {`
`26`	`27`	`$this->reindex($ids);`
`27`	`28`	`} catch (\Exception $e) {`
`28`		`- throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);`
	`29`	`+ throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -365,13 +365,13 @@ public function getTypeIndexers()`
`365`	`365`	`*`
`366`	`366`	`* @param string $productTypeId`
`367`	`367`	`* @return \Magento\Catalog\Model\Resource\Product\Indexer\Price\PriceInterface`
`368`		`- * @throws \Magento\Catalog\Exception`
	`368`	`+ * @throws \Magento\Framework\Exception\InputException`
`369`	`369`	`*/`
`370`	`370`	`protected function _getIndexer($productTypeId)`
`371`	`371`	`{`
`372`	`372`	`$this->getTypeIndexers();`
`373`	`373`	`if (!isset($this->_indexers[$productTypeId])) {`
`374`		`- throw new \Magento\Catalog\Exception(__('Unsupported product type "%1".', $productTypeId));`
	`374`	`+ throw new \Magento\Framework\Exception\InputException(__('Unsupported product type "%1".', $productTypeId));`
`375`	`375`	`}`
`376`	`376`	`return $this->_indexers[$productTypeId];`
`377`	`377`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction`
`16`	`16`	`*`
`17`	`17`	`* @param array\|int\|null $ids`
`18`	`18`	`* @return void`
`19`		`- * @throws \Magento\Catalog\Exception`
	`19`	`+ * @throws \Magento\Framework\Exception\LocalizedException`
`20`	`20`	`*/`
`21`	`21`	`public function execute($ids = null)`
`22`	`22`	`{`
`@@ -32,7 +32,7 @@ public function execute($ids = null)`
`32`	`32`	`}`
`33`	`33`	`$this->_syncData();`
`34`	`34`	`} catch (\Exception $e) {`
`35`		`- throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);`
	`35`	`+ throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,18 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction`
`16`	`16`	`*`
`17`	`17`	`* @param int\|null $id`
`18`	`18`	`* @return void`
`19`		`- * @throws \Magento\Catalog\Exception`
	`19`	`+ * @throws \Magento\Framework\Exception\InputException`
	`20`	`+ * @throws \Magento\Framework\Exception\LocalizedException`
`20`	`21`	`*/`
`21`	`22`	`public function execute($id = null)`
`22`	`23`	`{`
`23`	`24`	`if (!isset($id) \|\| empty($id)) {`
`24`		`- throw new \Magento\Catalog\Exception(__('Could not rebuild index for undefined product'));`
	`25`	`+ throw new \Magento\Framework\Exception\InputException(__('Could not rebuild index for undefined product'));`
`25`	`26`	`}`
`26`	`27`	`try {`
`27`	`28`	`$this->_reindexRows([$id]);`
`28`	`29`	`} catch (\Exception $e) {`
`29`		`- throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);`
	`30`	`+ throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);`
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,18 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction`
`16`	`16`	`*`
`17`	`17`	`* @param array $ids`
`18`	`18`	`* @return void`
`19`		`- * @throws \Magento\Catalog\Exception`
	`19`	`+ * @throws \Magento\Framework\Exception\InputException`
	`20`	`+ * @throws \Magento\Framework\Exception\LocalizedException`
`20`	`21`	`*/`
`21`	`22`	`public function execute($ids)`
`22`	`23`	`{`
`23`	`24`	`if (empty($ids)) {`
`24`		`- throw new \Magento\Catalog\Exception(__('Bad value was supplied.'));`
	`25`	`+ throw new \Magento\Framework\Exception\InputException(__('Bad value was supplied.'));`
`25`	`26`	`}`
`26`	`27`	`try {`
`27`	`28`	`$this->_reindexRows($ids);`
`28`	`29`	`} catch (\Exception $e) {`
`29`		`- throw new \Magento\Catalog\Exception($e->getMessage(), $e->getCode(), $e);`
	`30`	`+ throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);`
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`	`}`