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

Bump phpstan/phpstan from 1.12.3 to 1.12.6 #4252

Merged
merged 5 commits into from
Oct 13, 2024
Merged

Bump phpstan/phpstan from 1.12.3 to 1.12.6 #4252

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b783ee8
Bump phpstan/phpstan from 1.12.3 to 1.12.6
dependabot[bot] Oct 9, 2024
e95477b
phpstan 1.12.5 fixes (#4260)
sreichel Oct 9, 2024
3f360ff
Merge branch 'main' into dependabot/composer/phpstan/phpstan-1.12.6
sreichel Oct 9, 2024
ce48271
Merge branch 'main' into dependabot/composer/phpstan/phpstan-1.12.6
sreichel Oct 13, 2024
e3f1e3c
Updated .phpstan.dist.baseline.neon
sreichel Oct 13, 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
17 changes: 1 addition & 16 deletions .phpstan.dist.baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ parameters:

-
message: "#^Offset 'option_id' does not exist on array\\{final_price\\: mixed\\}\\.$#"
count: 4
count: 2
path: app/code/core/Mage/Bundle/Model/Product/Price.php

-
Expand Down Expand Up @@ -3820,11 +3820,6 @@ parameters:
count: 1
path: app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php

-
message: "#^Negated boolean expression is always true\\.$#"
count: 1
path: app/code/core/Mage/Sales/Model/Order.php

-
message: "#^Variable \\$oldArea might not be defined\\.$#"
count: 1
Expand Down Expand Up @@ -4485,11 +4480,6 @@ parameters:
count: 1
path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php

-
message: "#^Invalid array key type strin\\.$#"
count: 3
path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php

-
message: "#^Method Mage_Usa_Model_Shipping_Carrier_Dhl_International\\:\\:_mapRequestToShipment\\(\\) should return null but return statement is missing\\.$#"
count: 1
Expand All @@ -4505,11 +4495,6 @@ parameters:
count: 1
path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php

-
message: "#^Parameter \\$type of method Mage_Usa_Model_Shipping_Carrier_Dhl_International\\:\\:getCode\\(\\) has invalid type strin\\.$#"
count: 1
path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php

-
message: "#^Property Mage_Usa_Model_Shipping_Carrier_Dhl_International\\:\\:\\$_request \\(Mage_Shipping_Model_Rate_Request\\|null\\) does not accept Varien_Object\\.$#"
count: 1
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ protected function _getOptionDownloadUrl($route, $params)
protected function _parseExtensionsString($extensions)
{
preg_match_all('/[a-z0-9]+/si', strtolower($extensions), $matches);
if (isset($matches[0]) && is_array($matches[0]) && count($matches[0]) > 0) {
if (count($matches[0]) > 0) {
return $matches[0];
}
return null;
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public function getAllowedMethods()
/**
* Get configuration data of carrier
*
* @param strin $type
* @param string $type
* @param string $code
* @return array|bool
*/
Expand Down
10 changes: 5 additions & 5 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/Varien/Db/Adapter/Pdo/Mysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ public function getForeignKeys($tableName, $schemaName = null)
. '( ON DELETE (RESTRICT|CASCADE|SET NULL|NO ACTION))?'
. '( ON UPDATE (RESTRICT|CASCADE|SET NULL|NO ACTION))?#';
$matches = [];
preg_match_all($regExp, $createSql, $matches, PREG_SET_ORDER);
preg_match_all($regExp, $createSql, $matches, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL);
foreach ($matches as $match) {
$ddl[strtoupper($match[1])] = [
'FK_NAME' => $match[1],
Expand Down