From 2cf3ed734572a4a8a5147c41b12c572f3fdc696f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20H=C3=A9lias?= Date: Fri, 3 Nov 2023 13:39:40 +0100 Subject: [PATCH] Fix composer conflict --- .github/workflows/phpunit.yml | 8 ++++---- composer.json | 20 ++++++++++---------- tests/App/config.yaml | 3 +++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 382e1a9..3461a81 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -21,13 +21,13 @@ jobs: include: # Lowest Deps - php: 8.1 - symfony: 5.4.* + symfony: 6.2.* coverage: 'none' composer-flags: '--prefer-stable --prefer-lowest' can-fail: false # LTS with latest stable PHP - php: latest - symfony: 5.4.* + symfony: 6.3.* coverage: 'none' composer-flags: '--prefer-stable' can-fail: false @@ -39,7 +39,7 @@ jobs: can-fail: false # Development release - php: nightly - symfony: 6.4.*@dev + symfony: 7.0.*@dev coverage: 'none' composer-flags: '' can-fail: true @@ -61,7 +61,7 @@ jobs: fail-fast: true - name: Set Composer stability - if: matrix.symfony == '6.4.*@dev' + if: matrix.symfony == '7.0.*@dev' run: "composer config minimum-stability dev" - name: Get composer cache directory diff --git a/composer.json b/composer.json index 5fce6cf..ae3410a 100644 --- a/composer.json +++ b/composer.json @@ -27,23 +27,23 @@ "doctrine/doctrine-bundle": "^2.7.1", "doctrine/orm": "^2.14", "paragonie/ciphersweet": "^3.0 || ^4.0", - "symfony/config": "^5.4 || ^6.0", - "symfony/console": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/config": "^5.4 || ^6.2", + "symfony/console": "^5.4 || ^6.2", + "symfony/dependency-injection": "^5.4 || ^6.2", "symfony/deprecation-contracts": "^2.5 || ^3.2", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/http-kernel": "^5.4 || ^6.0", - "symfony/process": "^5.4 || ^6.0", - "symfony/property-access": "^5.4 || ^6.0", - "symfony/property-info": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4 || ^6.2", + "symfony/http-kernel": "^5.4 || ^6.2", + "symfony/process": "^5.4 || ^6.2", + "symfony/property-access": "^5.4 || ^6.2", + "symfony/property-info": "^5.4 || ^6.2", "symfony/service-contracts": "^2.2 || ^3.2" }, "require-dev": { "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/browser-kit": "^5.4 || ^6.2", "symfony/doctrine-bridge": "^6.2", "symfony/phpunit-bridge": "^6.2.3", - "symfony/yaml": "^5.4 || ^6.0" + "symfony/yaml": "^5.4 || ^6.2" }, "suggest": { "phpdocumentor/reflection-docblock": "To use the PHPDoc" diff --git a/tests/App/config.yaml b/tests/App/config.yaml index c819613..b03db57 100644 --- a/tests/App/config.yaml +++ b/tests/App/config.yaml @@ -4,12 +4,15 @@ imports: framework: annotations: false secret: '123456789' + handle_all_throwables: true http_method_override: false router: utf8: true resource: '%kernel.project_dir%/routing.yaml' strict_requirements: ~ test: true + php_errors: + log: true profiler: collect: false cache: