Skip to content

Commit 2110afd

Browse files
engcom-Foxtrotengcom-Foxtrot
committed
#24005: Static test fix.
1 parent 77942a5 commit 2110afd

File tree

23 files changed

+271
-160
lines changed

23 files changed

+271
-160
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ protected function getProductOptionTypes()
11531153

11541154
if (count($group['optgroup'])) {
11551155
$options[] = $group;
1156-
$groupIndex += 1;
1156+
$groupIndex++;
11571157
}
11581158
}
11591159

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

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
78

89
use Magento\Catalog\Api\Data\ProductAttributeInterface;
910
use Magento\Catalog\Model\Locator\LocatorInterface;
1011
use Magento\Eav\Api\AttributeRepositoryInterface;
11-
use Magento\Ui\Component\Form;
1212
use Magento\Framework\Stdlib\ArrayManager;
13+
use Magento\Ui\Component\Form;
1314

1415
/**
1516
* Data provider for main panel of product page
@@ -60,10 +61,10 @@ public function __construct(
6061
/**
6162
* Customize number fields for advanced price and weight fields.
6263
*
63-
* @since 101.0.0
6464
* @param array $data
6565
* @return array
6666
* @throws \Magento\Framework\Exception\NoSuchEntityException
67+
* @since 101.0.0
6768
*/
6869
public function modifyData(array $data)
6970
{
@@ -125,7 +126,7 @@ protected function customizeAdvancedPriceFormat(array $data)
125126
$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE] =
126127
$this->formatPrice($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
127128
$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY] =
128-
(float) $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
129+
(float)$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
129130
}
130131
}
131132

@@ -135,9 +136,9 @@ protected function customizeAdvancedPriceFormat(array $data)
135136
/**
136137
* Customize product form fields.
137138
*
138-
* @since 101.0.0
139139
* @param array $meta
140140
* @return array
141+
* @since 101.0.0
141142
*/
142143
public function modifyMeta(array $meta)
143144
{
@@ -234,9 +235,13 @@ protected function customizeWeightField(array $meta)
234235
null,
235236
'children'
236237
);
237-
$meta = $this->arrayManager->merge($containerPath . static::META_CONFIG_PATH, $meta, [
238-
'component' => 'Magento_Ui/js/form/components/group',
239-
]);
238+
$meta = $this->arrayManager->merge(
239+
$containerPath . static::META_CONFIG_PATH,
240+
$meta,
241+
[
242+
'component' => 'Magento_Ui/js/form/components/group',
243+
]
244+
);
240245

241246
$hasWeightPath = $this->arrayManager->slicePath($weightPath, 0, -1) . '/'
242247
. ProductAttributeInterface::CODE_HAS_WEIGHT;
@@ -438,8 +443,13 @@ protected function formatNumber($value)
438443
$precision = strlen(substr(strrchr($value, "."), 1));
439444
$store = $this->locator->getStore();
440445
$currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
441-
$value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL,
442-
'precision' => $precision]);
446+
$value = $currency->toCurrency(
447+
$value,
448+
[
449+
'display' => \Magento\Framework\Currency::NO_SYMBOL,
450+
'precision' => $precision
451+
]
452+
);
443453

444454
return $value;
445455
}

‎app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
use Magento\Framework\App\State;
1212

1313
/**
14+
* Checks visibility status.
15+
*
1416
* Defines status of visibility of form elements on Stores > Settings > Configuration page
1517
* in Admin Panel in Production mode.
1618
* @api

‎app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,6 @@ protected function enhanceTotalData(
403403
$total->setShippingTaxAmount($shippingTaxAmount);
404404
$total->setDiscountTaxCompensationAmount($discountTaxCompensation); // accessed via 'discount_tax_compensation'
405405
$total->setSubtotalInclTax($subtotalInclTax);
406-
return;
407406
}
408407

409408
/**

‎app/code/Magento/Weee/Block/Item/Price/Renderer.php‎

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ public function getIncludeWeeeFlag()
8686
}
8787

8888
/**
89-
* Get display price for unit price including tax. The Weee amount will be added to unit price including tax
90-
* depending on Weee display setting
89+
* Get display price for unit price including tax.
90+
*
91+
* The Weee amount will be added to unit price including tax depending on Weee display setting.
9192
*
9293
* @return float
9394
*/
@@ -107,8 +108,9 @@ public function getUnitDisplayPriceInclTax()
107108
}
108109

