Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 7bd7296d395c · 2019-08-01T16:37:17.000+02:00
* 4.4:
  Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite
  Sync "not implementing the method" deprecations messages
  Twig's namespaces can be null
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -119,6 +119,8 @@
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
         passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
+
+    passthru("$COMPOSER config --unset platform");
     if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
         passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
         passthru("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,8 @@`
`119`	`119`	`if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {`
`120`	`120`	`passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");`
`121`	`121`	`}`
	`122`	`+`
	`123`	`+ passthru("$COMPOSER config --unset platform");`
`122`	`124`	`if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {`
`123`	`125`	`passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");`
`124`	`126`	`passthru("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));`