From 4029b74019d61cef43ddc03e3f8d0d1f8c3f91c6 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Mon, 2 Dec 2024 12:38:14 +0100 Subject: [PATCH 1/3] Updating phpstan to 2.0 --- .drone.jsonnet | 2 +- .drone.yml | 2 +- .gitignore | 3 +++ composer.json | 3 ++- phpstan.neon | 10 ++++++++++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 phpstan.neon diff --git a/.drone.jsonnet b/.drone.jsonnet index 0ba10e78..c0280129 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -77,7 +77,7 @@ local pipeline(name, phpversion, params) = { depends: [ "composer" ], failure: "ignore", commands: [ - "vendor/bin/phpstan analyse src", + "./vendor/bin/phpstan", ] }, { diff --git a/.drone.yml b/.drone.yml index c94a5ea7..2eaa1c62 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: image: joomlaprojects/docker-images:php8.1-ast name: phan - commands: - - vendor/bin/phpstan analyse src + - ./vendor/bin/phpstan depends: - composer failure: ignore diff --git a/.gitignore b/.gitignore index f756138d..397f0267 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ +/.idea/ +build/ vendor/ composer.phar composer.lock phpunit.xml +phpunit.*.xml .phpunit.result.cache diff --git a/composer.json b/composer.json index 9aa19e79..d66cb71a 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,8 @@ "phpunit/phpunit": "^9.5.28", "psr/container": "^1.0", "squizlabs/php_codesniffer": "~3.7.2", - "phpstan/phpstan": "^1.10.7", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-deprecation-rules": "^2.0", "phan/phan": "^5.4.2" }, "suggest": { diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 00000000..07d82270 --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,10 @@ + +includes: + - vendor/phpstan/phpstan-deprecation-rules/rules.neon + +parameters: + level: 5 + phpVersion: 80100 + reportUnmatchedIgnoredErrors: false + paths: + - src From 473c24d8727d225fee22f30206bb34b041b9db50 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Mon, 2 Dec 2024 13:59:51 +0100 Subject: [PATCH 2/3] Sign drone.yml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2eaa1c62..65d683d1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -130,6 +130,6 @@ volumes: name: composer-cache --- kind: signature -hmac: c9820ee9949d145df5c2e47d5941d1649f380abd0ac1e5261370115fbf12729b +hmac: 1e19cee5cd20f1639f42e8969b61f85706e25769282fef6490bf7422c880eaea ... From 91a437272baa5e44266c22232c8f113e41bb3b0e Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Mon, 2 Dec 2024 15:59:18 +0100 Subject: [PATCH 3/3] Adding PHP 8.3/8.4 everywhere --- .drone.jsonnet | 1 + .drone.yml | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index c0280129..fa451eb2 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -104,4 +104,5 @@ local pipeline(name, phpversion, params) = { pipeline("8.1", "8.1", "--prefer-stable"), pipeline("8.2", "8.2", "--prefer-stable"), pipeline("8.3", "8.3", "--prefer-stable"), + pipeline("8.4", "8.4", "--prefer-stable"), ] diff --git a/.drone.yml b/.drone.yml index 65d683d1..ddeec51c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -129,7 +129,28 @@ volumes: path: /tmp/composer-cache name: composer-cache --- +kind: pipeline +name: PHP 8.4 +steps: +- commands: + - php -v + - composer update --prefer-stable + image: joomlaprojects/docker-images:php8.4 + name: composer + volumes: + - name: composer-cache + path: /tmp/composer-cache +- commands: + - vendor/bin/phpunit + failure: ignore + image: joomlaprojects/docker-images:php8.4 + name: PHPUnit +volumes: +- host: + path: /tmp/composer-cache + name: composer-cache +--- kind: signature -hmac: 1e19cee5cd20f1639f42e8969b61f85706e25769282fef6490bf7422c880eaea +hmac: 254821fd1b6b1971b8961a384b3b9e798a8fafdb99380c9935fa8bf87fc0056d ...