Skip to content

Commit bfe8b7d

Browse files
authored
Merge branch 'main' into rector/cq/InlineIfToExplicitIfRector
2 parents c5189a4 + e000e1b commit bfe8b7d

File tree

9 files changed

+62
-151
lines changed

9 files changed

+62
-151
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
namespace PHPSTORM_META {
33
override( \Mage::helper(0),
44
map( [
5-
'mm_ignition' => \MM_Ignition_Helper_Data::class,
6-
'mm_ignition/data' => \MM_Ignition_Helper_Data::class,
7-
'mm_ignition/flare' => \MM_Ignition_Helper_Flare::class,
8-
'mm_ignition/openAi' => \MM_Ignition_Helper_OpenAi::class,
95
'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
106
'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
117
'admin/block' => \Mage_Admin_Helper_Block::class,
@@ -96,6 +92,8 @@
9692
'core/hint' => \Mage_Core_Helper_Hint::class,
9793
'core/http' => \Mage_Core_Helper_Http::class,
9894
'core/js' => \Mage_Core_Helper_Js::class,
95+
'core/measure_length' => \Mage_Core_Helper_Measure_Length::class,
96+
'core/measure_weight' => \Mage_Core_Helper_Measure_Weight::class,
9997
'core/purifier' => \Mage_Core_Helper_Purifier::class,
10098
'core/security' => \Mage_Core_Helper_Security::class,
10199
'core/string' => \Mage_Core_Helper_String::class,

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

Lines changed: 32 additions & 64 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
99
'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
1010
'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
11-
'mm_ignition/observer_abstract' => \MM_Ignition_Model_Observer_Abstract::class,
12-
'mm_ignition/observer_handleIgnitionException' => \MM_Ignition_Model_Observer_HandleIgnitionException::class,
13-
'mm_ignition/observer_handleIgnitionRegister' => \MM_Ignition_Model_Observer_HandleIgnitionRegister::class,
14-
'mm_ignition/system_config_source_editor' => \MM_Ignition_Model_System_Config_Source_Editor::class,
15-
'mm_ignition/system_config_source_theme' => \MM_Ignition_Model_System_Config_Source_Theme::class,
1611
'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
1712
'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
1813
'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -1042,6 +1037,7 @@
10421037
'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
10431038
'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
10441039
'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
1040+
'configurableswatches/string_normalized' => \Mage_ConfigurableSwatches_Model_String_Normalized::class,
10451041
'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
10461042
'configurableswatches/system_config_source_catalog_product_configattribute_select' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute_Select::class,
10471043
'core/abstract' => \Mage_Core_Model_Abstract::class,
@@ -3172,11 +3168,6 @@
31723168
'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
31733169
'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
31743170
'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
3175-
'mm_ignition/observer_abstract' => \MM_Ignition_Model_Observer_Abstract::class,
3176-
'mm_ignition/observer_handleIgnitionException' => \MM_Ignition_Model_Observer_HandleIgnitionException::class,
3177-
'mm_ignition/observer_handleIgnitionRegister' => \MM_Ignition_Model_Observer_HandleIgnitionRegister::class,
3178-
'mm_ignition/system_config_source_editor' => \MM_Ignition_Model_System_Config_Source_Editor::class,
3179-
'mm_ignition/system_config_source_theme' => \MM_Ignition_Model_System_Config_Source_Theme::class,
31803171
'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
31813172
'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
31823173
'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -4206,6 +4197,7 @@
42064197
'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
42074198
'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
42084199
'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
4200+
'configurableswatches/string_normalized' => \Mage_ConfigurableSwatches_Model_String_Normalized::class,
42094201
'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
42104202
'configurableswatches/system_config_source_catalog_product_configattribute_select' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute_Select::class,
42114203
'core/abstract' => \Mage_Core_Model_Abstract::class,

0 commit comments

Comments
 (0)