Move to PHPv8 (#206)

* Bump to PHP 8.0 * Add version compatibility note to readme * Fix psalm error * Update composer.json --------- Co-authored-by: Marko Ivančić <[email protected]>
simplesamlphp · Aug 3, 2023 · d2236db · d2236db
1 parent 0327c2f
commit d2236db
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ["7.4", "8.0", "8.1"]
+        php-versions: ["8.0", "8.1", "8.2"]
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -55,7 +55,7 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Decide whether to run code coverage or not
-        if: ${{ matrix.php-versions != '7.4' }}
+        if: ${{ matrix.php-versions != '8.0' }}
         run: |
           echo "NO_COVERAGE=--no-coverage" >> $GITHUB_ENV
 
@@ -65,7 +65,7 @@ jobs:
           ./vendor/bin/phpunit $NO_COVERAGE
 
       - name: Save coverage data
-        if: ${{ matrix.php-versions == '7.4' }}
+        if: ${{ matrix.php-versions == '8.0' }}
         uses: actions/upload-artifact@v1
         with:
           name: build-data
@@ -78,7 +78,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          php-version: "7.4"
+          php-version: "8.0"
           extensions: mbstring, xml
           tools: composer:v2
           coverage: none
@@ -119,7 +119,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          php-version: "7.4"
+          php-version: "8.0"
           extensions: mbstring, xml
           tools: composer:v2
           coverage: none
@@ -152,7 +152,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          php-version: "7.4"
+          php-version: "8.0"
           tools: composer:v2
           extensions: mbstring, xml
 

diff --git a/README.md b/README.md
@@ -17,6 +17,14 @@ Currently supported flows are:
 
 ![Main screen capture](docs/oidc.png)
 
+## Version compatibility
+
+| OIDC module | SimpleSAMLphp |  PHP   | Note                        |
+|:------------|:--------------|:------:|-----------------------------|
+| v4.\*       | v2.\*         | \>=8.0 | Recommended                 |
+| v3.\*       | v2.\*         | \>=7.4 | Abandoned from August 2023. |
+| v2.\*       | v1.19.\*      | \>=7.4 |                             |
+
 ## Installation
 
 Installation can be as easy as executing:

diff --git a/composer.json b/composer.json
@@ -17,16 +17,16 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
-        "ext-curl": ">=7.4",
+        "php": "^8.0",
+        "ext-curl": "*",
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-pdo": "*",
         "guzzlehttp/guzzle": "^7.0",
-        "laminas/laminas-diactoros": "^2.2.1",
-        "laminas/laminas-httphandlerrunner": "^1.1.0",
+        "laminas/laminas-diactoros": "^2.25.2",
+        "laminas/laminas-httphandlerrunner": "^2",
         "lcobucci/jwt": "^4.1",
-        "league/oauth2-server": "^8.1.0",
+        "league/oauth2-server": "^8.5.3",
         "nette/forms": "^3",
         "psr/container": "^1.0",
         "psr/log": "^1.1",

diff --git a/src/Form/ClientForm.php b/src/Form/ClientForm.php
@@ -102,6 +102,12 @@ public function validateBackChannelLogoutUri(Form $form): void
         }
     }
 
+    /**
+     * @param array $values
+     * @param non-empty-string $regex
+     * @param string $messagePrefix
+     * @return void
+     */
     protected function validateByMatchingRegex(
         array $values,
         string $regex,