Merge remote-tracking branch 'hostep/fix-php82-deprecated-dynamic-properties' into AC-8817

Author: glo71317

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

@@ -116,13 +116,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      */
     protected $_productTypeModels = [];
 
-    /**
-     * Array of pairs store ID to its code.
-     *
-     * @var array
-     */
-    protected $_storeIdToCode = [];
-
     /**
      * Array of Website ID-to-code.
      *

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

@@ -115,13 +115,6 @@ class Carrier extends AbstractDhl implements CarrierInterface
      */
     protected $_request;
 
-    /**
-     * Rate result data
-     *
-     * @var Result|null
-     */
-    protected $_result;
-
     /**
      * Countries parameters data
      *

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

@@ -80,13 +80,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      */
     protected $_request = null;
 
-    /**
-     * Rate result data
-     *
-     * @var Result|null
-     */
-    protected $_result = null;
-
     /**
      * Path to wsdl file of rate service
      *

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

@@ -145,6 +145,18 @@ abstract class AbstractEntity
      */
     protected $_storeManager;
 
+    /**
+     * Array of pairs store ID to its code.
+     *
+     * @var array
+     */
+    protected $_storeIdToCode = [];
+
+    /**
+     * @var array
+     */
+    private $_invalidRows = [];
+
     /**
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Eav\Model\Config $config
@@ -172,10 +184,8 @@ public function __construct(
     protected function _initStores()
     {
         foreach ($this->_storeManager->getStores(true) as $store) {
-            // phpstan:ignore "Access to an undefined property"
             $this->_storeIdToCode[$store->getId()] = $store->getCode();
         }
-        // phpstan:ignore "Access to an undefined property"
         ksort($this->_storeIdToCode);
         // to ensure that 'admin' store (ID is zero) goes first
 
@@ -350,7 +360,6 @@ public function addRowError($errorCode, $errorRowNum)
         $errorCode = (string)$errorCode;
         $this->_errors[$errorCode][] = $errorRowNum + 1;
         // one added for human readability
-        // phpstan:ignore "Access to an undefined property"
         $this->_invalidRows[$errorRowNum] = true;
         $this->_errorsCount++;
 
@@ -508,7 +517,6 @@ public function getErrorsCount()
      */
     public function getInvalidRowsCount()
     {
-        // phpstan:ignore "Access to an undefined property"
         return count($this->_invalidRows);
     }
 

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

@@ -7,6 +7,7 @@
 namespace Magento\Shipping\Model\Carrier;
 
 use Magento\Quote\Model\Quote\Address\RateResult\Error;
+use Magento\Shipping\Model\Rate\Result as RateResult;
 use Magento\Shipping\Model\Shipment\Request;
 
 /**
@@ -45,6 +46,13 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
      */
     protected $_isFixed = false;
 
+    /**
+     * Rate result data
+     *
+     * @var RateResult|null
+     */
+    protected $_result = null;
+
     /**
      * @var string[]
      */
@@ -331,7 +339,7 @@ public function processAdditionalValidation(\Magento\Framework\DataObject $reque
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|\Magento\Framework\DataObject
      * @deprecated 100.2.6
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @see processAdditionalValidation()
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
     {
@@ -426,7 +434,6 @@ protected function _updateFreeMethodQuote($request)
             return;
         }
         $freeRateId = false;
-        // phpstan:ignore
         if (is_object($this->_result)) {
             foreach ($this->_result->getAllRates() as $i => $item) {
                 if ($item->getMethod() == $freeMethod) {

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

@@ -86,13 +86,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      */
     protected $_request;
 
-    /**
-     * Rate result data
-     *
-     * @var Result
-     */
-    protected $_result;
-
     /**
      * @var float
      */

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

@@ -93,13 +93,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      */
     protected $_request = null;
 
-    /**
-     * Rate result data
-     *
-     * @var Result|null
-     */
-    protected $_result = null;
-
     /**
      * Default cgi gateway url
      *

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

@@ -13,14 +13,18 @@
  * Class performs assertion that generated simple products are valid
  * after running setup:performance:generate-fixtures command
  */
-#[\AllowDynamicProperties]
 class SimpleProductsAssert
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
      */
     private $productRepository;
 
+    /**
+     * @var \Magento\ConfigurableProduct\Api\OptionRepositoryInterface
+     */
+    private $optionRepository;
+
     /**
      * @var \Magento\Setup\Fixtures\FixturesAsserts\ProductAssert
      */

pub/errors/processor.php

@@ -20,7 +20,6 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * phpcs:ignoreFile
  */
-#[\AllowDynamicProperties]
 class Processor
 {
     const MAGE_ERRORS_LOCAL_XML = 'local.xml';
@@ -111,6 +110,21 @@ class Processor
      */
     public $reportUrl;
 
+    /**
+     * @var string
+     */
+    public $_reportDir;
+
+    /**
+     * @var string
+     */
+    public $_indexDir;
+
+    /**
+     * @var string
+     */
+    public $_errorDir;
+
     /**
      * Server script name
      *