diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #22846 [FrameworkBundle][Translation] fix docblock position (xabbuh)

Browse Source 
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle][Translation] fix docblock position

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #22822
| License       | MIT
| Doc PR        |

The `$defaultLocale` argument is present in the `Translator` class of
the FrameworkBundle, but is not part of the Translation component.

Commits
-------

0829964 fix docblock position
This commit is contained in:
Nicolas Grekas 2017-05-22 09:49:45 +02:00
commit d33b6c5306
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
View File

@ -48,10 +48,11 @@ class Translator extends BaseTranslator implements WarmableInterface
* * debug: Whether to enable debugging or not (false by default)
* * resource_files: List of translation resources available grouped by locale.
*
* @param ContainerInterface $container A ContainerInterface instance
* @param MessageSelector $selector The message selector for pluralization
* @param array $loaderIds An array of loader Ids
* @param array $options An array of options
* @param ContainerInterface $container A ContainerInterface instance
* @param MessageSelector $selector The message selector for pluralization
* @param string $defaultLocale
* @param array $loaderIds An array of loader Ids
* @param array $options An array of options
*
* @throws InvalidArgumentException
*/

9
src/Symfony/Component/Translation/Translator.php
View File

@ -74,11 +74,10 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
/**
* Constructor.
*
* @param string $locale The locale
* @param MessageSelector|null $selector The message selector for pluralization
* @param string $defaultLocale
* @param string|null $cacheDir The directory to use for the cache
* @param bool $debug Use cache in debug mode ?
* @param string $locale The locale
* @param MessageSelector|null $selector The message selector for pluralization
* @param string|null $cacheDir The directory to use for the cache
* @param bool $debug Use cache in debug mode ?
*
* @throws InvalidArgumentException If a locale contains invalid characters
*/