diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c8a824e0..b6a663ba 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -65,7 +65,7 @@ jobs: run: vendor/bin/phpstan analyse - name: Run PHPUnit - run: bin/phpunit + run: vendor/bin/phpunit - name: Run PHPUnit (Twig Hooks) - run: bin/phpunit -c src/TwigHooks/phpunit.xml.dist + run: vendor/bin/phpunit -c src/TwigHooks/phpunit.xml.dist diff --git a/bin/phpunit b/bin/phpunit deleted file mode 100755 index 692baccb..00000000 --- a/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/composer.json b/composer.json index 97c8487a..6032658e 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,6 @@ "symfony/dotenv": "^5.4 || ^6.0", "symfony/flex": "^2.4", "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/phpunit-bridge": "^5.4 || ^6.0", "symfony/runtime": "^5.4 || ^6.0", "symfony/translation": "^5.4 || ^6.0", "symfony/web-profiler-bundle": "^5.4 || ^6.0", diff --git a/monorepo-builder.php b/monorepo-builder.php index 5b4cc00d..cfc0a18e 100644 --- a/monorepo-builder.php +++ b/monorepo-builder.php @@ -15,7 +15,6 @@ 'phpstan/phpstan' => '^1.10', 'symfony/debug-bundle' => '^5.4 || ^6.0', 'symfony/flex' => '^2.4', - 'symfony/phpunit-bridge' => '^5.4 || ^6.0', 'symplify/monorepo-builder' => '11.2.*', 'phpstan/phpstan-symfony' => '^1.3' ], diff --git a/symfony.lock b/symfony.lock index b9e0f80a..bd37c062 100644 --- a/symfony.lock +++ b/symfony.lock @@ -77,21 +77,6 @@ "src/Kernel.php" ] }, - "symfony/phpunit-bridge": { - "version": "7.0", - "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/routing": { "version": "5.4", "recipe": {