Skip to content

Commit f388f1f

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 9d2b089 + f84ead2 commit f388f1f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ContainerBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ public function setAlias(string $alias, string|Alias $id): Alias
798798
}
799799

800800
if ($alias === (string) $id) {
801-
throw new InvalidArgumentException(sprintf('An alias can not reference itself, got a circular reference on "%s".', $alias));
801+
throw new InvalidArgumentException(sprintf('An alias cannot reference itself, got a circular reference on "%s".', $alias));
802802
}
803803

804804
unset($this->definitions[$alias], $this->removedIds[$alias]);

ParameterBag/ParameterBagInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ interface ParameterBagInterface
2424
/**
2525
* Clears all parameters.
2626
*
27-
* @throws LogicException if the ParameterBagInterface can not be cleared
27+
* @throws LogicException if the ParameterBagInterface cannot be cleared
2828
*/
2929
public function clear();
3030

3131
/**
3232
* Adds parameters to the service container parameters.
3333
*
34-
* @throws LogicException if the parameter can not be added
34+
* @throws LogicException if the parameter cannot be added
3535
*/
3636
public function add(array $parameters);
3737

@@ -57,7 +57,7 @@ public function remove(string $name);
5757
/**
5858
* Sets a service container parameter.
5959
*
60-
* @throws LogicException if the parameter can not be set
60+
* @throws LogicException if the parameter cannot be set
6161
*/
6262
public function set(string $name, array|bool|string|int|float|null $value);
6363

Tests/ContainerBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public function testAliases()
270270
$builder->setAlias('foobar', 'foobar');
271271
$this->fail('->setAlias() throws an InvalidArgumentException if the alias references itself');
272272
} catch (\InvalidArgumentException $e) {
273-
$this->assertEquals('An alias can not reference itself, got a circular reference on "foobar".', $e->getMessage(), '->setAlias() throws an InvalidArgumentException if the alias references itself');
273+
$this->assertEquals('An alias cannot reference itself, got a circular reference on "foobar".', $e->getMessage(), '->setAlias() throws an InvalidArgumentException if the alias references itself');
274274
}
275275

276276
try {

0 commit comments

Comments
 (0)