Support doctrine/orm 2.14+

concretecms · Jan 24, 2023 · 1609a8c · 1609a8c
1 parent 0bad66a
commit 1609a8c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/concrete/composer.json b/concrete/composer.json
@@ -50,7 +50,7 @@
     "scssphp/scssphp": "^1.4",
     "doctrine/annotations": "^1.13.2",
     "doctrine/dbal": "^2.13.2",
-    "doctrine/orm": "^2.13 <2.14",
+    "doctrine/orm": "^2.13",
     "doctrine/lexer": "^1.2.3",
     "doctrine/common": "^3.1.2",
     "doctrine/persistence": "^2.5.1",

diff --git a/concrete/src/Database/EntityManagerConfigFactory.php b/concrete/src/Database/EntityManagerConfigFactory.php
@@ -84,9 +84,6 @@ public function getConfiguration()
      */
     public function getMetadataDriverImpl()
     {
-        // Register the doctrine Annotations
-        \Doctrine\Common\Annotations\AnnotationRegistry::registerFile('doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
-
         $legacyNamespace = $this->getConfigRepository()->get('app.enable_legacy_src_namespace');
         if ($legacyNamespace) {
             \Doctrine\Common\Annotations\AnnotationRegistry::registerAutoloadNamespace('Application\Src',