From df316564aa45337f03e052e8b4dff874ffafcae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?= Date: Tue, 23 Apr 2024 13:21:05 +0200 Subject: [PATCH] IBX-8119: Upgraded minimum PHP version to 8.3 --- .github/workflows/ci.yaml | 22 ++++++++++------------ composer.json | 29 +++++++++++++++-------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ab2d872..4131d90 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.1' + - '8.3' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup PHP Action uses: shivammathur/setup-php@v2 @@ -26,28 +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: Unit tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" timeout-minutes: 15 strategy: fail-fast: false matrix: php: - - '7.4' - - '8.0' - - '8.1' + - '8.3' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup PHP Action uses: shivammathur/setup-php@v2 @@ -57,9 +55,9 @@ 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: Setup problem matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" diff --git a/composer.json b/composer.json index 9fd8c32..0654127 100644 --- a/composer.json +++ b/composer.json @@ -17,24 +17,24 @@ } ], "require": { - "php": "^7.4 || ^8.0", - "ibexa/core": "~5.0.0@dev", - "twig/twig": "^3.0", - "symfony/dependency-injection": "^5.0", - "symfony/http-kernel": "^5.0", - "symfony/http-foundation": "^5.0", + "php": " >=8.3", + "ibexa/core": "~5.0.x-dev", + "symfony/asset": "^5.0", "symfony/config": "^5.0", - "symfony/finder": "^5.0", + "symfony/dependency-injection": "^5.0", "symfony/filesystem": "^5.0", - "symfony/asset": "^5.0", - "symfony/templating": "^5.0" + "symfony/finder": "^5.0", + "symfony/http-foundation": "^5.0", + "symfony/http-kernel": "^5.0", + "symfony/templating": "^5.0", + "twig/twig": "^3.0" }, "require-dev": { - "ibexa/code-style": "^1.0", - "ibexa/doctrine-schema": "~5.0.0@dev", - "phpunit/phpunit": "^8.1", "friendsofphp/php-cs-fixer": "^3.0", - "mikey179/vfsstream": "^1.6" + "ibexa/code-style": "^1.0", + "ibexa/doctrine-schema": "~5.0.x-dev", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": "^8.1" }, "autoload": { "psr-4": { @@ -67,6 +67,7 @@ "lolautruche/ez-core-extra-bundle": "<2.0" }, "config": { - "allow-plugins": false + "allow-plugins": false, + "sort-packages": true } }