Merge pull request #136 from Chris53897/feature/php-8-1

feat: drop support for PHP < 8.1
spatie · Jun 17, 2024 · 6cb8b9b · 6cb8b9b
2 parents e1c9cd7 + f9a1fad
commit 6cb8b9b
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 45 deletions.
diff --git a/.github/workflows/fix-styling.yml b/.github/workflows/fix-styling.yml
@@ -8,7 +8,7 @@ jobs:
 
         steps:
             -   name: Checkout code
-                uses: actions/checkout@v1
+                uses: actions/checkout@v4
 
             -   name: Fix style
                 uses: docker://oskarstark/php-cs-fixer-ga
@@ -21,7 +21,7 @@ jobs:
                 id: extract_branch
 
             -   name: Commit changes
-                uses: stefanzweifel/git-auto-commit-action@v2.3.0
+                uses: stefanzweifel/git-auto-commit-action@v5.0.1
                 with:
                     commit_message: Fix styling
                     branch: ${{ steps.extract_branch.outputs.branch }}

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -11,18 +11,18 @@ jobs:
         name: psalm
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '7.4'
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+                  php-version: '8.1'
+                  extensions: mbstring
                   coverage: none
 
             - name: Cache composer dependencies
 
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                   path: vendor
                   key: composer-${{ hashFiles('composer.lock') }}

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,20 +9,20 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [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 }}
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+                  extensions: mbstring
                   coverage: none
 
             - name: Setup problem matchers

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: main
 
@@ -21,7 +21,7 @@ jobs:
           release-notes: ${{ github.event.release.body }}
 
       - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           branch: main
           commit_message: Update CHANGELOG

diff --git 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
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Spatie Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-    <php>
-        <ini name="date.timezone" value="UTC"/>
-    </php>
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         cacheDirectory=".phpunit.cache">
+  <coverage>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+
+  <testsuites>
+    <testsuite name="Spatie Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+
+  <php>
+    <ini name="date.timezone" value="UTC"/>
+  </php>
+
+  <source>
+    <include>
+      <directory>src/</directory>
+    </include>
+  </source>
 </phpunit>