build(deps-dev): bump phpstan/phpstan from 2.1.17 to 2.1.18 (#4889)

dependabot[bot] · sreichel · web-flow · commit f1ae19de6063 · 2025-07-21T08:09:25.000+02:00
* build(deps-dev): bump phpstan/phpstan from 2.1.17 to 2.1.18 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 2.1.17 to 2.1.18. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/2.1.x/CHANGELOG.md) - [Commits](phpstan/phpstan@2.1.17...2.1.18) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-version: 2.1.18 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * fixes * baseline * updated rector - see rectorphp/rector#9268 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sven Reichel <github-sr@hotmail.com>
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -1938,6 +1938,12 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Config.php
 
+		-
+			message: '#^Argument of an invalid type hasOffsetValue\(string, mixed\) supplied for foreach, only iterables are supported\.$#'
+			identifier: foreach.nonIterable
+			count: 1
+			path: app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
+
 		-
 			message: '#^Binary operation "\-" between int and non\-falsy\-string results in an error\.$#'
 			identifier: binaryOp.invalid
@@ -2701,7 +2707,7 @@ parameters:
 			path: app/code/core/Mage/Core/Model/Layout.php
 
 		-
-			message: '#^Cannot unset offset ''@attributes'' on \(array\{\}\|array\{\000\*\000_parent\: Varien_Simplexml_Element\}\)\.$#'
+			message: '#^Cannot unset offset ''@attributes'' on \(array\{\}\|array\{''\000\*\000_parent''\: Varien_Simplexml_Element\}\)\.$#'
 			identifier: unset.offset
 			count: 1
 			path: app/code/core/Mage/Core/Model/Layout.php
@@ -3690,12 +3696,6 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Index/Model/Resource/Lock/Resource.php
 
-		-
-			message: '#^Offset ''path'' does not exist on array\{\000\*\000_parent\: Varien_Simplexml_Element\}\|array\{false\}\.$#'
-			identifier: offsetAccess.notFound
-			count: 1
-			path: app/code/core/Mage/Install/Model/Config.php
-
 		-
 			message: '#^Method Mage_Install_Model_Installer\:\:getDataModel\(\) should return Mage_Install_Model_Session but returns Mage_Install_Model_Installer_Data\|null\.$#'
 			identifier: return.type
@@ -4674,18 +4674,6 @@ parameters:
 			count: 3
 			path: app/code/core/Mage/Sales/Model/Recurring/Profile.php
 
-		-
-			message: '#^Parameter \#2 \$attribute of method Mage_Sales_Model_Resource_Order_Abstract\:\:_afterSaveAttribute\(\) expects string, array\<mixed, mixed\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
-
-		-
-			message: '#^Parameter \#2 \$attribute of method Mage_Sales_Model_Resource_Order_Abstract\:\:_beforeSaveAttribute\(\) expects string, array\<mixed, mixed\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
-
 		-
 			message: '#^Cannot call method updateOnRelatedRecordChanged\(\) on Mage_Core_Model_Resource_Db_Collection_Abstract\|false\.$#'
 			identifier: method.nonObject
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
@@ -27,6 +27,7 @@ public function __construct()
         parent::__construct();
         $this->setTemplate('system/config/edit.phtml');
 
