new tests, bug fixes, errors handling

Author: begimov

src/LocalizationHelper.php

@@ -43,6 +43,8 @@ public function trans($key, $default = null, $placeholders = [])
 
             $filename = $path[0];
 
+            if (! isset($path[1])) return __($key, $placeholders);
+
             $this->translator->addLines([$key => $default], $fallbackLocale);
 
             $this->writeToLangFile(
@@ -87,18 +89,17 @@ private function writeToLangFile($locale, $translations, $filename)
 
         $language_file = $this->basePath . "/{$locale}/{$filename}.php";
 
-        if (($fp = fopen($language_file, 'w')) !== FALSE) {
-            
-            fputs($fp, $header . $this->var_export54($translations) . ";\n");
+        try {
+            if (($fp = fopen($language_file, 'w')) !== FALSE) {
 
-            fclose($fp);
-
-            return true;
-
-        } else {
-            return false;
-        }
-    }
+                fputs($fp, $header . $this->var_export54($translations) . ";\n");
+                
+                fclose($fp);
+    
+                return true;
+            }
+        } catch (\Exception $e) {
+            return false;}}
 
     /**
      * var_export to php5.4 array syntax

tests/UsageTest.php

@@ -203,6 +203,48 @@ public function testReturnsKeyIfNotAbleToAddNewStringBecauseIsArray()
 
         $this->assertEquals(_p($key, uniqid()), $key);
     }
+    
+    public function testThrowsErrorIfLocalizationFileCantBeOpened()
+    {
+        $key = ($filename = uniqid()) . '.' . uniqid();
+
+        vfsStream::newFile($filename . '.php', 0000)
+                 ->withContent($content = 'notoverwritten')
+                 ->at($this->root->getChild('root/resources/lang/en'));
+
+        $value = uniqid();
+
+        _p($key, $value);
+
+        $this->assertEquals($content, $this->root->getChild('root/resources/lang/en/'. $filename . '.php')->getContent());
+    }
+    
+    public function testExportsFileIfContentsBoolean()
+    {
+        $key = ($filename = uniqid()) . '.' . uniqid();
+
+        $value = true;
+
+        _p($key, $value);
+
+        $this->assertStringStartsWith('<?php', $this->root->getChild('root/resources/lang/en/'. $filename . '.php')->getContent());
+    }
+
+    public function testExportsFileIfContentsObject()
+    {
+        $key = ($filename = uniqid()) . '.' . uniqid();
+
+        $value = new \stdClass;
+
+        _p($key, $value);
+
+        $this->assertStringStartsWith('<?php', $this->root->getChild('root/resources/lang/en/'. $filename . '.php')->getContent());
+    }
+
+    public function testHandlesCallsWithRootNameOnly()
+    {
+        $this->assertEquals('name', _p('name', 'test'));
+    }
 
     protected function getContents($filename)
     {