Merge branch 'main' into cleanup/head

Author: sreichel

.github/release-drafter.yml

@@ -4,18 +4,18 @@ categories:
   - title: '🚨 Security'
     labels:
       - 'security'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
   - title: '🚀 Features'
     labels:
       - 'new feature'
   - title: '🦾 Enhancements'
     labels:
       - 'enhancement'
       - 'improvement'
-  - title: '🐛 Bug Fixes'
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
   - title: '📖 Documentation'
     labels:
       - 'documentation'

.github/workflows/cypress.yml

@@ -39,7 +39,7 @@ jobs:
       - run: ddev cypress-run --config-file .cypress.config.js
 
       - name: Upload screenshots
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: ${{ !success() }}
         with:
           name: cypress-screenshots

.github/workflows/spellcheck.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.52.0
+        uses: rojopolis/spellcheck-github-actions@0.53.0
         with:
           config_path: .github/spellcheck.yml
           task_name: Markdown

.gitignore

@@ -23,6 +23,10 @@
 /app/etc/modules/Cm_RedisSession.xml
 /lib/Credis
 
+# MM Ignition
+/app/code/community/MM
+/app/etc/modules/MM_Ignition.xml
+
 # ChartJs library
 /js/lib/chartjs
 

.phpmd.dist.xml

@@ -76,7 +76,7 @@
     [-] LongClassName
     [x] ShortClassName
     [-] LongVariable
-    [x] ShortVariable
+    [-] ShortVariable
     [x] ShortMethodName - TMP disabled
     -->
     <rule ref="rulesets/naming.xml">

.phpstan.dist.baseline.neon

@@ -690,20 +690,14 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
 
-		-
-			rawMessage: 'Parameter #1 $order of method Mage_Sales_Model_Resource_Order_Collection_Abstract::setOrderFilter() expects int|Mage_Sales_Model_Order, array<string, mixed> given.'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
-
 		-
 			rawMessage: 'Parameter #1 $prefix of function uniqid expects string, int<0, max> given.'
 			identifier: argument.type
 			count: 1
 			path: app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
 
 		-
-			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, ''\\intval'' given.'
+			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, Closure(array|bool|float|int|resource|string|null, int=): int given.'
 			identifier: argument.type
 			count: 2
 			path: app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
@@ -1225,7 +1219,7 @@ parameters:
 			path: app/code/core/Mage/Bundle/Model/Product/Type.php
 
 		-
-			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, ''\\intval'' given.'
+			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, Closure(array|bool|float|int|resource|string|null, int=): int given.'
 			identifier: argument.type
 			count: 3
 			path: app/code/core/Mage/Bundle/Model/Product/Type.php
@@ -1536,12 +1530,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Layer.php
 
-		-
-			rawMessage: 'Parameter #2 $filterBlock (Varien_Object) of method Mage_Catalog_Model_Layer_Filter_Attribute::apply() should be compatible with parameter $filterBlock (null) of method Mage_Catalog_Model_Layer_Filter_Abstract::apply()'
-			identifier: method.childParameterType
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php
-
 		-
 			rawMessage: 'Parameter #1 $range of method Mage_Catalog_Model_Layer_Filter_Decimal::_renderItemLabel() expects int, string given.'
 			identifier: argument.type
@@ -1554,18 +1542,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php
 
-		-
-			rawMessage: 'Parameter #2 $filterBlock (Mage_Catalog_Block_Layer_Filter_Decimal) of method Mage_Catalog_Model_Layer_Filter_Decimal::apply() should be compatible with parameter $filterBlock (null) of method Mage_Catalog_Model_Layer_Filter_Abstract::apply()'
-			identifier: method.childParameterType
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php
-
-		-
-			rawMessage: 'Parameter #2 $filterBlock of method Mage_Catalog_Model_Layer_Filter_Abstract::apply() expects null, Mage_Catalog_Block_Layer_Filter_Decimal given.'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php
-
 		-
 			rawMessage: 'Parameter #2 $range of method Mage_Catalog_Model_Resource_Layer_Filter_Decimal::applyFilterToCollection() expects float, string given.'
 			identifier: argument.type
@@ -1729,7 +1705,7 @@ parameters:
 			path: app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
 
 		-
-			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, ''\\intval'' given.'
+			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, Closure(array|bool|float|int|resource|string|null, int=): int given.'
 			identifier: argument.type
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
@@ -1747,7 +1723,7 @@ parameters:
 			path: app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
 
 		-
