Merge pull request #51 from akrabat/php8.5

odan · web-flow · commit 82f0f238174d · 2025-11-02T16:00:02.000+01:00
Use GitHub Actions and support up to PHP 8.5
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,39 @@
+name: tests
+
+on: [ push, pull_request ]
+
+jobs:
+  tests:
+    name: Tests PHP ${{ matrix.php }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ 8.1, 8.2, 8.3, 8.4, 8.5 ]
+        include:
+          - php: 8.4
+            analysis: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      - name: Tests
+        run: composer test:coverage
+
+      - name: Upload coverage results to Coveralls
+        if: matrix.analysis
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          composer require php-coveralls/php-coveralls -n -W
+          vendor/bin/php-coveralls --coverage_clover=build/coverage/clover.xml -o build/coverage/coveralls.json -v
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
-vendor
+.DS_Store
+.phpunit.cache
+/build
+/vendor
+clover.xml
 composer.lock
diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "php": ">=5.5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0"
+        "phpunit/phpunit": "^10.0"
     },
     "autoload": {
         "psr-4": {
@@ -27,5 +27,15 @@
         "psr-4": {
             "Slim\\Flash\\Tests\\": "tests"
         }
+    },
+    "scripts": {
+        "check": [
+            "@test:coverage"
+        ],
+        "test": "phpunit --do-not-cache-result --colors=always",
+        "test:coverage": [
+            "@putenv XDEBUG_MODE=coverage",
+            "phpunit --do-not-cache-result --colors=always --coverage-clover build/coverage/clover.xml --coverage-html build/coverage --coverage-text"
+        ]
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true" colors="true"
          bootstrap="tests/bootstrap.php"
+         cacheDirectory=".phpunit.cache"
 >
     <testsuites>
-        <testsuite name="Slim Test Suite">
-            <directory>tests/</directory>
+        <testsuite name="Slim-Flash Test Suite">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory>src/</directory>
-        </whitelist>
-    </filter>
+    <coverage>
+        <report>
+            <html outputDirectory="coverage" lowUpperBound="20" highLowerBound="50"/>
+        </report>
+    </coverage>
+
+    <source>
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/MessagesTest.php b/tests/MessagesTest.php
@@ -1,11 +1,12 @@
 <?php
 namespace Slim\Flash\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Flash\Messages;
 
-class MessagesTest extends \PHPUnit_Framework_TestCase
+class MessagesTest extends TestCase
 {
     // Test get messages from previous request
     public function testGetMessagesFromPrevRequest()
@@ -169,7 +170,7 @@ public function testSetMessagesForCurrentRequest()
         $this->assertEquals(['An info'], $messages['info']);
 
         $this->assertArrayHasKey('slimFlash', $storage);
-        $this->assertEmpty([], $storage['slimFlash']);
+        $this->assertEmpty($storage['slimFlash']);
     }
 
     // Test set messages for next request
