Move tests requiring PHP ≥ 8.1 to their own directory

composer.json

@@ -66,7 +66,8 @@
         "psr-4": {
             "Doctrine\\Tests\\": "tests/Doctrine/Tests",
             "Doctrine\\StaticAnalysis\\": "tests/Doctrine/StaticAnalysis",
-            "Doctrine\\Performance\\": "tests/Doctrine/Performance"
+            "Doctrine\\Performance\\": "tests/Doctrine/Performance",
+            "Doctrine\\Tests_PHP81\\": "tests_php81"
         }
     },
     "bin": ["bin/doctrine"],

phpunit.xml.dist

@@ -22,6 +22,7 @@
     <testsuites>
         <testsuite name="Doctrine ORM Test Suite">
             <directory>./tests/Doctrine/Tests/ORM</directory>
+            <directory phpVersion="8.1" phpVersionOperator=">=">./tests_php81</directory>
         </testsuite>
     </testsuites>
 

tests/Doctrine/Tests/ORM/Functional/EnumTest.php → tests_php81/ORM/Functional/EnumTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Tests\ORM\Functional;
+namespace Doctrine\Tests_PHP81\ORM\Functional;
 
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Mapping\Column;
@@ -27,9 +27,6 @@
 use function sprintf;
 use function uniqid;
 
-/**
- * @requires PHP 8.1
- */
 class EnumTest extends OrmFunctionalTestCase
 {
     public function setUp(): void

tests/Doctrine/Tests/ORM/Functional/ReadonlyPropertiesTest.php → tests_php81/ORM/Functional/ReadonlyPropertiesTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Tests\ORM\Functional;
+namespace Doctrine\Tests_PHP81\ORM\Functional;
 
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\Tools\SchemaTool;
@@ -14,9 +14,6 @@
 
 use function dirname;
 
-/**
- * @requires PHP 8.1
- */
 class ReadonlyPropertiesTest extends OrmFunctionalTestCase
 {
     protected function setUp(): void

tests_php81/ORM/Functional/Ticket/GH10132Test.php

@@ -0,0 +1,117 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests_PHP81\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Tests\Models\Enums\Suit;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+class GH10132Test extends OrmFunctionalTestCase
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->createSchemaForModels(
+            Complex::class,
+            ComplexChild::class
+        );
+    }
+
+    public function testQueryBackedEnumInCompositeKeyJoin(): void
+    {
+        $complex = new Complex();
+        $complex->setType(Suit::Clubs);
+
+        $complexChild = new ComplexChild();
+        $complexChild->setComplex($complex);
+
+        $this->_em->persist($complex);
+        $this->_em->persist($complexChild);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $qb = $this->_em->createQueryBuilder();
+        $qb->select('s')
+            ->from(ComplexChild::class, 's')
+            ->where('s.complexType = :complexType');
+
+        $qb->setParameter('complexType', Suit::Clubs);
+
+        self::assertNotNull($qb->getQuery()->getOneOrNullResult());
+    }
+}
+
+/** @Entity */
+class Complex
+{
+    /**
+     * @Id
+     * @Column(type = "string", enumType = Suit::class)
+     */
+    protected Suit $type;
+
+    /** @OneToMany(targetEntity = ComplexChild::class, mappedBy = "complex", cascade = {"persist"}) */
+    protected Collection $complexChildren;
+
+    public function __construct()
+    {
+        $this->complexChildren = new ArrayCollection();
+    }
+
+    public function getType(): Suit
+    {
+        return $this->type;
+    }
+
+    public function setType(Suit $type): void
+    {
+        $this->type = $type;
+    }
+
+    public function getComplexChildren(): Collection
+    {
+        return $this->complexChildren;
+    }
+
+    public function addComplexChild(ComplexChild $complexChild): void
+    {
+        $this->complexChildren->add($complexChild);
+    }
+}
+
+/** @Entity */
+class ComplexChild
+{
+    /**
+     * @ManyToOne(targetEntity = Complex::class, inversedBy = "complexChildren")
+     * @JoinColumn(name = "complexType", referencedColumnName = "type", nullable = false)
+     */
+    protected Complex $complex;
+
+    /**
+     * @Id
+     * @Column(type = "string", enumType = Suit::class)
+     */
+    protected Suit $complexType;
+
+    public function setComplex(Complex $complex): void
+    {
+        $complex->addComplexChild($this);
+        $this->complexType = $complex->getType();
+        $this->complex     = $complex;
+    }
+
+    public function getComplexType(): Suit
+    {
+        return $this->complexType;
+    }
+
+    public function getComplex(): Complex
+    {
+        return $this->complex;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/GH10288Test.php → tests_php81/ORM/Functional/Ticket/GH10288Test.php

@@ -15,14 +15,11 @@
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\InheritanceType;
-use Doctrine\Tests\Models\GH10288\GH10288People;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
 /**
  * This test makes sure that Discriminator columns can use both custom types using PHP enums as well as
  * enumType definition of enums.
- *
- * @requires PHP 8.1
  */
 class GH10288Test extends OrmFunctionalTestCase
 {
@@ -114,6 +111,12 @@ public function testEnumDiscriminatorWithCustomEnumType(): void
     }
 }
 
+enum GH10288People: string
+{
+    case BOSS     = 'boss';
+    case EMPLOYEE = 'employee';
+}
+
 class GH10288PeopleType extends StringType
 {
     public const NAME = 'GH10288PeopleType';

tests/Doctrine/Tests/ORM/Mapping/ReflectionReadonlyPropertyTest.php → tests_php81/ORM/Mapping/ReflectionReadonlyPropertyTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Tests\ORM\Mapping;
+namespace Doctrine\Tests_PHP81\ORM\Mapping;
 
 use Doctrine\ORM\Mapping\ReflectionReadonlyProperty;
 use Doctrine\Tests\Models\CMS\CmsTag;
@@ -12,9 +12,6 @@
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 
-/**
- * @requires PHP 8.1
- */
 class ReflectionReadonlyPropertyTest extends TestCase
 {
     public function testSecondWriteWithSameValue(): void

tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerEnumIdTest.php → tests_php81/ORM/Utility/IdentifierFlattenerEnumIdTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Tests\ORM\Utility;
+namespace Doctrine\Tests_PHP81\ORM\Utility;
 
 use Doctrine\Tests\Models\Enums\Suit;
 use Doctrine\Tests\Models\Enums\TypedCardEnumCompositeId;
@@ -13,7 +13,6 @@
 /**
  * Test the IdentifierFlattener utility class
  *
- * @requires PHP 8.1
  * @covers \Doctrine\ORM\Utility\IdentifierFlattener
  */
 class IdentifierFlattenerEnumIdTest extends OrmFunctionalTestCase