Skip to content

Commit 7d7555e

Browse files
isavchuk-magentoisavchuk-magento
committed
Merge branch '2.2-develop' of https://github.com/magento/magento2ce into MAGETWO-61067
2 parents 6e82eb7 + 75e5dec commit 7d7555e

File tree

168 files changed

+1427
-3345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+1427
-3345
lines changed

‎app/code/Magento/Catalog/Block/Product/Context.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* As Magento moves from inheritance-based APIs all such classes will be deprecated together with
1717
* the classes they were introduced for.
1818
*
19-
* @deprecated
19+
* @deprecated
2020
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2121
*/
2222
class Context extends \Magento\Framework\View\Element\Template\Context

‎app/code/Magento/Catalog/Model/ProductVisibilityCondition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Catalog\Model;

‎app/code/Magento/Catalog/Model/Widget/RecentlyComparedStorageConfiguration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
3232

3333
/**
3434
* Parse lifetime of recently compared products in widget
35-
*
35+
*
3636
* @inheritdoc
3737
*/
3838
public function get()

‎app/code/Magento/Catalog/Model/Widget/RecentlyViewedStorageConfiguration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Catalog\Model\Widget;

‎app/code/Magento/Catalog/Test/Unit/Block/FrontendStorageManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Catalog\Test\Unit\Block;

‎app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Catalog\Test\Unit\Model;

‎app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,12 @@ public function testGet()
9393
$attributeId = 5;
9494
$skus = ['sku_1', 'sku_2'];
9595
$idsBySku = [
96-
'sku_1' =>
97-
[
98-
1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
99-
],
100-
'sku_2' =>
101-
[
102-
2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
103-
]
96+
'sku_1' => [
97+
1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
98+
],
99+
'sku_2' => [
100+
2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
101+
]
104102
];
105103
$select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
106104
->disableOriginalConstructor()->getMock();
@@ -228,14 +226,12 @@ public function testDelete()
228226
$attributeId = 5;
229227
$skus = ['sku_1', 'sku_2'];
230228
$idsBySku = [
231-
'sku_1' =>
232-
[
233-
1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
234-
],
235-
'sku_2' =>
236-
[
237-
2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
238-
]
229+
'sku_1' => [
230+
1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
231+
],
232+
'sku_2' => [
233+
2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
234+
]
239235
];
240236
$this->productIdLocator
241237
->expects($this->once())
@@ -278,14 +274,12 @@ public function testDeleteWithException()
278274
$attributeId = 5;
279275
$skus = ['sku_1', 'sku_2'];
280276
$idsBySku = [
281-
'sku_1' =>
282-
[
283-
1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
284-
],
285-
'sku_2' =>
286-
[
287-
2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
288-
]
277+
'sku_1' => [
278+
1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
279+
],
280+
'sku_2' => [
281+
2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
282+
]
289283
];
290284
$this->productIdLocator
291285
->expects($this->once())

‎app/code/Magento/Catalog/Test/Unit/Model/ProductRenderListTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Catalog\Test\Unit\Model;

‎app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Listing\Collector;

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/**
2929
* Class AdvancedPricing
30-
*
30+
*
3131
* @api
3232
*
3333
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)

0 commit comments

Comments
 (0)