diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4fd01ab..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.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: 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' - 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 e6de494..3eef3ab 100644 --- a/composer.json +++ b/composer.json @@ -7,21 +7,21 @@ "ezsystems/ezplatform-query-fieldtype": "*" }, "require": { - "php": "^7.4 || ^8.0", + "php": ">=8.3", "ext-json": "*", - "ibexa/admin-ui": "~5.0.0@dev", - "ibexa/content-forms": "~5.0.0@dev", - "ibexa/graphql": "~5.0.0@dev", - "ibexa/rest": "~5.0.0@dev", - "ibexa/core": "~5.0.0@dev", + "ibexa/admin-ui": "~5.0.x-dev", + "ibexa/content-forms": "~5.0.x-dev", + "ibexa/core": "~5.0.x-dev", + "ibexa/graphql": "~5.0.x-dev", + "ibexa/rest": "~5.0.x-dev", + "psr/log": "^1.1", "symfony/dependency-injection": "^5.0", - "symfony/expression-language": "^5.0", "symfony/event-dispatcher": "^5.0", + "symfony/expression-language": "^5.0", "symfony/framework-bundle": "^5.0", "symfony/http-kernel": "^5.0", "symfony/translation": "^5.0", - "symfony/yaml": "^5.0", - "psr/log": "^1.1" + "symfony/yaml": "^5.0" }, "autoload": { "psr-4": { @@ -38,15 +38,15 @@ } }, "require-dev": { - "ibexa/doctrine-schema": "~5.0.0@dev", - "ibexa/design-engine": "~5.0.0@dev", - "ibexa/fieldtype-richtext": "~5.0.0@dev", - "ibexa/search": "~5.0.0@dev", - "ibexa/user": "~5.0.0@dev", - "ibexa/http-cache": "~5.0.0@dev", - "phpspec/phpspec": "^7.1", + "friendsofphp/php-cs-fixer": "^3.0", "ibexa/code-style": "^1.0", - "friendsofphp/php-cs-fixer": "^3.0" + "ibexa/design-engine": "~5.0.x-dev", + "ibexa/doctrine-schema": "~5.0.x-dev", + "ibexa/fieldtype-richtext": "~5.0.x-dev", + "ibexa/http-cache": "~5.0.x-dev", + "ibexa/search": "~5.0.x-dev", + "ibexa/user": "~5.0.x-dev", + "phpspec/phpspec": "^7.1" }, "scripts": { "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots", @@ -61,6 +61,7 @@ "config": { "allow-plugins": { "composer/package-versions-deprecated": true - } + }, + "sort-packages": true } }