Skip to content
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

Jump to bottom

Clean Adminhtml: Mage_Api blocks #4262

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

Clean Adminhtml: Mage_Api blocks #4262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06aaa15
moved block api classes
sreichel Oct 9, 2024
dd90b35
Updated .phpstan.dist.baseline.neon
sreichel Oct 9, 2024
cff3ed8
Merge branch 'main' into adminhtml-blocks-api
sreichel Oct 14, 2024
51e20d9
Merge branch 'main' into adminhtml-blocks-api
sreichel Nov 14, 2024
e4d6774
Merge branch 'main' into adminhtml-blocks-api
sreichel Nov 14, 2024
117a43c
Merge branch 'main' into adminhtml-blocks-api
sreichel Nov 26, 2024
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
20 changes: 10 additions & 10 deletions .phpstan.dist.baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,6 @@ parameters:
count: 1
path: app/code/core/Mage/Admin/Model/Rules.php

-
message: "#^If condition is always true\\.$#"
count: 1
path: app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php

-
message: "#^Call to an undefined method Mage_Api_Model_Resource_Roles_User_Collection\\:\\:setUserFilter\\(\\)\\.$#"
count: 1
path: app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php

-
message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Varien_Data_Collection_Db, Varien_Data_Collection given\\.$#"
count: 1
Expand Down Expand Up @@ -870,6 +860,16 @@ parameters:
count: 1
path: app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php

-
message: "#^If condition is always true\\.$#"
count: 1
path: app/code/core/Mage/Api/Block/Adminhtml/Tab/Rolesedit.php

-
message: "#^Call to an undefined method Mage_Api_Model_Resource_Roles_User_Collection\\:\\:setUserFilter\\(\\)\\.$#"
count: 1
path: app/code/core/Mage/Api/Block/Adminhtml/Tab/Userroles.php

