Run tests with Doctrine Annotations 2

composer.json

@@ -13,7 +13,7 @@
         "doctrine/orm": "^2.15"
     },
     "require-dev": {
-        "doctrine/annotations": "^1.14",
+        "doctrine/annotations": "^1.14 || ^2",
         "doctrine/coding-standard": "^9.0.2 || ^12.0",
         "nesbot/carbon": "*",
         "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",

tests/Entities/Blank.php

@@ -2,13 +2,15 @@
 
 namespace DoctrineExtensions\Tests\Entities;
 
-/** @Entity */
+use Doctrine\ORM\Mapping as ORM;
+
+/** @ORM\Entity */
 class Blank
 {
     /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue
+     * @ORM\Id
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue
      */
     public $id;
 }

tests/Entities/BlogPost.php

@@ -2,22 +2,24 @@
 
 namespace DoctrineExtensions\Tests\Entities;
 
-/** @Entity */
+use Doctrine\ORM\Mapping as ORM;
+
+/** @ORM\Entity */
 class BlogPost
 {
     /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue
+     * @ORM\Id
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue
      */
     public $id;
 
-    /** @Column(type="DateTime") */
+    /** @ORM\Column(type="DateTime") */
     public $created;
 
-    /** @Column(type="decimal", precision=12, scale=8) */
+    /** @ORM\Column(type="decimal", precision=12, scale=8) */
     public $longitude;
 
-    /** @Column(type="decimal", precision=12, scale=8) */
+    /** @ORM\Column(type="decimal", precision=12, scale=8) */
     public $latitude;
 }

tests/Entities/CarbonDate.php

@@ -2,39 +2,38 @@
 
 namespace DoctrineExtensions\Tests\Entities;
 
-/**
- * @Entity
- * @Table
- */
+use Doctrine\ORM\Mapping as ORM;
+
+/** @ORM\Entity */
 class CarbonDate
 {
     /**
-     * @Id
-     * @Column(type="integer")
+     * @ORM\Id
+     * @ORM\Column(type="integer")
      */
     public $id;
 
-    /** @Column(type="CarbonDate", nullable=true) */
+    /** @ORM\Column(type="CarbonDate", nullable=true) */
     public $date;
 
-    /** @Column(type="CarbonDateTime", nullable=true) */
+    /** @ORM\Column(type="CarbonDateTime", nullable=true) */
     public $datetime;
 
-    /** @Column(type="CarbonDateTimeTz", nullable=true) */
+    /** @ORM\Column(type="CarbonDateTimeTz", nullable=true) */
     public $datetimeTz;
 
-    /** @Column(type="CarbonTime", nullable=true) */
+    /** @ORM\Column(type="CarbonTime", nullable=true) */
     public $time;
 
-    /** @Column(type="CarbonImmutableDate", nullable=true) */
+    /** @ORM\Column(type="CarbonImmutableDate", nullable=true) */
     public $dateImmutable;
 
-    /** @Column(type="CarbonImmutableDateTime", nullable=true) */
+    /** @ORM\Column(type="CarbonImmutableDateTime", nullable=true) */
     public $datetimeImmutable;
 
-    /** @Column(type="CarbonImmutableDateTimeTz", nullable=true) */
+    /** @ORM\Column(type="CarbonImmutableDateTimeTz", nullable=true) */
     public $datetimeTzImmutable;
 
-    /** @Column(type="CarbonImmutableTime", nullable=true) */
+    /** @ORM\Column(type="CarbonImmutableTime", nullable=true) */
     public $timeImmutable;
 }

tests/Entities/Date.php

@@ -2,16 +2,18 @@
 
 namespace DoctrineExtensions\Tests\Entities;
 
-/** @Entity */
+use Doctrine\ORM\Mapping as ORM;
+
+/** @ORM\Entity */
 class Date
 {
     /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue
+     * @ORM\Id
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue
      */
     public $id;
 
-    /** @Column(type="datetime") */
+    /** @ORM\Column(type="datetime") */
     public $created;
 }

tests/Entities/Product.php

@@ -2,25 +2,27 @@
 
 namespace DoctrineExtensions\Tests\Entities;
 
-/** @Entity */
+use Doctrine\ORM\Mapping as ORM;
+
+/** @ORM\Entity */
 class Product
 {
     /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue
+     * @ORM\Id
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue
      */
     public $id;
 
-    /** @Column(type="string") */
+    /** @ORM\Column(type="string") */
     public $name;
 
-    /** @Column(type="DateTime") */
+    /** @ORM\Column(type="DateTime") */
     public $created;
 
-    /** @Column(type="decimal", precision=10, scale=2) */
+    /** @ORM\Column(type="decimal", precision=10, scale=2) */
     public $price;
 
-    /** @Column(type="decimal", precision=5, scale=2) */
+    /** @ORM\Column(type="decimal", precision=5, scale=2) */
     public $weight;
 }

tests/Entities/Set.php

@@ -2,16 +2,18 @@
 
 namespace DoctrineExtensions\Tests\Entities;
 
-/** @Entity */
+use Doctrine\ORM\Mapping as ORM;
+
+/** @ORM\Entity */
 class Set
 {
     /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue
+     * @ORM\Id
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue
      */
     public $id;
 
-    /** @Column(type="String") */
+    /** @ORM\Column(type="String") */
     public $set;
 }

tests/Entities/ZendDate.php

@@ -2,19 +2,18 @@
 
 namespace DoctrineExtensions\Tests\Entities;
 
-/**
- * @Entity
- * @Table
- */
+use Doctrine\ORM\Mapping as ORM;
+
+/** @ORM\Entity */
 class ZendDate
 {
     /**
-     * @Id
-     * @Column(type="integer")
+     * @ORM\Id
+     * @ORM\Column(type="integer")
      */
     public $id;
 
-    /** @Column(type="ZendDate") */
+    /** @ORM\Column(type="ZendDate") */
     public $date;
 
     public function __construct($id, $date)

tests/Query/DbTestCase.php

@@ -2,8 +2,10 @@
 
 namespace DoctrineExtensions\Tests\Query;
 
+use Doctrine\DBAL\DriverManager;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\ORMSetup;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
@@ -23,8 +25,11 @@ public function setUp(): void
         $this->configuration->setProxyDir(__DIR__ . '/Proxies');
         $this->configuration->setProxyNamespace('DoctrineExtensions\Tests\Proxies');
         $this->configuration->setAutoGenerateProxyClasses(true);
-        $this->configuration->setMetadataDriverImpl($this->configuration->newDefaultAnnotationDriver(__DIR__ . '/../Entities'));
-        $this->entityManager = EntityManager::create(['driver' => 'pdo_sqlite', 'memory' => true], $this->configuration);
+        $this->configuration->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([__DIR__ . '/../Entities']));
+        $this->entityManager = new EntityManager(
+            DriverManager::getConnection(['driver' => 'pdo_sqlite', 'memory' => true], $this->configuration),
+            $this->configuration
+        );
     }
 
     public function assertDqlProducesSql($actualDql, $expectedSql, $params = []): void