+        /** @var string $sectionCode */
         $sectionCode = $this->getRequest()->getParam('section');
         $sections = Mage::getSingleton('adminhtml/config')->getSections();
 
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php
@@ -60,8 +60,11 @@ public function editAction()
     {
         $this->_title($this->__('System'))->_title($this->__('Configuration'));
 
+        /** @var string $current */
         $current = $this->getRequest()->getParam('section');
+        /** @var string $website */
         $website = $this->getRequest()->getParam('website');
+        /** @var string $store */
         $store   = $this->getRequest()->getParam('store');
 
         Mage::getSingleton('adminhtml/config_data')
@@ -81,7 +84,10 @@ public function editAction()
         $this->loadLayout();
 
         $this->_setActiveMenu('system/config');
-        $this->getLayout()->getBlock('menu')->setAdditionalCacheKeyInfo([$current]);
+
+        /** @var Mage_Adminhtml_Block_Page_Menu $block */
+        $block = $this->getLayout()->getBlock('menu');
+        $block->setAdditionalCacheKeyInfo([$current]);
 
         $this->_addBreadcrumb(
             Mage::helper('adminhtml')->__('System'),
@@ -241,6 +247,8 @@ public function stateAction()
     /**
      * Export shipping table rates in csv format
      *
+     * @throws Mage_Core_Exception
+     * @throws Exception
      */
     public function exportTableratesAction()
     {
diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php
@@ -148,7 +148,7 @@ public function associativeArrayUnpack(&$mixed)
      * Corrects data representation.
      *
      * @param Object $obj - Link to Object
-     * @return array
+     * @return string[]
      */
     public function clearWsiFootprints(&$obj)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
@@ -333,7 +333,8 @@ public function getProductCollection()
      * Retrieve all customer attributes
      *
      * @param bool $noDesignAttributes
-     * @return array
+     * @return Mage_Eav_Model_Entity_Attribute[]
+     * @throws Mage_Core_Exception
      * @todo Use with Flat Resource
      */
     public function getAttributes($noDesignAttributes = false)
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php
@@ -55,6 +55,7 @@ public function info($categoryId, $store = null, $attributes = null)
      * @return int
      * @throws Mage_Api_Exception
      * @throws Mage_Eav_Model_Entity_Attribute_Exception
+     * @throws Mage_Core_Exception
      */
     public function create($parentId, $categoryData, $store = null)
     {
@@ -107,6 +108,7 @@ public function create($parentId, $categoryData, $store = null)
      * @param array $categoryData
      * @param string|int $store
      * @return bool
+     * @throws Mage_Core_Exception
      */
     public function update($categoryId, $categoryData, $store = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
@@ -236,12 +236,14 @@ protected function _prepareDataForSave($product, $productData)
         if (property_exists($productData, 'additional_attributes')) {
             if (property_exists($productData->additional_attributes, 'single_data')) {
                 foreach ($productData->additional_attributes->single_data as $_attribute) {
+                    /** @var string $attributeCode */
                     $attributeCode = $_attribute->key;
                     $productData->$attributeCode = $_attribute->value;
                 }
             }
             if (property_exists($productData->additional_attributes, 'multi_data')) {
                 foreach ($productData->additional_attributes->multi_data as $_attribute) {
+                    /** @var string $attributeCode */
                     $attributeCode = $_attribute->key;
                     $productData->$attributeCode = $_attribute->value;
                 }
@@ -251,6 +253,7 @@ protected function _prepareDataForSave($product, $productData)
 
         // phpcs:ignore: Ecg.Performance.Loop.DataLoad
         foreach ($product->getTypeInstance(true)->getEditableAttributes($product) as $attribute) {
+            /** @var string $attributeCode */
             $attributeCode = $attribute->getAttributeCode();
 
             //Unset data if object attribute has no value in current store
diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php
@@ -44,8 +44,10 @@ public function assign($type, $productId, $linkedProductId, $data = [], $identif
 
         $links[(int) $linkedProductId] = [];
         foreach ($collection->getLinkModel()->getAttributes() as $attribute) {
-            if (isset($data->{$attribute['code']})) {
-                $links[(int) $linkedProductId][$attribute['code']] = $data->{$attribute['code']};
+            /** @var string $attributeCode */
+            $attributeCode = $attribute['code'];
+            if (isset($data->{$attributeCode})) {
+                $links[(int) $linkedProductId][$attributeCode] = $data->{$attributeCode};
             }
         }
 
@@ -102,8 +104,10 @@ public function update($type, $productId, $linkedProductId, $data = [], $identif
         }
 
         foreach ($collection->getLinkModel()->getAttributes() as $attribute) {
-            if (isset($data->{$attribute['code']})) {
-                $links[(int) $linkedProductId][$attribute['code']] = $data->{$attribute['code']};
+            /** @var string $attributeCode */
+            $attributeCode = $attribute['code'];
+            if (isset($data->{$attributeCode})) {
+                $links[(int) $linkedProductId][$attributeCode] = $data->{$attributeCode};
             }
         }
 
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
@@ -445,7 +445,8 @@ public function getControllerClassName($realModule, $controller)
     }
 
     /**
-     * @return array
+     * @param string[] $p
+     * @return string[]
      */
     public function rewrite(array $p)
     {
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
@@ -1337,7 +1337,7 @@ public function getGroupedClassName($groupType, $classId, $groupRootNode = null)
              * In MMDB release resource nodes <..._mysql4> were renamed to <..._resource>. So <deprecatedNode> is left
              * to keep name of previously used nodes, that still may be used by non-updated extensions.
              */
-            $deprecatedNode = $config->deprecatedNode;
+            $deprecatedNode = (string) $config->deprecatedNode;
             $configOld = $this->_xml->global->{$groupType . 's'}->$deprecatedNode;
             if (isset($configOld->rewrite->$class)) {
                 $className = (string) $configOld->rewrite->$class;
diff --git a/app/code/core/Mage/Core/Model/Resource.php b/app/code/core/Mage/Core/Model/Resource.php
@@ -229,7 +229,7 @@ public function getEntity($model, $entity)
          * to keep name of previously used nodes, that still may be used by non-updated extensions.
          */
         if (isset($modelsNode->$model->deprecatedNode)) {
-            $deprecatedNode = $modelsNode->$model->deprecatedNode;
+            $deprecatedNode = (string) $modelsNode->$model->deprecatedNode;
             if (isset($modelsNode->$deprecatedNode->entities->$entity)) {
                 $entityConfig = $modelsNode->$deprecatedNode->entities->$entity;
             }
diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php
@@ -43,9 +43,10 @@ public function dispatch($observer)
 
         /** @var Mage_Cron_Model_Schedule $schedule */
         foreach ($schedules->getIterator() as $schedule) {
-            $jobConfig = $jobsRoot->{$schedule->getJobCode()};
+            $jobCode = (string) $schedule->getJobCode();
+            $jobConfig = $jobsRoot->{$jobCode};
             if (!$jobConfig || !$jobConfig->run) {
-                $jobConfig = $defaultJobsRoot->{$schedule->getJobCode()};
+                $jobConfig = $defaultJobsRoot->{$jobCode};
                 if (!$jobConfig || !$jobConfig->run) {
                     continue;
                 }
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
@@ -195,7 +195,7 @@ public function getAttributeId()
     }
 
     /**
-     * @param mixed $data
+     * @param string $data
      * @return $this
      */
     public function setAttributeCode($data)
@@ -204,7 +204,7 @@ public function setAttributeCode($data)
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getAttributeCode()
     {
diff --git a/app/code/core/Mage/Install/Model/Config.php b/app/code/core/Mage/Install/Model/Config.php
@@ -88,6 +88,7 @@ public function getWritableFullPathsForCheck()
         $paths = [];
         $items = (array) $this->getNode(self::XML_PATH_CHECK_WRITEABLE);
         foreach ($items as $nodeKey => $item) {
+            /** @var array{path: string, existence: string, recursive: string} $value */
             $value = (array) $item;
             if (isset($this->_optionsMapping[self::XML_PATH_CHECK_WRITEABLE][$nodeKey])) {
                 $configKey = $this->_optionsMapping[self::XML_PATH_CHECK_WRITEABLE][$nodeKey];
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
@@ -259,7 +259,7 @@ public function getGridTable()
     /**
      * Before save object attribute
      *
-     * @param string $attribute
+     * @param string[] $attribute
      * @return $this
      */
     protected function _beforeSaveAttribute(Mage_Core_Model_Abstract $object, $attribute)
@@ -277,7 +277,7 @@ protected function _beforeSaveAttribute(Mage_Core_Model_Abstract $object, $attri
     /**
      * After save object attribute
      *
-     * @param string $attribute
+     * @param string[] $attribute
      * @return $this
      */
     protected function _afterSaveAttribute(Mage_Core_Model_Abstract $object, $attribute)
diff --git a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml
@@ -21,6 +21,7 @@ $_swatchOuterHeight = $this->getSwatchOuterHeight();
 
 $_attr = $_attribute->getProductAttribute();
 $_attrCode = $_attr->getAttributeCode();
+/** @var string $_id */
 $_id = $_attribute->getAttributeId();
 
 $_swatchArray = $_config->attributes->$_id;
diff --git a/composer.json b/composer.json
@@ -60,10 +60,10 @@
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.13",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan": "^2.1.18",
         "phpstan/phpstan-phpunit": "^2.0",
         "phpunit/phpunit": "^9.6",
-        "rector/rector": "^2.0",
+        "rector/rector": "^2.1.2",
         "squizlabs/php_codesniffer": "^3.7",
         "symplify/vendor-patches": "^11.1"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Varien/Simplexml/Element.php b/lib/Varien/Simplexml/Element.php
@@ -143,6 +143,8 @@ public function descend($path)
             }
         }
         $desc = $this;
+
+        /** @var string[] $pathArr */
         foreach ($pathArr as $nodeName) {
             if (str_contains($nodeName, '@')) {
                 $a = explode('@', $nodeName);

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function associativeArrayUnpack(&$mixed)`
`148`	`148`	`* Corrects data representation.`
`149`	`149`	`*`
`150`	`150`	`* @param Object $obj - Link to Object`
`151`		`- * @return array`
	`151`	`+ * @return string[]`
`152`	`152`	`*/`
`153`	`153`	`public function clearWsiFootprints(&$obj)`
`154`	`154`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,10 @@ public function assign($type, $productId, $linkedProductId, $data = [], $identif`
`44`	`44`
`45`	`45`	`$links[(int) $linkedProductId] = [];`
`46`	`46`	`foreach ($collection->getLinkModel()->getAttributes() as $attribute) {`
`47`		`- if (isset($data->{$attribute['code']})) {`
`48`		`- $links[(int) $linkedProductId][$attribute['code']] = $data->{$attribute['code']};`
	`47`	`+ /** @var string $attributeCode */`
	`48`	`+ $attributeCode = $attribute['code'];`
	`49`	`+ if (isset($data->{$attributeCode})) {`
	`50`	`+ $links[(int) $linkedProductId][$attributeCode] = $data->{$attributeCode};`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`
`@@ -102,8 +104,10 @@ public function update($type, $productId, $linkedProductId, $data = [], $identif`
`102`	`104`	`}`
`103`	`105`
`104`	`106`	`foreach ($collection->getLinkModel()->getAttributes() as $attribute) {`
`105`		`- if (isset($data->{$attribute['code']})) {`
`106`		`- $links[(int) $linkedProductId][$attribute['code']] = $data->{$attribute['code']};`
	`107`	`+ /** @var string $attributeCode */`
	`108`	`+ $attributeCode = $attribute['code'];`
	`109`	`+ if (isset($data->{$attributeCode})) {`
	`110`	`+ $links[(int) $linkedProductId][$attributeCode] = $data->{$attributeCode};`
`107`	`111`	`}`
`108`	`112`	`}`
`109`	`113`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,8 @@ public function getControllerClassName($realModule, $controller)`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`/**`
`448`		`- * @return array`
	`448`	`+ * @param string[] $p`
	`449`	`+ * @return string[]`
`449`	`450`	`*/`
`450`	`451`	`public function rewrite(array $p)`
`451`	`452`	`{`