Merge pull request doctrine#2497 from franmomu/annotation2

Allow `doctrine/annotations` 2
lstrojny · Dec 27, 2022 · 4f14307 · 4f14307
2 parents 0fd338d + 68fb557
commit 4f14307
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-mongodb": "^1.5",
-        "doctrine/annotations": "^1.12",
+        "doctrine/annotations": "^1.12 || ^2.0",
         "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/collections": "^1.5 || ^2.0",
         "doctrine/event-manager": "^1.0 || ^2.0",
@@ -41,7 +41,7 @@
         "ext-bcmath": "*",
         "doctrine/coding-standard": "^11.0",
         "jmikola/geojson": "^1.0",
-        "phpbench/phpbench": "^1.0.0",
+        "phpbench/phpbench": "^1.0.0@dev",
         "phpstan/phpstan": "^1.9.4",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^9.5.5",

diff --git a/docs/en/reference/introduction.rst b/docs/en/reference/introduction.rst
@@ -427,15 +427,11 @@ more paths) and register the annotations for the driver:
 
     <?php
 
-    use Doctrine\Common\Annotations\AnnotationRegistry;
-
     // ...
 
     $config->setMetadataDriverImpl(AnnotationDriver::create(__DIR__ . '/Documents'));
 
-    $loader = require_once('path/to/vendor/autoload.php');
-
-    AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+    require_once('path/to/vendor/autoload.php');
 
 At this point, we have everything necessary to construct a ``DocumentManager``:
 
@@ -453,7 +449,6 @@ The final ``bootstrap.php`` file should look like this:
 
     <?php
 
-    use Doctrine\Common\Annotations\AnnotationRegistry;
     use Doctrine\ODM\MongoDB\Configuration;
     use Doctrine\ODM\MongoDB\DocumentManager;
     use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
@@ -462,10 +457,7 @@ The final ``bootstrap.php`` file should look like this:
         throw new RuntimeException('Install dependencies to run this script.');
     }
 
-    $loader = require_once $file;
-    $loader->add('Documents', __DIR__);
-
-    AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+    require_once $file;
 
     $config = new Configuration();
     $config->setProxyDir(__DIR__ . '/Proxies');

diff --git a/docs/en/tutorials/getting-started.rst b/docs/en/tutorials/getting-started.rst
@@ -147,14 +147,10 @@ instance. Read more about setting up the Doctrine MongoDB ODM in the
 
     <?php
 
-    use Doctrine\Common\Annotations\AnnotationRegistry;
     use Doctrine\ODM\MongoDB\Configuration;
     use Doctrine\ODM\MongoDB\DocumentManager;
-    use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
 
-    $loader = require_once('path/to/vendor/autoload.php');
-
-    AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+    require_once('path/to/vendor/autoload.php');
 
     $config = new Configuration();
     $config->setProxyDir('/path/to/generate/proxies');

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -2,14 +2,10 @@
 
 declare(strict_types=1);
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
-
 $file = __DIR__ . '/../vendor/autoload.php';
 
 if (! file_exists($file)) {
     throw new RuntimeException('Install dependencies to run test suite.');
 }
 
-$loader = require $file;
-
-AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+require $file;
diff --git a/tools/sandbox/config.php b/tools/sandbox/config.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
@@ -14,9 +13,7 @@
     throw new RuntimeException('Install dependencies to run this script.');
 }
 
-$loader = require_once $file;
-$loader->add('Documents', __DIR__);
-AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+require_once $file;
 
 $config = new Configuration();
 $config->setProxyDir(__DIR__ . '/Proxies');