Skip to content

phpstan: checks around getConfig + asArray #5601

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

Open
Hanmac wants to merge 15 commits into
base: main
Choose a base branch
from
Open

phpstan: checks around getConfig + asArray #5601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
13ed3e0
phpstan: checks around getConfig + asArray
Hanmac May 22, 2026
bfed783
~ use <=> for compareCcTypes
Hanmac May 22, 2026
abb7a7f
~ remove ignored errors and more patches
Hanmac May 22, 2026
0696384
is_string to !is_array
Hanmac May 22, 2026
07531c3
~ fixes
Hanmac May 22, 2026
4ad429f
instanceof check
Hanmac May 22, 2026
fca7c48
~ revert (array) $node cast
Hanmac May 22, 2026
388d0a9
use array_key_exists for addFilterToMap
Hanmac May 22, 2026
8a59644
~ more type hints
Hanmac May 22, 2026
fab58e4
getActiveMethods: use _getMethod instead Mage::getModel
Hanmac May 22, 2026
402b83b
~ phpstan fixes
Hanmac May 22, 2026
5ddd306
add cast (bool) (int)
Hanmac May 22, 2026
c961598
phpstan: more cleanup in Mage_Payment
Hanmac May 22, 2026
876d729
~ fix use is_a
Hanmac May 22, 2026
14d24a9
~ rector
Hanmac May 22, 2026
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
1 change: 0 additions & 1 deletion .phpstan.dist.baselines/_loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
__DIR__ . '/if.alwaysTrue.php',
__DIR__ . '/if.condNotBoolean.php',
__DIR__ . '/instanceof.alwaysTrue.php',
__DIR__ . '/isset.variable.php',
__DIR__ . '/method.childParameterType.php',
__DIR__ . '/method.childReturnType.php',
__DIR__ . '/method.deprecated.php',
Expand Down
20 changes: 0 additions & 20 deletions .phpstan.dist.baselines/argument.type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,16 +951,6 @@
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $array of function uasort expects array, array|string given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #2 $string of function explode expects string, string|true given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $roleId of method Mage_Api2_Model_Acl::addRole() expects int, int|string|null given.',
'count' => 1,
Expand Down Expand Up @@ -4891,16 +4881,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Exception.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #2 $haystack of function in_array expects array, array<string, class-string>|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $array of function uasort expects array, array|string given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #2 $array of function array_key_exists expects array, array|int given.',
'count' => 1,
Expand Down
15 changes: 0 additions & 15 deletions .phpstan.dist.baselines/assign.propertyType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Index/Model/Resource/Lock/Resource.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Varien_Data_Collection_Db<Mage_Core_Model_Abstract>::$_map (array{fields: array<string, string>}|null) does not accept array{fields: non-empty-array<string, string|Zend_Db_Expr>}.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Mage_Page_Block_Html_Pager::$_frameEnd (int) does not accept float|int.',
'count' => 1,
Expand Down Expand Up @@ -581,16 +576,6 @@
'count' => 1,
'path' => __DIR__ . '/../lib/Mage/HTTP/Client/Socket.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Varien_Data_Collection_Db<T of Varien_Object>::$_map (array{fields: array<string, string>}|null) does not accept non-empty-array<string, array<string, string>>.',
'count' => 2,
'path' => __DIR__ . '/../lib/Varien/Data/Collection/Db.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Varien_Data_Collection_Db<T of Varien_Object>::$_map (array{fields: array<string, string>}|null) does not accept non-empty-array<string, array{}>.',
'count' => 1,
'path' => __DIR__ . '/../lib/Varien/Data/Collection/Db.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Varien_Data_Form_Filter_Date::$_locale (string|Zend_Locale) does not accept string|Zend_Locale|null.',
'count' => 1,
Expand Down
10 changes: 0 additions & 10 deletions .phpstan.dist.baselines/booleanAnd.leftNotBoolean.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1591,16 +1591,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Block/Info/Container.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, Mage_Payment_Model_Method_Abstract given on the left side.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, object|false given on the left side.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, string|null given on the left side.',
'count' => 1,
Expand Down
20 changes: 0 additions & 20 deletions .phpstan.dist.baselines/booleanNot.exprNotBoolean.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,11 +1111,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, Mage_Core_Model_Config_Element|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, array given.',
'count' => 1,
Expand Down Expand Up @@ -5046,21 +5041,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Block/Info.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, Mage_Payment_Model_Method_Abstract|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, mixed given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, string|null given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, string given.',
'count' => 1,
Expand Down
5 changes: 0 additions & 5 deletions .phpstan.dist.baselines/equal.notAllowed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4361,11 +4361,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Block/Info/Container.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Loose comparison via "==" between mixed and mixed is not allowed.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Loose comparison via "==" between mixed and int is not allowed.',
'count' => 1,
Expand Down
15 changes: 0 additions & 15 deletions .phpstan.dist.baselines/foreach.nonIterable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api/Model/Resource/User.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Argument of an invalid type array|string supplied for foreach, only iterables are supported.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Argument of an invalid type list<string>|false supplied for foreach, only iterables are supported.',
'count' => 1,
Expand Down Expand Up @@ -471,16 +466,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Block/Info.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Argument of an invalid type array|string supplied for foreach, only iterables are supported.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Argument of an invalid type array|string supplied for foreach, only iterables are supported.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Argument of an invalid type array<Varien_Simplexml_Element>|false|null supplied for foreach, only iterables are supported.',
'count' => 1,
Expand Down
10 changes: 0 additions & 10 deletions .phpstan.dist.baselines/function.strict.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,11 +311,6 @@
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Api/Model/Wsdl/Config/Base.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Call to function in_array() requires parameter #3 to be set.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Call to function in_array() requires parameter #3 to be set.',
'count' => 1,
Expand Down Expand Up @@ -1216,11 +1211,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Paygate/Model/Authorizenet.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Call to function in_array() requires parameter #3 to be set.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Call to function in_array() requires parameter #3 to be set.',
'count' => 1,
Expand Down
15 changes: 0 additions & 15 deletions .phpstan.dist.baselines/if.condNotBoolean.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2121,11 +2121,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in an if condition, Mage_Core_Model_Config_Element|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in an if condition, array given.',
'count' => 1,
Expand Down Expand Up @@ -6461,16 +6456,6 @@
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Block/Info/Container.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in an if condition, Mage_Core_Model_Layout given.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in an if condition, string|null given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in an if condition, Mage_Payment_Model_Method_Abstract|false given.',
'count' => 1,
Expand Down
10 changes: 0 additions & 10 deletions .phpstan.dist.baselines/isset.variable.php
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions .phpstan.dist.baselines/method.nonObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2001,11 +2001,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method getNode() on Mage_Core_Model_Config|null.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method children() on array|Varien_Simplexml_Element.',
'count' => 1,
Expand Down Expand Up @@ -4896,36 +4891,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Block/Info/Container.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method asCanonicalArray() on Mage_Core_Model_Config_Element|false.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method getBlockClassName() on Mage_Core_Model_Config|null.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method getConfigData() on object|false.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method setMethod() on Mage_Core_Block_Abstract|false.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method asArray() on Mage_Core_Model_Config_Element|false.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method getNode() on Mage_Core_Model_Config|null.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method getCountryId() on Mage_Sales_Model_Order_Address|false.',
'count' => 1,
Expand Down
5 changes: 0 additions & 5 deletions .phpstan.dist.baselines/method.notFound.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,11 +1351,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Call to an undefined method object::getConfigData().',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Call to an undefined method object::setTemplate().',
'count' => 1,
Expand Down
25 changes: 0 additions & 25 deletions .phpstan.dist.baselines/missingType.iterableValue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19191,11 +19191,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Block/Info/Ccsave.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Helper_Data::getAllBillingAgreementMethods() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Helper_Data::getPaymentMethodList() return type has no value type specified in iterable type array.',
'count' => 1,
Expand Down Expand Up @@ -19226,26 +19221,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Model_Config::getActiveMethods() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Model_Config::getAllMethods() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Model_Config::getMonths() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Model_Config::getYears() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Model_Info::setAdditionalInformation() has parameter $key with no value type specified in iterable type array.',
'count' => 1,
Expand Down
5 changes: 0 additions & 5 deletions .phpstan.dist.baselines/missingType.parameter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,11 +1196,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Helper_Data::getMethodModelClassName() has parameter $code with no type specified.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Global::getElementOriginalData() has parameter $key with no type specified.',
'count' => 1,
Expand Down
5 changes: 0 additions & 5 deletions .phpstan.dist.baselines/missingType.property.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2536,11 +2536,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Exception.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Mage_Payment_Model_Config::$_methods has no type specified.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Model/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Mage_Payment_Model_Method_Abstract::$_canAuthorize has no type specified.',
'count' => 1,
Expand Down
5 changes: 0 additions & 5 deletions .phpstan.dist.baselines/property.notFound.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Customer/Model/Customer.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Access to an undefined property object::$sort_order.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Access to an undefined property object::$Code.',
'count' => 3,
Expand Down
15 changes: 0 additions & 15 deletions .phpstan.dist.baselines/return.type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api/Model/User.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Api2_Helper_Data::getAuthAdapters() should return array but returns array|string.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Api2/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Api2_Model_Config::getResourceAttributes() should return array but returns array|string.',
'count' => 1,
Expand Down Expand Up @@ -2361,16 +2356,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Block/Form.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Helper_Data::getMethodFormBlock() should return Mage_Core_Block_Abstract but returns Mage_Core_Block_Abstract|false.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Helper_Data::getMethodInstance() should return Mage_Payment_Model_Method_Abstract|false but returns object|false.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Payment/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Payment_Model_Billing_AgreementAbstract::getPaymentMethodInstance() should return Mage_Payment_Model_Method_Abstract|null but returns Mage_Payment_Model_Method_Abstract|false.',
'count' => 1,
Expand Down
Loading
Loading