-
message: "#^Method Mage_Api_Model_Acl\\:\\:_getRoleRegistry\\(\\) should return Mage_Api_Model_Acl_Role_Registry but returns Zend_Acl_Role_Registry\\.$#"
count: 1
Expand Down
20 changes: 20 additions & 0 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 @@ -782,6 +782,25 @@
'api2/adminhtml_roles_tab_resources' => \Mage_Api2_Block_Adminhtml_Roles_Tab_Resources::class,
'api2/adminhtml_roles_tab_users' => \Mage_Api2_Block_Adminhtml_Roles_Tab_Users::class,
'api2/adminhtml_roles_tabs' => \Mage_Api2_Block_Adminhtml_Roles_Tabs::class,
'api/adminhtml_buttons' => \Mage_Api_Block_Adminhtml_Buttons::class,
'api/adminhtml_editroles' => \Mage_Api_Block_Adminhtml_Editroles::class,
'api/adminhtml_edituser' => \Mage_Api_Block_Adminhtml_Edituser::class,
'api/adminhtml_grid_role' => \Mage_Api_Block_Adminhtml_Grid_Role::class,
'api/adminhtml_role' => \Mage_Api_Block_Adminhtml_Role::class,
'api/adminhtml_role_grid_user' => \Mage_Api_Block_Adminhtml_Role_Grid_User::class,
'api/adminhtml_roles' => \Mage_Api_Block_Adminhtml_Roles::class,
'api/adminhtml_tab_roleinfo' => \Mage_Api_Block_Adminhtml_Tab_Roleinfo::class,
'api/adminhtml_tab_rolesedit' => \Mage_Api_Block_Adminhtml_Tab_Rolesedit::class,
'api/adminhtml_tab_rolesusers' => \Mage_Api_Block_Adminhtml_Tab_Rolesusers::class,
'api/adminhtml_tab_userroles' => \Mage_Api_Block_Adminhtml_Tab_Userroles::class,
'api/adminhtml_user' => \Mage_Api_Block_Adminhtml_User::class,
'api/adminhtml_user_edit' => \Mage_Api_Block_Adminhtml_User_Edit::class,
'api/adminhtml_user_edit_form' => \Mage_Api_Block_Adminhtml_User_Edit_Form::class,
'api/adminhtml_user_edit_tab_main' => \Mage_Api_Block_Adminhtml_User_Edit_Tab_Main::class,
'api/adminhtml_user_edit_tab_roles' => \Mage_Api_Block_Adminhtml_User_Edit_Tab_Roles::class,
'api/adminhtml_user_edit_tabs' => \Mage_Api_Block_Adminhtml_User_Edit_Tabs::class,
'api/adminhtml_user_grid' => \Mage_Api_Block_Adminhtml_User_Grid::class,
'api/adminhtml_users' => \Mage_Api_Block_Adminhtml_Users::class,
'directpost/form' => \Mage_Authorizenet_Block_Directpost_Form::class,
'directpost/iframe' => \Mage_Authorizenet_Block_Directpost_Iframe::class,
'bundle/adminhtml_catalog_product_composite_fieldset_bundle' => \Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Bundle::class,
Expand Down Expand Up @@ -1053,6 +1072,7 @@
'install/locale' => \Mage_Install_Block_Locale::class,
'install/state' => \Mage_Install_Block_State::class,
'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,
Expand Down
20 changes: 20 additions & 0 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 @@ -782,6 +782,25 @@
'api2/adminhtml_roles_tab_resources' => \Mage_Api2_Block_Adminhtml_Roles_Tab_Resources::class,
'api2/adminhtml_roles_tab_users' => \Mage_Api2_Block_Adminhtml_Roles_Tab_Users::class,
'api2/adminhtml_roles_tabs' => \Mage_Api2_Block_Adminhtml_Roles_Tabs::class,
'api/adminhtml_buttons' => \Mage_Api_Block_Adminhtml_Buttons::class,
'api/adminhtml_editroles' => \Mage_Api_Block_Adminhtml_Editroles::class,
'api/adminhtml_edituser' => \Mage_Api_Block_Adminhtml_Edituser::class,
'api/adminhtml_grid_role' => \Mage_Api_Block_Adminhtml_Grid_Role::class,
'api/adminhtml_role' => \Mage_Api_Block_Adminhtml_Role::class,
'api/adminhtml_role_grid_user' => \Mage_Api_Block_Adminhtml_Role_Grid_User::class,
'api/adminhtml_roles' => \Mage_Api_Block_Adminhtml_Roles::class,
'api/adminhtml_tab_roleinfo' => \Mage_Api_Block_Adminhtml_Tab_Roleinfo::class,
'api/adminhtml_tab_rolesedit' => \Mage_Api_Block_Adminhtml_Tab_Rolesedit::class,
'api/adminhtml_tab_rolesusers' => \Mage_Api_Block_Adminhtml_Tab_Rolesusers::class,
'api/adminhtml_tab_userroles' => \Mage_Api_Block_Adminhtml_Tab_Userroles::class,
'api/adminhtml_user' => \Mage_Api_Block_Adminhtml_User::class,
'api/adminhtml_user_edit' => \Mage_Api_Block_Adminhtml_User_Edit::class,
'api/adminhtml_user_edit_form' => \Mage_Api_Block_Adminhtml_User_Edit_Form::class,
'api/adminhtml_user_edit_tab_main' => \Mage_Api_Block_Adminhtml_User_Edit_Tab_Main::class,
'api/adminhtml_user_edit_tab_roles' => \Mage_Api_Block_Adminhtml_User_Edit_Tab_Roles::class,
'api/adminhtml_user_edit_tabs' => \Mage_Api_Block_Adminhtml_User_Edit_Tabs::class,
'api/adminhtml_user_grid' => \Mage_Api_Block_Adminhtml_User_Grid::class,
'api/adminhtml_users' => \Mage_Api_Block_Adminhtml_Users::class,
'directpost/form' => \Mage_Authorizenet_Block_Directpost_Form::class,
'directpost/iframe' => \Mage_Authorizenet_Block_Directpost_Iframe::class,
'bundle/adminhtml_catalog_product_composite_fieldset_bundle' => \Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Bundle::class,
Expand Down Expand Up @@ -1053,6 +1072,7 @@
'install/locale' => \Mage_Install_Block_Locale::class,
'install/state' => \Mage_Install_Block_State::class,
'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,
Expand Down
40 changes: 20 additions & 20 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 @@ -17,8 +17,8 @@
'adminhtml/dashboard_abstract' => \Mage_Adminhtml_Helper_Dashboard_Abstract::class,
'adminhtml/dashboard_data' => \Mage_Adminhtml_Helper_Dashboard_Data::class,
'adminhtml/dashboard_order' => \Mage_Adminhtml_Helper_Dashboard_Order::class,
'adminhtml/data' => \Mage_Adminhtml_Helper_Data::class,
'adminhtml' => \Mage_Adminhtml_Helper_Data::class,
'adminhtml/data' => \Mage_Adminhtml_Helper_Data::class,
'adminhtml/help_mapping' => \Mage_Adminhtml_Helper_Help_Mapping::class,
'adminhtml/js' => \Mage_Adminhtml_Helper_Js::class,
'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
Expand All @@ -29,25 +29,25 @@
'api' => \Mage_Api_Helper_Data::class,
'api/data' => \Mage_Api_Helper_Data::class,
'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle/data' => \Mage_Bundle_Helper_Data::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,
'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
'catalog/category' => \Mage_Catalog_Helper_Category::class,
'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
'catalog/data' => \Mage_Catalog_Helper_Data::class,
'catalog' => \Mage_Catalog_Helper_Data::class,
'catalog/data' => \Mage_Catalog_Helper_Data::class,
'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
Expand All @@ -61,8 +61,8 @@
'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,
'centinel/data' => \Mage_Centinel_Helper_Data::class,
'centinel' => \Mage_Centinel_Helper_Data::class,
'centinel/data' => \Mage_Centinel_Helper_Data::class,
'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
'checkout' => \Mage_Checkout_Helper_Data::class,
'checkout/data' => \Mage_Checkout_Helper_Data::class,
Expand All @@ -81,8 +81,8 @@
'core/abstract' => \Mage_Core_Helper_Abstract::class,
'core/array' => \Mage_Core_Helper_Array::class,
'core/cookie' => \Mage_Core_Helper_Cookie::class,
'core/data' => \Mage_Core_Helper_Data::class,
'core' => \Mage_Core_Helper_Data::class,
'core/data' => \Mage_Core_Helper_Data::class,
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
Expand All @@ -101,8 +101,8 @@
'customer/address' => \Mage_Customer_Helper_Address::class,
'customer' => \Mage_Customer_Helper_Data::class,
'customer/data' => \Mage_Customer_Helper_Data::class,
'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
'dataflow' => \Mage_Dataflow_Helper_Data::class,
'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
'directory' => \Mage_Directory_Helper_Data::class,
'directory/data' => \Mage_Directory_Helper_Data::class,
'directory/url' => \Mage_Directory_Helper_Url::class,
Expand All @@ -117,18 +117,18 @@
'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
'importexport/data' => \Mage_ImportExport_Helper_Data::class,
'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
'importexport' => \Mage_ImportExport_Helper_Data::class,
'importexport/data' => \Mage_ImportExport_Helper_Data::class,
'index' => \Mage_Index_Helper_Data::class,
'index/data' => \Mage_Index_Helper_Data::class,
'install' => \Mage_Install_Helper_Data::class,
'install/data' => \Mage_Install_Helper_Data::class,
'log/data' => \Mage_Log_Helper_Data::class,
'log' => \Mage_Log_Helper_Data::class,
'media/data' => \Mage_Media_Helper_Data::class,
'log/data' => \Mage_Log_Helper_Data::class,
'media' => \Mage_Media_Helper_Data::class,
'media/data' => \Mage_Media_Helper_Data::class,
'newsletter' => \Mage_Newsletter_Helper_Data::class,
'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
'oauth' => \Mage_Oauth_Helper_Data::class,
Expand All @@ -139,19 +139,19 @@
'page/layout' => \Mage_Page_Helper_Layout::class,
'payment' => \Mage_Payment_Helper_Data::class,
'payment/data' => \Mage_Payment_Helper_Data::class,
'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
'paypal/data' => \Mage_Paypal_Helper_Data::class,
'paypal' => \Mage_Paypal_Helper_Data::class,
'paypal/data' => \Mage_Paypal_Helper_Data::class,
'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
'persistent' => \Mage_Persistent_Helper_Data::class,
'persistent/data' => \Mage_Persistent_Helper_Data::class,
'persistent/session' => \Mage_Persistent_Helper_Session::class,
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
'productalert' => \Mage_ProductAlert_Helper_Data::class,
'rating/data' => \Mage_Rating_Helper_Data::class,
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
'rating' => \Mage_Rating_Helper_Data::class,
'rating/data' => \Mage_Rating_Helper_Data::class,
'reports' => \Mage_Reports_Helper_Data::class,
'reports/data' => \Mage_Reports_Helper_Data::class,
'review' => \Mage_Review_Helper_Data::class,
Expand All @@ -165,22 +165,22 @@
'salesrule/coupon' => \Mage_SalesRule_Helper_Coupon::class,
'salesrule' => \Mage_SalesRule_Helper_Data::class,
'salesrule/data' => \Mage_SalesRule_Helper_Data::class,
'sales/data' => \Mage_Sales_Helper_Data::class,
'sales' => \Mage_Sales_Helper_Data::class,
'sales/data' => \Mage_Sales_Helper_Data::class,
'sales/guest' => \Mage_Sales_Helper_Guest::class,
'sales/reorder' => \Mage_Sales_Helper_Reorder::class,
'sendfriend/data' => \Mage_Sendfriend_Helper_Data::class,
'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
'sendfriend/data' => \Mage_Sendfriend_Helper_Data::class,
'shipping' => \Mage_Shipping_Helper_Data::class,
'shipping/data' => \Mage_Shipping_Helper_Data::class,
'sitemap' => \Mage_Sitemap_Helper_Data::class,
'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
'tag' => \Mage_Tag_Helper_Data::class,
'tag/data' => \Mage_Tag_Helper_Data::class,
'tax/data' => \Mage_Tax_Helper_Data::class,
'tax' => \Mage_Tax_Helper_Data::class,
'uploader/data' => \Mage_Uploader_Helper_Data::class,
'tax/data' => \Mage_Tax_Helper_Data::class,
'uploader' => \Mage_Uploader_Helper_Data::class,
'uploader/data' => \Mage_Uploader_Helper_Data::class,
'uploader/file' => \Mage_Uploader_Helper_File::class,
'usa' => \Mage_Usa_Helper_Data::class,
'usa/data' => \Mage_Usa_Helper_Data::class,
Expand Down
Loading
Loading