Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 93d206d164d7 · 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/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/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)));
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php b/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php
@@ -12,10 +12,13 @@
 namespace Symfony\Component\Intl\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Locale;
 
 abstract class ResourceBundleTestCase extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     // Include the locales statically so that the data providers are decoupled
     // from the Intl class. Otherwise tests will fail if the intl extension is
     // not loaded, because it is NOT possible to skip the execution of data
@@ -696,7 +699,7 @@ abstract class ResourceBundleTestCase extends TestCase
 
     private static $rootLocales;
 
-    protected function setUp(): void
+    private function doSetUp()
     {
         Locale::setDefault('en');
         Locale::setDefaultFallback('en');

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)));`