flip attribute driver constructor arguments (#2359)

doctrine · Aug 12, 2021 · bc77760 · bc77760
1 parent 34a3cf8
commit bc77760
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php
@@ -340,11 +340,7 @@ private function setShardKey(ClassMetadata $class, ODM\ShardKey $shardKey): void
      */
     public static function create($paths = [], ?Reader $reader = null): AnnotationDriver
     {
-        if ($reader === null) {
-            $reader = new AnnotationReader();
-        }
-
-        return new self($reader, $paths);
+        return new self($reader ?? new AnnotationReader(), $paths);
     }
 }
 

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AttributeDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AttributeDriver.php
@@ -11,6 +11,14 @@
  */
 class AttributeDriver extends AnnotationDriver
 {
+    /**
+     * @param string|string[]|null $paths
+     */
+    public function __construct($paths = null, ?Reader $reader = null)
+    {
+        parent::__construct($reader ?? new AttributeReader(), $paths);
+    }
+
     /**
      * Factory method for the Attribute Driver
      *
@@ -20,10 +28,6 @@ class AttributeDriver extends AnnotationDriver
      */
     public static function create($paths = [], ?Reader $reader = null): AnnotationDriver
     {
-        if ($reader === null) {
-            $reader = new AttributeReader();
-        }
-
-        return new self($reader, $paths);
+        return new self($paths, $reader);
     }
 }
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AttributeDriverTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AttributeDriverTest.php
@@ -5,7 +5,6 @@
 namespace Doctrine\ODM\MongoDB\Tests\Mapping;
 
 use Doctrine\ODM\MongoDB\Mapping\Driver\AttributeDriver;
-use Doctrine\ODM\MongoDB\Mapping\Driver\AttributeReader;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 
 /**
@@ -15,8 +14,6 @@ class AttributeDriverTest extends AbstractAnnotationDriverTest
 {
     protected function loadDriver(): MappingDriver
     {
-        $reader = new AttributeReader();
-
-        return new AttributeDriver($reader);
+        return new AttributeDriver();
     }
 }