Skip to content

Commit 0190c5f

Browse files
A-KomarA-Komar
committed
Merge branch 'MAGNIMEX-SPRINT2-FIX-CODE-STYLES' into 'MAGNIMEX-SPRINT2'
Magnimex sprint2 fix code styles MAGNIMEX-SPRINT2: fix code styles(phpmd, phpcs) using psr2 rules 1 - BundleImportExport 2 - CatalogImportExport 3 - ConfigurableImportExport 4 - GroupedImportExport 5 - ImportExport 6 - CatalogUrlRewrite See merge request !102
2 parents 9322e72 + a1353b4 commit 0190c5f

File tree

9 files changed

+186
-153
lines changed

9 files changed

+186
-153
lines changed

‎app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,10 @@ protected function parseSelections($rowData, $entityId)
166166
$this->_entityModel->getMultipleValueSeparator(),
167167
$rowData['bundle_values']
168168
);
169-
$selections = explode(\Magento\CatalogImportExport\Model\Import\Product::PSEUDO_MULTI_LINE_SEPARATOR,
170-
$rowData['bundle_values']);
169+
$selections = explode(
170+
\Magento\CatalogImportExport\Model\Import\Product::PSEUDO_MULTI_LINE_SEPARATOR,
171+
$rowData['bundle_values']
172+
);
171173
foreach ($selections as $selection) {
172174
$values = explode($this->_entityModel->getMultipleValueSeparator(), $selection);
173175
$option = $this->parseOption($values);
@@ -568,8 +570,9 @@ protected function insertSelections()
568570
if ($tmpArray = $this->populateSelectionTemplate(
569571
$selection,
570572
$option['option_id'],
571-
$productId, $index)
572-
) {
573+
$productId,
574+
$index
575+
)) {
573576
$selections[] = $tmpArray;
574577
$index++;
575578
}
@@ -616,12 +619,19 @@ protected function deleteOptionsAndSelections($productIds)
616619
'parent_id IN (?)',
617620
$productIds
618621
));
619-
$this->connection->delete($optionTable, $this->connection
620-
->quoteInto('value_id IN (?)', array_keys($valuesIds)));
622+
$this->connection->delete(
623+
$optionTable,
624+
$this->connection->quoteInto('value_id IN (?)', array_keys($valuesIds))
625+
);
621626
$productIdsInWhere = $this->connection->quoteInto('parent_id IN (?)', $productIds);
622-
$this->connection->delete($optionTable, $this->connection->quoteInto('parent_id IN (?)', $productIdsInWhere));
623-
$this->connection->delete($optionTable, $this->connection
624-
->quoteInto('parent_product_id IN (?)', $productIdsInWhere));
627+
$this->connection->delete(
628+
$optionTable,
629+
$this->connection->quoteInto('parent_id IN (?)', $productIdsInWhere)
630+
);
631+
$this->connection->delete(
632+
$optionTable,
633+
$this->connection->quoteInto('parent_product_id IN (?)', $productIdsInWhere)
634+
);
625635
return $this;
626636
}
627637

‎app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -498,12 +498,17 @@ public function testSaveProductAttributes()
498498
$this->_connection->expects($this->any())
499499
->method('quoteInto')
500500
->willReturnCallback([$this, 'returnQuoteCallback']);
501-
$this->_connection->expects($this->once())->method('delete')
502-
->with($this->equalTo($testTable),
503-
$this->equalTo('(store_id NOT IN ('
504-
. $storeId . ') AND attribute_id = '
505-
. $attributeId . ' AND entity_id = '
506-
. self::ENTITY_ID . ')')
501+
$this->_connection
502+
->expects($this->once())
503+
->method('delete')
504+
->with(
505+
$this->equalTo($testTable),
506+
$this->equalTo(
507+
'(store_id NOT IN ('
508+
. $storeId . ') AND attribute_id = '
509+
. $attributeId . ' AND entity_id = '
510+
. self::ENTITY_ID . ')'
511+
)
507512
);
508513

509514
$tableData[] = [
@@ -983,8 +988,10 @@ public function testValidateRowValidateNewProductTypeGetNewSkuCall()
983988

984989
public function testValidateRowValidateNewProductTypeResetSku()
985990
{
986-
$this->markTestSkipped('No chance to assert sku resetting due to mutually exclusive condition:
987-
!isset($this->_invalidRows[$rowNum]) and isset($this->_invalidRows[$rowNum]) should be true simultaneously');
991+
$this->markTestSkipped(
992+
'No chance to assert sku resetting due to mutually exclusive condition:
993+
!isset($this->_invalidRows[$rowNum]) and isset($this->_invalidRows[$rowNum]) should be true simultaneously'
994+
);
988995
}
989996

990997
public function testValidateDefaultScopeNotValidAttributesResetSku()
@@ -1161,8 +1168,10 @@ public function isAttributeValidAssertAttrValidDataProvider()
11611168
'type' => 'varchar',
11621169
],
11631170
'$rowData' => [
1164-
'code' => str_repeat('a',
1165-
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH - 1),
1171+
'code' => str_repeat(
1172+
'a',
1173+
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH - 1
1174+
),
11661175
],
11671176
],
11681177
[
@@ -1212,8 +1221,10 @@ public function isAttributeValidAssertAttrValidDataProvider()
12121221
'type' => 'text',
12131222
],
12141223
'$rowData' => [
1215-
'code' => str_repeat('a',
1216-
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH - 1),
1224+
'code' => str_repeat(
1225+
'a',
1226+
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH - 1
1227+
),
12171228
],
12181229
],
12191230
];
@@ -1230,8 +1241,10 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
12301241
'type' => 'varchar',
12311242
],
12321243
'$rowData' => [
1233-
'code' => str_repeat('a',
1234-
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH + 1),
1244+
'code' => str_repeat(
1245+
'a',
1246+
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH + 1
1247+
),
12351248
],
12361249
],
12371250
[
@@ -1281,8 +1294,10 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
12811294
'type' => 'text',
12821295
],
12831296
'$rowData' => [
1284-
'code' => str_repeat('a',
1285-
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH + 1),
1297+
'code' => str_repeat(
1298+
'a',
1299+
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH + 1
1300+
),
12861301
],
12871302
],
12881303
];

