Skip to content

Commit 4f305a5

Browse files
authored
Merge pull request #2812 from shopware5/chore/update-phpstan
chore: Update PHPStan
2 parents 3515596 + cd34d77 commit 4f305a5

File tree

15 files changed

+208
-323
lines changed

15 files changed

+208
-323
lines changed

.phpstan-baseline.neon

Lines changed: 2 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -3220,11 +3220,6 @@ parameters:
32203220
count: 1
32213221
path: engine/Library/Enlight/Template/Plugins/block.stripLines.php
32223222

3223-
-
3224-
message: "#^Function smarty_block_stripLines\\(\\) never returns void so it can be removed from the return type\\.$#"
3225-
count: 1
3226-
path: engine/Library/Enlight/Template/Plugins/block.stripLines.php
3227-
32283223
-
32293224
message: "#^Method Smarty_Compiler_Config\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
32303225
count: 1
@@ -11855,36 +11850,6 @@ parameters:
1185511850
count: 1
1185611851
path: engine/Shopware/Commands/DatabaseSetupCommand.php
1185711852

11858-
-
11859-
message: "#^Method Shopware\\\\Commands\\\\FirstRunWizardDisableCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
11860-
count: 1
11861-
path: engine/Shopware/Commands/FirstRunWizardDisableCommand.php
11862-
11863-
-
11864-
message: "#^Query error\\: Column \"s_core_config_values\\.element_id\" expects value type int, got type mixed$#"
11865-
count: 2
11866-
path: engine/Shopware/Commands/FirstRunWizardDisableCommand.php
11867-
11868-
-
11869-
message: "#^Query error\\: Column \"s_core_config_values\\.id\" expects value type int, got type mixed~0\\|0\\.0\\|''\\|'0'\\|array\\{\\}\\|false\\|null$#"
11870-
count: 1
11871-
path: engine/Shopware/Commands/FirstRunWizardDisableCommand.php
11872-
11873-
-
11874-
message: "#^Method Shopware\\\\Commands\\\\FirstRunWizardEnableCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
11875-
count: 1
11876-
path: engine/Shopware/Commands/FirstRunWizardEnableCommand.php
11877-
11878-
-
11879-
message: "#^Query error\\: Column \"s_core_config_values\\.element_id\" expects value type int, got type mixed$#"
11880-
count: 2
11881-
path: engine/Shopware/Commands/FirstRunWizardEnableCommand.php
11882-
11883-
-
11884-
message: "#^Query error\\: Column \"s_core_config_values\\.id\" expects value type int, got type mixed~0\\|0\\.0\\|''\\|'0'\\|array\\{\\}\\|false\\|null$#"
11885-
count: 1
11886-
path: engine/Shopware/Commands/FirstRunWizardEnableCommand.php
11887-
1188811853
-
1188911854
message: "#^Method Shopware\\\\Commands\\\\GenerateAttributesCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
1189011855
count: 1
@@ -12685,11 +12650,6 @@ parameters:
1268512650
count: 1
1268612651
path: engine/Shopware/Components/Acl.php
1268712652

12688-
-
12689-
message: "#^Access to an undefined property Enlight_Controller_Response_Response\\:\\:\\$headers\\.$#"
12690-
count: 1
12691-
path: engine/Shopware/Components/AddLinkHeaderSubscriber.php
12692-
1269312653
-
1269412654
message: "#^Cannot call method setAcl\\(\\) on object\\|null\\.$#"
1269512655
count: 1
@@ -14125,21 +14085,6 @@ parameters:
1412514085
count: 1
1412614086
path: engine/Shopware/Components/Cart/CartPersistService.php
1412714087

14128-
-
14129-
message: "#^Query error\\: Column \"s_order_basket\\.currencyFactor\" expects value type float\\|int, got type mixed~0\\|0\\.0\\|''\\|'0'\\|array\\{\\}\\|false\\|null$#"
14130-
count: 1
14131-
path: engine/Shopware/Components/Cart/ConditionalLineItemService.php
14132-
14133-
-
14134-
message: "#^Query error\\: Column \"s_order_basket\\.sessionID\" expects value type string\\|null, got type mixed$#"
14135-
count: 1
14136-
path: engine/Shopware/Components/Cart/ConditionalLineItemService.php
14137-
14138-
-
14139-
message: "#^Query error\\: Column \"s_order_basket_attributes\\.basketID\" expects value type int\\|null, got type int\\|string\\|false$#"
14140-
count: 1
14141-
path: engine/Shopware/Components/Cart/ConditionalLineItemService.php
14142-
1414314088
-
1414414089
message: "#^Parameter \\#4 \\$path of class Symfony\\\\Component\\\\HttpFoundation\\\\Cookie constructor expects string\\|null, string\\|false given\\.$#"
1414514090
count: 1
@@ -17956,47 +17901,12 @@ parameters:
1795617901
path: engine/Shopware/Components/Plugin/Configuration/ReaderInterface.php
1795717902

