Skip to content

Commit

Permalink
Merge pull request #3 from ibexa/adjusted-composer-for-5.0
Browse files Browse the repository at this point in the history
Adjusted composer for 5.0
  • Loading branch information
mikadamczyk authored Oct 1, 2024
2 parents 6deaaee + b087f33 commit 44c240c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/backend-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
strategy:
matrix:
php:
- '8.1'
- '8.3'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
Expand All @@ -26,7 +26,7 @@ jobs:
extensions: 'pdo_sqlite, gd'
tools: cs2pr

- uses: ramsey/composer-install@v2
- uses: ramsey/composer-install@v3
with:
dependency-versions: "highest"

Expand All @@ -37,7 +37,7 @@ jobs:
name: Deptrac
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Deptrac
uses: smoench/deptrac-action@master

Expand All @@ -50,12 +50,10 @@ jobs:
fail-fast: false
matrix:
php:
- '7.4'
- '8.1'
- '8.2'
- '8.3'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
Expand All @@ -65,7 +63,7 @@ jobs:
extensions: pdo_sqlite, gd
tools: cs2pr

- uses: "ramsey/composer-install@v1"
- uses: "ramsey/composer-install@v3"
with:
dependency-versions: "highest"
composer-options: "--prefer-dist --no-progress --no-suggest"
Expand Down
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"ibexa-dxp"
],
"require": {
"php": "^7.4 || ^8.0",
"ibexa/core": "~4.6.x-dev",
"php": ">=8.3",
"ibexa/core": "~5.0.x-dev",
"symfony/config": "^5.4",
"symfony/dependency-injection": "^5.4",
"symfony/event-dispatcher": "^5.4",
Expand All @@ -17,8 +17,9 @@
"symfony/yaml": "^5.4"
},
"require-dev": {
"ibexa/behat": "~4.6.x-dev",
"ibexa/behat": "~5.0.x-dev",
"ibexa/code-style": "~2.0.0",
"ibexa/doctrine-schema": "~5.0.x-dev",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-phpunit": "^1.3",
"phpstan/phpstan-symfony": "^1.3",
Expand Down Expand Up @@ -55,7 +56,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "4.6.x-dev"
"dev-main": "5.0.x-dev"
}
},
"config": {
Expand Down

0 comments on commit 44c240c

Please sign in to comment.