‎app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/Plugin/ImportTest.php

Lines changed: 121 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,121 @@
1-
<?php
2-
3-
/**
4-
* Copyright © 2015 Magento. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
7-
8-
namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Product\Plugin;
9-
10-
use Magento\ImportExport\Model\Import as ImportExport;
11-
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
12-
13-
class ImportTest extends \PHPUnit_Framework_TestCase
14-
{
15-
16-
/**
17-
* @var \Magento\UrlRewrite\Model\UrlPersistInterface|\PHPUnit_Framework_MockObject_MockObject
18-
*/
19-
protected $urlPersist;
20-
21-
/**
22-
* @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
23-
*/
24-
protected $productUrlRewriteGenerator;
25-
26-
/**
27-
* @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
28-
*/
29-
protected $productRepository;
30-
31-
/**
32-
* @var \Magento\CatalogUrlRewrite\Model\Product\Plugin\Import|\PHPUnit_Framework_MockObject_MockObject
33-
*/
34-
protected $import;
35-
36-
/**
37-
* @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
38-
*/
39-
protected $observer;
40-
41-
/**
42-
* @var \Magento\Framework\Event|\PHPUnit_Framework_MockObject_MockObject
43-
*/
44-
protected $event;
45-
46-
/**
47-
* @var \Magento\Framework\DB\Adapter\Pdo\Mysql|\PHPUnit_Framework_MockObject_MockObject
48-
*/
49-
protected $adapter;
50-
51-
/**
52-
* @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
53-
*/
54-
protected $object;
55-
56-
/**
57-
* @var ObjectManagerHelper
58-
*/
59-
protected $objectManagerHelper;
60-
61-
public function setUp()
62-
{
63-
$this->object = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false);
64-
$this->adapter = $this->getMock(
65-
'Magento\Framework\DB\Adapter\Pdo\Mysql',
66-
['getOldSku', '_populateToUrlGeneration'],
67-
[],
68-
'',
69-
false
70-
);
71-
$this->adapter->expects($this->any())->method('_populateToUrlGeneration')->willReturn($this->object);
72-
$this->adapter->expects($this->any())->method('getOldSku')->willReturn([
73-
'sku' => ['sku' => 'sku', 'url_key' => 'value1', 'entity_id' => '1'],
74-
'sku2' => ['sku' => 'sku2', 'url_key' => 'value2', 'entity_id' => '2']
75-
]);
76-
$this->event = $this->getMock('\Magento\Framework\Event', ['getAdapter', 'getBunch'], [], '', false);
77-
$this->event->expects($this->any())->method('getAdapter')->willReturn($this->adapter);
78-
$this->event->expects($this->any())->method('getBunch')->willReturn([
79-
['sku' => 'sku', 'url_key' => 'value1'], ['sku' => 'sku3', 'url_key' => 'value3']
80-
]);
81-
$this->observer = $this->getMock('\Magento\Framework\Event\Observer', ['getEvent'], [], '', false);
82-
$this->observer->expects($this->any())->method('getEvent')->willReturn($this->event);
83-
$this->urlPersist = $this->getMockBuilder('\Magento\UrlRewrite\Model\UrlPersistInterface')
84-
->disableOriginalConstructor()
85-
->getMock();
86-
$this->productUrlRewriteGenerator =
87-
$this->getMockBuilder('\Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator')
88-
->disableOriginalConstructor()
89-
->setMethods(['generate'])
90-
->getMock();
91-
$this->productRepository = $this->getMockBuilder('\Magento\Catalog\Api\ProductRepositoryInterface')
92-
->disableOriginalConstructor()
93-
->getMock();
94-
$this->objectManagerHelper = new ObjectManagerHelper($this);
95-
$this->import = $this->objectManagerHelper->getObject(
96-
'\Magento\CatalogUrlRewrite\Model\Product\Plugin\Import',
97-
[
98-
'urlPersist' => $this->urlPersist,
99-
'productUrlRewriteGenerator' => $this->productUrlRewriteGenerator,
100-
'productRepository' => $this->productRepository,
101-
]
102-
);
103-
}
104-
105-
/**
106-
* Test for afterImportData()
107-
*/
108-
public function testAfterImportData()
109-
{
110-
$this->productUrlRewriteGenerator->expects($this->any())->method('generate')->willReturn(['url1', 'url2']);
111-
$this->import->afterImportData($this->observer);
112-
}
113-
114-
/**
115-
* Test for clearProductUrls()
116-
*/
117-
public function testClearProductUrls()
118-
{
119-
$this->import->clearProductUrls($this->observer);
120-
}
121-
}
1+
<?php
2+
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
8+
namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Product\Plugin;
9+
10+
use Magento\ImportExport\Model\Import as ImportExport;
11+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
12+
13+
class ImportTest extends \PHPUnit_Framework_TestCase
14+
{
15+
16+
/**
17+
* @var \Magento\UrlRewrite\Model\UrlPersistInterface|\PHPUnit_Framework_MockObject_MockObject
18+
*/
19+
protected $urlPersist;
20+
21+
/**
22+
* @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
23+
*/
24+
protected $productUrlRewriteGenerator;
25+
26+
/**
27+
* @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
28+
*/
29+
protected $productRepository;
30+
31+
/**
32+
* @var \Magento\CatalogUrlRewrite\Model\Product\Plugin\Import|\PHPUnit_Framework_MockObject_MockObject
33+
*/
34+
protected $import;
35+
36+
/**
37+
* @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
38+
*/
39+
protected $observer;
40+
41+
/**
42+
* @var \Magento\Framework\Event|\PHPUnit_Framework_MockObject_MockObject
43+
*/
44+
protected $event;
45+
46+
/**
47+
* @var \Magento\Framework\DB\Adapter\Pdo\Mysql|\PHPUnit_Framework_MockObject_MockObject
48+
*/
49+
protected $adapter;
50+
51+
/**
52+
* @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
53+
*/
54+
protected $object;
55+
56+
/**
57+
* @var ObjectManagerHelper
58+
*/
59+
protected $objectManagerHelper;
60+
61+
public function setUp()
62+
{
63+
$this->object = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false);
64+
$this->adapter = $this->getMock(
65+
'Magento\Framework\DB\Adapter\Pdo\Mysql',
66+
['getOldSku', '_populateToUrlGeneration'],
67+
[],
68+
'',
69+
false
70+
);
71+
$this->adapter->expects($this->any())->method('_populateToUrlGeneration')->willReturn($this->object);
72+
$this->adapter->expects($this->any())->method('getOldSku')->willReturn([
73+
'sku' => ['sku' => 'sku', 'url_key' => 'value1', 'entity_id' => '1'],
74+
'sku2' => ['sku' => 'sku2', 'url_key' => 'value2', 'entity_id' => '2']
75+
]);
76+
$this->event = $this->getMock('\Magento\Framework\Event', ['getAdapter', 'getBunch'], [], '', false);
77+
$this->event->expects($this->any())->method('getAdapter')->willReturn($this->adapter);
78+
$this->event->expects($this->any())->method('getBunch')->willReturn([
79+
['sku' => 'sku', 'url_key' => 'value1'], ['sku' => 'sku3', 'url_key' => 'value3']
80+
]);
81+
$this->observer = $this->getMock('\Magento\Framework\Event\Observer', ['getEvent'], [], '', false);
82+
$this->observer->expects($this->any())->method('getEvent')->willReturn($this->event);
83+
$this->urlPersist = $this->getMockBuilder('\Magento\UrlRewrite\Model\UrlPersistInterface')
84+
->disableOriginalConstructor()
85+
->getMock();
86+
$this->productUrlRewriteGenerator =
87+
$this->getMockBuilder('\Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator')
88+
->disableOriginalConstructor()
89+
->setMethods(['generate'])
90+
->getMock();
91+
$this->productRepository = $this->getMockBuilder('\Magento\Catalog\Api\ProductRepositoryInterface')
92+
->disableOriginalConstructor()
93+
->getMock();
94+
$this->objectManagerHelper = new ObjectManagerHelper($this);
95+
$this->import = $this->objectManagerHelper->getObject(
96+
'\Magento\CatalogUrlRewrite\Model\Product\Plugin\Import',
97+
[
98+
'urlPersist' => $this->urlPersist,
99+
'productUrlRewriteGenerator' => $this->productUrlRewriteGenerator,
100+
'productRepository' => $this->productRepository,
101+
]
102+
);
103+
}
104+
105+
/**
106+
* Test for afterImportData()
107+
*/
108+
public function testAfterImportData()
109+
{
110+
$this->productUrlRewriteGenerator->expects($this->any())->method('generate')->willReturn(['url1', 'url2']);
111+
$this->import->afterImportData($this->observer);
112+
}
113+
114+
/**
115+
* Test for clearProductUrls()
116+
*/
117+
public function testClearProductUrls()
118+
{
119+
$this->import->clearProductUrls($this->observer);
120+
}
121+
}

0 commit comments

Comments
 (0)