From 58767f8e584b452e2cc5f4c6e185e75d5c27ea2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Bu=C3=9Fmann?= Date: Thu, 5 Mar 2020 14:54:55 +0100 Subject: [PATCH 1/5] Added twig 3 support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8337836cb9..68710218e8 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "symfony/translation-contracts": "^2.0", "symfony/twig-bundle": "^4.4 || ^5.0", "symfony/validator": "^4.4 || ^5.0", - "twig/twig": "^1.28 || ^2.0" + "twig/twig": "^1.28 || ^2.0 || ^3.0" }, "conflict": { "doctrine/doctrine-bundle": "<1.3", From d4387b88c6d2cc644bc3b9b30227c43f21c46abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Bu=C3=9Fmann?= Date: Thu, 15 Apr 2021 15:12:25 +0200 Subject: [PATCH 2/5] Added PHP 8 to composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 68710218e8..0196d237ad 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5 || ^8.0", "paragonie/random_compat": "^1 || ^2 || ^9", "symfony/form": "^4.4 || ^5.0", "symfony/framework-bundle": "^4.4 || ^5.0", From c5414e21baca06b47de88723b8f6aac8f178dd38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Bu=C3=9Fmann?= Date: Thu, 15 Apr 2021 15:38:50 +0200 Subject: [PATCH 3/5] Update UserListener.php --- Doctrine/UserListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doctrine/UserListener.php b/Doctrine/UserListener.php index 0d55ec64d3..642ded7aef 100644 --- a/Doctrine/UserListener.php +++ b/Doctrine/UserListener.php @@ -12,7 +12,7 @@ namespace FOS\UserBundle\Doctrine; use Doctrine\Common\EventSubscriber; -use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\Common\Persistence\ObjectManager; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ORM\EntityManager; From afd4fe0f8f9513901cef8d364fcc3162eb6935a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Bu=C3=9Fmann?= Date: Thu, 15 Apr 2021 16:15:47 +0200 Subject: [PATCH 4/5] Update UserManager.php --- Doctrine/UserManager.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Doctrine/UserManager.php b/Doctrine/UserManager.php index f11ff87c7c..9028837649 100644 --- a/Doctrine/UserManager.php +++ b/Doctrine/UserManager.php @@ -13,6 +13,7 @@ use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\Persistence\ObjectRepository; +use Doctrine\ORM\EntityManagerInterface; use FOS\UserBundle\Model\UserInterface; use FOS\UserBundle\Model\UserManager as BaseUserManager; use FOS\UserBundle\Util\CanonicalFieldsUpdater; @@ -35,10 +36,10 @@ class UserManager extends BaseUserManager * * @param PasswordUpdaterInterface $passwordUpdater * @param CanonicalFieldsUpdater $canonicalFieldsUpdater - * @param ObjectManager $om + * @param EntityManagerInterface $om * @param string $class */ - public function __construct(PasswordUpdaterInterface $passwordUpdater, CanonicalFieldsUpdater $canonicalFieldsUpdater, ObjectManager $om, $class) + public function __construct(PasswordUpdaterInterface $passwordUpdater, CanonicalFieldsUpdater $canonicalFieldsUpdater, EntityManagerInterface $om, $class) { parent::__construct($passwordUpdater, $canonicalFieldsUpdater); From 4e553ef4b6320e2a0008fd2a26dbbcaa1e0fde4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Bu=C3=9Fmann?= Date: Thu, 15 Apr 2021 16:16:09 +0200 Subject: [PATCH 5/5] Update UserListener.php --- Doctrine/UserListener.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Doctrine/UserListener.php b/Doctrine/UserListener.php index 642ded7aef..e286e494fc 100644 --- a/Doctrine/UserListener.php +++ b/Doctrine/UserListener.php @@ -13,7 +13,6 @@ use Doctrine\Common\EventSubscriber; use Doctrine\ORM\Event\LifecycleEventArgs; -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ORM\EntityManager; use FOS\UserBundle\Model\UserInterface; @@ -89,10 +88,10 @@ private function updateUserFields(UserInterface $user) /** * Recomputes change set for Doctrine implementations not doing it automatically after the event. * - * @param ObjectManager $om + * @param EntityManager $om * @param UserInterface $user */ - private function recomputeChangeSet(ObjectManager $om, UserInterface $user) + private function recomputeChangeSet(EntityManager $om, UserInterface $user) { $meta = $om->getClassMetadata(get_class($user));