Skip to content

Commit 2377b80

Browse files
committed
Merge branch '3.1.x'
Signed-off-by: Maurício Meneghini Fauth <[email protected]>
2 parents 27384f5 + 20cad01 commit 2377b80

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

Diff for: composer.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@
3939
},
4040
"require-dev": {
4141
"phpmyadmin/coding-standard": "^4.0",
42-
"phpstan/extension-installer": "^1.3",
43-
"phpstan/phpstan": "^1.10",
44-
"phpstan/phpstan-phpunit": "^1.3",
45-
"phpstan/phpstan-strict-rules": "^1.5",
46-
"phpunit/phpunit": "^10.3",
42+
"phpstan/extension-installer": "^1.4",
43+
"phpstan/phpstan": "^1.12",
44+
"phpstan/phpstan-deprecation-rules": "^1.2",
45+
"phpstan/phpstan-phpunit": "^1.4",
46+
"phpstan/phpstan-strict-rules": "^1.6",
47+
"phpunit/phpunit": "^10.5",
4748
"psalm/plugin-phpunit": "^0.18.4",
4849
"vimeo/psalm": "^5.15"
4950
},

Diff for: phpstan-baseline.neon

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
parameters:
22
ignoreErrors:
3+
-
4+
message: "#^Foreach overwrites \\$i with its key variable\\.$#"
5+
count: 1
6+
path: examples/read.php
7+
38
-
49
message: "#^Cannot cast mixed to int\\.$#"
510
count: 1

Diff for: phpstan.neon.dist

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ parameters:
55
paths:
66
- src
77
- tests
8+
- examples
89
checkBenevolentUnionTypes: true
9-
checkImplicitMixed: true
10-
checkTooWideReturnTypesInProtectedAndPublicMethods: true
1110
checkUninitializedProperties: true
12-
reportUnmatchedIgnoredErrors: true
11+
checkDynamicProperties: true
12+
checkTooWideReturnTypesInProtectedAndPublicMethods: true
13+
checkImplicitMixed: true

0 commit comments

Comments
 (0)