From ea0dbb78a2c35e80a0a0af5524c5335e05aeaa46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Tvrd=C3=ADk?= Date: Wed, 18 Feb 2026 16:10:57 +0100 Subject: [PATCH 1/3] Update CI workflow, GH Actions, and dev dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Upgrade actions/checkout v2 → v4, remove deprecated actions/cache v2 - Extend PHP matrix: PHPStan 8.1–8.5, Tests 7.2–8.5 - Upgrade PHPStan 1.x → 2.x, phpstan-strict-rules 1.x → 2.x - Remove bleedingEdge.neon include (default in PHPStan 2) - Simplify workflow by dropping dependency caching - Remove deprecated --no-suggest flag and ::set-output syntax --- .github/workflows/build.yml | 44 +++++++------------------------------ .phpstan.neon | 3 --- composer.json | 4 ++-- 3 files changed, 10 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec3a6ad..f04ce10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,11 +7,6 @@ on: - main - v*.* -env: - php-extensions: mbstring, intl - php-extensions-key: v1 - php-tools: "composer:v2" - jobs: phpstan: name: PHPStan @@ -20,28 +15,17 @@ jobs: strategy: matrix: - php-version: [ '7.2', '8.1', '8.2', '8.3' ] + php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - name: Setup PHP with pecl extension + - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} - - name: Get composer cache directory - id: composercache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ${{ steps.composercache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }} - restore-keys: ${{ runner.os }}-composer- - - name: Install dependencies run: composer install --prefer-dist @@ -54,35 +38,23 @@ jobs: strategy: fail-fast: false matrix: - php-version: [ '7.2', '8.0', '8.1', '8.2', '8.3' ] + php-version: [ '7.2', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - name: Setup PHP with pecl extension + - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} - extensions: ${{ env.php-extensions }} - tools: ${{ env.php-tools }} + tools: composer:v2 coverage: pcov - - name: Get composer cache directory - id: composercache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ${{ steps.composercache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }} - restore-keys: ${{ runner.os }}-composer- - - name: Install dependencies - run: composer install --prefer-dist --no-interaction --no-progress --no-suggest + run: composer install --prefer-dist --no-interaction --no-progress - name: Tests run: ./vendor/bin/tester ./tests/cases diff --git a/.phpstan.neon b/.phpstan.neon index 871e0b4..309bd4f 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -1,6 +1,3 @@ -includes: - - phar://%rootDir%/phpstan.phar/conf/bleedingEdge.neon - parameters: level: max paths: diff --git a/composer.json b/composer.json index cba9510..9024223 100644 --- a/composer.json +++ b/composer.json @@ -24,9 +24,9 @@ }, "require-dev": { "nette/tester": "~2.0", - "phpstan/phpstan": "1.12.7", + "phpstan/phpstan": "2.1.17", "phpstan/extension-installer": "1.4.3", - "phpstan/phpstan-strict-rules": "1.6.1" + "phpstan/phpstan-strict-rules": "2.0.4" }, "autoload": { "psr-4": { From 81703406a1d07ee753450508f3f1cc80f808e3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Tvrd=C3=ADk?= Date: Wed, 18 Feb 2026 16:12:41 +0100 Subject: [PATCH 2/3] Increase minimum PHP version to 8.0 Drop PHP 7.2 from composer.json require and CI test matrix. --- .github/workflows/build.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f04ce10..7fbc49f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: strategy: fail-fast: false matrix: - php-version: [ '7.2', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] + php-version: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] runs-on: ubuntu-latest diff --git a/composer.json b/composer.json index 9024223..59f4ccd 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "issues": "https://github.com/nextras/multi-query-parser/issues" }, "require": { - "php": "~7.2 || ~8.0" + "php": "~8.0" }, "require-dev": { "nette/tester": "~2.0", From a1aa1e72178b87c12cae985cac3a6659954d82fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Tvrd=C3=ADk?= Date: Wed, 18 Feb 2026 16:13:36 +0100 Subject: [PATCH 3/3] Add PHP 8.0 to PHPStan matrix PHPStan 2.x supports PHP ^7.4, so 8.0 should be included. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7fbc49f..5b34097 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ] + php-version: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] steps: - name: Checkout