Skip to content

Commit

Permalink
PhpStan: bumped to 1.12.1 & renamed config files (#4183)
Browse files Browse the repository at this point in the history
* Moved files

* Updated labeler.yml
  • Loading branch information
sreichel authored Sep 6, 2024
1 parent 5d3af08 commit aff71b1
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,7 @@
'phpstan':
- changed-files:
- any-glob-to-any-file: [
.phpstan*,
phpstan*,
.github/workflows/phpstan.yml
]
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,11 @@
.phpcs*.xml
!.phpcs*.xml.dist

# PhpStan
.phpstan*.neon
phpstan*.neon
!phpstan.dist.*.neon
!.phpstan.dist.neon
!.phpstan.dist.*.neon

# dev scripts loaded via composer
/shell/update-copyright.php
Expand Down
5 changes: 5 additions & 0 deletions phpstan.dist.baseline.neon → .phpstan.dist.baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -3965,6 +3965,11 @@ parameters:
count: 1
path: app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php

-
message: "#^Negated boolean expression is always true\\.$#"
count: 1
path: app/code/core/Mage/Sales/Model/Order.php

-
message: "#^Variable \\$oldArea might not be defined\\.$#"
count: 1
Expand Down
2 changes: 1 addition & 1 deletion phpstan.dist.neon → .phpstan.dist.neon
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
includes:
- vendor/macopedia/phpstan-magento1/extension.neon
- phpstan.dist.baseline.neon
- .phpstan.dist.baseline.neon
- phar://phpstan.phar/conf/bleedingEdge.neon
parameters:
magentoRootPath: %currentWorkingDirectory%
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"openmage/dev-meta-package": "^1.0",
"phpcompatibility/php-compatibility": "^9.3",
"phpmd/phpmd": "^2.13",
"phpstan/phpstan": "^1.11",
"phpstan/phpstan": "^1.12.1",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.7",
"symplify/vendor-patches": "^11.1"
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

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

0 comments on commit aff71b1

Please sign in to comment.