Merge branch 'MAGETWO-84100' of https://github.com/magento-trigger/magento2ce into MAGETWO-84100

Sergii Kovalenko · Sergii Kovalenko · commit fbaa3f248c97 · 2018-01-31T19:15:42.000+02:00
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php
@@ -258,4 +258,3 @@
         ],
     ],
 ];
-
diff --git a/dev/tests/setup-integration/framework/tests/unit/testsuite/Magento/TestFramework/Test/Unit/Annotation/ReinstallInstanceTest.php b/dev/tests/setup-integration/framework/tests/unit/testsuite/Magento/TestFramework/Test/Unit/Annotation/ReinstallInstanceTest.php
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php
@@ -80,7 +80,6 @@ public function testFromDefinition()
         );
     }
 
-
     public function testFromDefinitionSigned()
     {
         $data = [

-Original file line number
+Diff line change
         ],
     ],
 ];
+-
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ public function testFromDefinition()`
`80`	`80`	`);`
`81`	`81`	`}`
`82`	`82`
`83`		`-`
`84`	`83`	`public function testFromDefinitionSigned()`
`85`	`84`	`{`
`86`	`85`	`$data = [`