MAGETWO-35561: Stabilize story

Author: Yurii Torbyk

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -733,7 +733,7 @@ public function walkAttributes($partMethod, array $args = [], $collectExceptionM
                     /** @var \Magento\Eav\Model\Entity\Attribute\Exception $e */
                     $e = $this->_universalFactory->create(
                         'Magento\Eav\Model\Entity\Attribute\Exception',
-                        ['message' => __($e->getMessage())]
+                        ['phrase' => __($e->getMessage())]
                     );
                     $e->setAttributeCode($attrCode)->setPart($part);
                     throw $e;

app/code/Magento/Payment/Test/Unit/Block/Info/CcTest.php

@@ -131,8 +131,6 @@ public function ccExpMonthDataProvider()
      */
     public function testGetCcExpDate($ccExpMonth, $ccExpYear)
     {
-        $this->markTestIncomplete('Failing on the develop branch');
-
         $paymentInfo = $this->getMock('Magento\Payment\Model\Info', ['getCcExpMonth', 'getCcExpYear'], [], '', false);
         $paymentInfo
             ->expects($this->any())
@@ -159,7 +157,7 @@ public function testGetCcExpDate($ccExpMonth, $ccExpYear)
     public function getCcExpDateDataProvider()
     {
         return [
-            [2, 2015],
+            [3, 2015],
             [12, 2011],
             [01, 2036]
         ];

dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php

@@ -50,7 +50,7 @@ public function getRealMemoryUsage()
             // try to use the Windows command line
             // some ports of Unix commands on Windows, such as MinGW, have limited capabilities and cannot be used
             $result = $this->_getWinProcessMemoryUsage($pid);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (\Exception $e) {
             // fall back to the Unix command line
             $result = $this->_getUnixProcessMemoryUsage($pid);
         }

dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php

@@ -121,7 +121,7 @@ public function tableForPeriodDataProvider()
             ],
             [
                 'period'    => 'month',
-                'table'     => 'report_viewed_product_aggregated_yearly',
+                'table'     => 'report_viewed_product_aggregated_monthly',
                 'date_from' => null,
                 'date_to'   => $dateNow,
             ],

lib/internal/Magento/Framework/Code/Generator.php

@@ -69,7 +69,7 @@ public function getGeneratedEntities()
      *
      * @param string $className
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Exception
      * @throws \InvalidArgumentException
      */
     public function generateClass($className)
@@ -102,9 +102,7 @@ public function generateClass($className)
         $this->tryToLoadSourceClass($className, $generator);
         if (!($file = $generator->generate())) {
             $errors = $generator->getErrors();
-            throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase(implode(' ', $errors))
-            );
+            throw new \Exception(implode(' ', $errors));
         }
         $this->includeFile($file);
         return self::GENERATION_SUCCESS;
@@ -169,18 +167,15 @@ public function getObjectManager()
      * @param string $className
      * @param \Magento\Framework\Code\Generator\EntityAbstract $generator
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Exception
      */
     protected function tryToLoadSourceClass($className, $generator)
     {
         $sourceClassName = $generator->getSourceClassName();
         if (!$this->definedClasses->classLoadable($sourceClassName)) {
             if ($this->generateClass($sourceClassName) !== self::GENERATION_SUCCESS) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    new \Magento\Framework\Phrase(
-                        'Source class "%1" for "%2" generation does not exist.',
-                        [$sourceClassName, $className]
-                    )
+                throw new \Exception(
+                    sprintf('Source class "%s" for "%s" generation does not exist.', $sourceClassName, $className)
                 );
             }
         }

lib/internal/Magento/Framework/Shell.php

@@ -42,7 +42,7 @@ public function __construct(
      * @param string $command Command with optional argument markers '%s'
      * @param string[] $arguments Argument values to substitute markers with
      * @return string Output of an executed command
-     * @throws \Magento\Framework\Exception\LocalizedException If a command returns non-zero exit code
+     * @throws \Exception If a command returns non-zero exit code
      */
     public function execute($command, array $arguments = [])
     {
@@ -51,18 +51,15 @@ public function execute($command, array $arguments = [])
 
         $disabled = explode(',', ini_get('disable_functions'));
         if (in_array('exec', $disabled)) {
-            throw new Exception\LocalizedException(new \Magento\Framework\Phrase("exec function is disabled."));
+            throw new \Exception("exec function is disabled.");
         }
 
         exec($command, $output, $exitCode);
         $output = implode(PHP_EOL, $output);
         $this->log($output);
         if ($exitCode) {
             $commandError = new \Exception($output, $exitCode);
-            throw new Exception\LocalizedException(
-                new \Magento\Framework\Phrase("Command returned non-zero exit code:\n`%1`", [$command]),
-                $commandError
-            );
+            throw new \Exception("Command returned non-zero exit code:\n`{$command}`", 0, $commandError);
         }
         return $output;
     }