add ^6.0 for framework-extra-bundle

Author: jwong-dayspring

Controller/ForgotResetController.php

@@ -5,6 +5,7 @@
 use Dayspring\LoginBundle\Entity\ChangePasswordEntity;
 use Dayspring\LoginBundle\Form\Type\ChangePasswordType;
 use Dayspring\LoginBundle\Form\Type\ResetPasswordType;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
@@ -24,27 +25,14 @@
 
 class ForgotResetController extends AbstractController
 {
-    protected $userProvider;
-    protected $authenticationManager;
-    protected $session;
-    protected $tokenStorage;
-    protected $userPasswordHasher;
-    protected $mailer;
 
     public function __construct(
-//        AuthenticationManagerInterface $authenticationManager,
-        UserProviderInterface $userProvider,
-        SessionInterface $session,
-        MailerInterface $mailer,
-        TokenStorageInterface $tokenStorage,
-        UserPasswordHasherInterface $userPasswordHasher
+        protected UserProviderInterface $userProvider,
+        protected RequestStack $requestStack,
+        protected MailerInterface $mailer,
+        protected TokenStorageInterface $tokenStorage,
+        protected UserPasswordHasherInterface $userPasswordHasher
     ) {
-//        $this->authenticationManager = $authenticationManager;
-        $this->mailer = $mailer;
-        $this->session = $session;
-        $this->tokenStorage = $tokenStorage;
-        $this->userPasswordHasher = $userPasswordHasher;
-        $this->userProvider = $userProvider;
     }
 
     /**
@@ -165,7 +153,7 @@ public function changePasswordAction(Request $request)
 //                $token = $this->authenticationManager->authenticate($token);
 //                $this->tokenStorage->setToken($token);
 
-                $this->session->getFlashBag()->add('success', 'New password has been saved.');
+                $this->requestStack->getSession()->getFlashBag()->add('success', 'New password has been saved.');
 
                 return $this->redirect($this->generateUrl("account_dashboard"));
             }

Tests/Resources/config/config.yml

@@ -11,7 +11,7 @@ framework:
     #serializer:      { enable_annotations: true }
     #templating:    { engines: ['twig', 'php'] }
     session:
-        storage_id: session.storage.mock_file
+        storage_factory_id: session.storage.factory.mock_file
     profiler:
         collect: false
     mailer:

Tests/TestKernel.php

@@ -8,17 +8,17 @@
 
 class TestKernel extends Kernel
 {
-    public function getProjectDir()
+    public function getProjectDir(): string
     {
         return __DIR__;
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return __DIR__.'/../var/cache';
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return __DIR__.'/../var/log';
     }

Tests/WebTestCase.php

@@ -19,7 +19,7 @@ class WebTestCase extends BaseWebTestCase
 
     protected static $application;
 
-    protected static function getKernelClass()
+    protected static function getKernelClass(): string
     {
         return TestKernel::class;
     }

composer.json

@@ -41,7 +41,7 @@
         "symfony/asset": "^5.3|^6.0",
         "symfony/expression-language": "^5.1|^6.0",
         "symfony/monolog-bundle": "^3.6.0",
-        "sensio/framework-extra-bundle": "^5.5.6",
+        "sensio/framework-extra-bundle": "^5.5.6|^6.0",
         "dayspring-tech/propel-bundle": "dev-jrw-symfony_6 as 6.0.0",
 
         "egulias/email-validator": "^2.1.25|^3.0|^4.0",