Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit f6b73e184548 · 2019-08-01T16:34:08.000+02:00
* 4.3:
  Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite
  Sync "not implementing the method" deprecations messages
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/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -364,7 +364,7 @@ public function setPathSeparator(string $separator)
                     $child->setPathSeparator($separator);
                 }
             } else {
-                @trigger_error('Passing a ParentNodeDefinitionInterface without getChildNodeDefinitions() is deprecated since Symfony 4.1.', E_USER_DEPRECATED);
+                @trigger_error(sprintf('Not implementing the "%s::getChildNodeDefinitions()" method in "%s" is deprecated since Symfony 4.1.', ParentNodeDefinitionInterface::class, \get_class($this)), E_USER_DEPRECATED);
             }
         }
 
diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
@@ -182,7 +182,7 @@ private function initTypeExtensions()
                     $extendedTypes[] = $extendedType;
                 }
             } else {
-                @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', \get_class($extension), FormTypeExtensionInterface::class), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Not implementing the "%s::getExtendedTypes()" method in "%s" is deprecated since Symfony 4.2.', FormTypeExtensionInterface::class, \get_class($extension)), E_USER_DEPRECATED);
 
                 $extendedTypes = [$extension->getExtendedType()];
             }
diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
@@ -96,7 +96,7 @@ private function processFormTypeExtensions(ContainerBuilder $container)
 
             if (isset($tag[0]['extended_type'])) {
                 if (!method_exists($typeExtensionClass, 'getExtendedTypes')) {
-                    @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', $typeExtensionClass, FormTypeExtensionInterface::class), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Not implementing the "%s::getExtendedTypes()" method in "%s" is deprecated since Symfony 4.2.', FormTypeExtensionInterface::class, $typeExtensionClass), E_USER_DEPRECATED);
                 }
 
                 $typeExtensions[$tag[0]['extended_type']][] = new Reference($serviceId);
