Restored doctrine/persistence 2.x as conditional dependency

szymach · szymach · commit f0657767a40c · 2023-10-31T17:00:58.000+01:00
diff --git a/Doctrine/Admin/DataIndexerElementImpl.php b/Doctrine/Admin/DataIndexerElementImpl.php
@@ -24,6 +24,8 @@ trait DataIndexerElementImpl
 
     public function getDataIndexer(): DataIndexerInterface
     {
-        return new DoctrineDataIndexer($this->registry, $this->getRepository()->getClassName());
+        /** @var class-string<T> $className */
+        $className = $this->getRepository()->getClassName();
+        return new DoctrineDataIndexer($this->registry, $className);
     }
 }
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "require": {
         "php": "^7.4|^8.0",
         "doctrine/doctrine-bundle": "^2.10",
-        "doctrine/persistence": "^3.0",
+        "doctrine/persistence": "^2.0|^3.0",
         "doctrine/orm": "^2.8",
         "fsi/data": "^1.0.2",
         "fsi/translatable": "^1.0.2",

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ trait DataIndexerElementImpl`
`24`	`24`
`25`	`25`	`public function getDataIndexer(): DataIndexerInterface`
`26`	`26`	`{`
`27`		`- return new DoctrineDataIndexer($this->registry, $this->getRepository()->getClassName());`
	`27`	`+ /** @var class-string<T> $className */`
	`28`	`+ $className = $this->getRepository()->getClassName();`
	`29`	`+ return new DoctrineDataIndexer($this->registry, $className);`
`28`	`30`	`}`
`29`	`31`	`}`