Don't wrap the reader if it is already an attribute reader (#2566)

* Don't wrap the reader if it is already an attribute reader

* Test the LoggableListener with both an annotation and attribute reader

* Apply suggestions from code review

Author: mbabker

src/Mapping/ExtensionMetadataFactory.php

@@ -206,7 +206,11 @@ protected function getDriver($omDriver)
             }
 
             if ($driver instanceof AttributeDriverInterface) {
-                $driver->setAnnotationReader(new AttributeAnnotationReader(new AttributeReader(), $this->annotationReader));
+                if ($this->annotationReader instanceof AttributeReader) {
+                    $driver->setAnnotationReader($this->annotationReader);
+                } else {
+                    $driver->setAnnotationReader(new AttributeAnnotationReader(new AttributeReader(), $this->annotationReader));
+                }
             } elseif ($driver instanceof AnnotationDriverInterface) {
                 $driver->setAnnotationReader($this->annotationReader);
             }

tests/Gedmo/Loggable/AnnotationLoggableEntityTest.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Doctrine Behavioral Extensions package.
+ * (c) Gediminas Morkevicius <[email protected]> http://www.gediminasm.org
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Gedmo\Loggable;
+
+use Doctrine\Common\EventManager;
+use Gedmo\Tests\Loggable\LoggableEntityTest;
+
+/**
+ * These are tests for loggable behavior with an annotation reader (created by the listener by default)
+ *
+ * @author Gediminas Morkevicius <[email protected]>
+ */
+final class AnnotationLoggableEntityTest extends LoggableEntityTest
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $evm = new EventManager();
+        $loggableListener = new LoggableListener();
+        $loggableListener->setUsername('jules');
+        $evm->addEventSubscriber($loggableListener);
+
+        $this->em = $this->getDefaultMockSqliteEntityManager($evm);
+    }
+}

tests/Gedmo/Loggable/AttributeLoggableEntityTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Doctrine Behavioral Extensions package.
+ * (c) Gediminas Morkevicius <[email protected]> http://www.gediminasm.org
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Gedmo\Loggable;
+
+use Doctrine\Common\EventManager;
+use Gedmo\Mapping\Driver\AttributeReader;
+use Gedmo\Tests\Loggable\LoggableEntityTest;
+
+/**
+ * These are tests for loggable behavior with an attribute reader
+ *
+ * @requires PHP >= 8.0
+ *
+ * @author Gediminas Morkevicius <[email protected]>
+ */
+final class AttributeLoggableEntityTest extends LoggableEntityTest
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $evm = new EventManager();
+        $loggableListener = new LoggableListener();
+        $loggableListener->setAnnotationReader(new AttributeReader());
+        $loggableListener->setUsername('jules');
+        $evm->addEventSubscriber($loggableListener);
+
+        $this->em = $this->getDefaultMockSqliteEntityManager($evm);
+    }
+}

tests/Gedmo/Loggable/LoggableEntityTest.php

@@ -11,9 +11,7 @@
 
 namespace Gedmo\Tests\Loggable;
 
-use Doctrine\Common\EventManager;
 use Gedmo\Loggable\Entity\LogEntry;
-use Gedmo\Loggable\LoggableListener;
 use Gedmo\Tests\Loggable\Fixture\Entity\Address;
 use Gedmo\Tests\Loggable\Fixture\Entity\Article;
 use Gedmo\Tests\Loggable\Fixture\Entity\Comment;
@@ -27,25 +25,13 @@
  *
  * @author Gediminas Morkevicius <[email protected]>
  */
-final class LoggableEntityTest extends BaseTestCaseORM
+abstract class LoggableEntityTest extends BaseTestCaseORM
 {
     public const ARTICLE = Article::class;
     public const COMMENT = Comment::class;
     public const RELATED_ARTICLE = RelatedArticle::class;
     public const COMMENT_LOG = \Gedmo\Tests\Loggable\Fixture\Entity\Log\Comment::class;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $evm = new EventManager();
-        $loggableListener = new LoggableListener();
-        $loggableListener->setUsername('jules');
-        $evm->addEventSubscriber($loggableListener);
-
-        $this->em = $this->getDefaultMockSqliteEntityManager($evm);
-    }
-
     public function testShouldHandleClonedEntity(): void
     {
         $art0 = new Article();