From 833fc4418bcff4b0a46770d2f8d6d522cc05836c Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 11 Jan 2023 22:36:05 +0100 Subject: [PATCH 1/4] Add deprecation plugin for phpstan --- composer.json | 7 ++++--- phpstan.neon | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 39113b7ac4..55b05e4086 100644 --- a/composer.json +++ b/composer.json @@ -5,11 +5,11 @@ "license": "MIT", "config": { "platform": { - "php": "7.4" + "php": "8.1" } }, "require": { - "php": ">=7.4", + "php": ">=8.1", "jdorn/sql-formatter": "^1.2", "smarty/smarty": "^4.1", "ezyang/htmlpurifier": "^4.14", @@ -35,7 +35,8 @@ "maximebf/debugbar": "^1.18", "junker/debugbar-smarty": "^0.2", "hannesvdvreken/guzzle-debugbar": "^3.0", - "fakerphp/faker": "^1.19" + "fakerphp/faker": "^1.19", + "phpstan/phpstan-deprecation-rules": "^1.1.1" }, "autoload": { "classmap": [ diff --git a/phpstan.neon b/phpstan.neon index 8876aff620..143103ac71 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -20,3 +20,5 @@ parameters: message: '#Cannot access property \$id on object\|false.#' path: modules/Core/pages/panel/users_reports.php reportUnmatchedIgnoredErrors: false +includes: + - vendor/phpstan/phpstan-deprecation-rules/rules.neon From c81252ede7d2d25fe6da2218ef44f23cc3d50740 Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 11 Jan 2023 22:41:06 +0100 Subject: [PATCH 2/4] Fix dependency resolution --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 55b05e4086..ba78577790 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "symfony/http-foundation": "^5.4" }, "require-dev": { - "phpstan/phpstan": "1.6.9", + "phpstan/phpstan": "^1.9.9", "maximebf/debugbar": "^1.18", "junker/debugbar-smarty": "^0.2", "hannesvdvreken/guzzle-debugbar": "^3.0", From 925520728fbb0036450122865b251fbbbab072eb Mon Sep 17 00:00:00 2001 From: Tadhg Boyle Date: Tue, 28 Feb 2023 11:24:07 -0800 Subject: [PATCH 3/4] update ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7aacf6793..d8fa1cefa8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: operating-system: ["ubuntu-latest"] - php-versions: ["7.4", "8.0", "8.1", "8.2"] + php-versions: ["8.1", "8.2"] steps: - uses: actions/checkout@v2 From 71942cb22fab114cdb193d90d056b10e8654a38d Mon Sep 17 00:00:00 2001 From: Robin Slot Date: Fri, 21 Jul 2023 11:14:26 +0200 Subject: [PATCH 4/4] Fix path to config file and update packages --- composer.json | 6 +++--- dev/phpstan.neon | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index dad07f6ff8..fd634646ac 100644 --- a/composer.json +++ b/composer.json @@ -33,12 +33,12 @@ "php-di/php-di": "^6.4" }, "require-dev": { - "phpstan/phpstan": "^1.9.9", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-deprecation-rules": "^1.1.3", "maximebf/debugbar": "^1.18", "junker/debugbar-smarty": "^0.2", "hannesvdvreken/guzzle-debugbar": "^3.0", - "fakerphp/faker": "^1.19", - "phpstan/phpstan-deprecation-rules": "^1.1.1" + "fakerphp/faker": "^1.19" }, "autoload": { "classmap": [ diff --git a/dev/phpstan.neon b/dev/phpstan.neon index f77432dd3e..7f2c33119f 100644 --- a/dev/phpstan.neon +++ b/dev/phpstan.neon @@ -23,4 +23,4 @@ parameters: path: ../modules/Core/pages/panel/users_reports.php reportUnmatchedIgnoredErrors: false includes: - - vendor/phpstan/phpstan-deprecation-rules/rules.neon + - ../vendor/phpstan/phpstan-deprecation-rules/rules.neon