Skip to content

Commit

Permalink
Merge branch '4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell committed Dec 12, 2021
2 parents d4394d0 + 77e9746 commit bb78c37
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
"authors": [
{
"name": "Graham Campbell",
"email": "[email protected]"
"email": "[email protected]",
"homepage": "https://github.com/GrahamCampbell"
},
{
"name": "Vance Lucas",
"email": "[email protected]"
"email": "[email protected]",
"homepage": "https://github.com/vlucas"
}
],
"require": {
Expand Down
1 change: 0 additions & 1 deletion phpstan.src.neon.dist
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
parameters:
level: max
ignoreErrors:
- '#Anonymous function should have native return typehint ".+".#'
- '#Only booleans are allowed in a negated boolean, int\|false given.#'
- '#Method Dotenv\\Util\\Regex::split\(\) should return GrahamCampbell\\ResultType\\Result\<array\<string\>, string\> but returns GrahamCampbell\\ResultType\\Result\<array\<int, bool\|string\>, string\>.#'
2 changes: 1 addition & 1 deletion phpstan.tests.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ parameters:
level: max
ignoreErrors:
- '#Parameter \#1 \$name of method Dotenv\\Repository\\RepositoryInterface::[a-z]+\(\) expects string, null given.#'
- '#Method Dotenv\\Tests\\[a-zA-Z\\]+Test::test[a-zA-Z0-9]+\(\) has no return typehint specified.#'
- '#Method Dotenv\\Tests\\[a-zA-Z\\]+Test::test[a-zA-Z0-9]+\(\) has no return type specified.#'
- '#Call to static method PHPUnit\\Framework\\Assert::assert(InstanceOf|IsArray)\(\) with .+ will always evaluate to true.#'
10 changes: 5 additions & 5 deletions vendor-bin/phpstan/composer.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"require": {
"php": "^7.4",
"phpstan/phpstan": "0.12.99",
"phpstan/phpstan": "1.2.0",
"phpstan/extension-installer": "1.1.0",
"phpstan/phpstan-deprecation-rules": "0.12.6",
"phpstan/phpstan-phpunit": "0.12.22",
"phpstan/phpstan-strict-rules": "0.12.11",
"thecodingmachine/phpstan-strict-rules": "0.12.1"
"phpstan/phpstan-deprecation-rules": "1.0.0",
"phpstan/phpstan-phpunit": "1.0.0",
"phpstan/phpstan-strict-rules": "1.1.0",
"thecodingmachine/phpstan-strict-rules": "1.0.0"
},
"config": {
"preferred-install": "dist"
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/psalm/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require": {
"php": "^7.4",
"psalm/phar": "4.10.0"
"psalm/phar": "4.15.0"
},
"config": {
"preferred-install": "dist"
Expand Down

0 comments on commit bb78c37

Please sign in to comment.