Merge branch '4.4'

* 4.4: [DI] fix locators with numeric keys Add support for NO_COLOR env var [DI][FrameworkBundle] add EnvVarLoaderInterface - remove SecretEnvVarProcessor Fix error when we use VO for the marking property [DI] Remove LazyString from 4.4, before adding back to the String component
symfony · Nov 8, 2019 · f507d24 · f507d24
2 parents dca3a24 + c85ac54
commit f507d24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * added the stamps of a message after it is dispatched in `TraceableMessageBus` and `MessengerDataCollector` collected data
  * added `UuidCaster`
  * made all casters final
+ * added support for the `NO_COLOR` env var (https://no-color.org/)
 
 4.3.0
 -----

diff --git a/Dumper/CliDumper.php b/Dumper/CliDumper.php
@@ -578,6 +578,11 @@ private function hasColorSupport($stream): bool
             return false;
         }
 
+        // Follow https://no-color.org/
+        if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) {
+            return false;
+        }
+
         if ('Hyper' === getenv('TERM_PROGRAM')) {
             return true;
         }