Skip to content

Commit 8110aab

Browse files
authored
Updated PHPStan to 1.8.3 (#2540)
1 parent 22700c4 commit 8110aab

File tree

4 files changed

+49
-62
lines changed

4 files changed

+49
-62
lines changed

.github/phpstan-baseline.neon

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -570,11 +570,6 @@ parameters:
570570
count: 1
571571
path: ../app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
572572

573-
-
574-
message: "#^Method Mage_Eav_Model_Entity_Abstract\\:\\:save\\(\\) invoked with 0 parameters, 1 required\\.$#"
575-
count: 1
576-
path: ../app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
577-
578573
-
579574
message: "#^Variable \\$billingAddress might not be defined\\.$#"
580575
count: 2
@@ -1220,16 +1215,6 @@ parameters:
12201215
count: 2
12211216
path: ../app/code/core/Mage/Catalog/Block/Product/Gallery.php
12221217

1223-
-
1224-
message: "#^Variable \\$class might not be defined\\.$#"
1225-
count: 1
1226-
path: ../app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php
1227-
1228-
-
1229-
message: "#^Variable \\$type might not be defined\\.$#"
1230-
count: 1
1231-
path: ../app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php
1232-
12331218
-
12341219
message: "#^Method Mage_Catalog_Block_Product_View_Tabs\\:\\:addTab\\(\\) should return bool but return statement is missing\\.$#"
12351220
count: 1
@@ -1641,12 +1626,12 @@ parameters:
16411626
path: ../app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php
16421627

16431628
-
1644-
message: "#^Binary operation \"\\-\" between int and non\\-empty\\-string results in an error\\.$#"
1629+
message: "#^Binary operation \"\\-\" between int and non-falsy-string results in an error\\.$#"
16451630
count: 2
16461631
path: ../app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
16471632

16481633
-
1649-
message: "#^Binary operation \"\\-\" between non\\-empty\\-string and 1 results in an error\\.$#"
1634+
message: "#^Binary operation \"\\-\" between non-falsy-string and 1 results in an error\\.$#"
16501635
count: 2
16511636
path: ../app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
16521637

@@ -2101,7 +2086,7 @@ parameters:
21012086
path: ../app/code/core/Mage/Core/Model/Design.php
21022087

21032088
-
2104-
message: "#^Binary operation \"\\.\" between non\\-empty\\-string and array results in an error\\.$#"
2089+
message: "#^Binary operation \"\\.\" between non-falsy-string and array results in an error\\.$#"
21052090
count: 1
21062091
path: ../app/code/core/Mage/Core/Model/Design/Package.php
21072092

@@ -2391,7 +2376,7 @@ parameters:
23912376
path: ../app/code/core/Mage/Dataflow/Model/Profile.php
23922377

23932378
-
2394-
message: "#^Binary operation \"\\*\" between float and non\\-empty\\-string results in an error\\.$#"
2379+
message: "#^Binary operation \"\\*\" between float and non-falsy-string results in an error\\.$#"
23952380
count: 1
23962381
path: ../app/code/core/Mage/Directory/Model/Currency.php
23972382

@@ -2927,7 +2912,7 @@ parameters:
29272912
path: ../app/code/core/Mage/Install/controllers/WizardController.php
29282913

29292914
-
2930-
message: "#^Binary operation \"\\+\" between non\\-empty\\-string and 1 results in an error\\.$#"
2915+
message: "#^Binary operation \"\\+\" between non-falsy-string and 1 results in an error\\.$#"
29312916
count: 2
29322917
path: ../app/code/core/Mage/Log/Model/Resource/Log.php
29332918

app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ protected function _init()
116116
*
117117
* @return mixed
118118
*/
119+
#[\ReturnTypeWillChange]
119120
public function current()
120121
{
121122
return array_combine(
@@ -141,6 +142,7 @@ public function getColNames()
141142
*
142143
* @return int More than 0 integer on success, integer 0 on failure.
143144
*/
145+
#[\ReturnTypeWillChange]
144146
public function key()
145147
{
146148
return $this->_currentKey;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"magento-ecg/coding-standard": "^4.4",
2929
"phpcompatibility/php-compatibility": "^9.3",
3030
"phpmd/phpmd": "^2.12",
31-
"phpstan/phpstan": "^1.8",
31+
"phpstan/phpstan": "^1.8.3",
3232
"squizlabs/php_codesniffer": "^3.7"
3333
},
3434
"conflict": {

composer.lock

Lines changed: 41 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)