Fix concatenation #1

Author: kylekatarnls

src/JsPhpize/Parser/ExpressionParser.php

@@ -38,6 +38,8 @@ protected function getBracketsArray()
 
             if (!$isValue) {
                 switch ($token->type) {
+                    case 'newline':
+                        continue 2;
                     case 'string':
                         $key = $token->value;
                         break;
@@ -140,6 +142,12 @@ protected function handlePlus(&$expression, $token, $handlePlus)
                 }
                 $token = $this->helperWrap('plus', $before . ' ' . implode(' ', $after));
             }
+        } else {
+            while (strval(end($expression)) === '+') {
+                array_pop($expression);
+                $before = array_pop($expression);
+                $token = $this->helperWrap('plus', $before, $token);
+            }
         }
 
         $expression[] = $token;

tests/mainMethods.php

@@ -115,6 +115,22 @@ public function testCompileFileMissing()
         }
     }
 
+    /**
+     * @group group
+     */
+    public function testCompileConcat()
+    {
+        $jsPhpize = new JsPhpize();
+        $actual = $jsPhpize->render('return "group[" + group.id + "]"', array(
+            'group' => (object) array(
+                'id' => 4,
+            ),
+        ));
+        $expected = 'group[4]';
+
+        $this->assertSame($expected, $actual);
+    }
+
     public function testCompileSource()
     {
         $jsPhpize = new JsPhpize();