-			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, ''\\intval'' given.'
+			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, Closure(array|bool|float|int|resource|string|null, int=): int given.'
 			identifier: argument.type
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
@@ -2166,12 +2142,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
 
-		-
-			rawMessage: 'Return type (int) of method Mage_CatalogRule_Model_Action_Index_Refresh_Row::_getProduct() should be compatible with return type (null) of method Mage_CatalogRule_Model_Action_Index_Refresh::_getProduct()'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php
-
 		-
 			rawMessage: 'Parameter #1 $combine of method Mage_CatalogRule_Model_Observer::_removeAttributeFromConditions() expects Mage_CatalogRule_Model_Rule_Condition_Combine, Mage_Rule_Model_Condition_Combine given.'
 			identifier: argument.type
@@ -2479,7 +2449,7 @@ parameters:
 			path: app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
 
 		-
-			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(string): bool)|null, ''trim'' given.'
+			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(string): bool)|null, Closure(string, string=): string given.'
 			identifier: argument.type
 			count: 1
 			path: app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php
@@ -2628,18 +2598,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Encryption.php
 
-		-
-			rawMessage: Negated boolean expression is always false.
-			identifier: booleanNot.alwaysFalse
-			count: 2
-			path: app/code/core/Mage/Core/Model/File/Storage.php
-
-		-
-			rawMessage: Result of || is always false.
-			identifier: booleanOr.alwaysFalse
-			count: 1
-			path: app/code/core/Mage/Core/Model/File/Storage.php
-
 		-
 			rawMessage: 'Parameter #1 $params of method Mage_Core_Model_File_Storage_Database_Abstract::__construct() expects array, string|null given.'
 			identifier: argument.type
@@ -3223,7 +3181,7 @@ parameters:
 			path: app/code/core/Mage/Downloadable/Model/Link/Api/V2.php
 
 		-
-			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, ''\\intval'' given.'
+			rawMessage: 'Parameter #2 $callback of function array_filter expects (callable(mixed): bool)|null, Closure(array|bool|float|int|resource|string|null, int=): int given.'
 			identifier: argument.type
 			count: 1
 			path: app/code/core/Mage/Downloadable/Model/Product/Type.php
@@ -4284,12 +4242,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Block/Recurring/Profiles.php
 
-		-
-			rawMessage: 'Parameter #1 $order of method Mage_Sales_Model_Resource_Order_Collection_Abstract::setOrderFilter() expects int|Mage_Sales_Model_Order, array given.'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Api2/Order.php
-
 		-
 			rawMessage: 'Parameter #2 $code of method Mage_Api2_Model_Resource::_critical() expects int|null, string given.'
 			identifier: argument.type
@@ -4938,12 +4890,6 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
 
-		-
-			rawMessage: 'Parameter #3 $value of function curl_setopt expects bool, int given.'
-			identifier: argument.type
-			count: 2
-			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
-
 		-
 			rawMessage: 'Property Mage_Usa_Model_Shipping_Carrier_Dhl::$_request (Mage_Shipping_Model_Rate_Request|null) does not accept Varien_Object.'
 			identifier: assign.propertyType
@@ -5022,12 +4968,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
 
-		-
-			rawMessage: 'Parameter #3 $value of function curl_setopt expects bool, int given.'
-			identifier: argument.type
-			count: 2
-			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
-
 		-
 			rawMessage: 'Property Mage_Usa_Model_Shipping_Carrier_Fedex::$_result (Mage_Shipping_Model_Rate_Result|null) does not accept Mage_Shipping_Model_Tracking_Result.'
 			identifier: assign.propertyType
@@ -5046,30 +4986,12 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
 
-		-
-			rawMessage: 'Parameter #1 $string of function strlen expects string, array|false given.'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
-
 		-
 			rawMessage: 'Parameter #2 $value of method SimpleXMLElement::addChild() expects string|null, float given.'
 			identifier: argument.type
 			count: 1
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
 
-		-
-			rawMessage: 'Parameter #3 $value of function curl_setopt expects bool, int given.'
-			identifier: argument.type
-			count: 18
-			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
-
-		-
-			rawMessage: 'Parameter #3 $value of function curl_setopt expects bool, int given.'
-			identifier: argument.type
-			count: 3
-			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php
-
 		-
 			rawMessage: 'Parameter #2 $serviceType of method Mage_Usa_Model_Shipping_Carrier_Usps::_formUsSignatureConfirmationShipmentRequest() expects string, array|bool given.'
 			identifier: argument.type
