Disable dot helper when used inside isset()

Author: kylekatarnls

src/JsPhpize/Compiler/Compiler.php

@@ -205,12 +205,12 @@ protected function visitDyiade(Dyiade $dyiade, $indent)
         return $leftHand . ' ' . $dyiade->operator . ' ' . $rightHand;
     }
 
-    protected function mapNodesArray($array, $indent, $pattern = null)
+    protected function mapNodesArray($array, $indent, $pattern = null, $dotDisabled = false)
     {
         $visitNode = [$this, 'visitNode'];
 
-        return array_map(function ($value) use ($visitNode, $indent, $pattern) {
-            $value = $visitNode($value, $indent);
+        return array_map(function ($value) use ($visitNode, $indent, $pattern, $dotDisabled) {
+            $value = $visitNode($value, $indent, $dotDisabled);
 
             if ($pattern) {
                 $value = sprintf($pattern, $value);
@@ -220,17 +220,17 @@ protected function mapNodesArray($array, $indent, $pattern = null)
         }, $array);
     }
 
-    protected function visitNodesArray($array, $indent, $glue = '', $pattern = null)
+    protected function visitNodesArray($array, $indent, $glue = '', $pattern = null, $dotDisabled = false)
     {
-        return implode($glue, $this->mapNodesArray($array, $indent, $pattern));
+        return implode($glue, $this->mapNodesArray($array, $indent, $pattern, $dotDisabled));
     }
 
     protected function visitFunctionCall(FunctionCall $functionCall, $indent)
     {
         $function = $functionCall->function;
         $arguments = $functionCall->arguments;
         $applicant = $functionCall->applicant;
-        $arguments = $this->visitNodesArray($arguments, $indent, ', ');
+        $arguments = $this->visitNodesArray($arguments, $indent, ', ', null, $function instanceof Variable && $function->name === 'isset');
         $dynamicCall = $this->visitNode($function, $indent) . '(' . $arguments . ')';
 
         if ($function instanceof Variable && count($function->children) === 0) {
@@ -286,14 +286,14 @@ protected function visitInstruction(Instruction $group, $indent)
         }, $group->instructions));
     }
 
-    public function visitNode(Node $node, $indent)
+    public function visitNode(Node $node, $indent, $dotDisabled = false)
     {
         $method = preg_replace(
             '/^(.+\\\\)?([^\\\\]+)$/',
             'visit$2',
             get_class($node)
         );
-        $php = method_exists($this, $method) ? $this->$method($node, $indent) : '';
+        $php = method_exists($this, $method) ? $this->$method($node, $indent, $dotDisabled) : '';
 
         if ($node instanceof Value) {
             $php = $node->getBefore() . $php . $node->getAfter();
@@ -314,19 +314,33 @@ protected function visitTernary(Ternary $ternary, $indent)
             ' : ' . $this->visitNode($ternary->falseValue, $indent);
     }
 
-    protected function handleVariableChildren(DynamicValue $dynamicValue, $indent, $php)
+    protected function handleVariableChildren(DynamicValue $dynamicValue, $indent, $php, $dotDisabled = false)
     {
-        if (count($dynamicValue->children)) {
-            $arguments = $this->mapNodesArray($dynamicValue->children, $indent);
+        $children = $dynamicValue->children;
+
+        if (count($children)) {
+            $arguments = $this->mapNodesArray($children, $indent, null, $dotDisabled);
             array_unshift($arguments, $php);
             $dot = $this->engine->getHelperName('dot');
+
+            if ($dotDisabled) {
+                $lastChild = end($children);
+                $dotChild = $lastChild instanceof Constant && $lastChild->dotChild;
+                $lastChild = array_pop($arguments);
+            }
+
             $php = $this->helperWrap($dot, $arguments);
+
+            if ($dotDisabled) {
+                $pattern = $dotChild ? '%s->{%s}' : '%s[%s]';
+                $php = sprintf($pattern, $php, $lastChild);
+            }
         }
 
         return $php;
     }
 
-    protected function visitVariable(Variable $variable, $indent)
+    protected function visitVariable(Variable $variable, $indent, $dotDisabled = false)
     {
         $name = $variable->name;
         if (in_array($name, ['Math', 'RegExp'])) {
@@ -339,7 +353,7 @@ protected function visitVariable(Variable $variable, $indent)
             $name = '$' . $name;
         }
 
-        return $this->handleVariableChildren($variable, $indent, $name);
+        return $this->handleVariableChildren($variable, $indent, $name, $dotDisabled);
     }
 
     public function compile(Block $block, $indent = '')

src/JsPhpize/Nodes/Constant.php

@@ -7,8 +7,9 @@
 /**
  * Class Constant.
  *
- * @property-read string $value raw value
- * @property-read string $type  constant type
+ * @property-read string $value    raw value
+ * @property-read string $type     constant type
+ * @property-read bool   $dotChild rather is constant is used as an object child (dot operator, e.g. `->` for PHP)
  */
 class Constant extends Value implements Assignable
 {
@@ -22,22 +23,29 @@ class Constant extends Value implements Assignable
      */
     protected $value;
 
+    /**
+     * @var bool
+     */
+    protected $dotChild;
+
     /**
      * Constant constructor.
      *
      * @param $type
      * @param $value
+     * @param $dotChild
      *
      * @throws Exception
      */
-    public function __construct($type, $value)
+    public function __construct($type, $value, $dotChild = false)
     {
         if (!in_array($type, ['constant', 'number', 'string', 'regexp'])) {
             throw new Exception("The given type [$type] is not a valid constant type.", 23);
         }
 
         $this->type = $type;
         $this->value = $value;
+        $this->dotChild = $dotChild;
     }
 
     public function getNonAssignableReason()

src/JsPhpize/Parser/TokenExtractor.php

@@ -41,7 +41,7 @@ protected function getVariableChildFromToken(Token $token)
             $token = $this->next();
 
             if ($token && $token->isValidMember()) {
-                return new Constant('string', var_export($token->value, true));
+                return new Constant('string', var_export($token->value, true), true);
             }
 
             throw $this->unexpected($token);

tests/render.php

@@ -133,5 +133,20 @@ public function testDollarVariablePrefix()
         $this->assertFalse($jsPhpize->renderCode($code));
         $this->assertTrue($jsPhpize->renderCode($code, ['variable' => 1]));
         $this->assertFalse($jsPhpize->renderCode($code, ['variable' => false]));
+
+        $code = 'return $foo && isset($bar[$foo])';
+
+        $this->assertFalse($jsPhpize->renderCode($code, ['foo' => 'a']));
+        $this->assertTrue($jsPhpize->renderCode($code, ['foo' => 'a', 'bar' => ['a' => 'x']]));
+
+        $code = 'return $foo && isset($bar.foo)';
+
+        $this->assertFalse($jsPhpize->renderCode($code, ['foo' => 'a']));
+        $this->assertTrue($jsPhpize->renderCode($code, ['foo' => 'a', 'bar' => (object) ['foo' => 'x']]));
+
+        $code = 'return $foo && isset($bar["foo"])';
+
+        $this->assertFalse($jsPhpize->renderCode($code, ['foo' => 'a']));
+        $this->assertTrue($jsPhpize->renderCode($code, ['foo' => 'a', 'bar' => ['foo' => 'x']]));
     }
 }