From c96aca4a4b17a3f6199a25ee6ee55a4cc65b1beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?= <pawel.niedzielski@ibexa.co>
Date: Tue, 23 Apr 2024 13:21:09 +0200
Subject: [PATCH] IBX-8119: Upgraded minimum PHP version to 8.3

---
 .github/workflows/ci.yaml | 26 ++++++++++----------------
 composer.json             | 29 ++++++++++++++++-------------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3bd49fb..59502f4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,13 +10,13 @@ on:
 jobs:
   cs_fix:
     name: Run code style check
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     strategy:
       matrix:
         php:
-          - '8.0'
+          - '8.3'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
@@ -26,31 +26,26 @@ jobs:
           extensions: 'pdo_sqlite, gd'
           tools: cs2pr
 
-      - uses: "ramsey/composer-install@v1"
+      - uses: ramsey/composer-install@v3
         with:
-          dependency-versions: "highest"
+          dependency-versions: highest
 
       - name: Run code style check
         run: composer run-script check-cs -- --format=checkstyle | cs2pr
 
   tests:
     name: Tests
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     timeout-minutes: 10
 
     strategy:
       fail-fast: false
       matrix:
         php:
-          - '7.4'
-          - '8.0'
-        composer_options: [ "" ]
-        include:
-            - php: '8.1'
-              composer_options: "--ignore-platform-req php"
+          - '8.3'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
@@ -60,10 +55,9 @@ jobs:
           extensions: pdo_sqlite, gd
           tools: cs2pr
 
-      - uses: "ramsey/composer-install@v1"
+      - uses: ramsey/composer-install@v3
         with:
-          dependency-versions: "highest"
-          composer-options: "${{ matrix.composer_options }}"
+          dependency-versions: highest
 
       - name: Setup problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
diff --git a/composer.json b/composer.json
index 3519b37..06a2b49 100644
--- a/composer.json
+++ b/composer.json
@@ -13,30 +13,30 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "ibexa/core": "~5.0.x-dev",
-        "ibexa/rest": "~5.0.0@dev",
-        "friendsofsymfony/http-cache-bundle": "^2.8",
+        "php": " >=8.3",
         "friendsofsymfony/http-cache": "^2.9",
-        "symfony/http-foundation": "^5.0",
-        "symfony/http-kernel": "^5.0",
+        "friendsofsymfony/http-cache-bundle": "^2.8",
+        "ibexa/core": "~5.0.x-dev",
+        "ibexa/rest": "~5.0.x-dev",
+        "php-http/curl-client": "^2.1",
+        "psr/http-client": "^1.0",
+        "symfony/config": "^5.0",
         "symfony/dependency-injection": "^5.0",
         "symfony/event-dispatcher": "^5.0",
+        "symfony/http-foundation": "^5.0",
+        "symfony/http-kernel": "^5.0",
         "symfony/routing": "^5.0",
         "symfony/yaml": "^5.0",
-        "symfony/config": "^5.0",
-        "psr/http-client": "^1.0",
-        "php-http/curl-client": "^2.1",
         "toflar/psr6-symfony-http-cache-store": "^2.2 || ^3.0"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.0",
         "ibexa/ci-scripts": "^0.2@dev",
-        "ibexa/doctrine-schema": "~5.0.0@dev",
-        "phpunit/phpunit": "^8.5",
+        "ibexa/code-style": "^1.0",
+        "ibexa/doctrine-schema": "~5.0.x-dev",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3",
         "phpspec/phpspec": "^7.1",
-        "ibexa/code-style": "^1.0",
-        "friendsofphp/php-cs-fixer": "^3.0",
+        "phpunit/phpunit": "^8.5",
         "symfony/phpunit-bridge": "^5.1"
     },
     "autoload": {
@@ -68,5 +68,8 @@
         "branch-alias": {
             "dev-main": "5.0.x-dev"
         }
+    },
+    "config": {
+        "sort-packages": true
     }
 }