Merge branch '5.0'

nicolas-grekas · nicolas-grekas · commit 9f93a38fffd2 · 2020-01-21T12:48:14.000+01:00
* 5.0:
  [SecurityBundle] fix tests
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php
@@ -2,8 +2,10 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\SecuredPageBundle\Security\Core\User;
 
+use Symfony\Bundle\SecurityBundle\Tests\Functional\UserWithoutEquatable;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
@@ -52,6 +54,6 @@ public function refreshUser(UserInterface $user)
 
     public function supportsClass($class)
     {
-        return 'Symfony\Component\Security\Core\User\User' === $class;
+        return User::class === $class || UserWithoutEquatable::class === $class;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\SecuredPageBundle\Security\Core\User;`
`4`	`4`
	`5`	`+use Symfony\Bundle\SecurityBundle\Tests\Functional\UserWithoutEquatable;`
`5`	`6`	`use Symfony\Component\Security\Core\Exception\UnsupportedUserException;`
`6`	`7`	`use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;`
	`8`	`+use Symfony\Component\Security\Core\User\User;`
`7`	`9`	`use Symfony\Component\Security\Core\User\UserInterface;`
`8`	`10`	`use Symfony\Component\Security\Core\User\UserProviderInterface;`
`9`	`11`
`@@ -52,6 +54,6 @@ public function refreshUser(UserInterface $user)`
`52`	`54`
`53`	`55`	`public function supportsClass($class)`
`54`	`56`	`{`
`55`		`- return 'Symfony\Component\Security\Core\User\User' === $class;`
	`57`	`+ return User::class === $class \|\| UserWithoutEquatable::class === $class;`
`56`	`58`	`}`
`57`	`59`	`}`