Fixes: register compiler pass, fix tests

Seldaek · Seldaek · commit 04b27a50c14a · 2021-05-19T09:18:54.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -175,7 +175,7 @@ public function verifyToken(PersistentTokenInterface $token, string $tokenValue)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateExistingToken(PersistentTokenInterface $token, string $tokenValue, \DateTimeInterface $lastUsed): void
     {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
@@ -69,7 +69,7 @@ public function testVerifyOutdatedTokenAfterParallelRequest()
 
         // new request comes in requiring remember-me auth, which updates the token
         $provider->updateExistingToken($token, $newValue, new \DateTime('-5 seconds'));
-        $provider->updateToken($token, $newValue, new \DateTime('-5 seconds'));
+        $provider->updateToken($series, $newValue, new \DateTime('-5 seconds'));
 
         // parallel request comes in with the old remember-me cookie and session, which also requires reauth
         $token = $provider->loadTokenBySeries($series);
@@ -94,7 +94,7 @@ public function testVerifyOutdatedTokenAfterParallelRequestFailsAfter60Seconds()
 
         // new request comes in requiring remember-me auth, which updates the token
         $provider->updateExistingToken($token, $newValue, new \DateTime('-61 seconds'));
-        $provider->updateToken($token, $newValue, new \DateTime('-5 seconds'));
+        $provider->updateToken($series, $newValue, new \DateTime('-5 seconds'));
 
         // parallel request comes in with the old remember-me cookie and session, which also requires reauth
         $token = $provider->loadTokenBySeries($series);
diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
@@ -14,6 +14,7 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\AddSecurityVotersPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\AddSessionDomainConstraintPass;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\CleanRememberMeVerifierPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterCsrfFeaturesPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterEntryPointPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterGlobalSecurityEventListenersPass;
@@ -85,6 +86,7 @@ public function build(ContainerBuilder $container)
         // execute after ResolveChildDefinitionsPass optimization pass, to ensure class names are set
         $container->addCompilerPass(new SortFirewallListenersPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->addCompilerPass(new ReplaceDecoratedRememberMeHandlerPass(), PassConfig::TYPE_OPTIMIZE);
+        $container->addCompilerPass(new CleanRememberMeVerifierPass(), PassConfig::TYPE_BEFORE_REMOVING);
 
         $container->addCompilerPass(new AddEventAliasesPass(array_merge(
             AuthenticationEvents::ALIASES,

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public function verifyToken(PersistentTokenInterface $token, string $tokenValue)`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`/**`
`178`		`- * {@inheritDoc}`
	`178`	`+ * {@inheritdoc}`
`179`	`179`	`*/`
`180`	`180`	`public function updateExistingToken(PersistentTokenInterface $token, string $tokenValue, \DateTimeInterface $lastUsed): void`
`181`	`181`	`{`