Merge pull request #2221 from zephir-lang/#1536-add-test-case

stub/constantsparent.zep

@@ -3,7 +3,6 @@ namespace Stub;
 
 class ConstantsParent
 {
-
 	const P1 = null;
 
 	const P2 = false;
@@ -15,5 +14,4 @@ class ConstantsParent
 	const P5 = 10.25;
 
 	const P6 = "test";
-
 }

stub/properties/staticprotectedproperties.zep

@@ -3,7 +3,6 @@ namespace Stub\Properties;
 
 class StaticProtectedProperties
 {
-
 	/**
 	 * This is a protected property with no initial value
 	 */
@@ -81,4 +80,20 @@ class StaticProtectedProperties
 		return self::someString;
 	}
 
+    /**
+     * @issue https://github.com/zephir-lang/zephir/issues/1536
+     */
+    public function compareStaticNull() -> bool
+    {
+        var someNull;
+
+        let someNull = self::someNull;
+
+        if someNull === null {
+            let someNull = true;
+            return someNull;
+        }
+
+        return someNull;
+    }
 }

tests/Extension/Properties/StaticPropertyArrayTest.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension\Properties;
 
 use PHPUnit\Framework\TestCase;

tests/Extension/Properties/StaticProtectedPropertiesTest.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Extension\Properties;
+
+use PHPUnit\Framework\TestCase;
+use Stub\Properties\StaticProtectedProperties;
+
+/**
+ * @issue https://github.com/zephir-lang/zephir/issues/1536
+ */
+final class StaticProtectedPropertiesTest extends TestCase
+{
+    public function testCompareStaticNullOnBuiltIn(): void
+    {
+        $class = new StaticProtectedProperties();
+        $this->assertTrue($class->compareStaticNull());
+    }
+
+    public function testCompareStaticNullOnExtending(): void
+    {
+        $spp = new \TestStaticProtectedProperties();
+        $this->assertTrue($spp->compareStaticNull());
+    }
+}

tests/fixtures/mocks/TestScopePhpMagicExtending.php

@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
+
 class TestScopePhpMagicExtending extends TestScopePhpMagic
 {
     private $privateProperty2 = 'private2';

tests/fixtures/mocks/TestStaticProtectedProperties.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+use Stub\Properties\StaticProtectedProperties;
+
+/**
+ * @issue https://github.com/zephir-lang/zephir/issues/1536
+ */
+class TestStaticProtectedProperties extends StaticProtectedProperties
+{
+}