diff --git a/.github/settings.yml b/.github/settings.yml index 35d5ad85..206ffadd 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -18,8 +18,12 @@ branches: - "Static Code Analysis (8.1)" - "Test (PHP 8, symfony 5.4, lowest)" - "Test (PHP 8, symfony 5.4, highest)" + - "Test (PHP 8, symfony 6, lowest)" + - "Test (PHP 8, symfony 6, highest)" - "Test (PHP 8.1, symfony 5.4, lowest)" - "Test (PHP 8.1, symfony 5.4, highest)" + - "Test (PHP 8.1, symfony 6, lowest)" + - "Test (PHP 8.1, symfony 6, highest)" - "Code Coverage (8.1)" - "Mutation Tests (8.1)" strict: true diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5f7346a9..844351c0 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -119,6 +119,7 @@ jobs: symfony: - 5.4 + - 6.0 steps: - name: "Checkout" diff --git a/composer.json b/composer.json index 71be3134..e7e7cffc 100644 --- a/composer.json +++ b/composer.json @@ -43,21 +43,21 @@ "doctrine/common": "^2.12 || ^3.0", "doctrine/dbal": "^2.6 || ^3.0", "doctrine/event-manager": "^1.0", - "doctrine/orm": "^2.5", + "doctrine/orm": "^2.10", "doctrine/persistence": "^1.3 || ^2.0", - "symfony/property-access": "^5.4" + "symfony/property-access": "^5.4 || ^6.0" }, "require-dev": { - "doctrine/doctrine-bundle": "^2.0", + "doctrine/doctrine-bundle": "^2.5", "ergebnis/composer-normalize": "^2.0.1", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/expression-language": "^5.4", - "symfony/framework-bundle": "^5.4" + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/expression-language": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4 || ^6.0" }, "conflict": { - "doctrine/doctrine-bundle": "<2.0", - "symfony/framework-bundle": "<4.4" + "doctrine/doctrine-bundle": "<2.5", + "symfony/framework-bundle": "<5.4" }, "suggest": { "symfony/framework-bundle": "If you want to use symfony"