1795817903
-
17959-
message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:addCronjob\\(\\) has no return type specified\\.$#"
17960-
count: 1
17961-
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
17962-
17963-
-
17964-
message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:addCronjob\\(\\) has parameter \\$cronjob with no value type specified in iterable type array\\.$#"
17965-
count: 1
17966-
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
17967-
17968-
-
17969-
message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:removeNotExistingEntries\\(\\) has no return type specified\\.$#"
17970-
count: 1
17971-
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
17972-
17973-
-
17974-
message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:removeNotExistingEntries\\(\\) has parameter \\$cronjobActions with no value type specified in iterable type array\\.$#"
17975-
count: 1
17976-
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
17977-
17978-
-
17979-
message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:synchronize\\(\\) has no return type specified\\.$#"
17980-
count: 1
17981-
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
17982-
17983-
-
17984-
message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:synchronize\\(\\) has parameter \\$cronjobs with no value type specified in iterable type array\\.$#"
17985-
count: 1
17986-
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
17987-
17988-
-
17989-
message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\<mixed~'active', mixed\\>&hasOffsetValue\\('pluginID', int\\)$#"
17990-
count: 1
17991-
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
17992-
17993-
-
17994-
message: "#^Query error\\: Argument \\#1 is not a constant array, got hasOffsetValue\\('end', DateTime\\)&hasOffsetValue\\('next', DateTime\\)&hasOffsetValue\\('pluginID', int\\)&non\\-empty\\-array$#"
17904+
message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\<string, mixed\\>&hasOffsetValue\\('pluginID', int\\)$#"
1799517905
count: 1
1799617906
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
1799717907

1799817908
-
17999-
message: "#^Query error\\: Column \"s_crontab\\.id\" expects value type int, got type mixed~0\\|0\\.0\\|''\\|'0'\\|array\\{\\}\\|false\\|null$#"
17909+
message: "#^Query error\\: Argument \\#1 is not a constant array, got non\\-empty\\-array\\<string, mixed\\>&hasOffsetValue\\('end', DateTime\\)&hasOffsetValue\\('next', DateTime\\)&hasOffsetValue\\('pluginID', int\\)$#"
1800017910
count: 1
1800117911
path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
1800217912

UPGRADE-5.7.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This changelog references changes done in Shopware 5.7 patch versions.
4040
* Updated `symfony/polyfill-php82` to version 1.31.0
4141
* Updated `symfony/polyfill-php83` to version 1.31.0
4242
* Updated `symfony/http-kernel` to version 4.4.51
43-
* Updated `symfony/serializer` to version 5.4.44
43+
* Updated `symfony/serializer` to version 5.4.45
4444
* Updated `voku/anti-xss` to version 4.1.42
4545
* Updated `wikimedia/less.php` to version 5.1.1
4646
* Updated several indirect dependencies

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
"friends-of-behat/mink-extension": "2.7.5",
113113
"php-parallel-lint/php-var-dump-check": "^0.5",
114114
"phpstan/extension-installer": "1.4.3",
115-
"phpstan/phpstan": "1.12.0",
116-
"phpstan/phpstan-doctrine": "1.5.3",
117-
"phpstan/phpstan-phpunit": "1.4.0",
118-
"phpstan/phpstan-symfony": "1.4.11",
115+
"phpstan/phpstan": "1.12.10",
116+
"phpstan/phpstan-doctrine": "1.5.6",
117+
"phpstan/phpstan-phpunit": "1.4.1",
118+
"phpstan/phpstan-symfony": "1.4.12",
119119
"phpunit/phpunit": "^9.6",
120120
"sensiolabs/behat-page-object-extension": "2.3.7",
121121
"staabm/phpstan-dba": "0.2.81",

0 commit comments

Comments
 (0)