Merge branch '3.x' into 3.next

Author: ADmad

.gitattributes

@@ -7,10 +7,13 @@
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.stickler.yml export-ignore
 CONTRIBUTING.md export-ignore
 docs.Dockerfile export-ignore
 phpunit.xml export-ignore
 phpcs.xml export-ignore
 /.github export-ignore
 /tests export-ignore
+phpstan.neon export-ignore
+phpstan-baseline.neon export-ignore
+psalm.xml export-ignore
+psalm-baseline.xml export-ignore

.stickler.yml

@@ -62,7 +62,7 @@ Token
 
 The token authenticator can authenticate a request based on a token that
 comes along with the request in the headers or in the request
-parameters.
+parameters. This requires a token column in the Users table, so comparison can be made between the received token and stored token.
 
 Configuration options:
 

docs/en/authenticators.rst

@@ -35,7 +35,8 @@ user from your application's database::
 
         // Enable impersonation.
         $this->Authentication->impersonate($targetUser);
-        $this->redirect($this->referer());
+
+        return $this->redirect($this->referer());
     }
 
 Once you have started to impersonate a user, all subsequent requests will have

docs/en/impersonation.rst

@@ -445,6 +445,10 @@ public function stopImpersonating()
      */
     public function isImpersonating(): bool
     {
+        if (!$this->getIdentity()) {
+            return false;
+        }
+
         $service = $this->getImpersonationAuthenticationService();
         $controller = $this->getController();
 

src/Controller/Component/AuthenticationComponent.php

@@ -731,13 +731,17 @@ public function testIsImpersonating()
         $this->request->getSession()->write('AuthImpersonate', $impersonator);
         $this->service->authenticate($this->request);
         $request = $this->request
-            ->withAttribute('authentication', $this->service);
+            ->withAttribute('authentication', $this->service)
+            ->withAttribute('identity', new Identity($impersonated));
         $controller = new Controller($request, $this->response);
         $registry = new ComponentRegistry($controller);
         $component = new AuthenticationComponent($registry);
 
         $result = $component->isImpersonating();
         $this->assertTrue($result);
+
+        $component->logout();
+        $this->assertFalse($component->isImpersonating());
     }
 
     /**
@@ -749,10 +753,13 @@ public function testGetImpersonationAuthenticationServiceFailure()
     {
         $service = $this->getMockBuilder(AuthenticationServiceInterface::class)->getMock();
 
-        $component = $this->createPartialMock(AuthenticationComponent::class, ['getAuthenticationService']);
-        $component->expects($this->once())
-            ->method('getAuthenticationService')
-            ->willReturn($service);
+        $user = new ArrayObject(['username' => 'mariano']);
+        $request = $this->request
+            ->withAttribute('authentication', $service)
+            ->withAttribute('identity', new Identity($user));
+        $controller = new Controller($request, $this->response);
+        $registry = new ComponentRegistry($controller);
+        $component = new AuthenticationComponent($registry);
 
         $this->expectException(InvalidArgumentException::class);
         $classname = get_class($service);