Add PHP 74 version tests

composer.json

@@ -32,6 +32,7 @@
   "autoload-dev": {
     "psr-4": {
       "Cycle\\ORM\\Promise\\Tests\\": "tests/Promise/",
+      "Cycle\\ORM\\Promise\\Tests74\\": "tests/php74/",
       "Cycle\\ORM\\Promise\\Tests\\Promises\\": "tests/fixtures/promises/",
       "": "tests/fixtures/withoutNamespace/"
     }

phpunit.xml

@@ -13,8 +13,11 @@
 >
 
     <testsuites>
-        <testsuite name="Proxy Creator">
-            <directory>./tests/</directory>
+        <testsuite name="Proxy Factory">
+            <directory>./tests/Promise/</directory>
+        </testsuite>
+        <testsuite name="Proxy Factory 74">
+            <directory phpVersion="7.4.0-dev" phpVersionOperator="ge">./tests/php74/</directory>
         </testsuite>
     </testsuites>
 
@@ -23,4 +26,4 @@
             <directory>src</directory>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>

src/functions/version.php

@@ -11,7 +11,18 @@
 
 namespace Cycle\ORM\Promise;
 
+/**
+ * @return bool
+ */
 function php74(): bool
 {
-    return version_compare(PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION, '7.4.0', '>=');
+    return version_compare(phpVersion(), '7.4.0', '>=');
+}
+
+/**
+ * @return string
+ */
+function phpVersion(): string
+{
+    return PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION;
 }

tests/Promise/ProxyPrinter/ConstantsTest.php

@@ -14,8 +14,6 @@
 use Cycle\ORM\Promise\Declaration\Declarations;
 use Cycle\ORM\Promise\Printer;
 
-use function Cycle\ORM\Promise\php74;
-
 class ConstantsTest extends BaseProxyPrinterTest
 {
     /**
@@ -25,7 +23,7 @@ class ConstantsTest extends BaseProxyPrinterTest
      */
     public function testConstValues(): void
     {
-        $classname = Fixtures\EntityWithoutConstConflicts::class;
+        $classname = Fixtures\EntityWithProperties::class;
         $as = self::NS . __CLASS__ . __LINE__;
         $reflection = new \ReflectionClass($classname);
 
@@ -36,21 +34,14 @@ public function testConstValues(): void
         $output = ltrim($output, '<?php');
 
         $this->assertStringContainsString(
-            'PUBLIC_PROPERTIES = [\'publicProperty\', \'publicPropertyWithDefaults\'];',
+            "PUBLIC_PROPERTIES = ['publicProperty', 'publicPropertyWithDefaults'];",
             $output
         );
 
-        if (php74()) {
-            $this->assertStringContainsString(
-                'UNSET_PROPERTIES = [\'publicPropertyWithDefaults\'];',
-                $output
-            );
-        } else {
-            $this->assertStringContainsString(
-                'UNSET_PROPERTIES = [\'publicProperty\', \'publicPropertyWithDefaults\'];',
-                $output
-            );
-        }
+        $this->assertStringContainsString(
+            "UNSET_PROPERTIES = ['publicProperty', 'publicPropertyWithDefaults'];",
+            $output
+        );
     }
 
     /**

tests/Promise/ProxyPrinter/Fixtures/EntityWithProperties.php

@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Spiral Framework. Cycle ProxyFactory
+ *
+ * @license MIT
+ * @author  Valentin V (Vvval)
+ */
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Promise\Tests\ProxyPrinter\Fixtures;
+
+class EntityWithProperties
+{
+    public $publicProperty;
+    public $publicPropertyWithDefaults = 'defaultPublicValue';
+    protected $protectedProperty;
+    protected $protectedPropertyWithDefaults = 'defaultProtectedValue';
+}

tests/Promise/ProxyPrinter/Fixtures/EntityWithProperties74.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Spiral Framework. Cycle ProxyFactory
+ *
+ * @license MIT
+ * @author  Valentin V (Vvval)
+ */
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Promise\Tests\ProxyPrinter\Fixtures;
+
+class EntityWithProperties74
+{
+    public $publicProperty;
+    public string $publicTypedProperty;
+    public $publicPropertyWithDefaults = 'defaultPublicValue';
+    protected $protectedProperty;
+    protected $protectedPropertyWithDefaults = 'defaultProtectedValue';
+}

tests/Promise/ProxyPrinter/Fixtures/EntityWithoutConstConflicts.php

@@ -16,9 +16,4 @@ class EntityWithoutConstConflicts
     public const    PUBLIC_CONST    = 1;
     protected const PROTECTED_CONST = 2;
     private const   PRIVATE_CONST   = 3;
-
-    public $publicProperty;
-    public $publicPropertyWithDefaults = 'defaultPublicValue';
-    protected $protectedProperty;
-    protected $protectedPropertyWithDefaults = 'defaultProtectedValue';
 }

tests/fixtures/promises/FileTestThree.php

@@ -1,2 +1,3 @@
 <?php
-namespace Cycle\ORM\Promise\Tests\Promises; class FileTestThree {}
+// phpcs:ignoreFile
+namespace Cycle\ORM\Promise\Tests\Promises; class FileTestThree {}

tests/php74/ConstantsPHP74Test.php

@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Spiral Framework. Cycle ProxyFactory
+ *
+ * @license MIT
+ * @author  Valentin V (Vvval)
+ */
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Promise\Tests74;
+
+use Cycle\ORM\Promise\Declaration\DeclarationInterface;
+use Cycle\ORM\Promise\Declaration\Declarations;
+use Cycle\ORM\Promise\Printer;
+use PhpParser\PrettyPrinter\Standard;
+use PhpParser\PrettyPrinterAbstract;
+use PHPUnit\Framework\TestCase;
+use Spiral\Core\Container;
+
+class ConstantsPHP74Test extends TestCase
+{
+    protected const NS = 'Cycle\ORM\Promise\Tests74\Promises';
+
+    /** @var \Spiral\Core\Container */
+    protected $container;
+
+    /**
+     * @throws \Cycle\ORM\Promise\Exception\ProxyFactoryException
+     * @throws \ReflectionException
+     * @throws \Throwable
+     */
+    public function testConstValues(): void
+    {
+        $classname = Fixtures\EntityWithProperties74::class;
+        $as = self::NS . __CLASS__ . __LINE__;
+        $reflection = new \ReflectionClass($classname);
+
+        $parent = Declarations::createParentFromReflection($reflection);
+        $class = Declarations::createClassFromName($as, $parent);
+
+        $output = $this->make($reflection, $class, $parent);
+        $output = ltrim($output, '<?php');
+
+        $this->assertStringContainsString(
+            "PUBLIC_PROPERTIES = ['publicProperty', 'publicTypedProperty', 'publicPropertyWithDefaults'];",
+            $output
+        );
+
+        $this->assertStringContainsString(
+            "UNSET_PROPERTIES = ['publicProperty', 'publicPropertyWithDefaults'];",
+            $output
+        );
+    }
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->container = new Container();
+    }
+
+    /**
+     * @param \ReflectionClass     $reflection
+     * @param DeclarationInterface $class
+     * @param DeclarationInterface $parent
+     * @return string
+     * @throws \Cycle\ORM\Promise\Exception\ProxyFactoryException
+     * @throws \ReflectionException
+     * @throws \Throwable
+     */
+    protected function make(
+        \ReflectionClass $reflection,
+        DeclarationInterface $class,
+        DeclarationInterface $parent
+    ): string {
+        return $this->proxyCreator()->make($reflection, $class, $parent);
+    }
+
+    /**
+     * @return \Cycle\ORM\Promise\Printer
+     * @throws \Throwable
+     */
+    private function proxyCreator(): Printer
+    {
+        $this->container->bind(PrettyPrinterAbstract::class, Standard::class);
+
+        return $this->container->get(Printer::class);
+    }
+}

tests/php74/Fixtures/EntityWithProperties74.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Spiral Framework. Cycle ProxyFactory
+ *
+ * @license MIT
+ * @author  Valentin V (Vvval)
+ */
+
+declare(strict_types=1);
+
+namespace Cycle\ORM\Promise\Tests74\Fixtures;
+
+class EntityWithProperties74
+{
+    public $publicProperty;
+    public string $publicTypedProperty;
+    public $publicPropertyWithDefaults = 'defaultPublicValue';
+    protected $protectedProperty;
+    protected $protectedPropertyWithDefaults = 'defaultProtectedValue';
+}