Skip to content

Commit 7e94049

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Security][WIP] Add authenticators info to the profiler [Translation] Use symfony default locale when pulling translations from providers added missing translations for Bosnian (bs) Add the missing greek translations for security core and validator component [HttpKernel] Fix return types in `EventDataCollector` Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1 [Security][Validator] Add missing translations for Slovenian (sl) [Messenger] Add worker metadata inside logs [Messenger] Log when worker should stop and when `SIGTERM` is received cs fix [Security][Validator] Add missing translations for Finnish (fi) [VarDumper] returns a 500 when dd() is executed chore(VarDumper): declare that dd() never returns [MonologBridge] Deprecate the Swiftmailer handler [Cache] Commit items implicitly only when deferred keys are requested [MonologBridge] Deprecates ResetLoggersWorkerSubscriber Fix "can not" spelling [HttpClient] fix missing kernel.reset tag on TraceableHttpClient services [Form] Fix ChoiceType Extension to effectively set and use the translator Added new CssColor constraint
2 parents e6898e4 + e8b4424 commit 7e94049

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Key.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function isExpired(): bool
9393
public function __sleep(): array
9494
{
9595
if (!$this->serializable) {
96-
throw new UnserializableKeyException('The key can not be serialized.');
96+
throw new UnserializableKeyException('The key cannot be serialized.');
9797
}
9898

9999
return ['resource', 'expiringTime', 'state'];

LockInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ interface LockInterface
2727
* the call should block until the release of the lock.
2828
*
2929
* @throws LockConflictedException If the lock is acquired by someone else in blocking mode
30-
* @throws LockAcquiringException If the lock can not be acquired
30+
* @throws LockAcquiringException If the lock cannot be acquired
3131
*/
3232
public function acquire(bool $blocking = false): bool;
3333

@@ -37,7 +37,7 @@ public function acquire(bool $blocking = false): bool;
3737
* @param float|null $ttl Maximum expected lock duration in seconds
3838
*
3939
* @throws LockConflictedException If the lock is acquired by someone else
40-
* @throws LockAcquiringException If the lock can not be refreshed
40+
* @throws LockAcquiringException If the lock cannot be refreshed
4141
*/
4242
public function refresh(float $ttl = null);
4343

@@ -49,7 +49,7 @@ public function isAcquired(): bool;
4949
/**
5050
* Release the lock.
5151
*
52-
* @throws LockReleasingException If the lock can not be released
52+
* @throws LockReleasingException If the lock cannot be released
5353
*/
5454
public function release();
5555

SharedLockInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ interface SharedLockInterface extends LockInterface
2626
* determines whether or not the call should block until the release of the lock.
2727
*
2828
* @throws LockConflictedException If the lock is acquired by someone else in blocking mode
29-
* @throws LockAcquiringException If the lock can not be acquired
29+
* @throws LockAcquiringException If the lock cannot be acquired
3030
*/
3131
public function acquireRead(bool $blocking = false): bool;
3232
}

0 commit comments

Comments
 (0)