Allow Symfony 6.0

doctrine · May 19, 2021 · 460f399 · 460f399
1 parent abc1d3e
commit 460f399
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/Registry.php b/Registry.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\ORMException;
+use Doctrine\ORM\Proxy\Proxy;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use Psr\Container\ContainerInterface;
 use Symfony\Bridge\Doctrine\ManagerRegistry;
@@ -25,7 +26,7 @@ public function __construct(ContainerInterface $container, array $connections, a
     {
         $this->container = $container;
 
-        parent::__construct('ORM', $connections, $entityManagers, $defaultConnection, $defaultEntityManager, 'Doctrine\ORM\Proxy\Proxy');
+        parent::__construct('ORM', $connections, $entityManagers, $defaultConnection, $defaultEntityManager, Proxy::class);
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -30,12 +30,12 @@
         "doctrine/dbal": "^2.9.0|^3.0",
         "doctrine/persistence": "^1.3.3|^2.0",
         "doctrine/sql-formatter": "^1.0.1",
-        "symfony/cache": "^4.3.3|^5.0",
-        "symfony/config": "^4.3.3|^5.0",
-        "symfony/console": "^3.4.30|^4.3.3|^5.0",
-        "symfony/dependency-injection": "^4.3.3|^5.0",
-        "symfony/doctrine-bridge": "^4.4.22|^5.2.7",
-        "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0",
+        "symfony/cache": "^4.3.3|^5.0|^6.0",
+        "symfony/config": "^4.3.3|^5.0|^6.0",
+        "symfony/console": "^3.4.30|^4.3.3|^5.0|^6.0",
+        "symfony/dependency-injection": "^4.3.3|^5.0|^6.0",
+        "symfony/doctrine-bridge": "^4.4.22|^5.2.7|^6.0",
+        "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0|^6.0",
         "symfony/service-contracts": "^1.1.1|^2.0"
     },
     "require-dev": {
@@ -45,14 +45,14 @@
         "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3",
         "psalm/plugin-phpunit": "^0.15.1",
         "psalm/plugin-symfony": "^2.2.4",
-        "symfony/phpunit-bridge": "^5.2",
-        "symfony/property-info": "^4.3.3|^5.0",
-        "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0",
-        "symfony/security-bundle": "^4.4|^5.0",
-        "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0",
-        "symfony/validator": "^3.4.30|^4.3.3|^5.0",
-        "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0",
-        "symfony/yaml": "^3.4.30|^4.3.3|^5.0",
+        "symfony/phpunit-bridge": "^5.2|^6.0",
+        "symfony/property-info": "^4.3.3|^5.0|^6.0",
+        "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0|^6.0",
+        "symfony/security-bundle": "^4.4|^5.0|^6.0",
+        "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0|^6.0",
+        "symfony/validator": "^3.4.30|^4.3.3|^5.0|^6.0",
+        "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0|^6.0",
+        "symfony/yaml": "^3.4.30|^4.3.3|^5.0|^6.0",
         "twig/twig": "^1.34|^2.12|^3.0",
         "vimeo/psalm": "^4.7"
     },