Merge branch 'main' into designLayoutUpdates

Author: theroch

.phpstorm.meta.php/magento_blocks.meta.php

@@ -588,6 +588,7 @@
             'adminhtml/system_config_form' => \Mage_Adminhtml_Block_System_Config_Form::class,
             'adminhtml/system_config_form_field' => \Mage_Adminhtml_Block_System_Config_Form_Field::class,
             'adminhtml/system_config_form_field_array_abstract' => \Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract::class,
+            'adminhtml/system_config_form_field_csp_hosts' => \Mage_Adminhtml_Block_System_Config_Form_Field_Csp_Hosts::class,
             'adminhtml/system_config_form_field_datetime' => \Mage_Adminhtml_Block_System_Config_Form_Field_Datetime::class,
             'adminhtml/system_config_form_field_export' => \Mage_Adminhtml_Block_System_Config_Form_Field_Export::class,
             'adminhtml/system_config_form_field_file' => \Mage_Adminhtml_Block_System_Config_Form_Field_File::class,
@@ -968,6 +969,8 @@
             'core/text_tag_debug' => \Mage_Core_Block_Text_Tag_Debug::class,
             'core/text_tag_js' => \Mage_Core_Block_Text_Tag_Js::class,
             'core/text_tag_meta' => \Mage_Core_Block_Text_Tag_Meta::class,
+            'csp/adminhtml_meta' => \Mage_Csp_Block_Adminhtml_Meta::class,
+            'csp/meta' => \Mage_Csp_Block_Meta::class,
             'currencysymbol/adminhtml_system_currencysymbol' => \Mage_CurrencySymbol_Block_Adminhtml_System_Currencysymbol::class,
             'customer/account' => \Mage_Customer_Block_Account::class,
             'customer/account_changeforgotten' => \Mage_Customer_Block_Account_Changeforgotten::class,

.phpstorm.meta.php/magento_blocks_methods.meta.php

@@ -588,6 +588,7 @@
             'adminhtml/system_config_form' => \Mage_Adminhtml_Block_System_Config_Form::class,
             'adminhtml/system_config_form_field' => \Mage_Adminhtml_Block_System_Config_Form_Field::class,
             'adminhtml/system_config_form_field_array_abstract' => \Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract::class,
+            'adminhtml/system_config_form_field_csp_hosts' => \Mage_Adminhtml_Block_System_Config_Form_Field_Csp_Hosts::class,
             'adminhtml/system_config_form_field_datetime' => \Mage_Adminhtml_Block_System_Config_Form_Field_Datetime::class,
             'adminhtml/system_config_form_field_export' => \Mage_Adminhtml_Block_System_Config_Form_Field_Export::class,
             'adminhtml/system_config_form_field_file' => \Mage_Adminhtml_Block_System_Config_Form_Field_File::class,
@@ -968,6 +969,8 @@
             'core/text_tag_debug' => \Mage_Core_Block_Text_Tag_Debug::class,
             'core/text_tag_js' => \Mage_Core_Block_Text_Tag_Js::class,
             'core/text_tag_meta' => \Mage_Core_Block_Text_Tag_Meta::class,
+            'csp/adminhtml_meta' => \Mage_Csp_Block_Adminhtml_Meta::class,
+            'csp/meta' => \Mage_Csp_Block_Meta::class,
             'currencysymbol/adminhtml_system_currencysymbol' => \Mage_CurrencySymbol_Block_Adminhtml_System_Currencysymbol::class,
             'customer/account' => \Mage_Customer_Block_Account::class,
             'customer/account_changeforgotten' => \Mage_Customer_Block_Account_Changeforgotten::class,

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

@@ -2,6 +2,10 @@
 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,
@@ -61,6 +65,7 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
+            'catalog/search' => \Mage_Catalog_Helper_Search::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
             'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
@@ -96,6 +101,8 @@
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
             'core/url' => \Mage_Core_Helper_Url::class,
             'core/url_rewrite' => \Mage_Core_Helper_Url_Rewrite::class,
+            'csp' => \Mage_Csp_Helper_Data::class,
+            'csp/data' => \Mage_Csp_Helper_Data::class,
             'currencysymbol' => \Mage_CurrencySymbol_Helper_Data::class,
             'currencysymbol/data' => \Mage_CurrencySymbol_Helper_Data::class,
             'customer/address' => \Mage_Customer_Helper_Address::class,