Skip to content

Commit

Permalink
Merge branch '4.3' into 4.4
Browse files Browse the repository at this point in the history
* 4.3:
  Fix assertInternalType deprecation in phpunit 9
  Micro-typo fix
  • Loading branch information
nicolas-grekas committed Aug 1, 2019
2 parents 4769d9e + 966fd16 commit 4221e93
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion RememberMe/TokenBasedRememberMeServices.php
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Tests/RememberMe/AbstractRememberMeServicesTest.php
Expand Up @@ -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']);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4221e93

Please sign in to comment.