Skip to content

Commit a57e684

Browse files
Merge branch '4.4'
* 4.4: (27 commits) [Validator] add notice in UPGRADE file for new Range constraint option [CssSelector] Support *:only-of-type pseudo class selector [Intl] Update the ICU data to 65.1 (4.4 branch) [Intl] Update the ICU data to 65.1 (4.3 branch) Replace deprecated calls in tests [Intl] Update the ICU data to 65.1 Delete 5_Security_issue.md [DI] Whitelist error_renderer.renderer tag in UnusedTagsPass [DI] Whitelist validator.auto_mapper in UnusedTagsPass Update CHANGELOG.md [HttpClient] Fixed #33832 NO_PROXY option ignored in NativeHttpClient::request() method [EventDispatcher] A compiler pass for aliased userland events. [Cache] give 100ms before starting the expiration countdown [Cache] fix logger usage in CacheTrait::doGet() [VarDumper] fix dumping uninitialized SplFileInfo Added missing translations. [Form] Added CountryType option for using alpha3 country codes Fixed invalid changelog 4.0.0 for VarDumper [Workflow] Fixed BC break on WorkflowInterface Fix wrong expression language value ...
2 parents ac43f81 + 50ccd82 commit a57e684

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Authentication/Token/AbstractToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ final public function unserialize($serialized)
252252
$this->__unserialize(\is_array($serialized) ? $serialized : unserialize($serialized));
253253
}
254254

255-
private function hasUserChanged(UserInterface $user)
255+
private function hasUserChanged(UserInterface $user): bool
256256
{
257257
if (!($this->user instanceof UserInterface)) {
258258
throw new \BadMethodCallException('Method "hasUserChanged" should be called when current user class is instance of "UserInterface".');

Authorization/Voter/ExpressionVoter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function vote(TokenInterface $token, $subject, array $attributes)
6464
return $result;
6565
}
6666

67-
private function getVariables(TokenInterface $token, $subject)
67+
private function getVariables(TokenInterface $token, $subject): array
6868
{
6969
$roleNames = $token->getRoleNames();
7070

Encoder/EncoderFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private function createEncoder(array $config): PasswordEncoderInterface
8080
return $reflection->newInstanceArgs($config['arguments']);
8181
}
8282

83-
private function getEncoderConfigFromAlgorithm(array $config)
83+
private function getEncoderConfigFromAlgorithm(array $config): array
8484
{
8585
if ('auto' === $config['algorithm']) {
8686
$encoderChain = [];

0 commit comments

Comments
 (0)