From e8ac51cdc8249ddbc0e0e62a0e14bc952555afe5 Mon Sep 17 00:00:00 2001 From: artgris Date: Thu, 2 Mar 2023 10:20:47 +0100 Subject: [PATCH] Update doctrine-annotations to 2.0 --- .github/workflows/tests-windows.yaml | 2 +- Tests/bootstrap.php | 14 +++++++------- composer.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests-windows.yaml b/.github/workflows/tests-windows.yaml index 5d3a394..8c298a9 100644 --- a/.github/workflows/tests-windows.yaml +++ b/.github/workflows/tests-windows.yaml @@ -29,7 +29,7 @@ jobs: - name: 'Install project dependencies' env: - SYMFONY_REQUIRE: 5.4 + SYMFONY_REQUIRE: 6.2 run: | composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable vendor/bin/simple-phpunit install diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index f023400..265afb3 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -1,17 +1,17 @@ loadClass($class); - - return class_exists($class, false); -}); +if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) { + require dirname(__DIR__).'/config/bootstrap.php'; +} elseif (method_exists(Dotenv::class, 'bootEnv')) { + (new Dotenv())->bootEnv(dirname(__DIR__).'/.env'); +} include __DIR__.'/Fixtures/App/AppKernel.php'; diff --git a/composer.json b/composer.json index 8f8b464..463ad20 100644 --- a/composer.json +++ b/composer.json @@ -17,14 +17,14 @@ ], "require": { "php": ">=8.0.2", - "doctrine/annotations": "^1.14", + "doctrine/annotations": "^2.0", "oomphinc/composer-installers-extender": "^2.0", "symfony/asset": "^6.0", "symfony/event-dispatcher": "^6.0", "symfony/expression-language": "^6.0", - "symfony/framework-bundle": "^6.0", "symfony/flex": "^2", "symfony/form": "^6.0", + "symfony/framework-bundle": "^6.0", "symfony/mime": "^6.0", "symfony/translation": "^6.0", "symfony/twig-bridge": "^6.0",