109110
/**
110-
* Get base price for unit price including tax. The Weee amount will be added to unit price including tax
111-
* depending on Weee display setting
111+
* Get base price for unit price including tax.
112+
*
113+
* The Weee amount will be added to unit price including tax depending on Weee display setting.
112114
*
113115
* @return float
114116
*/
@@ -128,8 +130,9 @@ public function getBaseUnitDisplayPriceInclTax()
128130
}
129131

130132
/**
131-
* Get display price for row total including tax. The Weee amount will be added to row total including tax
132-
* depending on Weee display setting
133+
* Get display price for row total including tax.
134+
*
135+
* The Weee amount will be added to row total including tax depending on Weee display setting.
133136
*
134137
* @return float
135138
*/
@@ -149,8 +152,9 @@ public function getRowDisplayPriceInclTax()
149152
}
150153

151154
/**
152-
* Get base price for row total including tax. The Weee amount will be added to row total including tax
153-
* depending on Weee display setting
155+
* Get base price for row total including tax.
156+
*
157+
* The Weee amount will be added to row total including tax depending on Weee display setting.
154158
*
155159
* @return float
156160
*/
@@ -170,8 +174,9 @@ public function getBaseRowDisplayPriceInclTax()
170174
}
171175

172176
/**
173-
* Get display price for unit price excluding tax. The Weee amount will be added to unit price
174-
* depending on Weee display setting
177+
* Get display price for unit price excluding tax.
178+
*
179+
* The Weee amount will be added to unit price depending on Weee display setting.
175180
*
176181
* @return float
177182
*/
@@ -191,8 +196,9 @@ public function getUnitDisplayPriceExclTax()
191196
}
192197

193198
/**
194-
* Get base price for unit price excluding tax. The Weee amount will be added to unit price
195-
* depending on Weee display setting
199+
* Get base price for unit price excluding tax.
200+
*
201+
* The Weee amount will be added to unit price depending on Weee display setting.
196202
*
197203
* @return float
198204
*/
@@ -218,8 +224,9 @@ public function getBaseUnitDisplayPriceExclTax()
218224
}
219225

220226
/**
221-
* Get display price for row total excluding tax. The Weee amount will be added to row total
222-
* depending on Weee display setting
227+
* Get display price for row total excluding tax.
228+
*
229+
* The Weee amount will be added to row total depending on Weee display setting.
223230
*
224231
* @return float
225232
*/
@@ -239,8 +246,9 @@ public function getRowDisplayPriceExclTax()
239246
}
240247

241248
/**
242-
* Get base price for row total excluding tax. The Weee amount will be added to row total
243-
* depending on Weee display setting
249+
* Get base price for row total excluding tax.
250+
*
251+
* The Weee amount will be added to row total depending on Weee display setting.
244252
*
245253
* @return float
246254
*/
@@ -260,7 +268,9 @@ public function getBaseRowDisplayPriceExclTax()
260268
}
261269

262270
/**
263-
* Get final unit display price including tax, this will add Weee amount to unit price include tax
271+
* Get final unit display price including tax.
272+
*
273+
* This will add Weee amount to unit price include tax.
264274
*
265275
* @return float
266276
*/
@@ -276,7 +286,9 @@ public function getFinalUnitDisplayPriceInclTax()
276286
}
277287

278288
/**
279-
* Get base final unit display price including tax, this will add Weee amount to unit price include tax
289+
* Get base final unit display price including tax.
290+
*
291+
* This will add Weee amount to unit price include tax.
280292
*
281293
* @return float
282294
*/
@@ -292,7 +304,9 @@ public function getBaseFinalUnitDisplayPriceInclTax()
292304
}
293305

