Skip to content

Commit 057c738

Browse files
Merge branch '5.4' into 6.0
* 5.4: CS fixes Bump Symfony version to 5.4.11 Update VERSION for 5.4.10 Update CHANGELOG for 5.4.10 Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents 36d5636 + 4763e6a commit 057c738

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Authentication/Token/AbstractToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\Security\Core\Authentication\Token;
1313

14-
use Symfony\Component\Security\Core\User\UserInterface;
1514
use Symfony\Component\Security\Core\User\InMemoryUser;
15+
use Symfony\Component\Security\Core\User\UserInterface;
1616

1717
/**
1818
* Base class for Token instances.

Signature/SignatureHasher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function computeSignatureHash(UserInterface $user, int $expires): string
8787
$value = $value->format('c');
8888
}
8989

90-
if (!is_scalar($value) && !$value instanceof \Stringable) {
90+
if (!\is_scalar($value) && !$value instanceof \Stringable) {
9191
throw new \InvalidArgumentException(sprintf('The property path "%s" on the user object "%s" must return a value that can be cast to a string, but "%s" was returned.', $property, \get_class($user), get_debug_type($value)));
9292
}
9393
$signatureFields[] = base64_encode($value);

Tests/Authorization/AccessDecisionManagerTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ public function decide(\Traversable $results): bool
4545
$i = 0;
4646
foreach ($results as $result) {
4747
switch ($i++) {
48-
case 0:
49-
Assert::assertSame(VoterInterface::ACCESS_DENIED, $result);
48+
case 0:
49+
Assert::assertSame(VoterInterface::ACCESS_DENIED, $result);
5050

51-
break;
52-
case 1:
53-
Assert::assertSame(VoterInterface::ACCESS_GRANTED, $result);
51+
break;
52+
case 1:
53+
Assert::assertSame(VoterInterface::ACCESS_GRANTED, $result);
5454

55-
return true;
56-
}
55+
return true;
56+
}
5757
}
5858

5959
return false;

Tests/Authorization/Voter/AuthenticatedVoterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function testSupportsType()
8282

8383
$this->assertTrue($voter->supportsType(get_debug_type('foo')));
8484
$this->assertTrue($voter->supportsType(get_debug_type(null)));
85-
$this->assertTrue($voter->supportsType(get_debug_type(new \StdClass())));
85+
$this->assertTrue($voter->supportsType(get_debug_type(new \stdClass())));
8686
}
8787

8888
protected function getToken($authenticated)

Tests/Authorization/Voter/RoleVoterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function testSupportsType()
7272

7373
$this->assertTrue($voter->supportsType(get_debug_type('foo')));
7474
$this->assertTrue($voter->supportsType(get_debug_type(null)));
75-
$this->assertTrue($voter->supportsType(get_debug_type(new \StdClass())));
75+
$this->assertTrue($voter->supportsType(get_debug_type(new \stdClass())));
7676
}
7777

7878
protected function getTokenWithRoleNames(array $roles)

0 commit comments

Comments
 (0)