Skip to content

Commit 6950895

Browse files
committed
Fix phpcs issues that were false-positive
1 parent 7cac36c commit 6950895

File tree

126 files changed

+724
-765
lines changed

Some content is hidden

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

126 files changed

+724
-765
lines changed

app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/BundlePanelTest.php

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,22 +135,20 @@ public function testModifyMeta(string $shipmentTypePath, string $dataScope): voi
135135
->willReturn([]);
136136
$this->arrayManagerMock->method('set')
137137
->willReturn([]);
138+
139+
$metaArgument = [
140+
$shipmentTypePath . BundlePanel::META_CONFIG_PATH,
141+
[],
142+
[
143+
'dataScope' => $dataScope,
144+
'validation' => [
145+
'required-entry' => false
146+
]
147+
]
148+
];
138149
$this->arrayManagerMock
139150
->method('merge')
140-
->withConsecutive(
141-
[], [], [], [], [], [], [], [], [], [], [], [],
142-
[
143-
$shipmentTypePath . BundlePanel::META_CONFIG_PATH,
144-
[],
145-
[
146-
'dataScope' => $dataScope,
147-
'validation' => [
148-
'required-entry' => false
149-
]
150-
]
151-
]
152-
153-
);
151+
->withConsecutive([], [], [], [], [], [], [], [], [], [], [], [], $metaArgument);
154152
$this->bundlePanelModel->modifyMeta($sourceMeta);
155153
}
156154

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ protected function setUp(): void
158158
'delete',
159159
'quoteInto',
160160
'fetchAssoc'
161-
])
161+
]
162+
)
162163
->disableOriginalConstructor()
163164
->getMock();
164165
$this->select = $this->createMock(Select::class);

app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
class SaveHandlerTest extends TestCase
3030
{
3131
/**
32-
* Magento\Framework\TestFramework\Unit\Helper\ObjectManager
32+
* @var ObjectManager
3333
*/
3434
private $objectManager;
3535

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ protected function setUp(): void
9090
}
9191

9292
/**
93-
* @return void
94-
*/
93+
* @return void
94+
*/
9595
public function testGetList(): void
9696
{
9797
$productSku = 'simple_product';
@@ -106,17 +106,17 @@ public function testGetList(): void
106106
}
107107

108108
/**
109-
* @return void
110-
*/
109+
* @return void
110+
*/
111111
public function testDelete(): void
112112
{
113113
$this->optionResourceMock->expects($this->once())->method('delete')->with($this->optionMock);
114114
$this->assertTrue($this->optionRepository->delete($this->optionMock));
115115
}
116116

117117
/**
118-
* @return void
119-
*/
118+
* @return void
119+
*/
120120
public function testGetNonExistingOption(): void
121121
{
122122
$this->expectException('Magento\Framework\Exception\NoSuchEntityException');
@@ -136,8 +136,8 @@ public function testGetNonExistingOption(): void
136136
}
137137

138138
/**
139-
* @return void
140-
*/
139+
* @return void
140+
*/
141141
public function testGet(): void
142142
{
143143
$optionId = 1;
@@ -155,8 +155,8 @@ public function testGet(): void
155155
}
156156

157157
/**
158-
* @return void
159-
*/
158+
* @return void
159+
*/
160160
public function testDeleteByIdentifierNonExistingOption(): void
161161
{
162162
$this->expectException('Magento\Framework\Exception\NoSuchEntityException');
@@ -177,8 +177,8 @@ public function testDeleteByIdentifierNonExistingOption(): void
177177
}
178178

179179
/**
180-
* @return void
181-
*/
180+
* @return void
181+
*/
182182
public function testDeleteByIdentifier(): void
183183
{
184184
$optionId = 1;
@@ -200,8 +200,8 @@ public function testDeleteByIdentifier(): void
200200
}
201201

202202
/**
203-
* @return void
204-
*/
203+
* @return void
204+
*/
205205
public function testDeleteByIdentifierWhenCannotRemoveOption(): void
206206
{
207207
$this->expectException('Magento\Framework\Exception\CouldNotSaveException');
@@ -228,8 +228,8 @@ public function testDeleteByIdentifierWhenCannotRemoveOption(): void
228228
}
229229

230230
/**
231-
* @return void
232-
*/
231+
* @return void
232+
*/
233233
public function testSaveCouldNotSaveException(): void
234234
{
235235
$this->expectException('Magento\Framework\Exception\CouldNotSaveException');
@@ -239,8 +239,8 @@ public function testSaveCouldNotSaveException(): void
239239
}
240240

241241
/**
242-
* @return void
243-
*/
242+
* @return void
243+
*/
244244
public function testSaveNoSuchEntityException(): void
245245
{
246246
$this->expectException('Magento\Framework\Exception\NoSuchEntityException');
@@ -261,8 +261,8 @@ public function testSaveNoSuchEntityException(): void
261261
}
262262

263263
/**
264-
* @return void
265-
*/
264+
* @return void
265+
*/
266266
public function testSave(): void
267267
{
268268
$productSku = 'simple_product';
@@ -307,8 +307,8 @@ public function testSave(): void
307307
}
308308

309309
/**
310-
* @return void
311-
*/
310+
* @return void
311+
*/
312312
public function testSaveWhenOptionTypeWasChanged(): void
313313
{
314314
$productSku = 'simple_product';

app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ class PriceTest extends TestCase
6868
*/
6969
protected $websiteMock;
7070

71+
/**
72+
* @var ProductTierPriceExtensionFactory|MockObject
73+
*/
7174
private $tierPriceExtensionFactoryMock;
7275

7376
/**

app/code/Magento/Catalog/Test/Unit/Model/Product/TypeTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ public function testGetCompositeTypes(): void
137137
public function testGetTypesByPriority(): void
138138
{
139139
$expected = [];
140+
$options = [];
140141
foreach ($this->_productTypes as $typeId => $type) {
141142
$type['label'] = __($type['label']);
142143
$options[$typeId] = $type;

0 commit comments

Comments
 (0)