Skip to content

Remove deprecated Mage_Captcha module and references #4925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Remove deprecated Mage_Captcha module and references #4925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d364319
Initial plan
Copilot Sep 9, 2025
c616936
Remove Mage_Captcha module files and clean up references
Copilot Sep 9, 2025
a39f1c5
Update documentation and clean up remaining test references
Copilot Sep 9, 2025
749efe9
Merge branch 'main' into copilot/remove-mage-captcha-module-2
kiatng Sep 25, 2025
77a20c1
Update .phpstan.dist.baseline.neon
Hanmac Sep 25, 2025
3845ead
Merge branch 'main' into copilot/remove-mage-captcha-module-2
Hanmac Sep 25, 2025
3ea7104
Merge branch 'main' into copilot/remove-mage-captcha-module-2
sreichel Sep 30, 2025
54eb7cf
Remove Mage_Captcha references from PHPStorm metadata files
Copilot Oct 2, 2025
93e7f79
Merge branch 'main' into copilot/remove-mage-captcha-module-2
sreichel Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .phpstan.dist.baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,18 +1242,6 @@ parameters:
count: 1
path: app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php

-
rawMessage: 'Property Mage_Captcha_Model_Zend::$_helper (Mage_Captcha_Helper_Data) in empty() is not falsy.'
identifier: empty.property
count: 1
path: app/code/core/Mage/Captcha/Model/Zend.php

-
rawMessage: 'Return type (Mage_Customer_Model_Session) of method Mage_Captcha_Model_Zend::getSession() should be compatible with return type (Zend_Session_Namespace) of method Zend_Captcha_Word::getSession()'
identifier: method.childReturnType
count: 1
path: app/code/core/Mage/Captcha/Model/Zend.php

-
rawMessage: 'Argument of an invalid type string supplied for foreach, only iterables are supported.'
identifier: foreach.nonIterable
Expand Down
2 changes: 0 additions & 2 deletions .phpstorm.meta.php/magento_blocks.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,8 +811,6 @@
'bundle/catalog_product_view_type_bundle_option_select' => \Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Select::class,
'bundle/checkout_cart_item_renderer' => \Mage_Bundle_Block_Checkout_Cart_Item_Renderer::class,
'bundle/sales_order_items_renderer' => \Mage_Bundle_Block_Sales_Order_Items_Renderer::class,
'captcha/captcha' => \Mage_Captcha_Block_Captcha::class,
'captcha/captcha_zend' => \Mage_Captcha_Block_Captcha_Zend::class,
'cataloginventory/adminhtml_form_field_customergroup' => \Mage_CatalogInventory_Block_Adminhtml_Form_Field_Customergroup::class,
'cataloginventory/adminhtml_form_field_minsaleqty' => \Mage_CatalogInventory_Block_Adminhtml_Form_Field_Minsaleqty::class,
'cataloginventory/qtyincrements' => \Mage_CatalogInventory_Block_Qtyincrements::class,
Expand Down
2 changes: 0 additions & 2 deletions .phpstorm.meta.php/magento_blocks_methods.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,8 +811,6 @@
'bundle/catalog_product_view_type_bundle_option_select' => \Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Select::class,
'bundle/checkout_cart_item_renderer' => \Mage_Bundle_Block_Checkout_Cart_Item_Renderer::class,
'bundle/sales_order_items_renderer' => \Mage_Bundle_Block_Sales_Order_Items_Renderer::class,
'captcha/captcha' => \Mage_Captcha_Block_Captcha::class,
'captcha/captcha_zend' => \Mage_Captcha_Block_Captcha_Zend::class,
'cataloginventory/adminhtml_form_field_customergroup' => \Mage_CatalogInventory_Block_Adminhtml_Form_Field_Customergroup::class,
'cataloginventory/adminhtml_form_field_minsaleqty' => \Mage_CatalogInventory_Block_Adminhtml_Form_Field_Minsaleqty::class,
'cataloginventory/qtyincrements' => \Mage_CatalogInventory_Block_Qtyincrements::class,
Expand Down
2 changes: 0 additions & 2 deletions .phpstorm.meta.php/magento_helpers.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down
32 changes: 0 additions & 32 deletions .phpstorm.meta.php/magento_helpers_methods.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -235,8 +233,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -432,8 +428,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -629,8 +623,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -826,8 +818,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -1023,8 +1013,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -1220,8 +1208,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -1417,8 +1403,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -1614,8 +1598,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -1811,8 +1793,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -2008,8 +1988,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -2205,8 +2183,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -2402,8 +2378,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -2599,8 +2573,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -2796,8 +2768,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down Expand Up @@ -2993,8 +2963,6 @@
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
Expand Down
18 changes: 0 additions & 18 deletions .phpstorm.meta.php/magento_models.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,15 +419,6 @@
'bundle/selection' => \Mage_Bundle_Model_Selection::class,
'bundle/source_option_selection_price_type' => \Mage_Bundle_Model_Source_Option_Selection_Price_Type::class,
'bundle/source_option_type' => \Mage_Bundle_Model_Source_Option_Type::class,
'captcha/config_font' => \Mage_Captcha_Model_Config_Font::class,
'captcha/config_form_abstract' => \Mage_Captcha_Model_Config_Form_Abstract::class,
'captcha/config_form_backend' => \Mage_Captcha_Model_Config_Form_Backend::class,
'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class,
'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class,
'captcha/observer' => \Mage_Captcha_Model_Observer::class,
'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class,
'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
'captcha/zend' => \Mage_Captcha_Model_Zend::class,
'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class,
'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class,
'catalogindex/catalog_index_flag' => \Mage_CatalogIndex_Model_Catalog_Index_Flag::class,
Expand Down Expand Up @@ -3586,15 +3577,6 @@
'bundle/selection' => \Mage_Bundle_Model_Selection::class,
'bundle/source_option_selection_price_type' => \Mage_Bundle_Model_Source_Option_Selection_Price_Type::class,
'bundle/source_option_type' => \Mage_Bundle_Model_Source_Option_Type::class,
'captcha/config_font' => \Mage_Captcha_Model_Config_Font::class,
'captcha/config_form_abstract' => \Mage_Captcha_Model_Config_Form_Abstract::class,
'captcha/config_form_backend' => \Mage_Captcha_Model_Config_Form_Backend::class,
'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class,
'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class,
'captcha/observer' => \Mage_Captcha_Model_Observer::class,
'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class,
'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
'captcha/zend' => \Mage_Captcha_Model_Zend::class,
'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class,
'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class,
'catalogindex/catalog_index_flag' => \Mage_CatalogIndex_Model_Catalog_Index_Flag::class,
Expand Down
Loading
Loading