diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59e117dc..d0070129 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,11 +22,13 @@ jobs: fail-fast: false matrix: php: ["8.0", "8.1", "8.2"] - symfony: ["^4.4", "^5.4"] + symfony: ["^4.4", "^5.4", "^6.0"] sylius: ["~1.11.0", "~1.12.0"] node: ["14.x"] mysql: ["8.0"] exclude: + - symfony: "^6.0" + sylius: "~1.11.0" - symfony: "^4.4" sylius: "~1.12.0" @@ -96,6 +98,11 @@ jobs: composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10" composer config extra.symfony.require "${{ matrix.symfony }}" + - + name: Symfony Security Checker + if: matrix.symfony == '^4.4' || matrix.symfony == '^5.4' + run: composer require sensiolabs/security-checker --dev --no-update --no-scripts + - name: Restrict Sylius version if: matrix.sylius != '' diff --git a/composer.json b/composer.json index 716ef32c..17da2da5 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,6 @@ }, "require-dev": { "api-platform/core": "~2.5.0 || ~2.6.0 || ~2.7.0", - "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev", "lchrusciel/api-test-case": "^5.1", "league/flysystem-bundle": "^2.0 || ^3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.3", @@ -28,14 +27,13 @@ "phpstan/phpstan-symfony": "^1.0", "phpstan/phpstan-webmozart-assert": "^1.0", "phpunit/phpunit": "^9.5", - "sensiolabs/security-checker": "^6.0", "sylius/mailer-bundle": "^1.8 || ^2.0@beta", "sylius-labs/coding-standard": "^4.0", - "symfony/browser-kit": "^4.4 || ^5.4", - "symfony/debug-bundle": "^4.4 || ^5.4", - "symfony/dotenv": "^4.4 || ^5.4", - "symfony/intl": "^4.4 || ^5.4", - "symfony/web-profiler-bundle": "^4.4 || ^5.4", + "symfony/browser-kit": "^4.4 || ^5.4 || ^6.0", + "symfony/debug-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/dotenv": "^4.4 || ^5.4 || ^6.0", + "symfony/intl": "^4.4 || ^5.4 || ^6.0", + "symfony/web-profiler-bundle": "^4.4 || ^5.4 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "vimeo/psalm": "4.23.0" }, diff --git a/tests/Application/config/bootstrap.php b/tests/Application/config/bootstrap.php index e23eca03..c9951a7c 100644 --- a/tests/Application/config/bootstrap.php +++ b/tests/Application/config/bootstrap.php @@ -13,6 +13,10 @@ $_ENV += $env; } elseif (!class_exists(Dotenv::class)) { throw new RuntimeException('Please run "composer require symfony/dotenv" to load the ".env" files configuring the application.'); +} elseif (method_exists(Dotenv::class, 'bootEnv')) { + (new Dotenv())->bootEnv(dirname(__DIR__) . '/.env'); + + return; } else { // load all the .env files (new Dotenv(true))->loadEnv(dirname(__DIR__) . '/.env');