Merge pull request #2230 from zephir-lang/#1259-unset-property-via-va…

…riable #1259 - Fix unset property via variable
zephir-lang · Apr 25, 2021 · 5d2ec1d · 5d2ec1d
2 parents 4a29bea + 660dd4b
commit 5d2ec1d
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 29 deletions.
diff --git a/Library/Statements/UnsetStatement.php b/Library/Statements/UnsetStatement.php
@@ -101,21 +101,34 @@ public function compile(CompilationContext $compilationContext): void
      */
     private function generateUnsetPropertyFromObject(array $expression, CompilationContext $compilationContext): CompilationContext
     {
-        $expr = new Expression($expression['left']);
+        $expr = new Expression($expression['right']);
         $expr->setReadOnly(true);
         $exprVar = $expr->compile($compilationContext);
-        $variable = $compilationContext->symbolTable->getVariableForWrite($exprVar->getCode(), $compilationContext, $this->statement);
-
-        $temporaryVariableRef = $compilationContext->backend->getVariableCode($variable);
 
-        // TODO: Add more types check when parser will support them, see ArrayAccessTest.zep
-        switch ($expression['right']['type']) {
-            case 'string':
-                $compilationContext->codePrinter->output('ZVAL_STR('.$temporaryVariableRef.', "'.$expression['right']['value'].'");');
+        switch ($exprVar->getType()) {
+            case 'variable':
+                $variable = $compilationContext->symbolTable->getVariableForRead($exprVar->getCode(), $compilationContext, $this->statement);
+                $variableRef = $compilationContext->backend->getVariableCode($variable);
                 break;
 
-            case 'int':
-                $compilationContext->codePrinter->output('ZVAL_LONG('.$temporaryVariableRef.', '.$expression['right']['value'].');');
+            default:
+                $expr = new Expression($expression['left']);
+                $expr->setReadOnly(true);
+                $exprVar = $expr->compile($compilationContext);
+                $variable = $compilationContext->symbolTable->getVariableForWrite($exprVar->getCode(), $compilationContext, $this->statement);
+
+                $variableRef = $compilationContext->backend->getVariableCode($variable);
+
+                // TODO: Add more types check when parser will support them, see ArrayAccessTest.zep
+                switch ($expression['right']['type']) {
+                    case 'string':
+                        $compilationContext->codePrinter->output('ZVAL_STR('.$variableRef.', "'.$expression['right']['value'].'");');
+                        break;
+
+                    case 'int':
+                        $compilationContext->codePrinter->output('ZVAL_LONG('.$variableRef.', '.$expression['right']['value'].');');
+                        break;
+                }
                 break;
         }
 
@@ -127,7 +140,7 @@ private function generateUnsetPropertyFromObject(array $expression, CompilationC
 
         $compilationContext->headersManager->add('kernel/object');
         $compilationContext->codePrinter->output(
-            'zephir_unset_property_array('.$variableCode.', ZEND_STRL("'.$expression['left']['right']['value'].'"), '.$temporaryVariableRef.');'
+            'zephir_unset_property_array('.$variableCode.', ZEND_STRL("'.$expression['left']['right']['value'].'"), '.$variableRef.');'
         );
 
         return $compilationContext;

diff --git a/ext/stub/arrayaccessobj.zep.c b/ext/stub/arrayaccessobj.zep.c
diff --git a/ext/stub/arrayaccesstest.zep.c b/ext/stub/arrayaccesstest.zep.c
diff --git a/ext/stub/arrayaccesstest.zep.h b/ext/stub/arrayaccesstest.zep.h
diff --git a/ext/stub/unsettest.zep.c b/ext/stub/unsettest.zep.c
diff --git a/stub/arrayaccesstest.zep b/stub/arrayaccesstest.zep
@@ -3,6 +3,7 @@ namespace Stub;
 class ArrayAccessTest
 {
     protected data;
+    protected assigedFromMethod;
     protected unsetData = [
         "key_a": "marcin",
         "key_b": "paula",
@@ -28,6 +29,22 @@ class ArrayAccessTest
 		return arr["two"];
 	}
 
+	public function unsetByKeyFromArray(string! key, array data) -> array
+	{
+	    unset data[key];
+
+	    return data;
+	}
+
+	public function unsetByKeyFromProperty(string! key, array dataFromProperty) -> array
+	{
+	    let this->assigedFromMethod = dataFromProperty;
+
+	    unset this->assigedFromMethod[key];
+
+	    return this->assigedFromMethod;
+	}
+
     /**
      * @issue https://github.com/zephir-lang/zephir/issues/645
      */

diff --git a/tests/Extension/ArrayAccessTest.php b/tests/Extension/ArrayAccessTest.php
@@ -34,6 +34,22 @@ public function testTest(): void
         $this->assertSame(2, $class->get());
     }
 
+    public function testUnsetByKeyFromArray(): void
+    {
+        $class = new \Stub\ArrayAccessTest();
+
+        $this->assertSame([], $class->unsetByKeyFromArray('not-exist', []));
+    }
+
+    public function testUnsetByKeyFromProperty(): void
+    {
+        $class = new \Stub\ArrayAccessTest();
+
+        $this->assertSame([], $class->unsetByKeyFromProperty('ok', ['ok' => true]));
+        $this->assertSame(['another' => 'value'], $class->unsetByKeyFromProperty('ok', ['ok' => true, 'another' => 'value']));
+        $this->assertSame([], $class->unsetByKeyFromProperty('not-exist', []));
+    }
+
     /**
      * @issue https://github.com/zephir-lang/zephir/issues/645
      */