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

Update PHPStan to 1.0, rector to 0.12.x #4874

Merged
merged 7 commits into from
Nov 10, 2021
Merged

Update PHPStan to 1.0, rector to 0.12.x #4874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c7e9aad
Update PHPStan to 1.0
staabm Nov 1, 2021
882727a
update
gharlan Nov 9, 2021
76fb611
Merge branch 'main' into staabm-patch-2
gharlan Nov 9, 2021
7351ee9
baseline
gharlan Nov 9, 2021
1e77463
update rector
gharlan Nov 10, 2021
1ebcd1c
update
gharlan Nov 10, 2021
1a708fd
Update psalm baseline
gharlan Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions .tools/phpstan/baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
parameters:
ignoreErrors:
-
message: "#^Dead catch \\- Throwable is never thrown in the try block\\.$#"
count: 1
path: ../../redaxo/src/addons/cronjob/lib/types/phpcode.php

-
message: "#^Parameter \\#3 \\$alias of class PharData constructor expects string, null given\\.$#"
count: 1
Expand Down Expand Up @@ -126,7 +121,7 @@ parameters:
path: ../../redaxo/src/core/lib/autoload.php

-
message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, array\\('rex_autoload', 'autoload'\\) given\\.$#"
message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, array\\{'rex_autoload', 'autoload'\\} given\\.$#"
count: 1
path: ../../redaxo/src/core/lib/autoload.php

Expand Down Expand Up @@ -261,7 +256,7 @@ parameters:
path: ../../redaxo/src/core/tests/base/instance_list_pool_trait_test.php

-
message: "#^Parameter \\#3 \\$createListCallback of static method rex_test_instance_list_pool\\:\\:getInstanceList\\(\\) expects \\(callable\\(\\.\\.\\.mixed\\)\\: array\\)\\|null, Closure\\(mixed, mixed\\)\\: array\\(\\) given\\.$#"
message: "#^Parameter \\#3 \\$createListCallback of static method rex_test_instance_list_pool\\:\\:getInstanceList\\(\\) expects \\(callable\\(\\.\\.\\.mixed\\)\\: array\\)\\|null, Closure\\(mixed, mixed\\)\\: array\\{\\} given\\.$#"
count: 1
path: ../../redaxo/src/core/tests/base/instance_list_pool_trait_test.php

Expand Down
3 changes: 1 addition & 2 deletions .tools/psalm/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5776,14 +5776,13 @@
</MixedAssignment>
</file>
<file src="redaxo/src/core/lib/setup/setup.php">
<MixedArgument occurrences="11">
<MixedArgument occurrences="10">
<code>$config['db'][1]['host']</code>
<code>$config['db'][1]['login']</code>
<code>$config['db'][1]['name']</code>
<code>$config['db'][1]['password']</code>
<code>$dir</code>
<code>$dir</code>
<code>$expire</code>
<code>$func($path)</code>
<code>$path</code>
<code>self::MIN_PHP_VERSION</code>
Expand Down
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"friendsofphp/php-cs-fixer": "3.2.1",
"friendsofredaxo/linter": "1.3.0",
"phpstan/extension-installer": "1.1.0",
"phpstan/phpstan": "0.12.99",
"phpstan/phpstan-deprecation-rules": "0.12.6",
"phpstan/phpstan-phpunit": "0.12.22",
"phpstan/phpstan-symfony": "0.12.44",
"phpstan/phpstan": "1.1.2",
"phpstan/phpstan-deprecation-rules": "1.0.0",
"phpstan/phpstan-phpunit": "1.0.0",
"phpstan/phpstan-symfony": "1.0.1",
"phpunit/phpunit": "^9.3",
"psalm/plugin-phpunit": "0.16.1",
"psalm/plugin-symfony": "3.0.4",
"rector/rector": "0.11.60",
"rector/rector": "0.12.2",
"redaxo/php-cs-fixer-config": "1.0.0",
"redaxo/psalm-plugin": "1.0.0",
"vimeo/psalm": "4.11.2"
Expand Down
2 changes: 1 addition & 1 deletion redaxo/src/core/lib/setup/setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public static function isEnabled(): bool
// invalidate expired tokens
$updated = false;
foreach ($setup as $token => $expire) {
if (strtotime($expire) < time()) {
if (strtotime((string) $expire) < time()) {
unset($setup[$token]);
$updated = true;
}
Expand Down