From f9a1fadb216d363a8e10777faf8b22cde095ab9a Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 15 Jun 2024 08:03:54 +0200 Subject: [PATCH] feat: drop support for PHP < 8.1, bump min versions, migrate phpunit.xml --- .github/workflows/psalm.yml | 2 +- .github/workflows/run-tests.yml | 2 +- composer.json | 10 +++--- phpunit.xml | 60 +++++++++++++++++---------------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index ff27d2c..f5f83de 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -16,7 +16,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' extensions: mbstring coverage: none diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index db19e67..eecc31b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.4, 8.3, 8.2, 8.1, 8.0, 7.4] + php: [8.3, 8.2, 8.1] stability: [prefer-lowest, prefer-stable] name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 25815cf..fe44461 100644 --- a/composer.json +++ b/composer.json @@ -19,17 +19,17 @@ } ], "require": { - "php": "^7.4|^8.0", + "php": "^8.1", "ext-mbstring": "*", "spatie/enum": "^3.11" }, "require-dev": { "ext-json": "*", - "nesbot/carbon": "^2.63|^3.0", + "nesbot/carbon": "^3.5", "larapack/dd": "^1.1", - "pestphp/pest": "^1.22", - "spatie/pest-plugin-snapshots": "^1.1", - "vimeo/psalm": "^4.13" + "pestphp/pest": "^2.34", + "spatie/pest-plugin-snapshots": "^2.1", + "vimeo/psalm": "^5.24" }, "autoload": { "psr-4": { diff --git a/phpunit.xml b/phpunit.xml index b152aa2..ce7712d 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,32 +1,34 @@ - - - - tests - - - - - src/ - - - - - - - - - - - - + xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" + cacheDirectory=".phpunit.cache"> + + + + + + + + + + + tests + + + + + + + + + + + + + + src/ + +