From 912d7db7dd6306f42bb5fe6642579c0d11c2e93d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 10 Aug 2019 20:54:30 +0200
Subject: [PATCH] Disable PHPUnit result cache on the CI

---
 .appveyor.yml                                        | 1 +
 .travis.yml                                          | 1 +
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit        | 8 ++++++++
 src/Symfony/Component/Config/Definition/BaseNode.php | 4 ++--
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 552c26ce55d86..940eefd2318c2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,6 +13,7 @@ init:
     - SET "SYMFONY_REQUIRE=>=3.4"
     - SET ANSICON=121x90 (121x90)
     - SET SYMFONY_PHPUNIT_VERSION=4.8
+    - SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
     - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
 
 install:
diff --git a/.travis.yml b/.travis.yml
index fc3ff15d0f297..44c8c39cbc8d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ env:
         - MIN_PHP=5.5.9
         - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/5.6/bin/php
         - SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1
+        - SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
 
 matrix:
     include:
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 54fa18425c808..5209e75863f98 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -133,6 +133,14 @@ EOPHP
 global $argv, $argc;
 $argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
 $argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;
+
+if ($PHPUNIT_VERSION < 8.0) {
+    $argv = array_filter($argv, function ($v) use (&$argc) { if ('--do-not-cache-result' !== $v) return true; --$argc; });
+} elseif (filter_var(getenv('SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE'), FILTER_VALIDATE_BOOLEAN)) {
+    $argv[] = '--do-not-cache-result';
+    ++$argc;
+}
+
 $components = array();
 $cmd = array_map('escapeshellarg', $argv);
 $exit = 0;
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index 905406d12c56d..2b41efe79e7d7 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -280,9 +280,9 @@ final public function normalize($value)
     /**
      * Normalizes the value before any other normalization is applied.
      *
-     * @param $value
+     * @param mixed $value
      *
-     * @return The normalized array value
+     * @return mixed The normalized array value
      */
     protected function preNormalize($value)
     {