From e86e8b8853626a1fc6e0f99f6ba1ae930c8e698f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 2 Jun 2021 17:39:54 +0200
Subject: [PATCH] Fix recipe for phpunit

---
 phpunit/phpunit/4.7/phpunit.xml.dist        |  3 --
 phpunit/phpunit/9.3/.env.test               |  6 ++++
 phpunit/phpunit/9.3/manifest.json           | 11 ++++++
 phpunit/phpunit/9.3/phpunit.xml.dist        | 40 +++++++++++++++++++++
 phpunit/phpunit/9.3/tests                   |  1 +
 symfony/phpunit-bridge/5.3/bin/phpunit      | 17 +++++----
 symfony/phpunit-bridge/5.3/manifest.json    |  1 -
 symfony/phpunit-bridge/5.3/phpunit.xml.dist | 15 +++-----
 8 files changed, 73 insertions(+), 21 deletions(-)
 create mode 100644 phpunit/phpunit/9.3/.env.test
 create mode 100644 phpunit/phpunit/9.3/manifest.json
 create mode 100644 phpunit/phpunit/9.3/phpunit.xml.dist
 create mode 120000 phpunit/phpunit/9.3/tests

diff --git a/phpunit/phpunit/4.7/phpunit.xml.dist b/phpunit/phpunit/4.7/phpunit.xml.dist
index 4b9029be4..c7634d6f5 100644
--- a/phpunit/phpunit/4.7/phpunit.xml.dist
+++ b/phpunit/phpunit/4.7/phpunit.xml.dist
@@ -25,12 +25,9 @@
         </whitelist>
     </filter>
 
-    <!-- Run `composer require symfony/phpunit-bridge` before enabling this extension -->
-    <!--
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
     </listeners>
-    -->
 
     <!-- Run `composer require symfony/panther` before enabling this extension -->
     <!--
diff --git a/phpunit/phpunit/9.3/.env.test b/phpunit/phpunit/9.3/.env.test
new file mode 100644
index 000000000..9e7162f0b
--- /dev/null
+++ b/phpunit/phpunit/9.3/.env.test
@@ -0,0 +1,6 @@
+# define your env variables for the test env here
+KERNEL_CLASS='App\Kernel'
+APP_SECRET='$ecretf0rt3st'
+SYMFONY_DEPRECATIONS_HELPER=999999
+PANTHER_APP_ENV=panther
+PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
diff --git a/phpunit/phpunit/9.3/manifest.json b/phpunit/phpunit/9.3/manifest.json
new file mode 100644
index 000000000..8af7b3b35
--- /dev/null
+++ b/phpunit/phpunit/9.3/manifest.json
@@ -0,0 +1,11 @@
+{
+    "copy-from-recipe": {
+        ".env.test": ".env.test",
+        "phpunit.xml.dist": "phpunit.xml.dist",
+        "tests/": "tests/"
+    },
+    "gitignore": [
+        "/phpunit.xml",
+        ".phpunit.result.cache"
+    ]
+}
diff --git a/phpunit/phpunit/9.3/phpunit.xml.dist b/phpunit/phpunit/9.3/phpunit.xml.dist
new file mode 100644
index 000000000..7884fea8b
--- /dev/null
+++ b/phpunit/phpunit/9.3/phpunit.xml.dist
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="tests/bootstrap.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+        <server name="APP_ENV" value="test" force="true" />
+        <server name="SHELL_VERBOSITY" value="-1" />
+        <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
+        <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Project Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+    </listeners>
+
+    <!-- Run `composer require symfony/panther` before enabling this extension -->
+    <!--
+    <extensions>
+        <extension class="Symfony\Component\Panther\ServerExtension" />
+    </extensions>
+    -->
+</phpunit>
diff --git a/phpunit/phpunit/9.3/tests b/phpunit/phpunit/9.3/tests
new file mode 120000
index 000000000..98911dc67
--- /dev/null
+++ b/phpunit/phpunit/9.3/tests
@@ -0,0 +1 @@
+../../../symfony/phpunit-bridge/3.3/tests/
\ No newline at end of file
diff --git a/symfony/phpunit-bridge/5.3/bin/phpunit b/symfony/phpunit-bridge/5.3/bin/phpunit
index 2338d1b6d..f26f2c727 100755
--- a/symfony/phpunit-bridge/5.3/bin/phpunit
+++ b/symfony/phpunit-bridge/5.3/bin/phpunit
@@ -1,16 +1,19 @@
 #!/usr/bin/env php
 <?php
-if (file_exists(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
-    require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
+
+if (!ini_get('date.timezone')) {
+    ini_set('date.timezone', 'UTC');
+}
+
+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();
 } else {
-    if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+    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);
     }
 
-    if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
-        putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
-    }
-
     require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
 }
diff --git a/symfony/phpunit-bridge/5.3/manifest.json b/symfony/phpunit-bridge/5.3/manifest.json
index a2ed0cb42..4fb292b5a 100644
--- a/symfony/phpunit-bridge/5.3/manifest.json
+++ b/symfony/phpunit-bridge/5.3/manifest.json
@@ -6,7 +6,6 @@
         "tests/": "tests/"
     },
     "gitignore": [
-        ".phpunit",
         ".phpunit.result.cache",
         "/phpunit.xml"
     ],
diff --git a/symfony/phpunit-bridge/5.3/phpunit.xml.dist b/symfony/phpunit-bridge/5.3/phpunit.xml.dist
index eb15cc9cd..7884fea8b 100644
--- a/symfony/phpunit-bridge/5.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/5.3/phpunit.xml.dist
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<!-- If you use phpunit-bridge directly, set -->
-<!-- xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd" -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
@@ -13,11 +11,8 @@
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />
         <server name="SHELL_VERBOSITY" value="-1" />
-        <!-- If you use phpunit-bridge directly, you can control extra behavior -->
-        <!--
         <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
-        -->
+        <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
     </php>
 
     <testsuites>
@@ -26,11 +21,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />