👽️ support new UserProvider method in Symfony 5.3

Author: garak

.gitattributes

@@ -1,5 +1,5 @@
 /.git*            export-ignore
-/.php_cs          export-ignore
+/.php-cs-fixer.*  export-ignore
 /phpstan*         export-ignore
 /phpunit.xml.dist export-ignore
 /README.md        export-ignore

.github/workflows/build.yaml

@@ -62,5 +62,7 @@ jobs:
             - run: composer require --dev doctrine/lexer:v1.0.1 --no-update
               if: matrix.composer_option == '--prefer-lowest'
             - run: composer update --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
-            - run: bin/phpunit
-
+            - run: bin/phpunit --coverage-clover=clover.xml
+            - uses: codecov/codecov-action@v1
+              with:
+                  files: ./clover.xml

.php_cs .php-cs-fixer.php

@@ -6,17 +6,15 @@
     ->notPath('FakeFixtureDependent.php')
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHP71Migration:risky' => true,
         '@PHP73Migration' => true,
-        '@PHPUnit75Migration:risky' => true,
-        'ordered_imports' => true,
+        '@PHPUnit84Migration:risky' => true,
         'declare_strict_types' => false,
-        'native_function_invocation' => true,
+        'native_function_invocation' => ['include' => ['@all']],
         'php_unit_mock_short_will_return' => true,
     ])
     ->setFinder($finder)

src/Test/WebTestCase.php

@@ -115,7 +115,9 @@ protected static function saveOutput(bool $delete = true): void
     protected static function login(string $username = '[email protected]', ?string $firewall = null, ?string $service = null): void
     {
         $service = $service ?? static::$container->getParameter('beelab_test.user_service');
-        if (null === $user = static::$container->get($service)->loadUserByUsername($username)) {
+        $object = static::$container->get($service);
+        $user = \is_callable([$object, 'loadUserByIdentifier']) ? $object->loadUserByIdentifier($username) : $object->loadUserByUsername($username);
+        if (null === $user) {
             throw new \InvalidArgumentException(\sprintf('Username %s not found.', $username));
         }
         $firewall = $firewall ?? static::$container->getParameter('beelab_test.firewall');
@@ -184,7 +186,7 @@ protected static function getTxtFile(string $file = '0'): UploadedFile
      * Load fixtures as an array of "names"
      * This is inspired by https://github.com/liip/LiipFunctionalTestBundle.
      *
-     * @param array $fixtures e.g. ['UserData', 'OrderData']
+     * @param array<int, string> $fixtures e.g. ['UserData', 'OrderData']
      *
      * @throws \Doctrine\DBAL\DBALException
      * @throws \InvalidArgumentException
@@ -321,11 +323,11 @@ protected static function postForm(string $name, array $values, array $files = [
         self::$client->request($method, $formAction, [$name => $values], $filesValues);
     }
 
-    protected static function setSessionException(): void
+    protected static function setSessionException(string $msg = 'error...'): void
     {
         /** @var \Symfony\Component\HttpFoundation\Session\SessionInterface $session */
         $session = self::$container->get('session');
-        $session->set('_security.last_error', new AuthenticationServiceException('error...'));
+        $session->set('_security.last_error', new AuthenticationServiceException($msg));
         $session->save();
         $cookie = new Cookie($session->getName(), $session->getId());
         self::$client->getCookieJar()->set($cookie);

tests/Test/WebTestCaseTest.php

@@ -132,6 +132,30 @@ public function testLogin(): void
         $method->invoke(self::$mock, '[email protected]', 'main', 'beelab_user.manager');
     }
 
+    public function testLoginWithUserNotFound(): void
+    {
+        $repository = $this
+            ->getMockBuilder(UserProviderInterface::class)
+            ->setMethods(['loadUserByUsername', 'refreshUser', 'supportsClass'])
+            ->getMock()
+        ;
+        $repository
+            ->expects(self::once())
+            ->method('loadUserByUsername')
+            ->willReturn(null)
+        ;
+        self::$container
+            ->method('get')
+            ->with('beelab_user.manager')
+            ->willReturn($repository)
+        ;
+        $method = new \ReflectionMethod(self::$mock, 'login');
+        $method->setAccessible(true);
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Username [email protected] not found.');
+        $method->invoke(self::$mock, '[email protected]', 'main', 'beelab_user.manager');
+    }
+
     public function testGetFile(): void
     {
         // Call `getFile` method