diff --git a/api/.gitignore b/api/.gitignore index 4946fa7cb5..d384c8afda 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -15,12 +15,6 @@ ###> friendsofphp/php-cs-fixer ### /.php-cs-fixer.cache ###< friendsofphp/php-cs-fixer ### - -###> symfony/phpunit-bridge ### -.phpunit.result.cache -/phpunit.xml -###< symfony/phpunit-bridge ### - ###> lexik/jwt-authentication-bundle ### /config/jwt/*.pem ###< lexik/jwt-authentication-bundle ### diff --git a/api/bin/phpunit b/api/bin/phpunit deleted file mode 100755 index 692baccb64..0000000000 --- a/api/bin/phpunit +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env php -= 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"; - exit(1); - } - - require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php'; -} diff --git a/api/composer.json b/api/composer.json index dcd7db795d..183c2bb288 100644 --- a/api/composer.json +++ b/api/composer.json @@ -66,7 +66,6 @@ "symfony/css-selector": "7.2.0", "symfony/debug-bundle": "7.2.0", "symfony/maker-bundle": "1.62.0", - "symfony/phpunit-bridge": "7.2.0", "symfony/stopwatch": "7.2.2", "symfony/var-dumper": "7.2.0", "symfony/web-profiler-bundle": "7.2.2" @@ -113,7 +112,7 @@ "cs-fix": "php-cs-fixer fix", "test": [ "Composer\\Config::disableProcessTimeout", - "bin/phpunit -d memory_limit=-1 -c phpunit.xml.dist" + "vendor/bin/phpunit -d memory_limit=-1 -c phpunit.xml.dist" ], "paratest": [ "Composer\\Config::disableProcessTimeout", @@ -121,16 +120,16 @@ ], "update-snapshots": [ "Composer\\Config::disableProcessTimeout", - "bin/phpunit -d memory_limit=-1 -d --update-snapshots tests/Api/SnapshotTests", - "bin/phpunit -d memory_limit=-1 -d --update-snapshots tests/Util/ArrayDeepSortTest.php" + "vendor/bin/phpunit -d memory_limit=-1 -d --update-snapshots tests/Api/SnapshotTests", + "vendor/bin/phpunit -d memory_limit=-1 -d --update-snapshots tests/Util/ArrayDeepSortTest.php" ], "performance_test": [ "Composer\\Config::disableProcessTimeout", - "bin/phpunit -d memory_limit=-1 -c phpunit.performance_test.xml.dist" + "vendor/bin/phpunit -d memory_limit=-1 -c phpunit.performance_test.xml.dist" ], "performance_test_update-snapshots": [ "Composer\\Config::disableProcessTimeout", - "bin/phpunit -d memory_limit=-1 -d --update-snapshots -c phpunit.performance_test.xml.dist" + "vendor/bin/phpunit -d memory_limit=-1 -d --update-snapshots -c phpunit.performance_test.xml.dist" ], "auto-scripts": { "cache:clear": "symfony-cmd", diff --git a/api/composer.lock b/api/composer.lock index 8a9c615d4c..451a56a1e0 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "04dad43f6fe5e7728785bb8b628b26bf", + "content-hash": "b1baff5bf2d263118e43f64e342b1f23", "packages": [ { "name": "api-platform/core", @@ -13397,88 +13397,6 @@ ], "time": "2024-12-10T23:51:12+00:00" }, - { - "name": "symfony/phpunit-bridge", - "version": "v7.2.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "2bbde92ab25a0e2c88160857af7be9db5da0d145" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2bbde92ab25a0e2c88160857af7be9db5da0d145", - "reference": "2bbde92ab25a0e2c88160857af7be9db5da0d145", - "shasum": "" - }, - "require": { - "php": ">=7.2.5" - }, - "conflict": { - "phpunit/phpunit": "<7.5|9.1.2" - }, - "require-dev": { - "symfony/deprecation-contracts": "^2.5|^3.0", - "symfony/error-handler": "^5.4|^6.4|^7.0", - "symfony/polyfill-php81": "^1.27" - }, - "bin": [ - "bin/simple-phpunit" - ], - "type": "symfony-bridge", - "extra": { - "thanks": { - "url": "https://github.com/sebastianbergmann/phpunit", - "name": "phpunit/phpunit" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Bridge\\PhpUnit\\": "" - }, - "exclude-from-classmap": [ - "/Tests/", - "/bin/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides utilities for PHPUnit, especially user deprecation notices management", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v7.2.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-11-13T16:15:23+00:00" - }, { "name": "symfony/process", "version": "v7.2.0", diff --git a/api/symfony.lock b/api/symfony.lock index 6a57977a07..b24c703937 100644 --- a/api/symfony.lock +++ b/api/symfony.lock @@ -652,21 +652,6 @@ "symfony/password-hasher": { "version": "v5.3.3" }, - "symfony/phpunit-bridge": { - "version": "6.4", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "main", - "version": "6.3", - "ref": "1f5830c331065b6e4c9d5fa2105e322d29fcd573" - }, - "files": [ - ".env.test", - "bin/phpunit", - "phpunit.xml.dist", - "tests/bootstrap.php" - ] - }, "symfony/polyfill-intl-idn": { "version": "v1.23.0" },