Skip to content

Bugfix ovg2 #4

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
ovgray wants to merge 2 commits into
base: bugfix
Choose a base branch
from
Open

Bugfix ovg2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a38e70a
update references to TranslatorInterface and Twig\Environment
ovgray Dec 23, 2019
adb71b8
remove use of AdvancedUserInterface
ovgray Jan 10, 2020
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
2 changes: 1 addition & 1 deletion Mailer/TwigSwiftMailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class TwigSwiftMailer implements MailerInterface
* @param \Twig_Environment $twig
* @param array $parameters
*/
public function __construct(\Swift_Mailer $mailer, UrlGeneratorInterface $router, \Twig_Environment $twig, array $parameters)
public function __construct(\Swift_Mailer $mailer, UrlGeneratorInterface $router, \Twig\Environment $twig, array $parameters)
{
$this->mailer = $mailer;
$this->router = $router;
Expand Down
26 changes: 13 additions & 13 deletions Model/UserInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,18 +277,18 @@ public function isCredentialsNonExpired();
public function isEnabled();
}

// This is required to support apps that explicitly check if a user is an instance of AdvancedUserInterface
if (interface_exists('\Symfony\Component\Security\Core\User\AdvancedUserInterface')) {
/**
* @author Thibault Duplessis <thibault.duplessis@gmail.com>
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
*
* @deprecated since Symfony 4.1. Remove in Nov 2023 (End of support for security fixes SF 4.4)
*/
interface UserInterface extends FosUserInterface, \Symfony\Component\Security\Core\User\AdvancedUserInterface
{
}
} else {
//// This is required to support apps that explicitly check if a user is an instance of AdvancedUserInterface
//if (interface_exists('\Symfony\Component\Security\Core\User\AdvancedUserInterface')) {
// /**
// * @author Thibault Duplessis <thibault.duplessis@gmail.com>
// * @author Johannes M. Schmitt <schmittjoh@gmail.com>
// *
// * @deprecated since Symfony 4.1. Remove in Nov 2023 (End of support for security fixes SF 4.4)
// */
// interface UserInterface extends FosUserInterface, \Symfony\Component\Security\Core\User\AdvancedUserInterface
// {
// }
//} else {
/**
* @author Thibault Duplessis <thibault.duplessis@gmail.com>
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
Expand All @@ -297,4 +297,4 @@ interface UserInterface extends FosUserInterface, \Symfony\Component\Security\Co
interface UserInterface extends FosUserInterface, BaseUserInterface, EquatableInterface
{
}
}
//}
2 changes: 1 addition & 1 deletion Tests/EventListener/FlashListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Contracts\EventDispatcher\Event;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

class FlashListenerTest extends TestCase
{
Expand Down
18 changes: 9 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
"require": {
"php": "^7.2.5",
"paragonie/random_compat": "^1 || ^2 || ^9",
"symfony/form": "^4.4 || ^5.0",
"symfony/framework-bundle": "^4.4 || ^5.0",
"symfony/security-bundle": "^4.4 || ^5.0",
"symfony/templating": "^4.4 || ^5.0",
"symfony/translation": "^4.4 || ^5.0",
"symfony/form": "^4.4",
"symfony/framework-bundle": "^4.4",
"symfony/security-bundle": "^4.4",
"symfony/templating": "^4.4",
"symfony/translation": "^4.4",
"symfony/translation-contracts": "^2.0",
"symfony/twig-bundle": "^4.4 || ^5.0",
"symfony/validator": "^4.4 || ^5.0",
"symfony/twig-bundle": "^4.4",
"symfony/validator": "^4.4",
"twig/twig": "^1.28 || ^2.0"
},
"conflict": {
Expand All @@ -42,9 +42,9 @@
"friendsofphp/php-cs-fixer": "^2.2",
"phpunit/phpunit": "^4.8.35 || ^5.7.11 || ^6.5 || ^8",
"swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
"symfony/console": "^4.4 || ^5.0",
"symfony/console": "^4.4",
"symfony/phpunit-bridge": "^3.4 || ^4.2 || ^5.0",
"symfony/yaml": "^4.4 || ^5.0"
"symfony/yaml": "^4.4"
},
"config": {
"sort-packages": true
Expand Down