Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit c4d40914cb44 · 2020-12-08T17:43:38.000+01:00
* 5.1: minor cs fix [Config][TwigBundle] Fixed syntax error in config [DI] Fix Xdebug 3.0 detection Use php8 stable [Notifier] Streamline changelogs of notifier bridges [Cache] fix checking for redis_sentinel support [Messenger] Fixed wording in php doc [Intl] Update the ICU data to 68.1 [FrameworkBundle] acces public-deprecated services via the private container to remove false-positive deprecations 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
@@ -153,6 +153,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
`@@ -153,6 +153,10 @@`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
	`156`	`+if ('disabled' === $getEnvVar('SYMFONY_DEPRECATIONS_HELPER')) {`
	`157`	`+ putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');`
	`158`	`+}`
	`159`	`+`
`156`	`160`	`$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar')`
`157`	`161`	\|\| ($COMPOSER = rtrim('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
`158`	`162`	\|\| ($COMPOSER = rtrim('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer`) : `which composer 2> /dev/null`))