Skip to content
This repository has been archived by the owner on Aug 17, 2022. It is now read-only.

Commit

Permalink
Merge pull request #49 from loveOSS/phpstan/lvl-8
Browse files Browse the repository at this point in the history
[WIP] PHP8 support
  • Loading branch information
mickaelandrieu authored Mar 30, 2021
2 parents 4b5c10c + 7fbe0ae commit 0576efb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 44 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.workflow
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ workflow "Code Quality" {

action "PHPStan" {
uses = "docker://oskarstark/phpstan-ga:with-extensions"
args = "analyse src tests --level max --configuration extension.neon"
args = "analyse src --level max --configuration extension.neon"
secrets = ["GITHUB_TOKEN"]
}

Expand All @@ -22,12 +22,12 @@ action "Psalm" {
needs="PHPStan"
uses = "docker://mickaelandrieu/psalm-ga"
secrets = ["GITHUB_TOKEN"]
args = "--find-dead-code --diff --diff-methods"
args = "--find-dead-code --diff"
}

action "PHPQA" {
needs="PHP-CS-Fixer"
uses = "docker://mickaelandrieu/phpqa-ga"
secrets = ["GITHUB_TOKEN"]
args = "--report --tools phpcs:0,phpmd:0,phpcpd:0,parallel-lint:0,phpmetrics,phploc,pdepend --ignoredDirs vendor"
args = "--report --tools phpcs:0,phpmd:0,parallel-lint:0,phpmetrics,phploc,pdepend --ignoredDirs vendor"
}
23 changes: 0 additions & 23 deletions .github/workflows/rector_checkstyle.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ notifications:

php:
- 7.4
- 8.0

matrix:
fast_finish: true
Expand All @@ -24,8 +25,6 @@ script:
- composer phpstan
- composer psalm
- composer phpqa
- composer rector
- composer security-checker

after_success:
- bash <(curl -s https://codecov.io/bash)
25 changes: 10 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,22 @@
}
],
"require": {
"php": "^7.4",
"php": "^7.4|^8.0",
"ext-json": "*",
"psr/event-dispatcher": "^1.0",
"psr/simple-cache": "^1.0"
},
"require-dev": {
"edgedesign/phpqa": "^v1.23",
"friendsofphp/php-cs-fixer": "^2.16",
"edgedesign/phpqa": "^v1.24",
"friendsofphp/php-cs-fixer": "^2.18",
"guzzlehttp/guzzle": "^6.3|^7.0",
"php-parallel-lint/php-parallel-lint": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpunit/phpunit": "^8.0",
"rector/rector": "^0.7.54",
"sensiolabs/security-checker": "^5.0",
"symfony/cache": "~4.4|~5.1",
"symfony/http-client": "^4.4|~5.1",
"vimeo/psalm": "^3.12"
"symfony/cache": "~4.4|~5.2",
"symfony/http-client": "^4.4|~5.2",
"vimeo/psalm": "^4.3"
},
"suggest": {
"symfony/cache": "Allows use of Symfony Cache adapters to store transactions",
Expand All @@ -50,21 +48,18 @@
}
},
"scripts": {
"phpstan": "@php ./vendor/bin/phpstan analyse src tests -l 7 -c extension.neon",
"psalm": "@php ./vendor/bin/psalm --threads=8 --diff --diff-methods",
"phpstan": "@php ./vendor/bin/phpstan analyse src --level max -c extension.neon",
"psalm": "@php ./vendor/bin/psalm --threads=8 --diff",
"cs-fix": "@php ./vendor/bin/php-cs-fixer fix",
"test": "@php ./vendor/bin/phpunit",
"phpqa": "@php ./vendor/bin/phpqa --report --tools phpcs:0,phpmd:0,phpcpd:0,phpmetrics,phploc,pdepend,security-checker:0,parallel-lint:0 --ignoredDirs tests,vendor",
"rector": "@php ./vendor/bin/rector process src tests --set code-quality",
"security-checker": "@php ./vendor/bin/security-checker security:check"
"phpqa": "@php ./vendor/bin/phpqa --report --tools phpcs:0,phpmd:0,phpmetrics,phploc,pdepend,security-checker:0,parallel-lint:0 --ignoredDirs tests,vendor"
},
"scripts-descriptions": {
"phpstan": "Execute PHPStan analysis",
"psalm": "Execute Psalm analysis",
"cs-fix": "Check and fix coding styles using PHP CS Fixer",
"test": "Launch PHPUnit test suite",
"phpqa": "Execute PHQA toolsuite analysis",
"security-checker": "Executes Security Checker analysis"
"phpqa": "Execute PHQA toolsuite analysis"
},
"config": {
"sort-packages": true
Expand Down
1 change: 0 additions & 1 deletion psalm.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<MissingReturnType errorLevel="info" />
<MissingPropertyType errorLevel="info" />
<InvalidDocblock errorLevel="info" />
<MisplacedRequiredParam errorLevel="info" />

<MissingConstructor errorLevel="info" />
<MissingClosureParamType errorLevel="info" />
Expand Down

0 comments on commit 0576efb

Please sign in to comment.