Merge branch 'main' into rector/cq/InlineIfToExplicitIfRector

Author: sreichel

.phpstorm.meta.php/magento_helpers.meta.php

@@ -2,10 +2,6 @@
 namespace PHPSTORM_META {
     override( \Mage::helper(0),
         map( [
-            'mm_ignition' => \MM_Ignition_Helper_Data::class,
-            'mm_ignition/data' => \MM_Ignition_Helper_Data::class,
-            'mm_ignition/flare' => \MM_Ignition_Helper_Flare::class,
-            'mm_ignition/openAi' => \MM_Ignition_Helper_OpenAi::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
@@ -96,6 +92,8 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/measure_length' => \Mage_Core_Helper_Measure_Length::class,
+            'core/measure_weight' => \Mage_Core_Helper_Measure_Weight::class,
             'core/purifier' => \Mage_Core_Helper_Purifier::class,
             'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,

.phpstorm.meta.php/magento_helpers_methods.meta.php

@@ -8,11 +8,6 @@
             'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
             'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
             'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
-            'mm_ignition/observer_abstract' => \MM_Ignition_Model_Observer_Abstract::class,
-            'mm_ignition/observer_handleIgnitionException' => \MM_Ignition_Model_Observer_HandleIgnitionException::class,
-            'mm_ignition/observer_handleIgnitionRegister' => \MM_Ignition_Model_Observer_HandleIgnitionRegister::class,
-            'mm_ignition/system_config_source_editor' => \MM_Ignition_Model_System_Config_Source_Editor::class,
-            'mm_ignition/system_config_source_theme' => \MM_Ignition_Model_System_Config_Source_Theme::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -1042,6 +1037,7 @@
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
+            'configurableswatches/string_normalized' => \Mage_ConfigurableSwatches_Model_String_Normalized::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
             'configurableswatches/system_config_source_catalog_product_configattribute_select' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute_Select::class,
             'core/abstract' => \Mage_Core_Model_Abstract::class,
@@ -3172,11 +3168,6 @@
             'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
             'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
             'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
-            'mm_ignition/observer_abstract' => \MM_Ignition_Model_Observer_Abstract::class,
-            'mm_ignition/observer_handleIgnitionException' => \MM_Ignition_Model_Observer_HandleIgnitionException::class,
-            'mm_ignition/observer_handleIgnitionRegister' => \MM_Ignition_Model_Observer_HandleIgnitionRegister::class,
-            'mm_ignition/system_config_source_editor' => \MM_Ignition_Model_System_Config_Source_Editor::class,
-            'mm_ignition/system_config_source_theme' => \MM_Ignition_Model_System_Config_Source_Theme::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -4206,6 +4197,7 @@
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
+            'configurableswatches/string_normalized' => \Mage_ConfigurableSwatches_Model_String_Normalized::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
             'configurableswatches/system_config_source_catalog_product_configattribute_select' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute_Select::class,
             'core/abstract' => \Mage_Core_Model_Abstract::class,