tests/Types/CarbonDateTest.php

@@ -4,10 +4,12 @@
 
 use Carbon\Carbon;
 use Carbon\CarbonImmutable;
+use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\ORMSetup;
 use Doctrine\ORM\Tools\SchemaTool;
 use DoctrineExtensions\Tests\Entities\CarbonDate as Entity;
 use PHPUnit\Framework\TestCase;
@@ -44,13 +46,13 @@ public function setUp(): void
         $config->setProxyDir(__DIR__ . '/Proxies');
         $config->setProxyNamespace('DoctrineExtensions\Tests\PHPUnit\Proxies');
         $config->setAutoGenerateProxyClasses(true);
-        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(__DIR__ . '/../../Entities'));
+        $config->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([__DIR__ . '/../../Entities']));
 
-        $this->em = EntityManager::create(
-            [
+        $this->em = new EntityManager(
+            DriverManager::getConnection([
                 'driver' => 'pdo_sqlite',
                 'memory' => true,
-            ],
+            ], $config),
             $config
         );
 

tests/Types/ZendDateTest.php

@@ -2,10 +2,12 @@
 
 namespace DoctrineExtensions\Tests\Types;
 
+use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\ORMSetup;
 use Doctrine\ORM\Tools\SchemaTool;
 use DoctrineExtensions\Tests\Entities\ZendDate;
 use PHPUnit\Framework\TestCase;
@@ -39,13 +41,13 @@ public function setUp(): void
         $config->setProxyDir(__DIR__ . '/Proxies');
         $config->setProxyNamespace('DoctrineExtensions\Tests\PHPUnit\Proxies');
         $config->setAutoGenerateProxyClasses(true);
-        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(__DIR__ . '/../../Entities'));
+        $config->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([__DIR__ . '/../../Entities']));
 
-        $this->em = EntityManager::create(
-            [
+        $this->em = new EntityManager(
+            DriverManager::getConnection([
                 'driver' => 'pdo_sqlite',
                 'memory' => true,
-            ],
+            ], $config),
             $config
         );