MAGETWO-88409: Builds stabilization for PR

Author: rganin

dev/tests/setup-integration/testsuite/Magento/Setup/ValidationRulesTest.php

@@ -41,7 +41,7 @@ public function setUp()
     }
 
     /**
-     * @expectedException \Magento\Setup\Exception
+     * @expectedException \Magento\Framework\Setup\Exception
      * @expectedExceptionMessageRegExp /Primary key can`t be applied on table "test_table". All columns should be not nullable/
      * @moduleName Magento_TestSetupDeclarationModule8
      */
@@ -61,7 +61,7 @@ public function testFailOnInvalidPrimaryKey()
     }
 
     /**
-     * @expectedException \Magento\Setup\Exception
+     * @expectedException \Magento\Framework\Setup\Exception
      * @expectedExceptionMessageRegExp /Column definition "page_id_on" and reference column definition "page_id" are different in tables "dependent" and "test_table"/
      * @moduleName Magento_TestSetupDeclarationModule8
      */
@@ -80,7 +80,7 @@ public function testFailOnIncosistentReferenceDefinition()
     }
 
     /**
-     * @expectedException \Magento\Setup\Exception
+     * @expectedException \Magento\Framework\Setup\Exception
      * @expectedExceptionMessageRegExp /Auto Increment column do not have index. Column - "page_id"/
      * @moduleName Magento_TestSetupDeclarationModule8
      */

lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
 
+use Magento\Framework\Phrase;
 use Magento\Framework\Stdlib\BooleanUtils;
 use Magento\Framework\Setup\Exception;
 use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
@@ -116,7 +117,7 @@ private function validate(Schema $schema)
                 $messages .= sprintf("%s%s", PHP_EOL, $error['message']);
             }
 
-            throw new Exception(__($messages));
+            throw new Exception(new Phrase($messages));
         }
     }