diff --git a/src/Symfony/Component/Form/PreloadedExtension.php b/src/Symfony/Component/Form/PreloadedExtension.php
@@ -36,7 +36,7 @@ public function __construct(array $types, array $typeExtensions, FormTypeGuesser
         foreach ($typeExtensions as $extensions) {
             foreach ($extensions as $typeExtension) {
                 if (!method_exists($typeExtension, 'getExtendedTypes')) {
-                    @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', \get_class($typeExtension), FormTypeExtensionInterface::class), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Not implementing the "%s::getExtendedTypes()" method in "%s" is deprecated since Symfony 4.2.', FormTypeExtensionInterface::class, \get_class($typeExtension)), E_USER_DEPRECATED);
                 }
             }
         }
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');
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
@@ -40,7 +40,7 @@ public function getToken()
     public function setToken(TokenInterface $token = null)
     {
         if (null !== $token && !method_exists($token, 'getRoleNames')) {
-            @trigger_error(sprintf('Not implementing the getRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($token), TokenInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);
         }
 
         $this->token = $token;
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
@@ -44,7 +44,7 @@ public function __construct(ExpressionLanguage $expressionLanguage, Authenticati
             $authChecker = null;
 
             if (!method_exists($roleHierarchy, 'getReachableRoleNames')) {
-                @trigger_error(sprintf('Not implementing the getReachableRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($this->roleHierarchy), RoleHierarchyInterface::class), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Not implementing the "%s::getReachableRoleNames()" method in "%s" is deprecated since Symfony 4.3.', RoleHierarchyInterface::class, \get_class($this->roleHierarchy)), E_USER_DEPRECATED);
             }
         } elseif (null === $authChecker) {
             @trigger_error(sprintf('Argument 3 passed to "%s()" should be an instance of AuthorizationCheckerInterface, not passing it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
@@ -99,7 +99,7 @@ private function getVariables(TokenInterface $token, $subject)
             $roleNames = $token->getRoleNames();
             $roles = array_map(function (string $role) { return new Role($role, false); }, $roleNames);
         } else {
-            @trigger_error(sprintf('Not implementing the getRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($token), TokenInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);
 
             $roles = $token->getRoles(false);
             $roleNames = array_map(function (Role $role) { return $role->getRole(); }, $roles);
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
@@ -29,7 +29,7 @@ class RoleHierarchyVoter extends RoleVoter
     public function __construct(RoleHierarchyInterface $roleHierarchy, string $prefix = 'ROLE_')
     {
         if (!method_exists($roleHierarchy, 'getReachableRoleNames')) {
-            @trigger_error(sprintf('Not implementing the getReachableRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($roleHierarchy), RoleHierarchyInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Not implementing the "%s::getReachableRoleNames()" method in "%s" is deprecated since Symfony 4.3.', RoleHierarchyInterface::class, \get_class($roleHierarchy)), E_USER_DEPRECATED);
         }
 
         $this->roleHierarchy = $roleHierarchy;
@@ -46,7 +46,7 @@ protected function extractRoles(TokenInterface $token)
             if (method_exists($token, 'getRoleNames')) {
                 $roles = $token->getRoleNames();
             } else {
-                @trigger_error(sprintf('Not implementing the getRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($token), TokenInterface::class), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);
 
                 $roles = array_map(function (Role $role) { return $role->getRole(); }, $token->getRoles(false));
             }
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
@@ -62,7 +62,7 @@ protected function extractRoles(TokenInterface $token)
             return $token->getRoleNames();
         }
 
-        @trigger_error(sprintf('Not implementing the getRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($token), TokenInterface::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);
 
         return array_map(function (Role $role) { return $role->getRole(); }, $token->getRoles(false));
     }
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -38,7 +38,7 @@ class GuardListener
     public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
     {
         if (null !== $roleHierarchy && !method_exists($roleHierarchy, 'getReachableRoleNames')) {
-            @trigger_error(sprintf('Not implementing the getReachableRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($roleHierarchy), RoleHierarchyInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Not implementing the "%s::getReachableRoleNames()" method in "%s" is deprecated since Symfony 4.3.', RoleHierarchyInterface::class, \get_class($roleHierarchy)), E_USER_DEPRECATED);
         }
 
         $this->configuration = $configuration;
@@ -90,7 +90,7 @@ private function getVariables(GuardEvent $event): array
             $roleNames = $token->getRoleNames();
             $roles = array_map(function (string $role) { return new Role($role, false); }, $roleNames);
         } else {
-            @trigger_error(sprintf('Not implementing the getRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($token), TokenInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);
 
             $roles = $token->getRoles(false);
             $roleNames = array_map(function (Role $role) { return $role->getRole(); }, $roles);

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)));`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ public function setPathSeparator(string $separator)`
`364`	`364`	`$child->setPathSeparator($separator);`
`365`	`365`	`}`
`366`	`366`	`} else {`
`367`		`- @trigger_error('Passing a ParentNodeDefinitionInterface without getChildNodeDefinitions() is deprecated since Symfony 4.1.', E_USER_DEPRECATED);`
	`367`	`+ @trigger_error(sprintf('Not implementing the "%s::getChildNodeDefinitions()" method in "%s" is deprecated since Symfony 4.1.', ParentNodeDefinitionInterface::class, \get_class($this)), E_USER_DEPRECATED);`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private function initTypeExtensions()`
`182`	`182`	`$extendedTypes[] = $extendedType;`
`183`	`183`	`}`
`184`	`184`	`} else {`
`185`		`- @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', \get_class($extension), FormTypeExtensionInterface::class), E_USER_DEPRECATED);`
	`185`	`+ @trigger_error(sprintf('Not implementing the "%s::getExtendedTypes()" method in "%s" is deprecated since Symfony 4.2.', FormTypeExtensionInterface::class, \get_class($extension)), E_USER_DEPRECATED);`
`186`	`186`
`187`	`187`	`$extendedTypes = [$extension->getExtendedType()];`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private function processFormTypeExtensions(ContainerBuilder $container)`
`96`	`96`
`97`	`97`	`if (isset($tag[0]['extended_type'])) {`
`98`	`98`	`if (!method_exists($typeExtensionClass, 'getExtendedTypes')) {`
`99`		`- @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', $typeExtensionClass, FormTypeExtensionInterface::class), E_USER_DEPRECATED);`
	`99`	`+ @trigger_error(sprintf('Not implementing the "%s::getExtendedTypes()" method in "%s" is deprecated since Symfony 4.2.', FormTypeExtensionInterface::class, $typeExtensionClass), E_USER_DEPRECATED);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`$typeExtensions[$tag[0]['extended_type']][] = new Reference($serviceId);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(array $types, array $typeExtensions, FormTypeGuesser`
`36`	`36`	`foreach ($typeExtensions as $extensions) {`
`37`	`37`	`foreach ($extensions as $typeExtension) {`
`38`	`38`	`if (!method_exists($typeExtension, 'getExtendedTypes')) {`
`39`		`- @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', \get_class($typeExtension), FormTypeExtensionInterface::class), E_USER_DEPRECATED);`
	`39`	`+ @trigger_error(sprintf('Not implementing the "%s::getExtendedTypes()" method in "%s" is deprecated since Symfony 4.2.', FormTypeExtensionInterface::class, \get_class($typeExtension)), E_USER_DEPRECATED);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function getToken()`
`40`	`40`	`public function setToken(TokenInterface $token = null)`
`41`	`41`	`{`
`42`	`42`	`if (null !== $token && !method_exists($token, 'getRoleNames')) {`
`43`		`- @trigger_error(sprintf('Not implementing the getRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($token), TokenInterface::class), E_USER_DEPRECATED);`
	`43`	`+ @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`$this->token = $token;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class RoleHierarchyVoter extends RoleVoter`
`29`	`29`	`public function __construct(RoleHierarchyInterface $roleHierarchy, string $prefix = 'ROLE_')`
`30`	`30`	`{`
`31`	`31`	`if (!method_exists($roleHierarchy, 'getReachableRoleNames')) {`
`32`		`- @trigger_error(sprintf('Not implementing the getReachableRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($roleHierarchy), RoleHierarchyInterface::class), E_USER_DEPRECATED);`
	`32`	`+ @trigger_error(sprintf('Not implementing the "%s::getReachableRoleNames()" method in "%s" is deprecated since Symfony 4.3.', RoleHierarchyInterface::class, \get_class($roleHierarchy)), E_USER_DEPRECATED);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`$this->roleHierarchy = $roleHierarchy;`
`@@ -46,7 +46,7 @@ protected function extractRoles(TokenInterface $token)`
`46`	`46`	`if (method_exists($token, 'getRoleNames')) {`
`47`	`47`	`$roles = $token->getRoleNames();`
`48`	`48`	`} else {`
`49`		`- @trigger_error(sprintf('Not implementing the getRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($token), TokenInterface::class), E_USER_DEPRECATED);`
	`49`	`+ @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);`
`50`	`50`
`51`	`51`	`$roles = array_map(function (Role $role) { return $role->getRole(); }, $token->getRoles(false));`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ protected function extractRoles(TokenInterface $token)`
`62`	`62`	`return $token->getRoleNames();`
`63`	`63`	`}`
`64`	`64`
`65`		`- @trigger_error(sprintf('Not implementing the getRoleNames() method in %s which implements %s is deprecated since Symfony 4.3.', \get_class($token), TokenInterface::class), E_USER_DEPRECATED);`
	`65`	`+ @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);`
`66`	`66`
`67`	`67`	`return array_map(function (Role $role) { return $role->getRole(); }, $token->getRoles(false));`
`68`	`68`	`}`