Kunstmaan · acrobat · Jul 13, 2021 · Jul 10, 2021
diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
         "doctrine/inflector": "^1.4|^2.0",
         "doctrine/orm": "^2.5",
         "doctrine/dbal": "^2.9",
-        "doctrine/doctrine-bundle": "^1.6.12|^2.0",
+        "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/doctrine-cache-bundle": "^1.2",
         "doctrine/doctrine-migrations-bundle": "^1.3|^2.1",
         "symfony/swiftmailer-bundle": "^2.3|^3.0",
@@ -124,7 +124,8 @@
         "kunstmaan/voting-bundle": "self.version"
     },
     "conflict": {
-        "friendsofsymfony/user-bundle": "<2.0.0"
+        "friendsofsymfony/user-bundle": "<2.0.0",
+        "doctrine/persistence": "<1.3"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Kunstmaan/AdminBundle/Service/GroupManager.php b/src/Kunstmaan/AdminBundle/Service/GroupManager.php
@@ -2,8 +2,8 @@
 
 namespace Kunstmaan\AdminBundle\Service;
 
-use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 use Kunstmaan\AdminBundle\Entity\GroupInterface;
 
 class GroupManager
@@ -12,7 +12,7 @@ class GroupManager
     private $em;
     /** @var string */
     private $class;
-    /** @var ObjectRepository */
+    /** @var EntityRepository */
     private $repository;
 
     public function __construct(EntityManagerInterface $em, string $class)

diff --git a/src/Kunstmaan/AdminBundle/composer.json b/src/Kunstmaan/AdminBundle/composer.json
@@ -17,7 +17,7 @@
         "babdev/pagerfanta-bundle": "^2.5",
         "doctrine/orm": "^2.5",
         "doctrine/dbal": "^2.5",
-        "doctrine/doctrine-bundle": "^1.6.12|^2.0",
+        "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/doctrine-cache-bundle": "^1.2",
         "friendsofsymfony/user-bundle": "^2.0",
         "guzzlehttp/guzzle": "~6.1",

diff --git a/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php b/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php
@@ -31,7 +31,7 @@ abstract class AdminListController extends Controller
     /**
      * You can override this method to return the correct entity manager when using multiple databases ...
      *
-     * @return \Doctrine\Common\Persistence\ObjectManager|object
+     * @return \Doctrine\Persistence\ObjectManager|object
      */
     protected function getEntityManager()
     {

diff --git a/src/Kunstmaan/AdminListBundle/Controller/EntityLockCheckController.php b/src/Kunstmaan/AdminListBundle/Controller/EntityLockCheckController.php
@@ -2,6 +2,7 @@
 
 namespace Kunstmaan\AdminListBundle\Controller;
 
+use Kunstmaan\AdminListBundle\Entity\LockableEntityInterface;
 use Kunstmaan\AdminListBundle\Service\EntityVersionLockService;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -14,7 +15,7 @@ class EntityLockCheckController extends Controller
     /**
      * You can override this method to return the correct entity manager when using multiple databases ...
      *
-     * @return \Doctrine\Common\Persistence\ObjectManager|object
+     * @return \Doctrine\Persistence\ObjectManager|object
      */
     protected function getEntityManager()
     {

diff --git a/src/Kunstmaan/AdminListBundle/Service/EntityVersionLockService.php b/src/Kunstmaan/AdminListBundle/Service/EntityVersionLockService.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminListBundle\Service;
 
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use FOS\UserBundle\Model\User;
 use Kunstmaan\AdminBundle\Entity\UserInterface;
 use Kunstmaan\AdminListBundle\Entity\EntityVersionLock;

diff --git a/src/Kunstmaan/AdminListBundle/Tests/Service/EntityVersionLockServiceTest.php b/src/Kunstmaan/AdminListBundle/Tests/Service/EntityVersionLockServiceTest.php
@@ -123,7 +123,7 @@ protected function setUp(): void
             [EntityVersionLock::class, $mockLockRepository],
             [LockableEntity::class, $mockLockableRepository],
         ];
-        $mockObjectManager = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
+        $mockObjectManager = $this->getMockBuilder('Doctrine\Persistence\ObjectManager')
             ->disableOriginalConstructor()
             ->getMock();
         $mockObjectManager

diff --git a/src/Kunstmaan/AdminListBundle/composer.json b/src/Kunstmaan/AdminListBundle/composer.json
@@ -29,6 +29,9 @@
         "kunstmaan/menu-bundle": "^5.2",
         "kunstmaan/translator-bundle": "^5.2"
     },
+    "conflict": {
+        "doctrine/persistence": "<1.3"
+    },
     "minimum-stability": "dev",
     "autoload": {
         "psr-4": { "Kunstmaan\\AdminListBundle\\": "" }

diff --git a/src/Kunstmaan/FixturesBundle/Builder/BuildingSupervisor.php b/src/Kunstmaan/FixturesBundle/Builder/BuildingSupervisor.php
@@ -3,7 +3,7 @@
 namespace Kunstmaan\FixturesBundle\Builder;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\FixturesBundle\Loader\Fixture;
 use Kunstmaan\FixturesBundle\Parser\Parser;
 use Kunstmaan\FixturesBundle\Populator\Populator;

diff --git a/src/Kunstmaan/FixturesBundle/Loader/FixtureLoader.php b/src/Kunstmaan/FixturesBundle/Loader/FixtureLoader.php
@@ -3,7 +3,7 @@
 namespace Kunstmaan\FixturesBundle\Loader;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Faker\Factory;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;

diff --git a/src/Kunstmaan/FixturesBundle/composer.json b/src/Kunstmaan/FixturesBundle/composer.json
@@ -35,6 +35,9 @@
         "symfony/phpunit-bridge": "^5.1",
         "phpunit/phpunit": "^8.5"
     },
+    "conflict": {
+        "doctrine/persistence": "<1.3"
+    },
     "autoload": {
         "psr-4": {
             "Kunstmaan\\FixturesBundle\\": ""

diff --git a/src/Kunstmaan/GeneratorBundle/Command/KunstmaanGenerateCommand.php b/src/Kunstmaan/GeneratorBundle/Command/KunstmaanGenerateCommand.php
@@ -471,7 +471,7 @@ function ($name) use ($generator, $container) {
                         /*
                          * Replace slash to backslash. Eg: CmsBundle:Blog/Comment --> CmsBundle:Blog\Comment
                          *
-                         * @see \Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory::getMetadataFor()
+                         * @see \Doctrine\Persistence\Mapping\AbstractClassMetadataFactory::getMetadataFor()
                          * @see \Doctrine\ORM\Mapping\ClassMetadataFactory::getFqcnFromAlias()
                          */
                         if (!$this->isSymfony4()) {

diff --git a/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/GroupFixtures.php b/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/GroupFixtures.php
@@ -4,7 +4,7 @@
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\AdminBundle\Entity\Group;
 
 /**

diff --git a/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/RoleFixtures.php b/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/RoleFixtures.php
@@ -4,7 +4,7 @@
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\AdminBundle\Entity\Role;
 
 /**

diff --git a/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/UserFixtures.php b/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/UserFixtures.php
@@ -4,7 +4,7 @@
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\AdminBundle\Entity\User;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;

diff --git a/src/Kunstmaan/GeneratorBundle/Generator/ArticleGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/ArticleGenerator.php
@@ -2,9 +2,9 @@
 
 namespace Kunstmaan\GeneratorBundle\Generator;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Kunstmaan\GeneratorBundle\Helper\CommandAssistant;
 use Kunstmaan\GeneratorBundle\Helper\GeneratorUtils;
-use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
@@ -32,7 +32,7 @@ class ArticleGenerator extends KunstmaanGenerator
     /**
      * @param string $skeletonDir
      */
-    public function __construct(Filesystem $filesystem, RegistryInterface $registry, $skeletonDir, array $parentPages, CommandAssistant $assistant, ContainerInterface $container)
+    public function __construct(Filesystem $filesystem, ManagerRegistry $registry, $skeletonDir, array $parentPages, CommandAssistant $assistant, ContainerInterface $container)
     {
         parent::__construct($filesystem, $registry, $skeletonDir, $assistant, $container);
         $this->parentPages = $parentPages;

diff --git a/src/Kunstmaan/GeneratorBundle/Generator/ConfigGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/ConfigGenerator.php
@@ -2,8 +2,8 @@
 
 namespace Kunstmaan\GeneratorBundle\Generator;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Kunstmaan\GeneratorBundle\Helper\CommandAssistant;
-use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -15,7 +15,7 @@ class ConfigGenerator extends KunstmaanGenerator
     /** @var bool */
     private $newAuthentication;
 
-    public function __construct(Filesystem $filesystem, RegistryInterface $registry, $skeletonDir, CommandAssistant $assistant, ContainerInterface $container = null, bool $newAuthentication = false)
+    public function __construct(Filesystem $filesystem, ManagerRegistry $registry, $skeletonDir, CommandAssistant $assistant, ContainerInterface $container = null, bool $newAuthentication = false)
     {
         parent::__construct($filesystem, $registry, $skeletonDir, $assistant, $container);
         $this->newAuthentication = $newAuthentication;

diff --git a/src/Kunstmaan/GeneratorBundle/Generator/KunstmaanGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/KunstmaanGenerator.php
@@ -7,10 +7,10 @@
 use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
 use Doctrine\ORM\Tools\EntityGenerator;
 use Doctrine\ORM\Tools\EntityRepositoryGenerator;
+use Doctrine\Persistence\ManagerRegistry;
 use Kunstmaan\GeneratorBundle\Helper\CommandAssistant;
 use Kunstmaan\GeneratorBundle\Helper\GeneratorUtils;
 use Sensio\Bundle\GeneratorBundle\Generator\Generator;
-use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
@@ -31,7 +31,7 @@ class KunstmaanGenerator extends Generator
     protected $filesystem;
 
     /**
-     * @var RegistryInterface
+     * @var ManagerRegistry
      */
     protected $registry;
 
@@ -52,14 +52,14 @@ class KunstmaanGenerator extends Generator
 
     /**
      * @param Filesystem         $filesystem  The filesystem
-     * @param RegistryInterface  $registry    The registry
+     * @param ManagerRegistry    $registry    The registry
      * @param string             $skeletonDir The directory of the skeleton
      * @param CommandAssistant   $assistant   The command assistant
      * @param ContainerInterface $container   The container
      */
     public function __construct(
         Filesystem $filesystem,
-        RegistryInterface $registry,
+        ManagerRegistry $registry,
         $skeletonDir,
         CommandAssistant $assistant,
         ContainerInterface $container = null

diff --git a/src/Kunstmaan/GeneratorBundle/Generator/Symfony4EntityRepositoryGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/Symfony4EntityRepositoryGenerator.php
@@ -14,11 +14,11 @@ final class Symfony4EntityRepositoryGenerator
 
 use <entityClassName>;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Symfony\Bridge\Doctrine\RegistryInterface;
+use Doctrine\Persistence\ManagerRegistry;
 
 class <repository> extends ServiceEntityRepository
 {
-    public function __construct(RegistryInterface $registry)
+    public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, <entity>::class);
     }

diff --git a/...sioGeneratorBundle/skeleton/article/DataFixtures/ORM/ArticleGenerator/ArticleFixtures.php b/...sioGeneratorBundle/skeleton/article/DataFixtures/ORM/ArticleGenerator/ArticleFixtures.php
@@ -5,7 +5,7 @@
 use Doctrine\Bundle\FixturesBundle\ORMFixtureInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Faker\Factory;
 use Faker\Provider\DateTime;
 use Faker\Provider\Lorem;

diff --git a/...atorBundle/Resources/SensioGeneratorBundle/skeleton/article/Entity/Pages/OverviewPage.php b/...atorBundle/Resources/SensioGeneratorBundle/skeleton/article/Entity/Pages/OverviewPage.php
@@ -29,7 +29,7 @@ public function getPageTemplates(): array
     /**
      * @param \Doctrine\ORM\EntityManagerInterface $em
      *
-     * @return \Doctrine\Common\Persistence\ObjectRepository
+     * @return \Doctrine\Persistence\ObjectRepository
      */
     public function getArticleRepository($em)
     {

diff --git a/...Bundle/skeleton/defaultsite/DataFixtures/ORM/DefaultSiteGenerator/DefaultSiteFixtures.php b/...Bundle/skeleton/defaultsite/DataFixtures/ORM/DefaultSiteGenerator/DefaultSiteFixtures.php
@@ -5,7 +5,7 @@
 use Doctrine\Bundle\FixturesBundle\ORMFixtureInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\AdminBundle\Entity\DashboardConfiguration;
 use Kunstmaan\MediaBundle\Entity\Media;
 use Kunstmaan\MediaBundle\Helper\RemoteVideo\RemoteVideoHelper;

diff --git a/...atorBundle/skeleton/defaultsite/DataFixtures/ORM/DefaultSiteGenerator/SitemapFixtures.php b/...atorBundle/skeleton/defaultsite/DataFixtures/ORM/DefaultSiteGenerator/SitemapFixtures.php
@@ -5,7 +5,7 @@
 use Doctrine\Bundle\FixturesBundle\ORMFixtureInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\SitemapBundle\Entity\SitemapPage;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;

diff --git a/...neratorBundle/skeleton/searchpage/DataFixtures/ORM/SearchPageGenerator/SearchFixtures.php b/...neratorBundle/skeleton/searchpage/DataFixtures/ORM/SearchPageGenerator/SearchFixtures.php
@@ -5,7 +5,7 @@
 use Doctrine\Bundle\FixturesBundle\ORMFixtureInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 use Kunstmaan\UtilitiesBundle\Helper\Slugifier;
 

diff --git a/src/Kunstmaan/GeneratorBundle/composer.json b/src/Kunstmaan/GeneratorBundle/composer.json
@@ -16,6 +16,7 @@
     "require": {
         "php": "^7.2",
         "doctrine/inflector": "^1.4|^2.0",
+        "doctrine/data-fixtures": "^1.5",
         "fzaninotto/faker": "~1.6",
         "kunstmaan/admin-bundle": "^5.9",
         "kunstmaan/adminlist-bundle": "~5.2",
@@ -32,6 +33,9 @@
         "symfony/phpunit-bridge": "^5.1",
         "phpunit/phpunit": "^8.5"
     },
+    "conflict": {
+        "doctrine/persistence": "<1.3"
+    },
     "autoload": {
         "psr-4": { "Kunstmaan\\GeneratorBundle\\": "" }
     },

diff --git a/src/Kunstmaan/MediaBundle/DataFixtures/ORM/FolderFixtures.php b/src/Kunstmaan/MediaBundle/DataFixtures/ORM/FolderFixtures.php
@@ -4,7 +4,7 @@
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\MediaBundle\Entity\Folder;
 
 /**

diff --git a/src/Kunstmaan/MediaBundle/Form/Type/IdToMediaTransformer.php b/src/Kunstmaan/MediaBundle/Form/Type/IdToMediaTransformer.php
@@ -3,7 +3,7 @@
 namespace Kunstmaan\MediaBundle\Form\Type;
 
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\MediaBundle\Entity\Media;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;

diff --git a/src/Kunstmaan/MediaBundle/Form/Type/MediaType.php b/src/Kunstmaan/MediaBundle/Form/Type/MediaType.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\MediaBundle\Form\Type;
 
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Kunstmaan\MediaBundle\Helper\MediaManager;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;

diff --git a/src/Kunstmaan/MediaBundle/Tests/Form/AbstractTypeTest.php b/src/Kunstmaan/MediaBundle/Tests/Form/AbstractTypeTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
     {
         $formFactoryBuilderInterface = Forms::createFormFactoryBuilder();
         $formFactoryBuilderInterface->addType(new URLChooserType());
-        $formFactoryBuilderInterface->addTypeGuesser(new DoctrineOrmTypeGuesser($this->createMock('Doctrine\Common\Persistence\ManagerRegistry')));
+        $formFactoryBuilderInterface->addTypeGuesser(new DoctrineOrmTypeGuesser($this->createMock('Doctrine\Persistence\ManagerRegistry')));
         $this->factory = $formFactoryBuilderInterface->getFormFactory();
         $this->dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);

diff --git a/src/Kunstmaan/MediaBundle/Tests/Helper/FolderManagerTest.php b/src/Kunstmaan/MediaBundle/Tests/Helper/FolderManagerTest.php
@@ -2,15 +2,15 @@
 
 namespace Kunstmaan\MediaBundle\Tests\Helper;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\ORM\EntityRepository;
 use Kunstmaan\MediaBundle\Entity\Folder;
 use Kunstmaan\MediaBundle\Helper\FolderManager;
 use PHPUnit\Framework\TestCase;
 
 class FolderManagerTest extends TestCase
 {
     /**
-     * @var ObjectRepository
+     * @var EntityRepository
      */
     protected $repository;
 

diff --git a/src/Kunstmaan/MediaBundle/composer.json b/src/Kunstmaan/MediaBundle/composer.json
@@ -29,6 +29,9 @@
         "symfony/phpunit-bridge": "^5.1",
         "phpunit/phpunit": "^8.5"
     },
+    "conflict": {
+        "doctrine/persistence": "<1.3"
+    },
     "suggest": {
         "ext-imagick": "to support PDF preview images"
     },

diff --git a/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php b/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php
@@ -2,11 +2,11 @@
 
 namespace Kunstmaan\NodeBundle\EventListener;
 
-use Doctrine\Common\Persistence\Mapping\MappingException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\MappingException;
 use Kunstmaan\AdminBundle\FlashMessages\FlashTypes;
 use Kunstmaan\AdminBundle\Helper\DomainConfigurationInterface;
 use Kunstmaan\NodeBundle\Entity\HasNodeInterface;