294306
/**
295-
* Get final row display price including tax, this will add weee amount to rowTotalInclTax
307+
* Get final row display price including tax.
308+
*
309+
* This will add weee amount to rowTotalInclTax.
296310
*
297311
* @return float
298312
*/
@@ -308,7 +322,9 @@ public function getFinalRowDisplayPriceInclTax()
308322
}
309323

310324
/**
311-
* Get base final row display price including tax, this will add weee amount to rowTotalInclTax
325+
* Get base final row display price including tax.
326+
*
327+
* This will add weee amount to rowTotalInclTax.
312328
*
313329
* @return float
314330
*/
@@ -362,7 +378,9 @@ public function getBaseFinalUnitDisplayPriceExclTax()
362378
}
363379

364380
/**
365-
* Get final row display price excluding tax, this will add Weee amount to rowTotal
381+
* Get final row display price excluding tax.
382+
*
383+
* This will add Weee amount to rowTotal.
366384
*
367385
* @return float
368386
*/
@@ -378,7 +396,9 @@ public function getFinalRowDisplayPriceExclTax()
378396
}
379397

380398
/**
381-
* Get base final row display price excluding tax, this will add Weee amount to rowTotal
399+
* Get base final row display price excluding tax.
400+
*
401+
* This will add Weee amount to rowTotal.
382402
*
383403
* @return float
384404
*/

‎lib/internal/Magento/Framework/Composer/ComposerInformation.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ public function getRequiredExtensions()
150150
/** @var CompletePackageInterface $package */
151151
foreach ($this->getLocker()->getLockedRepository()->getPackages() as $package) {
152152
$requires = array_keys($package->getRequires());
153+
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
153154
$allPlatformReqs = array_merge($allPlatformReqs, $requires);
154155
}
155156
}

‎lib/internal/Magento/Framework/Composer/MagentoComponent.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Composer;
77

8+
/**
9+
* Magento component.
10+
*/
811
class MagentoComponent
912
{
1013
/**

‎lib/internal/Magento/Framework/Model/ResourceModel/Db/CreateEntityRow.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ public function __construct(
2828
}
2929

3030
/**
31+
* Prepare data.
32+
*
3133
* @param EntityMetadata $metadata
3234
* @param array $data
3335
* @return array
@@ -36,7 +38,7 @@ protected function prepareData(EntityMetadata $metadata, $data)
3638
{
3739
$output = [];
3840
foreach ($metadata->getEntityConnection()->describeTable($metadata->getEntityTable()) as $column) {
39-
if ($column['DEFAULT'] == 'CURRENT_TIMESTAMP' /*|| $column['IDENTITY']*/) {
41+
if ($column['DEFAULT'] == 'CURRENT_TIMESTAMP') {
4042
continue;
4143
}
4244
if (isset($data[strtolower($column['COLUMN_NAME'])])) {
@@ -52,6 +54,8 @@ protected function prepareData(EntityMetadata $metadata, $data)
5254
}
5355

5456
/**
57+
* Create entity row.
58+
*
5559
* @param string $entityType
5660
* @param array $data
5761
* @return array

‎lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use Magento\Framework\EntityManager\MetadataPool;
99

10+
/**
11+
* Delete entity row.
12+
*/
1013
class DeleteEntityRow
1114
{
1215
/**
@@ -24,6 +27,8 @@ public function __construct(
2427
}
2528

2629
/**
30+
* Delete entity row.
31+
*
2732
* @param string $entityType
2833
* @param array $data
2934
* @return bool

‎lib/internal/Magento/Framework/Model/ResourceModel/Db/ProcessEntityRelationInterface.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
interface ProcessEntityRelationInterface
1313
{
1414
/**
15+
* Process entity relation.
16+
*
1517
* @param string $entityType
1618
* @param object $entity
1719
* @return object

0 commit comments

Comments
 (0)