[Translation] Fix test, null is valid according to the tests

Simperfit · Simperfit · commit ed56c538a119 · 2019-07-05T10:15:43.000+02:00
diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php
@@ -34,7 +34,7 @@ public function __construct(TranslatorInterface $translator = null, IntlFormatte
     /**
      * {@inheritdoc}
      */
-    public function format(string $message, string $locale, array $parameters = [])
+    public function format(string $message, ?string $locale, array $parameters = [])
     {
         if ($this->translator instanceof TranslatorInterface) {
             return $this->translator->trans($message, $parameters, null, $locale);
diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php b/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php
@@ -26,5 +26,5 @@ interface MessageFormatterInterface
      *
      * @return string
      */
-    public function format(string $message, string $locale, array $parameters = []);
+    public function format(string $message, ?string $locale, array $parameters = []);
 }
diff --git a/src/Symfony/Component/Translation/Loader/ArrayLoader.php b/src/Symfony/Component/Translation/Loader/ArrayLoader.php
@@ -23,7 +23,7 @@ class ArrayLoader implements LoaderInterface
     /**
      * {@inheritdoc}
      */
-    public function load($resource, string $locale, string $domain = 'messages')
+    public function load($resource, ?string $locale, string $domain = 'messages')
     {
         $resource = $this->flatten($resource);
         $catalogue = new MessageCatalogue($locale);
diff --git a/src/Symfony/Component/Translation/Loader/FileLoader.php b/src/Symfony/Component/Translation/Loader/FileLoader.php
@@ -23,7 +23,7 @@ abstract class FileLoader extends ArrayLoader
     /**
      * {@inheritdoc}
      */
-    public function load($resource, string $locale, string $domain = 'messages')
+    public function load($resource, ?string $locale, string $domain = 'messages')
     {
         if (!stream_is_local($resource)) {
             throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
diff --git a/src/Symfony/Component/Translation/Loader/IcuDatFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuDatFileLoader.php
@@ -26,7 +26,7 @@ class IcuDatFileLoader extends IcuResFileLoader
     /**
      * {@inheritdoc}
      */
-    public function load($resource, string $locale, string $domain = 'messages')
+    public function load($resource, ?string $locale, string $domain = 'messages')
     {
         if (!stream_is_local($resource.'.dat')) {
             throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
diff --git a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php
@@ -26,7 +26,7 @@ class IcuResFileLoader implements LoaderInterface
     /**
      * {@inheritdoc}
      */
-    public function load($resource, string $locale, string $domain = 'messages')
+    public function load($resource, ?string $locale, string $domain = 'messages')
     {
         if (!stream_is_local($resource)) {
             throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
diff --git a/src/Symfony/Component/Translation/Loader/LoaderInterface.php b/src/Symfony/Component/Translation/Loader/LoaderInterface.php
@@ -34,5 +34,5 @@ interface LoaderInterface
      * @throws NotFoundResourceException when the resource cannot be found
      * @throws InvalidResourceException  when the resource cannot be loaded
      */
-    public function load($resource, string $locale, string $domain = 'messages');
+    public function load($resource, ?string $locale, string $domain = 'messages');
 }
diff --git a/src/Symfony/Component/Translation/Loader/QtFileLoader.php b/src/Symfony/Component/Translation/Loader/QtFileLoader.php
@@ -27,7 +27,7 @@ class QtFileLoader implements LoaderInterface
     /**
      * {@inheritdoc}
      */
-    public function load($resource, string $locale, string $domain = 'messages')
+    public function load($resource, ?string $locale, string $domain = 'messages')
     {
         if (!stream_is_local($resource)) {
             throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -28,7 +28,7 @@ class XliffFileLoader implements LoaderInterface
     /**
      * {@inheritdoc}
      */
-    public function load($resource, string $locale, string $domain = 'messages')
+    public function load($resource, ?string $locale, string $domain = 'messages')
     {
         if (!stream_is_local($resource)) {
             throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -119,12 +119,10 @@ public function addLoader(string $format, LoaderInterface $loader)
      *
      * @param string $format   The name of the loader (@see addLoader())
      * @param mixed  $resource The resource name
-     * @param string $locale   The locale
-     * @param string $domain   The domain
      *
      * @throws InvalidArgumentException If the locale contains invalid characters
      */
-    public function addResource(string $format, $resource, string $locale, string $domain = null)
+    public function addResource(string $format, $resource, ?string $locale, string $domain = null)
     {
         if (null === $domain) {
             $domain = 'messages';
@@ -248,7 +246,7 @@ protected function getLoaders()
     /**
      * @param string $locale
      */
-    protected function loadCatalogue(string $locale)
+    protected function loadCatalogue(?string $locale)
     {
         if (null === $this->cacheDir) {
             $this->initializeCatalogue($locale);
@@ -260,7 +258,7 @@ protected function loadCatalogue(string $locale)
     /**
      * @param string $locale
      */
-    protected function initializeCatalogue(string $locale)
+    protected function initializeCatalogue(?string $locale)
     {
         $this->assertValidLocale($locale);
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(TranslatorInterface $translator = null, IntlFormatte`
`34`	`34`	`/**`
`35`	`35`	`* {@inheritdoc}`
`36`	`36`	`*/`
`37`		`- public function format(string $message, string $locale, array $parameters = [])`
	`37`	`+ public function format(string $message, ?string $locale, array $parameters = [])`
`38`	`38`	`{`
`39`	`39`	`if ($this->translator instanceof TranslatorInterface) {`
`40`	`40`	`return $this->translator->trans($message, $parameters, null, $locale);`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ interface MessageFormatterInterface`
`26`	`26`	`*`
`27`	`27`	`* @return string`
`28`	`28`	`*/`
`29`		`- public function format(string $message, string $locale, array $parameters = []);`
	`29`	`+ public function format(string $message, ?string $locale, array $parameters = []);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class ArrayLoader implements LoaderInterface`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function load($resource, string $locale, string $domain = 'messages')`
	`26`	`+ public function load($resource, ?string $locale, string $domain = 'messages')`
`27`	`27`	`{`
`28`	`28`	`$resource = $this->flatten($resource);`
`29`	`29`	`$catalogue = new MessageCatalogue($locale);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ abstract class FileLoader extends ArrayLoader`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function load($resource, string $locale, string $domain = 'messages')`
	`26`	`+ public function load($resource, ?string $locale, string $domain = 'messages')`
`27`	`27`	`{`
`28`	`28`	`if (!stream_is_local($resource)) {`
`29`	`29`	`throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class IcuDatFileLoader extends IcuResFileLoader`
`26`	`26`	`/**`
`27`	`27`	`* {@inheritdoc}`
`28`	`28`	`*/`
`29`		`- public function load($resource, string $locale, string $domain = 'messages')`
	`29`	`+ public function load($resource, ?string $locale, string $domain = 'messages')`
`30`	`30`	`{`
`31`	`31`	`if (!stream_is_local($resource.'.dat')) {`
`32`	`32`	`throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class IcuResFileLoader implements LoaderInterface`
`26`	`26`	`/**`
`27`	`27`	`* {@inheritdoc}`
`28`	`28`	`*/`
`29`		`- public function load($resource, string $locale, string $domain = 'messages')`
	`29`	`+ public function load($resource, ?string $locale, string $domain = 'messages')`
`30`	`30`	`{`
`31`	`31`	`if (!stream_is_local($resource)) {`
`32`	`32`	`throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,5 @@ interface LoaderInterface`
`34`	`34`	`* @throws NotFoundResourceException when the resource cannot be found`
`35`	`35`	`* @throws InvalidResourceException when the resource cannot be loaded`
`36`	`36`	`*/`
`37`		`- public function load($resource, string $locale, string $domain = 'messages');`
	`37`	`+ public function load($resource, ?string $locale, string $domain = 'messages');`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class QtFileLoader implements LoaderInterface`
`27`	`27`	`/**`
`28`	`28`	`* {@inheritdoc}`
`29`	`29`	`*/`
`30`		`- public function load($resource, string $locale, string $domain = 'messages')`
	`30`	`+ public function load($resource, ?string $locale, string $domain = 'messages')`
`31`	`31`	`{`
`32`	`32`	`if (!stream_is_local($resource)) {`
`33`	`33`	`throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class XliffFileLoader implements LoaderInterface`
`28`	`28`	`/**`
`29`	`29`	`* {@inheritdoc}`
`30`	`30`	`*/`
`31`		`- public function load($resource, string $locale, string $domain = 'messages')`
	`31`	`+ public function load($resource, ?string $locale, string $domain = 'messages')`
`32`	`32`	`{`
`33`	`33`	`if (!stream_is_local($resource)) {`
`34`	`34`	`throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));`
Original file line number	Diff line number	Diff line change
`@@ -119,12 +119,10 @@ public function addLoader(string $format, LoaderInterface $loader)`
`119`	`119`	`*`
`120`	`120`	`* @param string $format The name of the loader (@see addLoader())`
`121`	`121`	`* @param mixed $resource The resource name`
`122`		`- * @param string $locale The locale`
`123`		`- * @param string $domain The domain`
`124`	`122`	`*`
`125`	`123`	`* @throws InvalidArgumentException If the locale contains invalid characters`
`126`	`124`	`*/`
`127`		`- public function addResource(string $format, $resource, string $locale, string $domain = null)`
	`125`	`+ public function addResource(string $format, $resource, ?string $locale, string $domain = null)`
`128`	`126`	`{`
`129`	`127`	`if (null === $domain) {`
`130`	`128`	`$domain = 'messages';`
`@@ -248,7 +246,7 @@ protected function getLoaders()`
`248`	`246`	`/**`
`249`	`247`	`* @param string $locale`
`250`	`248`	`*/`
`251`		`- protected function loadCatalogue(string $locale)`
	`249`	`+ protected function loadCatalogue(?string $locale)`
`252`	`250`	`{`
`253`	`251`	`if (null === $this->cacheDir) {`
`254`	`252`	`$this->initializeCatalogue($locale);`
`@@ -260,7 +258,7 @@ protected function loadCatalogue(string $locale)`
`260`	`258`	`/**`
`261`	`259`	`* @param string $locale`
`262`	`260`	`*/`
`263`		`- protected function initializeCatalogue(string $locale)`
	`261`	`+ protected function initializeCatalogue(?string $locale)`
`264`	`262`	`{`
`265`	`263`	`$this->assertValidLocale($locale);`
`266`	`264`