Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.10.x' into 1.11.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@ondrejmirtes
ondrejmirtes committed Sep 19, 2023
2 parents 4caad03 + 3334735 commit fbc09b5
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 55 deletions.
1 change: 0 additions & 1 deletion build/phpstan.neon
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
includes:
- ../vendor/phpstan/phpstan-deprecation-rules/rules.neon
- ../vendor/phpstan/phpstan-nette/rules.neon
- ../vendor/phpstan/phpstan-php-parser/extension.neon
- ../vendor/phpstan/phpstan-phpunit/extension.neon
- ../vendor/phpstan/phpstan-phpunit/rules.neon
- ../vendor/phpstan/phpstan-strict-rules/rules.neon
Expand Down
1 change: 0 additions & 1 deletion changelog-generator/phpstan.neon
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
includes:
- ../vendor/phpstan/phpstan-deprecation-rules/rules.neon
- ../vendor/phpstan/phpstan-nette/rules.neon
- ../vendor/phpstan/phpstan-php-parser/extension.neon
- ../vendor/phpstan/phpstan-phpunit/extension.neon
- ../vendor/phpstan/phpstan-phpunit/rules.neon
- ../vendor/phpstan/phpstan-strict-rules/rules.neon
Expand Down
1 change: 0 additions & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"php-parallel-lint/php-parallel-lint": "^1.2.0",
"phpstan/phpstan-deprecation-rules": "1.2.x-dev",
"phpstan/phpstan-nette": "^1.0",
"phpstan/phpstan-php-parser": "^1.1",
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-strict-rules": "1.5.x-dev",
"phpunit/phpunit": "^9.5.4",
Expand Down
53 changes: 1 addition & 52 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit fbc09b5

Please sign in to comment.