Merge remote-tracking branch 'origin/MAGETWO-92568' into 2.2.5-develop-pr31

zakdma · zakdma · commit 089ba6be4e31 · 2018-06-08T19:07:31.000+03:00
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
@@ -432,7 +432,7 @@ public function testSetShippingMethods()
     /**
      * @return void
      */
-    public function testCreateOrders(): void
+    public function testCreateOrders()
     {
         $addressTotal = 5;
         $productType = \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE;

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ public function testSetShippingMethods()`
`432`	`432`	`/**`
`433`	`433`	`* @return void`
`434`	`434`	`*/`
`435`		`- public function testCreateOrders(): void`
	`435`	`+ public function testCreateOrders()`
`436`	`436`	`{`
`437`	`437`	`$addressTotal = 5;`
`438`	`438`	`$productType = \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE;`