diff --git a/.phpstorm.meta.php/magento_blocks.meta.php b/.phpstorm.meta.php/magento_blocks.meta.php index 3fe157e5bf9..e4d9439c59c 100644 --- a/.phpstorm.meta.php/magento_blocks.meta.php +++ b/.phpstorm.meta.php/magento_blocks.meta.php @@ -1083,7 +1083,6 @@ 'oauth/authorize_button' => \Mage_Oauth_Block_Authorize_Button::class, 'oauth/authorize_buttonBaseAbstract' => \Mage_Oauth_Block_Authorize_ButtonBaseAbstract::class, 'oauth/customer_token_list' => \Mage_Oauth_Block_Customer_Token_List::class, - 'pagecache/adminhtml_cache_additional' => \Mage_PageCache_Block_Adminhtml_Cache_Additional::class, 'page/html' => \Mage_Page_Block_Html::class, 'page/html_breadcrumbs' => \Mage_Page_Block_Html_Breadcrumbs::class, 'page/html_cookieNotice' => \Mage_Page_Block_Html_CookieNotice::class, diff --git a/.phpstorm.meta.php/magento_blocks_methods.meta.php b/.phpstorm.meta.php/magento_blocks_methods.meta.php index 1f4674cd8a3..5770efa0083 100644 --- a/.phpstorm.meta.php/magento_blocks_methods.meta.php +++ b/.phpstorm.meta.php/magento_blocks_methods.meta.php @@ -1083,7 +1083,6 @@ 'oauth/authorize_button' => \Mage_Oauth_Block_Authorize_Button::class, 'oauth/authorize_buttonBaseAbstract' => \Mage_Oauth_Block_Authorize_ButtonBaseAbstract::class, 'oauth/customer_token_list' => \Mage_Oauth_Block_Customer_Token_List::class, - 'pagecache/adminhtml_cache_additional' => \Mage_PageCache_Block_Adminhtml_Cache_Additional::class, 'page/html' => \Mage_Page_Block_Html::class, 'page/html_breadcrumbs' => \Mage_Page_Block_Html_Breadcrumbs::class, 'page/html_cookieNotice' => \Mage_Page_Block_Html_CookieNotice::class, diff --git a/.phpstorm.meta.php/magento_helpers.meta.php b/.phpstorm.meta.php/magento_helpers.meta.php index 6192a3e6760..0ccbf726e21 100644 --- a/.phpstorm.meta.php/magento_helpers.meta.php +++ b/.phpstorm.meta.php/magento_helpers.meta.php @@ -132,8 +132,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, diff --git a/.phpstorm.meta.php/magento_helpers_methods.meta.php b/.phpstorm.meta.php/magento_helpers_methods.meta.php index f0ce708599a..05fa4212d53 100644 --- a/.phpstorm.meta.php/magento_helpers_methods.meta.php +++ b/.phpstorm.meta.php/magento_helpers_methods.meta.php @@ -132,8 +132,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -327,8 +325,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -522,8 +518,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -717,8 +711,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -912,8 +904,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -1107,8 +1097,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -1302,8 +1290,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -1497,8 +1483,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -1692,8 +1676,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -1887,8 +1869,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -2082,8 +2062,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -2277,8 +2255,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -2472,8 +2448,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -2667,8 +2641,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -2862,8 +2834,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, @@ -3057,8 +3027,6 @@ 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, - 'pagecache' => \Mage_PageCache_Helper_Data::class, - 'pagecache/data' => \Mage_PageCache_Helper_Data::class, 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, diff --git a/.phpstorm.meta.php/magento_models.meta.php b/.phpstorm.meta.php/magento_models.meta.php index 19159a55502..1c6a2e33db0 100644 --- a/.phpstorm.meta.php/magento_models.meta.php +++ b/.phpstorm.meta.php/magento_models.meta.php @@ -1898,9 +1898,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -2122,6 +2119,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -5084,9 +5082,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -5308,6 +5303,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, diff --git a/.phpstorm.meta.php/magento_models_methods.meta.php b/.phpstorm.meta.php/magento_models_methods.meta.php index eec4fa17805..cc6d607fb0e 100644 --- a/.phpstorm.meta.php/magento_models_methods.meta.php +++ b/.phpstorm.meta.php/magento_models_methods.meta.php @@ -1898,9 +1898,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -2122,6 +2119,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -5084,9 +5082,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -5308,6 +5303,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -8270,9 +8266,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -8494,6 +8487,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -11456,9 +11450,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -11680,6 +11671,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -14642,9 +14634,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -14866,6 +14855,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -17828,9 +17818,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -18052,6 +18039,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -21014,9 +21002,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -21238,6 +21223,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -24200,9 +24186,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -24424,6 +24407,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -27386,9 +27370,6 @@ 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, - 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, - 'pagecache/observer' => \Mage_PageCache_Model_Observer::class, - 'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class, 'page/config' => \Mage_Page_Model_Config::class, 'page/source_layout' => \Mage_Page_Model_Source_Layout::class, 'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class, @@ -27610,6 +27591,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, diff --git a/README.md b/README.md index a101869e689..ff649141d8f 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,16 @@ Most important changes will be listed here, all other changes since `19.4.0` can - bug fixes and PHP 7.x, 8.0 and 8.1 compatibility - added config cache for system.xml [#1916](https://github.com/OpenMage/magento-lts/pull/1916) - search for "NULL" in backend grids [#1203](https://github.com/OpenMage/magento-lts/pull/1203) -- removed modules `Mage_Compiler`, `Mage_GoogleBase`, `Mage_Xmlconnect`, `Phoenix_Moneybookers` +- removed modules: + - `Mage_Compiler` + - `Mage_GoogleBase` + - `Mage_PageCache` [#2258](https://github.com/OpenMage/magento-lts/pull/2258) + - `Mage_Xmlconnect` + - `Phoenix_Moneybookers` + + +_If you rely on that modules you can reinstall them with composer:_ +- `Mage_PageCache`: `composer require openmage/bc-mage-pagecache:dev-master` ### Between OpenMage 19.4.18 / 20.0.16 and 19.4.19 / 20.0.17 @@ -127,7 +136,6 @@ Do not use 20.x.x if you need IE support. - added redis as a valid option for `global/session_save` [#1513](https://github.com/OpenMage/magento-lts/pull/1513) - reduce needless saves by avoiding setting `_hasDataChanges` flag [#2066](https://github.com/OpenMage/magento-lts/pull/2066) - removed support for `global/sales/old_fields_map` defined in XML [#921](https://github.com/OpenMage/magento-lts/pull/921) -- removed module `Mage_PageCache` [#2258](https://github.com/OpenMage/magento-lts/pull/2258) - removed lib/flex containing unused ActionScript "file uploader" files [#2271](https://github.com/OpenMage/magento-lts/pull/2271) - enabled website level config cache [#2355](https://github.com/OpenMage/magento-lts/pull/2355) - make overrides of Mage_Core_Model_Resource_Db_Abstract::delete respect parent api [#1257](https://github.com/OpenMage/magento-lts/pull/1257) diff --git a/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php b/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php deleted file mode 100644 index 6d43ff4f9d9..00000000000 --- a/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php +++ /dev/null @@ -1,49 +0,0 @@ - - */ -class Mage_PageCache_Block_Adminhtml_Cache_Additional extends Mage_Adminhtml_Block_Template -{ - /** - * Get clean cache url - * - * @return string - */ - public function getCleanExternalCacheUrl() - { - return $this->getUrl('*/pageCache/clean'); - } - - /** - * Check if block can be displayed - * - * @return bool - */ - public function canShowButton() - { - return Mage::helper('pagecache')->isEnabled() && Mage::getSingleton('admin/session')->isAllowed('page_cache'); - } -} diff --git a/app/code/core/Mage/PageCache/Helper/Data.php b/app/code/core/Mage/PageCache/Helper/Data.php deleted file mode 100644 index 46b795ecefa..00000000000 --- a/app/code/core/Mage/PageCache/Helper/Data.php +++ /dev/null @@ -1,117 +0,0 @@ - - */ -class Mage_PageCache_Helper_Data extends Mage_Core_Helper_Abstract -{ - /** - * Pathes to external cache config options - */ - public const XML_PATH_EXTERNAL_CACHE_ENABLED = 'system/external_page_cache/enabled'; - public const XML_PATH_EXTERNAL_CACHE_LIFETIME = 'system/external_page_cache/cookie_lifetime'; - public const XML_PATH_EXTERNAL_CACHE_CONTROL = 'system/external_page_cache/control'; - - /** - * Path to external cache controls - */ - public const XML_PATH_EXTERNAL_CACHE_CONTROLS = 'global/external_cache/controls'; - - /** - * Cookie name for disabling external caching - * - * @var string - */ - public const NO_CACHE_COOKIE = 'external_no_cache'; - - protected $_moduleName = 'Mage_PageCache'; - - /** - * Check whether external cache is enabled - * - * @return bool - */ - public function isEnabled() - { - return Mage::getStoreConfigFlag(self::XML_PATH_EXTERNAL_CACHE_ENABLED); - } - - /** - * Return all available external cache controls - * - * @return array - */ - public function getCacheControls() - { - $controls = Mage::app()->getConfig()->getNode(self::XML_PATH_EXTERNAL_CACHE_CONTROLS); - return $controls->asCanonicalArray(); - } - - /** - * Initialize proper external cache control model - * - * @throws Mage_Core_Exception - * @return Mage_PageCache_Model_Control_Interface - */ - public function getCacheControlInstance() - { - $usedControl = Mage::getStoreConfig(self::XML_PATH_EXTERNAL_CACHE_CONTROL); - if ($usedControl) { - foreach ($this->getCacheControls() as $control => $info) { - if ($control == $usedControl && !empty($info['class'])) { - return Mage::getSingleton($info['class']); - } - } - } - Mage::throwException($this->__('Failed to load external cache control')); - } - - /** - * Disable caching on external storage side by setting special cookie - */ - public function setNoCacheCookie() - { - $cookie = Mage::getSingleton('core/cookie'); - $lifetime = Mage::getStoreConfig(self::XML_PATH_EXTERNAL_CACHE_LIFETIME); - $noCache = $cookie->get(self::NO_CACHE_COOKIE); - - if ($noCache) { - $cookie->renew(self::NO_CACHE_COOKIE, $lifetime); - } else { - $cookie->set(self::NO_CACHE_COOKIE, 1, $lifetime); - } - } - - /** - * Returns a lifetime of cookie for external cache - * - * @return string Time in seconds - */ - public function getNoCacheCookieLifetime() - { - return Mage::getStoreConfig(self::XML_PATH_EXTERNAL_CACHE_LIFETIME); - } -} diff --git a/app/code/core/Mage/PageCache/Model/Control/Interface.php b/app/code/core/Mage/PageCache/Model/Control/Interface.php deleted file mode 100644 index b1dc7a11e30..00000000000 --- a/app/code/core/Mage/PageCache/Model/Control/Interface.php +++ /dev/null @@ -1,35 +0,0 @@ - - */ -interface Mage_PageCache_Model_Control_Interface -{ - /** - * Clean external cache - */ - public function clean(); -} diff --git a/app/code/core/Mage/PageCache/Model/Control/Zend.php b/app/code/core/Mage/PageCache/Model/Control/Zend.php deleted file mode 100644 index 2fe1a9bdc74..00000000000 --- a/app/code/core/Mage/PageCache/Model/Control/Zend.php +++ /dev/null @@ -1,40 +0,0 @@ - - */ -class Mage_PageCache_Model_Control_Zend implements Mage_PageCache_Model_Control_Interface -{ - /** - * Clean zend server page cache - */ - public function clean() - { - if (extension_loaded('Zend Page Cache') && function_exists('page_cache_remove_all_cached_contents')) { - page_cache_remove_all_cached_contents(); - } - } -} diff --git a/app/code/core/Mage/PageCache/Model/Observer.php b/app/code/core/Mage/PageCache/Model/Observer.php deleted file mode 100644 index ae29f99b1a2..00000000000 --- a/app/code/core/Mage/PageCache/Model/Observer.php +++ /dev/null @@ -1,92 +0,0 @@ - - */ -class Mage_PageCache_Model_Observer -{ - public const XML_NODE_ALLOWED_CACHE = 'frontend/cache/allowed_requests'; - - /** - * Check if full page cache is enabled - * - * @return bool - */ - public function isCacheEnabled() - { - return Mage::helper('pagecache')->isEnabled(); - } - - /** - * Check when cache should be disabled - * - * @param Varien_Event_Observer $observer - * @return $this - */ - public function processPreDispatch(Varien_Event_Observer $observer) - { - if (!$this->isCacheEnabled()) { - return $this; - } - /** @var Mage_Core_Controller_Front_Action $action */ - $action = $observer->getEvent()->getControllerAction(); - $request = $action->getRequest(); - $needCaching = true; - - if ($request->isPost()) { - $needCaching = false; - } - - $configuration = Mage::getConfig()->getNode(self::XML_NODE_ALLOWED_CACHE); - - if (!$configuration) { - $needCaching = false; - } - - $configuration = $configuration->asArray(); - $module = $request->getModuleName(); - $controller = $request->getControllerName(); - $action = $request->getActionName(); - - if (!isset($configuration[$module])) { - $needCaching = false; - } - - if (isset($configuration[$module]['controller']) && $configuration[$module]['controller'] != $controller) { - $needCaching = false; - } - - if (isset($configuration[$module]['action']) && $configuration[$module]['action'] != $action) { - $needCaching = false; - } - - if (!$needCaching) { - Mage::helper('pagecache')->setNoCacheCookie(); - } - - return $this; - } -} diff --git a/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php b/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php deleted file mode 100644 index 0f5c3340d03..00000000000 --- a/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php +++ /dev/null @@ -1,47 +0,0 @@ - - */ -class Mage_PageCache_Model_System_Config_Source_Controls -{ - /** - * Return array of external cache controls for using as options - * - * @return array - */ - public function toOptionArray() - { - $options = []; - foreach (Mage::helper('pagecache')->getCacheControls() as $code => $type) { - $options[] = [ - 'value' => $code, - 'label' => $type['label'] - ]; - } - return $options; - } -} diff --git a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php deleted file mode 100644 index 49af5c048dc..00000000000 --- a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php +++ /dev/null @@ -1,71 +0,0 @@ - - */ -class Mage_PageCache_Adminhtml_PageCacheController extends Mage_Adminhtml_Controller_Action -{ - /** - * ACL resource - * @see Mage_Adminhtml_Controller_Action::_isAllowed() - */ - public const ADMIN_RESOURCE = 'page_cache'; - - /** - * Retrieve session model - * - * @return Mage_Adminhtml_Model_Session - */ - protected function _getSession() - { - return Mage::getSingleton('adminhtml/session'); - } - - /** - * Clean external cache action - * - * @return void - */ - public function cleanAction() - { - try { - if (Mage::helper('pagecache')->isEnabled()) { - Mage::helper('pagecache')->getCacheControlInstance()->clean(); - $this->_getSession()->addSuccess( - Mage::helper('pagecache')->__('The external full page cache has been cleaned.') - ); - } - } catch (Mage_Core_Exception $e) { - $this->_getSession()->addError($e->getMessage()); - } catch (Exception $e) { - $this->_getSession()->addException( - $e, - Mage::helper('pagecache')->__('An error occurred while clearing the external full page cache.') - ); - } - $this->_redirect('*/cache/index'); - } -} diff --git a/app/code/core/Mage/PageCache/etc/adminhtml.xml b/app/code/core/Mage/PageCache/etc/adminhtml.xml deleted file mode 100644 index 840985159c2..00000000000 --- a/app/code/core/Mage/PageCache/etc/adminhtml.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - External Page Cache - 0 - - - - - - diff --git a/app/code/core/Mage/PageCache/etc/config.xml b/app/code/core/Mage/PageCache/etc/config.xml deleted file mode 100644 index 70a5e68ddea..00000000000 --- a/app/code/core/Mage/PageCache/etc/config.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - 1.6.0.0 - - - - - - Mage_PageCache_Model - - - - - Mage_PageCache_Helper - - - - - Mage_PageCache_Block - - - - - - - pagecache/control_zend - - - - - - - - - pagecache.xml - - - - - - - - Mage_PageCache.csv - - - - - - - - - - pagecache.xml - - - - - - - - pagecache/observer - processPreDispatch - - - - - - - - - - - - - - - - - - - - - - Mage_PageCache_Adminhtml - - - - - - - - - 0 - zend_page_cache - 3600 - - - - diff --git a/app/code/core/Mage/PageCache/etc/system.xml b/app/code/core/Mage/PageCache/etc/system.xml deleted file mode 100644 index 08f81f84c9e..00000000000 --- a/app/code/core/Mage/PageCache/etc/system.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - 1 - 1 - 1 - 500 - - - - select - adminhtml/system_config_source_yesno - 1 - 1 - 0 - 0 - - - - 5 - 1 - 0 - 0 - 1 - If empty, default value will be used. - - - - select - pagecache/system_config_source_controls - 10 - 1 - 0 - 0 - 1 - - - - - - - diff --git a/app/design/adminhtml/default/default/layout/pagecache.xml b/app/design/adminhtml/default/default/layout/pagecache.xml deleted file mode 100644 index a8c81a0cf65..00000000000 --- a/app/design/adminhtml/default/default/layout/pagecache.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml b/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml deleted file mode 100644 index be2e270c332..00000000000 --- a/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml +++ /dev/null @@ -1,34 +0,0 @@ - - -canShowButton()): ?> - - - - - -
- - - __('External full page cache.')?> -
- diff --git a/app/design/frontend/base/default/layout/pagecache.xml b/app/design/frontend/base/default/layout/pagecache.xml deleted file mode 100644 index 0976481e242..00000000000 --- a/app/design/frontend/base/default/layout/pagecache.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/app/design/frontend/base/default/template/pagecache/cookie.phtml b/app/design/frontend/base/default/template/pagecache/cookie.phtml deleted file mode 100644 index 6058a9391cb..00000000000 --- a/app/design/frontend/base/default/template/pagecache/cookie.phtml +++ /dev/null @@ -1,30 +0,0 @@ - - - diff --git a/app/etc/modules/Mage_PageCache.xml b/app/etc/modules/Mage_PageCache.xml deleted file mode 100644 index d1d81e01f84..00000000000 --- a/app/etc/modules/Mage_PageCache.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - true - core - - - - - - diff --git a/app/locale/en_US/Mage_PageCache.csv b/app/locale/en_US/Mage_PageCache.csv deleted file mode 100644 index 8cf0a18b013..00000000000 --- a/app/locale/en_US/Mage_PageCache.csv +++ /dev/null @@ -1,12 +0,0 @@ -"An error occurred while clearing the external full page cache.","An error occurred while clearing the external full page cache." -"Cookie Lifetime (seconds)","Cookie Lifetime (seconds)" -"Enable External Cache","Enable External Cache" -"External Cache Control","External Cache Control" -"External Full Page Cache Settings","External Full Page Cache Settings" -"External Page Cache","External Page Cache" -"External full page cache.","External full page cache." -"Failed to load external cache control","Failed to load external cache control" -"Flush External Page Cache","Flush External Page Cache" -"If empty, default value will be used.","If empty, default value will be used." -"The external full page cache has been cleaned.","The external full page cache has been cleaned." -"Zend Full Page Cache","Zend Full Page Cache"