From 5379264cc4225c80aabae1c52a9157e5883659d0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Wed, 29 Nov 2023 15:57:40 +0100
Subject: [PATCH] Update to symfony 7.0.0
---
bin/phpunit | 10 +++++++---
composer.json | 12 ++++++------
symfony.lock | 2 +-
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/bin/phpunit b/bin/phpunit
index f26f2c7..692bacc 100755
--- a/bin/phpunit
+++ b/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/composer.json b/composer.json
index 0711434..980b1ec 100644
--- a/composer.json
+++ b/composer.json
@@ -193,12 +193,12 @@
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "*",
"phpunit/phpunit": "^9.0|^10.0",
- "symfony/browser-kit": "^6.0",
- "symfony/css-selector": "^6.0",
- "symfony/debug-bundle": "^6.0",
+ "symfony/browser-kit": "^6.0|^7.0",
+ "symfony/css-selector": "^6.0|^7.0",
+ "symfony/debug-bundle": "^6.0|^7.0",
"symfony/maker-bundle": "^1.0",
- "symfony/phpunit-bridge": "^6.0",
- "symfony/stopwatch": "^6.0",
- "symfony/web-profiler-bundle": "^6.0"
+ "symfony/phpunit-bridge": "^6.0|^7.0",
+ "symfony/stopwatch": "^6.0|^7.0",
+ "symfony/web-profiler-bundle": "^6.0|^7.0"
}
}
diff --git a/symfony.lock b/symfony.lock
index d2927aa..c28a715 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -188,7 +188,7 @@
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "6.3",
- "ref": "01dfaa98c58f7a7b5a9b30e6edb7074af7ed9819"
+ "ref": "5e6e46e7bd453880707d920c99be0da5afaaaa22"
},
"files": [
".env.test",
--
2.41.3