fixed concat values #14

Author: oscarotero

src/PhpNodeVisitor.php

@@ -143,6 +143,12 @@ protected static function getValue(Expr $value)
             case 'Scalar_LNumber':
             case 'Scalar_DNumber':
                 return $value->value;
+            case 'Expr_BinaryOp_Concat':
+                $values = [];
+                foreach ($value->getSubNodeNames() as $name) {
+                    $values[] = static::getValue($value->$name);
+                }
+                return implode('', $values);
             case 'Expr_Array':
                 $arr = [];
 

src/PhpScanner.php

@@ -3,8 +3,8 @@
 
 namespace Gettext\Scanner;
 
-use Gettext\Translations;
 use Gettext\Translation;
+use Gettext\Translations;
 
 /**
  * Class to scan PHP files and get gettext translations
@@ -55,10 +55,10 @@ protected function saveTranslation(
         $original = $translation->getOriginal();
 
         //Check if it includes a sprintf
-        if (strpos($original, "%") !== false) {
+        if (strpos($original, '%') !== false) {
             // %[argnum$][flags][width][.precision]specifier
             if (preg_match('/%(\d+\$)?([\-\+\s0]|\'.)?(\d+)?(\.\d+)?[bcdeEfFgGhHosuxX]/', $original)) {
-                $translation->getFlags()->add("php-format");
+                $translation->getFlags()->add('php-format');
             }
         }
 

tests/PhpFunctionsScannerTest.php

@@ -23,7 +23,7 @@ public function testPhpFunctionsExtractor()
         $code = file_get_contents($file);
         $functions = $scanner->scan($code, $file);
 
-        $this->assertCount(12, $functions);
+        $this->assertCount(14, $functions);
 
         //fn1
         $function = array_shift($functions);
@@ -167,6 +167,26 @@ public function testPhpFunctionsExtractor()
         $this->assertCount(1, $function->getComments());
         $comments = $function->getComments();
         $this->assertSame('Related comment 5', array_shift($comments));
+
+        //fn14
+        $function = array_shift($functions);
+        $this->assertSame('fn14', $function->getName());
+        $this->assertSame(1, $function->countArguments());
+        $this->assertSame(['Translatable string'], $function->getArguments());
+        $this->assertSame(32, $function->getLine());
+        $this->assertSame(32, $function->getLastLine());
+        $this->assertSame($file, $function->getFilename());
+        $this->assertCount(0, $function->getComments());
+
+        //fn15
+        $function = array_shift($functions);
+        $this->assertSame('fn15', $function->getName());
+        $this->assertSame(1, $function->countArguments());
+        $this->assertSame(['Translatable long string'], $function->getArguments());
+        $this->assertSame(33, $function->getLine());
+        $this->assertSame(34, $function->getLastLine());
+        $this->assertSame($file, $function->getFilename());
+        $this->assertCount(0, $function->getComments());
     }
 
     public function _testPhpFunctionsScannerWithDisabledComments()

tests/assets/functions.php

@@ -27,4 +27,8 @@
     /* No Related comment 4 */
 );
 //Related comment 5
-$bar = fn13("Translatable string","",["context"=>"Context string", 'foo']);
+$bar = fn13("Translatable string","",["context"=>"Context string", 'foo']);
+
+fn14("Translatable " . "string");
+fn15("Translatable " . "long "
+. "string");