From ba7bb3d8cc4deb30ac5759f4fb67eeb41258ebd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Sat, 24 Oct 2020 21:39:36 +0200 Subject: [PATCH 01/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e4aaf53..1a7012c 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ } }, "scripts": { - "phpstan": "@php ./vendor/bin/phpstan analyse src tests -l 7 -c extension.neon", + "phpstan": "@php ./vendor/bin/phpstan analyse src tests -l 8 -c extension.neon", "psalm": "@php ./vendor/bin/psalm --threads=8 --diff --diff-methods", "cs-fix": "@php ./vendor/bin/php-cs-fixer fix", "test": "@php ./vendor/bin/phpunit", From fdec1d21f1f05b70d1639d7d7b08cc40714e5e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Sat, 24 Oct 2020 21:40:48 +0200 Subject: [PATCH 02/11] Used max level keyword --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1a7012c..269b6df 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ } }, "scripts": { - "phpstan": "@php ./vendor/bin/phpstan analyse src tests -l 8 -c extension.neon", + "phpstan": "@php ./vendor/bin/phpstan analyse src tests --level max -c extension.neon", "psalm": "@php ./vendor/bin/psalm --threads=8 --diff --diff-methods", "cs-fix": "@php ./vendor/bin/php-cs-fixer fix", "test": "@php ./vendor/bin/phpunit", From 699478a85e71bfec8717dd7b55b1bad493536ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Wed, 9 Dec 2020 06:10:28 +0100 Subject: [PATCH 03/11] Removed tests folder from static analysis --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 269b6df..e4b09b5 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ } }, "scripts": { - "phpstan": "@php ./vendor/bin/phpstan analyse src tests --level max -c extension.neon", + "phpstan": "@php ./vendor/bin/phpstan analyse src --level max -c extension.neon", "psalm": "@php ./vendor/bin/psalm --threads=8 --diff --diff-methods", "cs-fix": "@php ./vendor/bin/php-cs-fixer fix", "test": "@php ./vendor/bin/phpunit", From 62e2ad475070874c302dcf9199712fc6f436a865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Wed, 9 Dec 2020 06:47:59 +0100 Subject: [PATCH 04/11] Fixed the main workflow --- .github/workflows/main.workflow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.workflow b/.github/workflows/main.workflow index c942af7..7f9e9cf 100644 --- a/.github/workflows/main.workflow +++ b/.github/workflows/main.workflow @@ -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"] } From 3524faf1a08e50207bb715cb7bee3d428dd0df7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Wed, 9 Dec 2020 06:51:02 +0100 Subject: [PATCH 05/11] Added PHP 8 to the matrix of tests --- .github/workflows/rector_checkstyle.yaml | 2 +- .travis.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rector_checkstyle.yaml b/.github/workflows/rector_checkstyle.yaml index 92999af..a0a1f37 100644 --- a/.github/workflows/rector_checkstyle.yaml +++ b/.github/workflows/rector_checkstyle.yaml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: shivammathur/setup-php@v1 + - uses: shivammathur/setup-php@v2 with: php-version: 7.4 coverage: none diff --git a/.travis.yml b/.travis.yml index e22250e..0d51ea2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ notifications: php: - 7.4 + - 8.0 matrix: fast_finish: true From 4d176ee1342a7d2f8fd18afe6c1689bf0854f2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Wed, 9 Dec 2020 07:04:51 +0100 Subject: [PATCH 06/11] Updated rector for PHP 8 support --- .github/workflows/main.workflow | 2 +- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.workflow b/.github/workflows/main.workflow index 7f9e9cf..51346c4 100644 --- a/.github/workflows/main.workflow +++ b/.github/workflows/main.workflow @@ -29,5 +29,5 @@ 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" } diff --git a/composer.json b/composer.json index e4b09b5..0bf9c2c 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.4", + "php": "^7.4|^8.0", "ext-json": "*", "psr/event-dispatcher": "^1.0", "psr/simple-cache": "^1.0" @@ -27,7 +27,7 @@ "phpstan/phpstan": "^0.12", "phpstan/phpstan-phpunit": "^0.12", "phpunit/phpunit": "^8.0", - "rector/rector": "^0.7.54", + "rector/rector": "^0.8", "sensiolabs/security-checker": "^5.0", "symfony/cache": "~4.4|~5.1", "symfony/http-client": "^4.4|~5.1", @@ -54,7 +54,7 @@ "psalm": "@php ./vendor/bin/psalm --threads=8 --diff --diff-methods", "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", + "phpqa": "@php ./vendor/bin/phpqa --report --tools phpcs:0,phpmd: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" }, From 1b77f2eaa50aaf27d6c5667f2d9aa410e60ac53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Wed, 9 Dec 2020 07:09:00 +0100 Subject: [PATCH 07/11] Removed Rector, not needed anymore --- .github/workflows/rector_checkstyle.yaml | 23 ----------------------- .travis.yml | 1 - composer.json | 2 -- 3 files changed, 26 deletions(-) delete mode 100644 .github/workflows/rector_checkstyle.yaml diff --git a/.github/workflows/rector_checkstyle.yaml b/.github/workflows/rector_checkstyle.yaml deleted file mode 100644 index a0a1f37..0000000 --- a/.github/workflows/rector_checkstyle.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: Rector Checkstyle - -on: - pull_request: null - push: - branches: - - main - -jobs: - rector_checkstyle: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - uses: shivammathur/setup-php@v2 - with: - php-version: 7.4 - coverage: none - tools: cs2pr - - - run: composer install --no-progress --ansi - - - run: vendor/bin/rector process --ansi --dry-run --output-format=checkstyle | cs2pr diff --git a/.travis.yml b/.travis.yml index 0d51ea2..df98f36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ script: - composer phpstan - composer psalm - composer phpqa - - composer rector - composer security-checker after_success: diff --git a/composer.json b/composer.json index 0bf9c2c..6b40266 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,6 @@ "phpstan/phpstan": "^0.12", "phpstan/phpstan-phpunit": "^0.12", "phpunit/phpunit": "^8.0", - "rector/rector": "^0.8", "sensiolabs/security-checker": "^5.0", "symfony/cache": "~4.4|~5.1", "symfony/http-client": "^4.4|~5.1", @@ -55,7 +54,6 @@ "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,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" }, "scripts-descriptions": { From 944295b0a9cbda2f029ef88fc9b15bcdf2771148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Wed, 9 Dec 2020 07:12:25 +0100 Subject: [PATCH 08/11] Updated Psalm for PHP8 support --- .github/workflows/main.workflow | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.workflow b/.github/workflows/main.workflow index 51346c4..c1a0d6d 100644 --- a/.github/workflows/main.workflow +++ b/.github/workflows/main.workflow @@ -22,7 +22,7 @@ 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" { diff --git a/composer.json b/composer.json index 6b40266..b200716 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "sensiolabs/security-checker": "^5.0", "symfony/cache": "~4.4|~5.1", "symfony/http-client": "^4.4|~5.1", - "vimeo/psalm": "^3.12" + "vimeo/psalm": "^4.3" }, "suggest": { "symfony/cache": "Allows use of Symfony Cache adapters to store transactions", @@ -50,7 +50,7 @@ }, "scripts": { "phpstan": "@php ./vendor/bin/phpstan analyse src --level max -c extension.neon", - "psalm": "@php ./vendor/bin/psalm --threads=8 --diff --diff-methods", + "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,phpmetrics,phploc,pdepend,security-checker:0,parallel-lint:0 --ignoredDirs tests,vendor", From d86e0a0826a38e8ae401ce04861a9497ebf39d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Wed, 9 Dec 2020 07:22:09 +0100 Subject: [PATCH 09/11] Fixed Psalm configuration file --- psalm.xml.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/psalm.xml.dist b/psalm.xml.dist index f2f7b0d..d393342 100644 --- a/psalm.xml.dist +++ b/psalm.xml.dist @@ -45,7 +45,6 @@ - From f451ffdc8a5816d8a6496e9f1fae486f96c3dad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Wed, 9 Dec 2020 07:24:50 +0100 Subject: [PATCH 10/11] Updated PHP CS Fixer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b200716..cfe99ef 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "edgedesign/phpqa": "^v1.23", - "friendsofphp/php-cs-fixer": "^2.16", + "friendsofphp/php-cs-fixer": "^2.17.1", "guzzlehttp/guzzle": "^6.3|^7.0", "php-parallel-lint/php-parallel-lint": "^1.0", "phpstan/phpstan": "^0.12", From 7fbe0aeca7b0abc041f42b60a0a015bee7e77db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Tue, 30 Mar 2021 14:04:19 +0200 Subject: [PATCH 11/11] Removed unmaintained security checker --- .travis.yml | 1 - composer.json | 15 ++++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index df98f36..0e7d2b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ script: - composer phpstan - composer psalm - composer phpqa - - composer security-checker after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/composer.json b/composer.json index cfe99ef..e3aa84f 100644 --- a/composer.json +++ b/composer.json @@ -20,16 +20,15 @@ "psr/simple-cache": "^1.0" }, "require-dev": { - "edgedesign/phpqa": "^v1.23", - "friendsofphp/php-cs-fixer": "^2.17.1", + "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", - "sensiolabs/security-checker": "^5.0", - "symfony/cache": "~4.4|~5.1", - "symfony/http-client": "^4.4|~5.1", + "symfony/cache": "~4.4|~5.2", + "symfony/http-client": "^4.4|~5.2", "vimeo/psalm": "^4.3" }, "suggest": { @@ -53,16 +52,14 @@ "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,phpmetrics,phploc,pdepend,security-checker:0,parallel-lint:0 --ignoredDirs tests,vendor", - "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