Merge remote-tracking branch 'origin/MAGETWO-64539-PR-3155' into develop-prs

Oleksii Korshenko · Oleksii Korshenko · commit d70da1d759bb · 2017-02-14T16:03:27.000-06:00
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -98,7 +98,6 @@ protected function setupExtensionAttributeMock()
     protected function verifyOrderTaxes($expectedTaxes)
     {
         $index = 0;
-        $orderTaxes = [];
         foreach ($expectedTaxes as $orderTaxId => $orderTaxData) {
             $orderTaxMock = $this->getMockBuilder(\Magento\Tax\Model\Sales\Order\Tax::class)
                 ->disableOriginalConstructor()
@@ -122,15 +121,13 @@ protected function verifyOrderTaxes($expectedTaxes)
             $this->orderTaxFactoryMock->expects($this->at($index))
                 ->method('create')
                 ->willReturn($orderTaxMock);
-            $orderTaxes[] = $orderTaxMock;
             $index++;
         }
     }
 
     public function verifyItemTaxes($expectedItemTaxes)
     {
         $index = 0;
-        $itemTaxes = [];
         foreach ($expectedItemTaxes as $itemTax) {
             $itemTaxMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Tax\Item::class)
                 ->disableOriginalConstructor()
@@ -150,7 +147,6 @@ public function verifyItemTaxes($expectedItemTaxes)
             $this->taxItemFactoryMock->expects($this->at($index))
                 ->method('create')
                 ->willReturn($itemTaxMock);
-            $itemTaxes[] = $itemTaxMock;
             $index++;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ protected function setupExtensionAttributeMock()`
`98`	`98`	`protected function verifyOrderTaxes($expectedTaxes)`
`99`	`99`	`{`
`100`	`100`	`$index = 0;`
`101`		`- $orderTaxes = [];`
`102`	`101`	`foreach ($expectedTaxes as $orderTaxId => $orderTaxData) {`
`103`	`102`	`$orderTaxMock = $this->getMockBuilder(\Magento\Tax\Model\Sales\Order\Tax::class)`
`104`	`103`	`->disableOriginalConstructor()`
`@@ -122,15 +121,13 @@ protected function verifyOrderTaxes($expectedTaxes)`
`122`	`121`	`$this->orderTaxFactoryMock->expects($this->at($index))`
`123`	`122`	`->method('create')`
`124`	`123`	`->willReturn($orderTaxMock);`
`125`		`- $orderTaxes[] = $orderTaxMock;`
`126`	`124`	`$index++;`
`127`	`125`	`}`
`128`	`126`	`}`
`129`	`127`
`130`	`128`	`public function verifyItemTaxes($expectedItemTaxes)`
`131`	`129`	`{`
`132`	`130`	`$index = 0;`
`133`		`- $itemTaxes = [];`
`134`	`131`	`foreach ($expectedItemTaxes as $itemTax) {`
`135`	`132`	`$itemTaxMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Tax\Item::class)`
`136`	`133`	`->disableOriginalConstructor()`
`@@ -150,7 +147,6 @@ public function verifyItemTaxes($expectedItemTaxes)`
`150`	`147`	`$this->taxItemFactoryMock->expects($this->at($index))`
`151`	`148`	`->method('create')`
`152`	`149`	`->willReturn($itemTaxMock);`
`153`		`- $itemTaxes[] = $itemTaxMock;`
`154`	`150`	`$index++;`
`155`	`151`	`}`
`156`	`152`	`}`