From 7689ca4be71008cae6f1070d31c983b81f49f8b9 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Tue, 24 Oct 2023 10:40:13 +0200
Subject: [PATCH] test with php 8.1 and 8.2

---
 .github/workflows/tests.yml | 13 ++++++-------
 composer.json               |  9 ++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3df5270..4e8cc27 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,6 +2,10 @@ name: tests
 
 on:
   push:
+      branches:
+        - '[0-9]+.x'
+        - '[0-9]+.[0-9]+'
+        - '[0-9]+.[0-9]+.x'
   pull_request:
 
 jobs:
@@ -10,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
 
     steps:
       - name: Checkout code
@@ -24,13 +28,8 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Install PHP 7 dependencies
+      - name: Install PHP dependencies
         run: composer update --prefer-dist --no-interaction --no-progress
-        if: "matrix.php != '8.0'"
-
-      - name: Install PHP 8 dependencies
-        run: composer update --prefer-dist --no-interaction --no-progress --ignore-platform-reqs
-        if: "matrix.php == '8.0'"
 
       - name: Execute tests
         run: composer test
diff --git a/composer.json b/composer.json
index 812167b..184fd60 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
         "php" : "^7.1 || ^8.0"
     },
     "require-dev": {
-        "friends-of-phpspec/phpspec-code-coverage" : "^4.3.2",
-        "phpspec/phpspec": "^5.1.2 || ^6.2"
+        "friends-of-phpspec/phpspec-code-coverage" : "^4.3.2 || ^6.3",
+        "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4"
     },
     "autoload": {
         "psr-4": {
@@ -29,10 +29,5 @@
     "scripts": {
         "test": "vendor/bin/phpspec run",
         "test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.1-dev"
-        }
     }
 }