@@ -6000,18 +5922,6 @@ parameters:
 			count: 1
 			path: lib/Mage/DB/Mysqli.php
 
-		-
-			rawMessage: 'Parameter #1 $handle of function curl_setopt expects CurlHandle, resource|false given.'
-			identifier: argument.type
-			count: 1
-			path: lib/Mage/HTTP/Client/Curl.php
-
-		-
-			rawMessage: 'Parameter #1 $handle of function curl_setopt_array expects CurlHandle, resource|false given.'
-			identifier: argument.type
-			count: 1
-			path: lib/Mage/HTTP/Client/Curl.php
-
 		-
 			rawMessage: Empty array passed to foreach.
 			identifier: foreach.emptyArray
@@ -6288,12 +6198,6 @@ parameters:
 			count: 1
 			path: lib/Varien/Filter/Template/Tokenizer/Variable.php
 
-		-
-			rawMessage: 'Parameter #3 $value of function curl_setopt expects bool, int given.'
-			identifier: argument.type
-			count: 2
-			path: lib/Varien/Http/Adapter/Curl.php
-
 		-
 			rawMessage: 'Parameter #2 $enable of function imageinterlace expects bool|null, int given.'
 			identifier: argument.type

.phpstan.dist.neon

@@ -27,10 +27,6 @@ parameters:
         - tests/unit
     excludePaths:
         #incompatible interfaces
-        - app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php
-        - app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
-        - app/code/core/Mage/Api/Model/Acl/Assert/Ip.php
-        - app/code/core/Mage/Api/Model/Acl/Assert/Time.php
         - app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
         - lib/Varien/Directory/Collection.php
         - lib/Varien/Directory/Factory.php
@@ -61,10 +57,6 @@ parameters:
         # Dataflow/Model/Convert/Iterator.php
         - app/code/core/Mage/Dataflow/Model/Convert/Iterator.php
 
-        # Too much noise from "Variable $this might not be defined"
-        - app/code/core/*/*/data/*
-        - app/code/core/*/*/sql/*
-
         # requires Mycrypt
         - lib/Magento/Crypt.php
         - lib/Varien/Crypt/Mcrypt.php

.phpstorm.meta.php/magento_models.meta.php

@@ -23,8 +23,6 @@
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
-            'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
-            'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
             'admin/acl_resource' => \Mage_Admin_Model_Acl_Resource::class,
             'admin/acl_role' => \Mage_Admin_Model_Acl_Role::class,
             'admin/acl_role_generic' => \Mage_Admin_Model_Acl_Role_Generic::class,
@@ -308,8 +306,6 @@
             'api2/router' => \Mage_Api2_Model_Router::class,
             'api2/server' => \Mage_Api2_Model_Server::class,
             'api/acl' => \Mage_Api_Model_Acl::class,
-            'api/acl_assert_ip' => \Mage_Api_Model_Acl_Assert_Ip::class,
-            'api/acl_assert_time' => \Mage_Api_Model_Acl_Assert_Time::class,
             'api/acl_resource' => \Mage_Api_Model_Acl_Resource::class,
             'api/acl_role' => \Mage_Api_Model_Acl_Role::class,
             'api/acl_role_generic' => \Mage_Api_Model_Acl_Role_Generic::class,
@@ -3191,8 +3187,6 @@
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
-            'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
-            'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
             'admin/acl_resource' => \Mage_Admin_Model_Acl_Resource::class,
             'admin/acl_role' => \Mage_Admin_Model_Acl_Role::class,
             'admin/acl_role_generic' => \Mage_Admin_Model_Acl_Role_Generic::class,
@@ -3476,8 +3470,6 @@
             'api2/router' => \Mage_Api2_Model_Router::class,
             'api2/server' => \Mage_Api2_Model_Server::class,
             'api/acl' => \Mage_Api_Model_Acl::class,
-            'api/acl_assert_ip' => \Mage_Api_Model_Acl_Assert_Ip::class,
-            'api/acl_assert_time' => \Mage_Api_Model_Acl_Assert_Time::class,
             'api/acl_resource' => \Mage_Api_Model_Acl_Resource::class,
             'api/acl_role' => \Mage_Api_Model_Acl_Role::class,
             'api/acl_role_generic' => \Mage_Api_Model_Acl_Role_Generic::class,