Add test to validate, passing empty string throws CannotInstantiateFo…

…rmatter.
auraphp · Oct 24, 2016 · 4e81ed9 · 4e81ed9
1 parent 3fc8904
commit 4e81ed9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/IntlFormatter.php b/src/IntlFormatter.php
@@ -64,6 +64,9 @@ public function format($locale, $string, array $tokens_values)
 
         try {
             $formatter = new MessageFormatter($locale, $string);
+            if (! $formatter) {
+                $this->throwCannotInstantiateFormatter();
+            }
         } catch (\Exception $e) {
             $this->throwCannotInstantiateFormatter();
         }

diff --git a/tests/IntlFormatterTest.php b/tests/IntlFormatterTest.php
@@ -168,6 +168,15 @@ public function testIssue6($tokens_values, $expect)
         $this->assertSame($expect, $actual);
     }
 
+    public function testEmptyStringThrowsException()
+    {
+        $locale = 'en_US';
+        $string = '';
+        $formatter = $this->newFormatter();
+        $this->setExpectedException('Aura\Intl\Exception\CannotInstantiateFormatter');
+        $actual = $formatter->format($locale, $string, []);
+    }
+
     public function provide_testIssue6()
     {
         return [