MAGETWO-35561: Stabilize story

Author: Yurii Torbyk

dev/tools/Magento/Tools/Di/Code/Scanner/PhpScanner.php

@@ -49,7 +49,7 @@ protected function _findMissingClasses($file, $classReflection, $methodName, $en
                         if (class_exists($missingClassName)) {
                             continue;
                         }
-                    } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                    } catch (\Exception $e) {
                     }
                     $sourceClassName = $this->getSourceClassName($missingClassName, $entityType);
                     if (!class_exists($sourceClassName) && !interface_exists($sourceClassName)) {

dev/tools/Magento/Tools/Di/Code/Scanner/XmlScanner.php

@@ -68,7 +68,7 @@ protected function _filterEntities(array $output)
             $isClassExists = false;
             try {
                 $isClassExists = class_exists($className);
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (\Exception $e) {
             }
             if (false === $isClassExists) {
                 if (class_exists($entityName) || interface_exists($entityName)) {

lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php

@@ -60,7 +60,7 @@ public function testGetGeneratedEntities()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Exception
      * @dataProvider generateValidClassDataProvider
      */
     public function testGenerateClass($className, $entityType)
@@ -117,7 +117,7 @@ public function testGenerateClassWithWrongName()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Exception
      */
     public function testGenerateClassWithError()
     {

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php

@@ -42,7 +42,7 @@ public function getParentsDataProvider()
 
     /**
      * @param $entity
-     * @expectedException  \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Exception
      * @dataProvider nonExistentGeneratorsDataProvider
      */
     public function testHasIfNonExists($entity)

lib/internal/Magento/Framework/Test/Unit/ShellTest.php

@@ -111,7 +111,7 @@ public function executeDataProvider()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Exception
      * @expectedExceptionMessage Command returned non-zero exit code:
      * @expectedExceptionCode 0
      */
@@ -133,7 +133,7 @@ public function testExecuteFailureDetails($command, $commandArgs, $expectedError
             /* Force command to return non-zero exit code */
             $commandArgs[count($commandArgs) - 1] .= ' exit(42);';
             $this->testExecute($command, $commandArgs, ''); // no result is expected in a case of a command failure
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (\Exception $e) {
             $this->assertInstanceOf('Exception', $e->getPrevious());
             $this->assertEquals($expectedError, $e->getPrevious()->getMessage());
             $this->assertEquals(42, $e->getPrevious()->getCode());