Skip to content

Added twig 3 support #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patrickbussmann wants to merge 5 commits into
base: bugfix
Choose a base branch
from
Open

Added twig 3 support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58767f8
Added twig 3 support
patrickbussmann Mar 5, 2020
d4387b8
Added PHP 8 to composer.json
patrickbussmann Apr 15, 2021
c5414e2
Update UserListener.php
patrickbussmann Apr 15, 2021
afd4fe0
Update UserManager.php
patrickbussmann Apr 15, 2021
4e553ef
Update UserListener.php
patrickbussmann Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Doctrine/UserListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
namespace FOS\UserBundle\Doctrine;

use Doctrine\Common\EventSubscriber;
use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
use Doctrine\Common\Persistence\ObjectManager;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ODM\MongoDB\DocumentManager;
use Doctrine\ORM\EntityManager;
use FOS\UserBundle\Model\UserInterface;
Expand Down Expand Up @@ -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));

Expand Down
5 changes: 3 additions & 2 deletions Doctrine/UserManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down