added tests for #133

Author: oscarotero

composer.json

@@ -23,7 +23,7 @@
     },
     "require-dev": {
         "illuminate/view": "*",
-        "twig/twig": "*",
+        "twig/twig": "^1.31",
         "twig/extensions": "*",
         "symfony/yaml": "~2"
     },

src/Utils/PhpFunctionsScanner.php

@@ -148,6 +148,7 @@ public function getFunctions(array $constants = [])
     protected function parsePhpComment($value)
     {
         $result = null;
+
         if ($this->extractComments !== false) {
             if ($value[0] === '#') {
                 $value = substr($value, 1);
@@ -156,21 +157,23 @@ protected function parsePhpComment($value)
             } else {
                 $value = substr($value, 2, -2);
             }
+
             $value = trim($value);
+
             if ($value !== '') {
-                if ($this->extractComments === '' || strpos($value, $this->extractComments) === 0) {
-                    $result = $value;
-                }
-                elseif (is_array($this->extractComments)) {
+                if (is_array($this->extractComments)) {
                     foreach ($this->extractComments as $string) {
                         if (strpos($value, $string) === 0) {
                             $result = $value;
                             break;
                         }
                     }        
+                } elseif ($this->extractComments === '' || strpos($value, $this->extractComments) === 0) {
+                    $result = $value;
                 }
             }
         }
+
         return $result;
     }
 }

tests/AssetsTest.php

@@ -288,7 +288,7 @@ public function testPhpCode2()
     {
         $translations = static::get('phpcode2/input', 'PhpCode', [
             'constants' => [
-                'CONTEXT' => 'my-context'
+                'CONTEXT' => 'my-context',
             ]
         ]);
         $countTranslations = 9;
@@ -323,6 +323,44 @@ public function testPhpCode2()
         $this->runTestFormat('phpcode2/YamlDictionary', $countTranslations);
     }
 
+    public function testPhpCode3()
+    {
+        $translations = static::get('phpcode3/input', 'PhpCode', [
+            'extractComments' => ['allowed1', 'allowed2'],
+        ]);
+        $countTranslations = 1;
+        $countHeaders = 8;
+
+        $this->assertCount($countTranslations, $translations);
+        $this->assertCount($countHeaders, $translations->getHeaders());
+        $this->assertEquals(0, $translations->countTranslated());
+
+        self::saveContent($translations, 'phpcode3/Po');
+        $this->assertContent($translations, 'phpcode3/Po');
+        $this->assertContent($translations, 'phpcode3/Mo');
+        $this->assertContent($translations, 'phpcode3/PhpArray');
+        $this->assertContent($translations, 'phpcode3/Jed');
+        $this->assertContent($translations, 'phpcode3/Json');
+        $this->assertContent($translations, 'phpcode3/JsonDictionary');
+        $this->assertContent($translations, 'phpcode3/Csv');
+        $this->assertContent($translations, 'phpcode3/CsvDictionary');
+        $this->assertContent($translations, 'phpcode3/Xliff');
+        $this->assertContent($translations, 'phpcode3/Yaml');
+        $this->assertContent($translations, 'phpcode3/YamlDictionary');
+
+        $this->runTestFormat('phpcode3/Po', $countTranslations, $countHeaders);
+        $this->runTestFormat('phpcode3/Mo', 0, $countHeaders);
+        $this->runTestFormat('phpcode3/PhpArray', $countTranslations, $countHeaders);
+        $this->runTestFormat('phpcode3/Jed', $countTranslations, 10);
+        $this->runTestFormat('phpcode3/Xliff', $countTranslations, $countHeaders);
+        $this->runTestFormat('phpcode3/Json', $countTranslations, $countHeaders);
+        $this->runTestFormat('phpcode3/JsonDictionary', $countTranslations);
+        $this->runTestFormat('phpcode3/Csv', $countTranslations, $countHeaders);
+        $this->runTestFormat('phpcode3/CsvDictionary', $countTranslations);
+        $this->runTestFormat('phpcode3/Yaml', $countTranslations, $countHeaders);
+        $this->runTestFormat('phpcode3/YamlDictionary', $countTranslations);
+    }
+
     public function testTwig()
     {
         $translations = static::get('twig/input', 'Twig');

tests/assets/phpcode3/Csv.csv

@@ -0,0 +1,10 @@
+,,"Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=UTF-8
+Language: 
+Language-Team: 
+Last-Translator: 
+MIME-Version: 1.0
+Project-Id-Version: 
+Report-Msgid-Bugs-To: 
+"
+,"Translation with comments",

tests/assets/phpcode3/CsvDictionary.csv

@@ -0,0 +1 @@
+"Translation with comments",

tests/assets/phpcode3/Jed.json

@@ -0,0 +1,12 @@
+{
+    "messages": {
+        "": {
+            "domain": "messages",
+            "lang": "en",
+            "plural-forms": "nplurals=2; plural=(n != 1);"
+        },
+        "Translation with comments": [
+            ""
+        ]
+    }
+}

tests/assets/phpcode3/Json.json

@@ -0,0 +1,14 @@
+{
+    "domain": null,
+    "plural-forms": null,
+    "messages": {
+        "": {
+            "": [
+                "Content-Transfer-Encoding: 8bit\nContent-Type: text\/plain; charset=UTF-8\nLanguage: \nLanguage-Team: \nLast-Translator: \nMIME-Version: 1.0\nProject-Id-Version: \nReport-Msgid-Bugs-To: \n"
+            ],
+            "Translation with comments": [
+                ""
+            ]
+        }
+    }
+}

tests/assets/phpcode3/JsonDictionary.json

@@ -0,0 +1,3 @@
+{
+    "Translation with comments": ""
+}

tests/assets/phpcode3/Mo.mo

@@ -0,0 +1,26 @@
+<?php return array (
+  'domain' => NULL,
+  'plural-forms' => NULL,
+  'messages' => 
+  array (
+    '' => 
+    array (
+      '' => 
+      array (
+        0 => 'Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=UTF-8
+Language: 
+Language-Team: 
+Last-Translator: 
+MIME-Version: 1.0
+Project-Id-Version: 
+Report-Msgid-Bugs-To: 
+',
+      ),
+      'Translation with comments' => 
+      array (
+        0 => '',
+      ),
+    ),
+  ),
+);