Merge branch '4.10' into migrate-folderUrl-config

AlexejKossmann · Jul 25, 2020 · 4e3f302 · 4e3f302
2 parents fb2566f + 1933140
commit 4e3f302
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -52,6 +52,7 @@
         "doctrine/dbal": "^2.10",
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",
         "doctrine/orm": "^2.6.3",
+        "doctrine/persistence": "^1.3",
         "dragonmantank/cron-expression": "^2.3",
         "friendsofsymfony/http-cache": "^2.6",
         "friendsofsymfony/http-cache-bundle": "^2.6",
@@ -176,7 +177,7 @@
             "contao/newsletter-bundle": "Contao\\NewsletterBundle\\ContaoManager\\Plugin"
         },
         "symfony": {
-            "require": "^4.4"
+            "require": "4.4.*"
         }
     },
     "autoload": {

diff --git a/core-bundle/composer.json b/core-bundle/composer.json
@@ -49,6 +49,7 @@
         "doctrine/dbal": "^2.10",
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",
         "doctrine/orm": "^2.6.3",
+        "doctrine/persistence": "^1.3",
         "dragonmantank/cron-expression": "^2.3",
         "friendsofsymfony/http-cache": "^2.6",
         "friendsofsymfony/http-cache-bundle": "^2.6",
@@ -136,7 +137,7 @@
     "extra": {
         "contao-manager-plugin": "Contao\\CoreBundle\\ContaoManager\\Plugin",
         "symfony": {
-            "require": "^4.4"
+            "require": "4.4.*"
         }
     },
     "autoload": {

diff --git a/core-bundle/src/Repository/CronJobRepository.php b/core-bundle/src/Repository/CronJobRepository.php
@@ -14,8 +14,8 @@
 
 use Contao\CoreBundle\Entity\CronJob;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Connection;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
  * @internal

diff --git a/core-bundle/src/Repository/RememberMeRepository.php b/core-bundle/src/Repository/RememberMeRepository.php
@@ -14,8 +14,8 @@
 
 use Contao\CoreBundle\Entity\RememberMe;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Connection;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
  * @internal

diff --git a/manager-bundle/composer.json b/manager-bundle/composer.json
@@ -23,6 +23,7 @@
         "contao/manager-plugin": "^2.4",
         "doctrine/dbal": "^2.10",
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",
+        "doctrine/persistence": "^1.3",
         "friendsofsymfony/http-cache": "^2.6",
         "friendsofsymfony/http-cache-bundle": "^2.6",
         "nelmio/cors-bundle": "^1.5.3 || ^2.0.1",
@@ -74,7 +75,7 @@
     "extra": {
         "contao-manager-plugin": "Contao\\ManagerBundle\\ContaoManager\\Plugin",
         "symfony": {
-            "require": "^4.4"
+            "require": "4.4.*"
         }
     },
     "autoload": {