#1094 - Fix nullable array declaration

zephir-lang · Apr 15, 2021 · 0c8523a · 0c8523a
1 parent 603682f
commit 0c8523a
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 26 deletions.
diff --git a/Library/Backends/ZendEngine3/Backend.php b/Library/Backends/ZendEngine3/Backend.php
@@ -1073,7 +1073,7 @@ public function forStatement(Variable $exprVariable, $keyVariable, $variable, $d
             $codePrinter->decreaseLevel();
         }
 
-        /*
+        /**
          * Compile statements in the 'for' block
          */
         if (isset($statement['statements'])) {
@@ -1176,29 +1176,31 @@ public function fetchClassEntry($str)
      * {@inheritdoc}
      *
      * @param string             $type
-     * @param CompilationContext $context
+     * @param CompilationContext $compilationContext
      * @param bool               $isLocal
      *
      * @return Variable
      */
     public function getScalarTempVariable(
         string $type,
-        CompilationContext $context,
+        CompilationContext $compilationContext,
         $isLocal = true
     ): Variable {
-        return $context->symbolTable->getTempNonTrackedVariable($type, $context);
+        return $compilationContext->symbolTable->getTempNonTrackedVariable($type, $compilationContext);
     }
 
     /**
-     * {@inheritdoc}
+     * Initialize array
+     *
+     * Init empty array or specific size array.
      *
      * @param Variable           $variable
      * @param CompilationContext $context
-     * @param int                $size
+     * @param int|null           $size
      *
      * @return void
      */
-    public function initArray(Variable $variable, CompilationContext $context, int $size = null)
+    public function initArray(Variable $variable, CompilationContext $context, ?int $size = null): void
     {
         $code = $this->getVariableCode($variable);
 

diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
@@ -1285,7 +1285,6 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
                 switch ($parameter['default']['type']) {
                     case 'null':
                         $compilationContext->backend->initVar($paramVariable, $compilationContext);
-                        $compilationContext->backend->initArray($paramVariable, $compilationContext, null);
                         break;
 
                     case 'empty-array':

diff --git a/Library/Operators/Comparison/ComparisonBaseOperator.php b/Library/Operators/Comparison/ComparisonBaseOperator.php
@@ -353,12 +353,14 @@ public function compile($expression, CompilationContext $compilationContext)
                     true
                 );
                 switch ($right->getType()) {
-                    case 'string':
                     case 'null':
-                        $rightStr = 'null' == $right->getType() ? '' : $right->getCode();
+                        return new CompiledExpression('bool', $this->zvalNullOperator.'('.$variableLeftCode.')', $expression['left']);
+                        break;
+
+                    case 'string':
                         $compilationContext->headersManager->add('kernel/operators');
 
-                        return new CompiledExpression('bool', $this->zvalStringOperator.'('.$variableLeftCode.', "'.$rightStr.'")', $expression['left']);
+                        return new CompiledExpression('bool', $this->zvalStringOperator.'('.$variableLeftCode.', "'.$right->getCode().'")', $expression['left']);
                         break;
 
                     case 'variable':
@@ -523,9 +525,7 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'array':
                         switch ($right->getType()) {
                             case 'null':
-                                $compilationContext->headersManager->add('kernel/operators');
-
-                                return new CompiledExpression('bool', $this->zvalStringOperator.'('.$variableCode.', "")', $expression['left']);
+                                return new CompiledExpression('bool', $this->zvalNullOperator.'('.$variableCode.')', $expression['left']);
 
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);

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/flow/switchflow.zep.c b/ext/stub/flow/switchflow.zep.c
diff --git a/ext/stub/globals/serverrequestfactory.zep.c b/ext/stub/globals/serverrequestfactory.zep.c
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
diff --git a/tests/Extension/MCallTest.php b/tests/Extension/MCallTest.php
@@ -114,7 +114,7 @@ public function testArrayParamWithDefaultNullValue(): void
         $this->assertNumberOfRequiredParameters(0);
 
         $this->assertSame('array', $this->getMethodFirstParameter()->getType()->getName());
-        $this->assertSame($this->test->testArrayParamWithDefaultNullValue(), []);
+        $this->assertNull($this->test->testArrayParamWithDefaultNullValue());
         $this->assertSame($this->test->testArrayParamWithDefaultNullValue([1]), [1]);
     }