Merge branch '3.4' into 4.3

* 3.4:
  Fix assertInternalType deprecation in phpunit 9
  Micro-typo fix

Author: nicolas-grekas

Http/RememberMe/TokenBasedRememberMeServices.php

@@ -111,7 +111,7 @@ protected function generateCookieValue($class, $username, $expires, $password)
     }
 
     /**
-     * Generates a hash for the cookie to ensure it is not being tempered with.
+     * Generates a hash for the cookie to ensure it is not being tampered with.
      *
      * @param string $class
      * @param string $username The username

Http/Tests/RememberMe/AbstractRememberMeServicesTest.php

@@ -12,13 +12,16 @@
 namespace Symfony\Component\Security\Http\Tests\RememberMe;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\RememberMe\AbstractRememberMeServices;
 use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
 
 class AbstractRememberMeServicesTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testGetRememberMeParameter()
     {
         $service = $this->getService(null, ['remember_me_parameter' => 'foo']);
@@ -261,7 +264,7 @@ public function testEncodeCookieAndDecodeCookieAreInvertible()
         $service = $this->getService();
 
         $encoded = $this->callProtected($service, 'encodeCookie', [$cookieParts]);
-        $this->assertInternalType('string', $encoded);
+        $this->assertIsString($encoded);
 
         $decoded = $this->callProtected($service, 'decodeCookie', [$encoded]);
         $this->assertSame($cookieParts, $decoded);