Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/JsPhpize/Parser/TokenExtractor.php

Author: kylekatarnls

.travis.yml

@@ -7,7 +7,12 @@ php:
   - '5.6'
   - '7.0'
   - '7.1'
-  - hhvm
+
+matrix:
+  include:
+    - php: hhvm
+      dist: trusty
+      sudo: required
 
 before_script:
   - travis_retry composer self-update

examples/new.js

@@ -0,0 +1 @@
+new Date();

examples/new.php

@@ -0,0 +1 @@
+new Date();

examples/prototype.js

@@ -0,0 +1,7 @@
+item = "uno";
+string = item.charAt(0)
+
+  .toUpperCase() +
+item.slice(1);
+
+return string;

examples/prototype.return

@@ -0,0 +1 @@
+Uno

examples/special-members.js

@@ -0,0 +1,5 @@
+attributes = {
+    class: 'foo'
+};
+
+return attributes.class;

examples/special-members.return

@@ -0,0 +1 @@
+foo

src/JsPhpize/Compiler/Compiler.php

@@ -189,16 +189,21 @@ protected function visitFunctionCall(FunctionCall $functionCall, $indent)
     {
         $function = $functionCall->function;
         $arguments = $functionCall->arguments;
+        $applicant = $functionCall->applicant;
         $arguments = $this->visitNodesArray($arguments, $indent, ', ');
         $dynamicCall = 'call_user_func(' .
             $this->visitNode($function, $indent) .
             ($arguments === '' ? '' : ', ' . $arguments) .
         ')';
 
-        if ($function instanceof Variable) {
+        if ($function instanceof Variable && count($function->children) === 0) {
             $name = $function->name;
             $staticCall = $name . '(' . $arguments . ')';
 
+            if ($applicant === 'new') {
+                return $staticCall;
+            }
+
             if (in_array($name, array(
                 'array',
                 'echo',
@@ -284,6 +289,12 @@ protected function visitFunctionCall(FunctionCall $functionCall, $indent)
                 $dynamicCall;
         }
 
+        if (count($functionCall->children)) {
+            $arguments = $this->mapNodesArray($functionCall->children, $indent);
+            array_unshift($arguments, $dynamicCall);
+            $dynamicCall = $this->helperWrap('dot', $arguments);
+        }
+
         return $dynamicCall;
     }
 

src/JsPhpize/Compiler/Helpers/Dot.h

@@ -12,6 +12,39 @@ function ($base) {
             return $getFromArray($base, $key);
         }
     };
+    $fallbackDot = function ($base, $key) use ($getCallable) {
+        if (is_string($base)) {
+            if ($key === 'substr' || $key === 'slice') {
+                return function ($start, $length = null) use ($base) {
+                    return func_num_args() === 1 ? substr($base, $start) : substr($base, $start, $length);
+                };
+            }
+            if ($key === 'charAt') {
+                return function ($pos) use ($base) {
+                    return substr($base, $pos, 1);
+                };
+            }
+            if ($key === 'indexOf') {
+                return function ($needle) use ($base) {
+                    $pos = strpos($base, $needle);
+
+                    return $pos === false ? -1 : $pos;
+                };
+            }
+            if ($key === 'toUpperCase') {
+                return function () use ($base) {
+                    return strtoupper($base);
+                };
+            }
+            if ($key === 'toLowerCase') {
+                return function () use ($base) {
+                    return strtolower($base);
+                };
+            }
+        }
+
+        return $getCallable($base, $key);
+    };
     foreach (array_slice(func_get_args(), 1) as $key) {
         $base = is_array($base)
             ? $getFromArray($base, $key)
@@ -26,7 +59,7 @@ function ($base) {
                         )
                     )
                 )
-                : $getCallable($base, $key)
+                : $fallbackDot($base, $key)
             );
     }
 

src/JsPhpize/Lexer/Token.php

@@ -43,6 +43,11 @@ public function isValue()
         return $this->typeIn(array('variable', 'constant', 'string', 'number'));
     }
 
+    public function isValidMember()
+    {
+        return $this->typeIn(array('variable', 'keyword'));
+    }
+
     protected function isComparison()
     {
         return $this->typeIn(array('===', '!==', '>=', '<=', '<>', '!=', '==', '>', '<'));