From ee6a3ce1cc427bda5b69ea7a7364629e23c11539 Mon Sep 17 00:00:00 2001 From: BacLuc Date: Thu, 30 Nov 2023 23:35:01 +0100 Subject: [PATCH] api: update symfony/phpunit-bridge recipe By running docker compose exec php composer recipes:install symfony/phpunit-bridge --force -v and then reverting the changes not needed for eCampV3 This will allow to update to phpunit 10. (https://github.com/symfony/symfony/issues/49069#issuecomment-1832614936) --- api/bin/phpunit | 10 +++++++--- api/phpunit.xml.dist | 2 +- api/symfony.lock | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/bin/phpunit b/api/bin/phpunit index f26f2c727c1..692baccb647 100755 --- a/api/bin/phpunit +++ b/api/bin/phpunit @@ -6,9 +6,13 @@ if (!ini_get('date.timezone')) { } if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) { - define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php'); - require PHPUNIT_COMPOSER_INSTALL; - PHPUnit\TextUI\Command::main(); + if (PHP_VERSION_ID >= 80000) { + require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit'; + } else { + define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php'); + require PHPUNIT_COMPOSER_INSTALL; + PHPUnit\TextUI\Command::main(); + } } else { if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) { echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n"; diff --git a/api/phpunit.xml.dist b/api/phpunit.xml.dist index 58ded4ddf9f..ca9726ba5d0 100644 --- a/api/phpunit.xml.dist +++ b/api/phpunit.xml.dist @@ -48,4 +48,4 @@ --> - \ No newline at end of file + diff --git a/api/symfony.lock b/api/symfony.lock index 86ff512314e..b5962a10134 100644 --- a/api/symfony.lock +++ b/api/symfony.lock @@ -668,12 +668,12 @@ "version": "v5.3.3" }, "symfony/phpunit-bridge": { - "version": "5.1", + "version": "6.4", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "5.1", - "ref": "bf16921ef8309a81d9f046e9b6369c46bcbd031f" + "branch": "main", + "version": "6.3", + "ref": "1f5830c331065b6e4c9d5fa2105e322d29fcd573" }, "files": [ ".env.test",