Revert deprecation on annotation driver

Author: GromNaN

lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php

@@ -13,6 +13,15 @@
  */
 class AnnotationDriver extends AttributeDriver
 {
+    /**
+     * The annotation reader.
+     *
+     * @internal this property will be private in 3.0
+     *
+     * @var Reader
+     */
+    protected $reader;
+
     /**
      * Initializes a new AnnotationDriver that uses the given AnnotationReader for reading
      * docblock annotations.
@@ -22,7 +31,9 @@ class AnnotationDriver extends AttributeDriver
      */
     public function __construct($reader, $paths = null)
     {
-        parent::__construct($paths, $reader);
+        parent::__construct($paths);
+
+        $this->reader = $reader;
     }
 
     /**

lib/Doctrine/ODM/MongoDB/Mapping/Driver/AttributeDriver.php

@@ -49,7 +49,7 @@ class AttributeDriver implements MappingDriver
     /** @param string|string[]|ClassLocator|null $paths */
     public function __construct($paths = null, ?Reader $reader = null)
     {
-        if ($reader !== null && ! $this instanceof AnnotationDriver) {
+        if ($reader !== null) {
             trigger_deprecation(
                 'doctrine/mongodb-odm',
                 '2.7',

tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractAnnotationDriverTestCase.php

@@ -75,7 +75,7 @@ public function testFieldInheritance(): void
     public function testLoadMetadataForNonDocumentThrowsException(): void
     {
         $cm               = new ClassMetadata('stdClass');
-        $annotationDriver = AnnotationDriver::create();
+        $annotationDriver = static::loadDriver();
 
         $this->expectException(MappingException::class);
         $annotationDriver->loadMetadataForClass('stdClass', $cm);
@@ -85,7 +85,7 @@ public function testLoadMetadataForNonDocumentThrowsException(): void
     public function testColumnWithMissingTypeDefaultsToString(): void
     {
         $cm               = new ClassMetadata(ColumnWithoutType::class);
-        $annotationDriver = AnnotationDriver::create();
+        $annotationDriver = static::loadDriver();
 
         $annotationDriver->loadMetadataForClass(stdClass::class, $cm);
         self::assertEquals('id', $cm->fieldMappings['id']['type']);

tests/Doctrine/ODM/MongoDB/Tests/Tools/Console/Command/Schema/UpdateCommandTest.php

@@ -4,10 +4,11 @@
 
 namespace Doctrine\ODM\MongoDB\Tests\Tools\Console\Command\Schema;
 
-use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
+use Doctrine\ODM\MongoDB\Mapping\Driver\AttributeDriver;
 use Doctrine\ODM\MongoDB\Tests\Tools\Console\Command\AbstractCommandTestCase;
 use Doctrine\ODM\MongoDB\Tools\Console\Command\Schema\UpdateCommand;
 use Doctrine\Persistence\Mapping\Driver\ClassNames;
+use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Documents\Ecommerce;
 use Documents\SchemaValidated;
 use Symfony\Component\Console\Command\Command;
@@ -88,7 +89,7 @@ public function testDisabledValidatorsProcessing(): void
         self::assertStringNotContainsString('Updated validation for all classes', $output);
     }
 
-    private function createDriver(): AnnotationDriver
+    private function createDriver(): MappingDriver
     {
         $paths = [__DIR__ . '/../../../../../../../../Documents/Ecommerce'];
         // Available in Doctrine Persistence 4.1+
@@ -104,6 +105,6 @@ private function createDriver(): AnnotationDriver
             ]);
         }
 
-        return AnnotationDriver::create($paths);
+        return AttributeDriver::create($paths);
     }
 }