From 4f1119fc546f1adc5b4c0a5f1329cd34cb5e2d12 Mon Sep 17 00:00:00 2001
From: Ingolf Steinardt <info@e-spin.de>
Date: Sat, 23 Mar 2024 13:34:14 +0100
Subject: [PATCH] Fix composer.json for PHP 8

---
 .github/workflows/diagnostics.yml | 20 ++++----------------
 composer.json                     | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml
index 842ee26..5c7807e 100644
--- a/.github/workflows/diagnostics.yml
+++ b/.github/workflows/diagnostics.yml
@@ -14,18 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: '7.4'
-            phpcq_install: 'install'
-            phpcq_flags: ''
-            composer_install: 'update --prefer-lowest'
-          - php: '7.4'
-            phpcq_install: 'update'
-            phpcq_flags: ''
-            composer_install: 'update'
-          - php: '8.0'
-            phpcq_install: 'update'
-            phpcq_flags: ''
-            composer_install: 'update'
           - php: '8.1'
             phpcq_install: 'update'
             phpcq_flags: ''
@@ -37,7 +25,7 @@ jobs:
 
     steps:
       - name: PHP ${{ matrix.php }} Pull source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -48,7 +36,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: PHP ${{ matrix.php }} Cache composer cache directory
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         env:
           cache-name: composer-cache-dir-${{ matrix.php }}
         with:
@@ -56,7 +44,7 @@ jobs:
           key: ${{ runner.os }}-build-${{ env.cache-name }}
 
       - name: PHP ${{ matrix.php }} Cache vendor directory
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         env:
           cache-name: composer-vendor-${{ matrix.php }}
         with:
@@ -78,7 +66,7 @@ jobs:
         run: ./vendor/bin/phpcq run -v -o github-action -o default ${{ matrix.phpcq_flags }}
 
       - name: PHP ${{ matrix.php }} Upload build directory to artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: ${{ success() }} || ${{ failure() }}
         with:
           name: phpcq-builds-php-${{ matrix.php }}
diff --git a/composer.json b/composer.json
index ece2d3d..9d9471f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,17 +21,17 @@
     "source": "https://github.com/cyberspectrum/i18n-bundle"
   },
   "require": {
-    "php": "^7.4 || ^8.0",
-    "cyberspectrum/i18n": "dev-fix/phpcq-2 as 1.0.0@dev",
-    "psr/log": "^1.1.4 || ^2.0 || ^3.0",
-    "symfony/config": "^4.4 || ^5.4 || ^6.0",
-    "symfony/console": "^4.4 || ^5.4 || ^6.0",
-    "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
-    "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
-    "symfony/yaml": "^4.4 || ^5.4 || ^6.0"
+    "php": "^8.1",
+    "cyberspectrum/i18n": "^1.1@dev",
+    "psr/log": "^3.0",
+    "symfony/config": "^5.4 || ^6.0",
+    "symfony/console": "^5.4 || ^6.0",
+    "symfony/dependency-injection": "^5.4 || ^6.0",
+    "symfony/http-kernel": "^5.4 || ^6.0",
+    "symfony/yaml": "^5.4 || ^6.0"
   },
   "require-dev": {
-    "cyberspectrum/i18n-xliff": "dev-fix/phpcq-2 as 1.0.0@dev",
+    "cyberspectrum/i18n-xliff": "^1.1@dev",
     "phpcq/runner-bootstrap": "^1.0@dev"
   },
   "suggest": {
@@ -51,7 +51,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0.x-dev"
+      "dev-fix/phpcq-2": "1.1.x-dev"
     }
   }
 }