Skip to content

Commit 32c17dd

Browse files
Merge branch '3.3' into 3.4
* 3.3: [Serializer] Remove a useless legacy annotation Fixed extra semi-colon fix docblock position [DependencyInjection] remove unused variable [PhpUnitBridge] add changelog entries for #21140 [DI] Remove dead service_container checks
2 parents 867c2c7 + dc3b2a0 commit 32c17dd

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Translator.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
7474
/**
7575
* Constructor.
7676
*
77-
* @param string $locale The locale
78-
* @param MessageSelector|null $selector The message selector for pluralization
79-
* @param string $defaultLocale
80-
* @param string|null $cacheDir The directory to use for the cache
81-
* @param bool $debug Use cache in debug mode ?
77+
* @param string $locale The locale
78+
* @param MessageSelector|null $selector The message selector for pluralization
79+
* @param string|null $cacheDir The directory to use for the cache
80+
* @param bool $debug Use cache in debug mode ?
8281
*
8382
* @throws InvalidArgumentException If a locale contains invalid characters
8483
*/

0 commit comments

Comments
 (0)