MAGETWO-34991: Eliminate exceptions from the list Part2

Yuri Kovsher · Yuri Kovsher · commit 47de030734bb · 2015-03-26T12:00:41.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
@@ -44,8 +44,6 @@ public function testLayoutArguments($area, $layoutFile)
                     continue;
                 }
                 $this->_argInterpreter->evaluate($argumentData);
-            } catch (\Magento\Framework\Data\Argument\MissingOptionalValueException $e) {
-                // Argument value is missing in the testing environment, but it's optional, so no big deal
             } catch (\Exception $e) {
                 $this->fail($e->getMessage());
             }
diff --git a/lib/internal/Magento/Framework/App/Arguments/ArgumentInterpreter.php b/lib/internal/Magento/Framework/App/Arguments/ArgumentInterpreter.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Data\Argument\Interpreter\Constant;
 use Magento\Framework\Data\Argument\InterpreterInterface;
-use Magento\Framework\Data\Argument\MissingOptionalValueException;
 
 /**
  * Interpreter that returns value of an application argument, retrieving its name from a constant
@@ -30,7 +29,6 @@ public function __construct(Constant $constInterpreter)
     /**
      * {@inheritdoc}
      * @return mixed
-     * @throws MissingOptionalValueException
      */
     public function evaluate(array $data)
     {
diff --git a/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php b/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php
@@ -17,7 +17,6 @@ interface InterpreterInterface
      * @return mixed
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
-     * @throws MissingOptionalValueException
      */
     public function evaluate(array $data);
 }
diff --git a/lib/internal/Magento/Framework/Data/Argument/MissingOptionalValueException.php b/lib/internal/Magento/Framework/Data/Argument/MissingOptionalValueException.php

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@ public function testLayoutArguments($area, $layoutFile)`
`44`	`44`	`continue;`
`45`	`45`	`}`
`46`	`46`	`$this->_argInterpreter->evaluate($argumentData);`
`47`		`- } catch (\Magento\Framework\Data\Argument\MissingOptionalValueException $e) {`
`48`		`- // Argument value is missing in the testing environment, but it's optional, so no big deal`
`49`	`47`	`} catch (\Exception $e) {`
`50`	`48`	`$this->fail($e->getMessage());`
`51`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ interface InterpreterInterface`
`17`	`17`	`* @return mixed`
`18`	`18`	`* @throws \InvalidArgumentException`
`19`	`19`	`* @throws \UnexpectedValueException`
`20`		`- * @throws MissingOptionalValueException`
`21`	`20`	`*/`
`22`	`21`	`public function evaluate(array $data);`
`23`	`22`	`}`