Skip to content

Commit 912912c

Browse files
committed
Merge remote-tracking branch 'origin/AC-8817' into Hammer_Platform_Health_Scope_21082023
2 parents ca14932 + 5e89f4d commit 912912c

File tree

10 files changed

+59
-61
lines changed

10 files changed

+59
-61
lines changed

app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
116116
*/
117117
protected $_productTypeModels = [];
118118

119-
/**
120-
* Array of pairs store ID to its code.
121-
*
122-
* @var array
123-
*/
124-
protected $_storeIdToCode = [];
125-
126119
/**
127120
* Array of Website ID-to-code.
128121
*

app/code/Magento/Dhl/Model/Carrier.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,6 @@ class Carrier extends AbstractDhl implements CarrierInterface
115115
*/
116116
protected $_request;
117117

118-
/**
119-
* Rate result data
120-
*
121-
* @var Result|null
122-
*/
123-
protected $_result;
124-
125118
/**
126119
* Countries parameters data
127120
*

app/code/Magento/Fedex/Model/Carrier.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
8080
*/
8181
protected $_request = null;
8282

83-
/**
84-
* Rate result data
85-
*
86-
* @var Result|null
87-
*/
88-
protected $_result = null;
89-
9083
/**
9184
* Path to wsdl file of rate service
9285
*

app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ abstract class AbstractEntity
145145
*/
146146
protected $_storeManager;
147147

148+
/**
149+
* Array of pairs store ID to its code.
150+
*
151+
* @var array
152+
*/
153+
protected $_storeIdToCode = [];
154+
155+
/**
156+
* @var array
157+
*/
158+
private $_invalidRows = [];
159+
148160
/**
149161
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
150162
* @param \Magento\Eav\Model\Config $config
@@ -172,10 +184,8 @@ public function __construct(
172184
protected function _initStores()
173185
{
174186
foreach ($this->_storeManager->getStores(true) as $store) {
175-
// phpstan:ignore "Access to an undefined property"
176187
$this->_storeIdToCode[$store->getId()] = $store->getCode();
177188
}
178-
// phpstan:ignore "Access to an undefined property"
179189
ksort($this->_storeIdToCode);
180190
// to ensure that 'admin' store (ID is zero) goes first
181191

@@ -350,7 +360,6 @@ public function addRowError($errorCode, $errorRowNum)
350360
$errorCode = (string)$errorCode;
351361
$this->_errors[$errorCode][] = $errorRowNum + 1;
352362
// one added for human readability
353-
// phpstan:ignore "Access to an undefined property"
354363
$this->_invalidRows[$errorRowNum] = true;
355364
$this->_errorsCount++;
356365

@@ -508,7 +517,6 @@ public function getErrorsCount()
508517
*/
509518
public function getInvalidRowsCount()
510519
{
511-
// phpstan:ignore "Access to an undefined property"
512520
return count($this->_invalidRows);
513521
}
514522

app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\Shipping\Model\Carrier;
88

99
use Magento\Quote\Model\Quote\Address\RateResult\Error;
10+
use Magento\Shipping\Model\Rate\Result as RateResult;
1011
use Magento\Shipping\Model\Shipment\Request;
1112

1213
/**
@@ -45,6 +46,13 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
4546
*/
4647
protected $_isFixed = false;
4748

49+
/**
50+
* Rate result data
51+
*
52+
* @var RateResult|null
53+
*/
54+
protected $_result = null;
55+
4856
/**
4957
* @var string[]
5058
*/
@@ -331,7 +339,7 @@ public function processAdditionalValidation(\Magento\Framework\DataObject $reque
331339
* @param \Magento\Framework\DataObject $request
332340
* @return $this|bool|\Magento\Framework\DataObject
333341
* @deprecated 100.2.6
334-
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
342+
* @see processAdditionalValidation()
335343
*/
336344
public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
337345
{
@@ -426,7 +434,6 @@ protected function _updateFreeMethodQuote($request)
426434
return;
427435
}
428436
$freeRateId = false;
429-
// phpstan:ignore
430437
if (is_object($this->_result)) {
431438
foreach ($this->_result->getAllRates() as $i => $item) {
432439
if ($item->getMethod() == $freeMethod) {

app/code/Magento/Ups/Model/Carrier.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
8888
*/
8989
protected $_request;
9090

91-
/**
92-
* Rate result data
93-
*
94-
* @var Result
95-
*/
96-
protected $_result;
97-
9891
/**
9992
* @var float
10093
*/

app/code/Magento/Usps/Model/Carrier.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
9393
*/
9494
protected $_request = null;
9595

96-
/**
97-
* Rate result data
98-
*
99-
* @var Result|null
100-
*/
101-
protected $_result = null;
102-
10396
/**
10497
* Default cgi gateway url
10598
*

composer.lock

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/SimpleProductsAssert.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@
1313
* Class performs assertion that generated simple products are valid
1414
* after running setup:performance:generate-fixtures command
1515
*/
16-
#[\AllowDynamicProperties]
1716
class SimpleProductsAssert
1817
{
1918
/**
2019
* @var \Magento\Catalog\Api\ProductRepositoryInterface
2120
*/
2221
private $productRepository;
2322

23+
/**
24+
* @var \Magento\ConfigurableProduct\Api\OptionRepositoryInterface
25+
*/
26+
private $optionRepository;
27+
2428
/**
2529
* @var \Magento\Setup\Fixtures\FixturesAsserts\ProductAssert
2630
*/

pub/errors/processor.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
2121
* phpcs:ignoreFile
2222
*/
23-
#[\AllowDynamicProperties]
2423
class Processor
2524
{
2625
const MAGE_ERRORS_LOCAL_XML = 'local.xml';
@@ -111,6 +110,21 @@ class Processor
111110
*/
112111
public $reportUrl;
113112

113+
/**
114+
* @var string
115+
*/
116+
public $_reportDir;
117+
118+
/**
119+
* @var string
120+
*/
121+
public $_indexDir;
122+
123+
/**
124+
* @var string
125+
*/
126+
public $_errorDir;
127+
114128
/**
115129
* Server script name
116130
*

0 commit comments

Comments
 (0)