Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit d8bdf54f1a61 · 2020-12-08T17:43:25.000+01:00
* 4.4: minor cs fix [Config][TwigBundle] Fixed syntax error in config [DI] Fix Xdebug 3.0 detection Use php8 stable [Cache] fix checking for redis_sentinel support [Intl] Update the ICU data to 68.1 Remove unused @throws tags and handling of never thrown exceptions [PhpUnitBridge] Fix disabling DeprecationErrorHandler from phpunit configuration file
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -147,6 +147,10 @@
     }
 }
 
+if ('disabled' === $getEnvVar('SYMFONY_DEPRECATIONS_HELPER')) {
+    putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
+}
+
 $COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar')
     || ($COMPOSER = rtrim('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
     || ($COMPOSER = rtrim('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer`) : `which composer 2> /dev/null`))

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,10 @@`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
	`150`	`+if ('disabled' === $getEnvVar('SYMFONY_DEPRECATIONS_HELPER')) {`
	`151`	`+ putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');`
	`152`	`+}`
	`153`	`+`
`150`	`154`	`$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar')`
`151`	`155`	\|\| ($COMPOSER = rtrim('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
`152`	`156`	\|\| ($COMPOSER = rtrim('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer`) : `which composer 2> /dev/null`))