Merge pull request #422 from filakhtov/doctrine-persistence-1-3-compat

Enable compatibility with doctrine/persistence 1.3+
laravel-doctrine · Jan 8, 2020 · deb9b76 · deb9b76
2 parents aabee24 + 555c809
commit deb9b76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -38,9 +38,6 @@
         "illuminate/notifications": "5.5.*|5.6.*|5.7.*|5.8.*",
         "illuminate/queue": "5.5.*|5.6.*|5.7.*|5.8.*"
     },
-    "conflict": {
-        "doctrine/persistence": ">=1.3@dev"
-    },
     "autoload": {
         "psr-4": {
             "LaravelDoctrine\\ORM\\": "src/"

diff --git a/src/DoctrineServiceProvider.php b/src/DoctrineServiceProvider.php
@@ -160,6 +160,9 @@ protected function registerManagerRegistry()
 
         $this->app->alias('registry', ManagerRegistry::class);
         $this->app->alias('registry', IlluminateRegistry::class);
+
+        // This alias is required for compatibility with doctrine/persistence 1.3+
+        $this->app->alias(ManagerRegistry::class, \Doctrine\Persistence\ManagerRegistry::class);
     }
 
     /**

diff --git a/tests/Middleware/SubstituteBindingsTest.php b/tests/Middleware/SubstituteBindingsTest.php
@@ -44,6 +44,8 @@ protected function getRouter()
             return $router;
         });
 
+        $container->alias(ManagerRegistry::class, \Doctrine\Persistence\ManagerRegistry::class);
+
         $container->singleton(ManagerRegistry::class, function () {
             return $this->registry;
         });