Skip to content

Commit bb78c37

Browse files
Merge branch '4.2'
2 parents d4394d0 + 77e9746 commit bb78c37

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
"authors": [
77
{
88
"name": "Graham Campbell",
9-
"email": "hello@gjcampbell.co.uk"
9+
"email": "hello@gjcampbell.co.uk",
10+
"homepage": "https://github.com/GrahamCampbell"
1011
},
1112
{
1213
"name": "Vance Lucas",
13-
"email": "vance@vancelucas.com"
14+
"email": "vance@vancelucas.com",
15+
"homepage": "https://github.com/vlucas"
1416
}
1517
],
1618
"require": {

phpstan.src.neon.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
level: max
33
ignoreErrors:
4-
- '#Anonymous function should have native return typehint ".+".#'
54
- '#Only booleans are allowed in a negated boolean, int\|false given.#'
65
- '#Method Dotenv\\Util\\Regex::split\(\) should return GrahamCampbell\\ResultType\\Result\<array\<string\>, string\> but returns GrahamCampbell\\ResultType\\Result\<array\<int, bool\|string\>, string\>.#'

phpstan.tests.neon.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ parameters:
22
level: max
33
ignoreErrors:
44
- '#Parameter \#1 \$name of method Dotenv\\Repository\\RepositoryInterface::[a-z]+\(\) expects string, null given.#'
5-
- '#Method Dotenv\\Tests\\[a-zA-Z\\]+Test::test[a-zA-Z0-9]+\(\) has no return typehint specified.#'
5+
- '#Method Dotenv\\Tests\\[a-zA-Z\\]+Test::test[a-zA-Z0-9]+\(\) has no return type specified.#'
66
- '#Call to static method PHPUnit\\Framework\\Assert::assert(InstanceOf|IsArray)\(\) with .+ will always evaluate to true.#'

vendor-bin/phpstan/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"require": {
33
"php": "^7.4",
4-
"phpstan/phpstan": "0.12.99",
4+
"phpstan/phpstan": "1.2.0",
55
"phpstan/extension-installer": "1.1.0",
6-
"phpstan/phpstan-deprecation-rules": "0.12.6",
7-
"phpstan/phpstan-phpunit": "0.12.22",
8-
"phpstan/phpstan-strict-rules": "0.12.11",
9-
"thecodingmachine/phpstan-strict-rules": "0.12.1"
6+
"phpstan/phpstan-deprecation-rules": "1.0.0",
7+
"phpstan/phpstan-phpunit": "1.0.0",
8+
"phpstan/phpstan-strict-rules": "1.1.0",
9+
"thecodingmachine/phpstan-strict-rules": "1.0.0"
1010
},
1111
"config": {
1212
"preferred-install": "dist"

vendor-bin/psalm/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.4",
4-
"psalm/phar": "4.10.0"
4+
"psalm/phar": "4.15.0"
55
},
66
"config": {
77
"preferred-install": "dist"

0 commit comments

Comments
 (0)