Merge pull request #841 from magento-engcom/develop-prs

[EngCom] Public Pull Requests: - #6049 - #6930 - #3155
magento · Feb 15, 2017 · f42f6d2 · f42f6d2
2 parents ae5f67c + d70da1d
commit f42f6d2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Use the following table to verify you have the correct prerequisites to install
 		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
 	</tr>
 	<tr>
-		<td>PHP 5.6.x, 7.0.2 or 7.0.6</td>
+		<td>PHP 5.6.x, 7.0.2, 7.0.4 or 7.0.6</td>
 		<td><code>php -v</code></td>
 		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
 	</tr>

diff --git a/app/code/Magento/ProductVideo/Setup/InstallSchema.php b/app/code/Magento/ProductVideo/Setup/InstallSchema.php
@@ -11,7 +11,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 
 /**
- * Class InstallSchema adds new table `eav_attribute_option_swatch`
+ * Class InstallSchema adds new table `catalog_product_entity_media_gallery_value_video`
  */
 class InstallSchema implements InstallSchemaInterface
 {

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++;
         }
     }