Merge pull request #4 from lyrixx/up

Drop support of PHP 8.1, Add support of PHP 8.4, and update tooling
jolicode · Feb 12, 2025 · af3ced6 · af3ced6
2 parents 43d7790 + 2a9034a
commit af3ced6
Show file tree

Hide file tree

Showing 8 changed files with 2,687 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,9 +12,9 @@ jobs:
         strategy:
             matrix:
                 php-versions:
-                    - '8.1'
                     - '8.2'
                     - '8.3'
+                    - '8.4'
 
         steps:
             - uses: actions/checkout@v3
@@ -30,17 +30,44 @@ jobs:
             - name: Install dependencies
               run: composer install --prefer-dist --no-progress
 
+            - name: Run tests
+              run: composer test
+
+    php-cs-fixer:
+        name: Run PHP CS Fixer
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.2'
+
             - name: Install PHP CS Fixer
               run: composer install --prefer-dist --no-progress --working-dir=tools/php-cs-fixer
 
             - name: Run PHP CS Fixer
               run: composer cs-check
 
+    phpstan:
+        name: Run PHPStan
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.4'
+
+            - name: Install dependencies
+              run: composer install --prefer-dist --no-progress
+
             - name: Install PHPStan
               run: composer install --prefer-dist --no-progress --working-dir=tools/phpstan
 
             - name: Run PHPStan
               run: composer phpstan
-
-            - name: Run tests
-              run: composer test
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
-.idea
-.phpunit.cache
-.php-cs-fixer.cache
 .phpstan-cache
-composer.lock
+/.php-cs-fixer.cache
+/.phpunit.cache
+/composer.lock
 vendor
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Not released yet
 
+* Drop support of PHP 8.1
+* Add support of PHP 8.4
+
 ## 0.2.0 (2024-10-02)
 
 * Remove mb_string extension requirement

diff --git a/composer.json b/composer.json
@@ -21,16 +21,16 @@
         }
     },
     "require": {
-        "php": ">=8.1"
+        "php": ">=8.2"
+    },
+    "require-dev": {
+        "symfony/phpunit-bridge": "^6.4"
     },
     "config": {
-        "sort-packages": true,
         "platform": {
-            "php": "8.1.19"
-        }
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "^6.3.1"
+            "php": "8.2"
+        },
+        "sort-packages": true
     },
     "scripts": {
         "test": "vendor/bin/simple-phpunit",

diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json
@@ -1,5 +1,12 @@
 {
     "require": {
-        "friendsofphp/php-cs-fixer": "^3.30"
+        "friendsofphp/php-cs-fixer": "^3.64"
+    },
+    "config": {
+        "bump-after-update": true,
+        "platform": {
+            "php": "8.2"
+        },
+        "sort-packages": true
     }
 }