Don't ignore empty MO translation files

berarma · berarma · commit 02e8c3d01c5c · 2017-08-02T00:16:00.000+02:00
diff --git a/src/I18n/ChainMessagesLoader.php b/src/I18n/ChainMessagesLoader.php
@@ -71,9 +71,7 @@ public function __invoke()
                 ));
             }
 
-            if (count($package->getMessages())) {
-                return $package;
-            }
+            return $package;
         }
 
         return new Package();
diff --git a/src/I18n/MessagesFileLoader.php b/src/I18n/MessagesFileLoader.php
@@ -101,13 +101,12 @@ public function __construct($name, $locale, $extension = 'po')
      * Loads the translation file and parses it. Returns an instance of a translations
      * package containing the messages loaded from the file.
      *
-     * @return \Aura\Intl\Package
+     * @return \Aura\Intl\Package|false
      * @throws \RuntimeException if no file parser class could be found for the specified
      * file extension.
      */
     public function __invoke()
     {
-        $package = new Package('default');
         $folders = $this->translationsFolders();
         $ext = $this->_extension;
         $file = false;
@@ -126,7 +125,7 @@ public function __invoke()
         }
 
         if (!$file) {
-            return $package;
+            return false;
         }
 
         $name = ucfirst($ext);
@@ -137,6 +136,7 @@ public function __invoke()
         }
 
         $messages = (new $class)->parse($file);
+        $package = new Package('default');
         $package->setMessages($messages);
 
         return $package;
diff --git a/tests/TestCase/I18n/MessagesFileLoaderTest.php b/tests/TestCase/I18n/MessagesFileLoaderTest.php
@@ -64,4 +64,19 @@ public function testCustomLocalePath()
         $messages = $package->getMessages();
         $this->assertEquals('Po (translated) from custom folder', $messages['Plural Rule 1']['_context']['']);
     }
+
+    /**
+     * Test reading MO files
+     * @return void
+     */
+    public function testLoadingMoFiles()
+    {
+        $loader = new MessagesFileLoader('empty', 'es', 'mo');
+        $package = $loader();
+        $this->assertNotFalse($package);
+
+        $loader = new MessagesFileLoader('missing', 'es', 'mo');
+        $package = $loader();
+        $this->assertFalse($package);
+    }
 }
diff --git a/tests/test_app/TestApp/Locale/es/empty.mo b/tests/test_app/TestApp/Locale/es/empty.mo

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,7 @@ public function __invoke()`
`71`	`71`	`));`
`72`	`72`	`}`
`73`	`73`
`74`		`- if (count($package->getMessages())) {`
`75`		`- return $package;`
`76`		`- }`
	`74`	`+ return $package;`
`77`	`75`	`}`
`78`	`76`
`79`	`77`	`return new Package();`
Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,12 @@ public function __construct($name, $locale, $extension = 'po')`
`101`	`101`	`* Loads the translation file and parses it. Returns an instance of a translations`
`102`	`102`	`* package containing the messages loaded from the file.`
`103`	`103`	`*`
`104`		`- * @return \Aura\Intl\Package`
	`104`	`+ * @return \Aura\Intl\Package\|false`
`105`	`105`	`* @throws \RuntimeException if no file parser class could be found for the specified`
`106`	`106`	`* file extension.`
`107`	`107`	`*/`
`108`	`108`	`public function __invoke()`
`109`	`109`	`{`
`110`		`- $package = new Package('default');`
`111`	`110`	`$folders = $this->translationsFolders();`
`112`	`111`	`$ext = $this->_extension;`
`113`	`112`	`$file = false;`
`@@ -126,7 +125,7 @@ public function __invoke()`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`if (!$file) {`
`129`		`- return $package;`
	`128`	`+ return false;`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`$name = ucfirst($ext);`
`@@ -137,6 +136,7 @@ public function __invoke()`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`$messages = (new $class)->parse($file);`
	`139`	`+ $package = new Package('default');`
`140`	`140`	`$package->setMessages($messages);`
`141`	`141`
`142`	`142`	`return $package;`