Skip to content

Commit f42f6d2

Browse files
author
Oleksii Korshenko
authored
Merge pull request #841 from magento-engcom/develop-prs
[EngCom] Public Pull Requests: - #6049 - #6930 - #3155
2 parents ae5f67c + d70da1d commit f42f6d2

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Use the following table to verify you have the correct prerequisites to install
3333
<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
3434
</tr>
3535
<tr>
36-
<td>PHP 5.6.x, 7.0.2 or 7.0.6</td>
36+
<td>PHP 5.6.x, 7.0.2, 7.0.4 or 7.0.6</td>
3737
<td><code>php -v</code></td>
3838
<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>
3939
</tr>

app/code/Magento/ProductVideo/Setup/InstallSchema.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\Catalog\Model\ResourceModel\Product\Gallery;
1212

1313
/**
14-
* Class InstallSchema adds new table `eav_attribute_option_swatch`
14+
* Class InstallSchema adds new table `catalog_product_entity_media_gallery_value_video`
1515
*/
1616
class InstallSchema implements InstallSchemaInterface
1717
{

app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ protected function setupExtensionAttributeMock()
9898
protected function verifyOrderTaxes($expectedTaxes)
9999
{
100100
$index = 0;
101-
$orderTaxes = [];
102101
foreach ($expectedTaxes as $orderTaxId => $orderTaxData) {
103102
$orderTaxMock = $this->getMockBuilder(\Magento\Tax\Model\Sales\Order\Tax::class)
104103
->disableOriginalConstructor()
@@ -122,15 +121,13 @@ protected function verifyOrderTaxes($expectedTaxes)
122121
$this->orderTaxFactoryMock->expects($this->at($index))
123122
->method('create')
124123
->willReturn($orderTaxMock);
125-
$orderTaxes[] = $orderTaxMock;
126124
$index++;
127125
}
128126
}
129127

130128
public function verifyItemTaxes($expectedItemTaxes)
131129
{
132130
$index = 0;
133-
$itemTaxes = [];
134131
foreach ($expectedItemTaxes as $itemTax) {
135132
$itemTaxMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Tax\Item::class)
136133
->disableOriginalConstructor()
@@ -150,7 +147,6 @@ public function verifyItemTaxes($expectedItemTaxes)
150147
$this->taxItemFactoryMock->expects($this->at($index))
151148
->method('create')
152149
->willReturn($itemTaxMock);
153-
$itemTaxes[] = $itemTaxMock;
154150
$index++;
155151
}
156152
}

0 commit comments

Comments
 (0)