Update codebase to PHP 7.4 (#146)

TavoNiievez · web-flow · commit 581210697cb5 · 2021-11-21T14:42:53.000-05:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.3, 7.4, 8.0]
+        php: [7.4, 8.0, 8.1]
         symfony: [4.4, 5.3]
 
     steps:
@@ -59,7 +59,10 @@ jobs:
           composer require symfony/css-selector=${{ matrix.symfony }} --ignore-platform-req=php --no-update
           composer require symfony/dom-crawler=${{ matrix.symfony }} --ignore-platform-req=php --no-update
           composer require symfony/browser-kit=${{ matrix.symfony }} --ignore-platform-req=php --no-update
-          composer install --prefer-dist --no-progress --ignore-platform-req=php
+          composer require vlucas/phpdotenv --ignore-platform-req=php --no-update
+          composer require codeception/module-asserts --ignore-platform-req=php --no-update
+          composer require codeception/module-doctrine2 --ignore-platform-req=php --no-update
+          composer install --prefer-dist --no-progress --ignore-platform-req=php --no-dev
 
       - name: Validate composer.json and composer.lock
         run: composer validate
diff --git a/composer.json b/composer.json
@@ -16,14 +16,22 @@
     ],
     "minimum-stability": "RC",
     "require": {
-        "php": "^7.3 | ^8.0",
+        "php": "^7.4 | ^8.0",
         "ext-json": "*",
         "codeception/lib-innerbrowser": "^1.4",
         "codeception/codeception": "^4.0"
     },
     "require-dev": {
         "codeception/module-asserts": "^1.3",
         "codeception/module-doctrine2": "^1.1",
+        "doctrine/orm": "^2.10",
+        "symfony/form": "^4.4 | ^5.0",
+        "symfony/framework-bundle": "^4.4 | ^5.0",
+        "symfony/http-kernel": "^4.4 | ^5.0",
+        "symfony/mailer": "^4.4 | ^5.0",
+        "symfony/routing": "^4.4 | ^5.0",
+        "symfony/security-bundle": "^4.4 | ^5.0",
+        "symfony/twig-bundle": "^4.4 | ^5.0",
         "vlucas/phpdotenv": "^4.2 | ^5.3"
     },
     "suggest": {
diff --git a/src/Codeception/Lib/Connector/Symfony.php b/src/Codeception/Lib/Connector/Symfony.php
@@ -17,25 +17,13 @@
 
 class Symfony extends HttpKernelBrowser
 {
-    /**
-     * @var bool
-     */
-    private $rebootable;
+    private bool $rebootable;
 
-    /**
-     * @var bool
-     */
-    private $hasPerformedRequest = false;
+    private bool $hasPerformedRequest = false;
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?ContainerInterface $container;
 
-    /**
-     * @var array
-     */
-    public $persistentServices = [];
+    public array $persistentServices = [];
 
     /**
      * Constructor.
@@ -67,6 +55,7 @@ protected function doRequest($request): Response
                 $this->hasPerformedRequest = true;
             }
         }
+
         return parent::doRequest($request);
     }
 
@@ -113,6 +102,7 @@ private function getContainer(): ?ContainerInterface
         if ($container->has('test.service_container')) {
             $container = $container->get('test.service_container');
         }
+
         return $container;
     }
 
@@ -123,6 +113,7 @@ private function getProfiler(): ?Profiler
             $profiler = $this->container->get('profiler');
             return $profiler;
         }
+
         return null;
     }
 
@@ -131,10 +122,11 @@ private function getService(string $serviceName): ?object
         if ($this->container->has($serviceName)) {
             return $this->container->get($serviceName);
         }
+
         return null;
     }
 
-    private function persistDoctrineConnections()
+    private function persistDoctrineConnections(): void
     {
         if (!$this->container->hasParameter('doctrine.connections')) {
             return;
diff --git a/src/Codeception/Module/Symfony.php b/src/Codeception/Module/Symfony.php
@@ -143,16 +143,16 @@ class Symfony extends Framework implements DoctrineProvider, PartedModule
     use TimeAssertionsTrait;
     use TwigAssertionsTrait;
 
-    /**
-     * @var Kernel
-     */
-    public $kernel;
+    public Kernel $kernel;
 
     /**
      * @var SymfonyConnector
      */
     public $client;
 
+    /**
+     * @var array
+     */
     public $config = [
         'app_path' => 'app',
         'kernel_class' => 'App\Kernel',
@@ -172,10 +172,7 @@ public function _parts(): array
         return ['services'];
     }
 
-    /**
-     * @var string|null
-     */
-    protected $kernelClass;
+    protected ?string $kernelClass = null;
 
     /**
      * Services that should be persistent permanently for all tests
@@ -229,6 +226,7 @@ public function _after(TestInterface $test): void
         foreach (array_keys($this->permanentServices) as $serviceName) {
             $this->permanentServices[$serviceName] = $this->grabService($serviceName);
         }
+
         parent::_after($test);
     }
 
@@ -250,6 +248,7 @@ public function _getEntityManager()
         if ($this->kernel === null) {
             $this->fail('Symfony module is not loaded');
         }
+
         $emService = $this->config['em_service'];
         if (!isset($this->permanentServices[$emService])) {
             // Try to persist configured entity manager
@@ -258,13 +257,16 @@ public function _getEntityManager()
             if ($container->has('doctrine')) {
                 $this->persistPermanentService('doctrine');
             }
+
             if ($container->has('doctrine.orm.default_entity_manager')) {
                 $this->persistPermanentService('doctrine.orm.default_entity_manager');
             }
+
             if ($container->has('doctrine.dbal.default_connection')) {
                 $this->persistPermanentService('doctrine.dbal.default_connection');
             }
         }
+
         return $this->permanentServices[$emService];
     }
 
@@ -277,9 +279,11 @@ public function _getContainer(): ContainerInterface
         if (!$container instanceof ContainerInterface) {
             $this->fail('Could not get Symfony container');
         }
+
         if ($container->has('test.service_container')) {
             $container = $container->get('test.service_container');
         }
+
         return $container;
     }
 
@@ -348,6 +352,7 @@ protected function getProfile(): ?Profile
         if (!$profiler = $this->getService('profiler')) {
             return null;
         }
+
         try {
             $response = $this->getClient()->getResponse();
             return $profiler->loadProfileFromResponse($response);
@@ -356,6 +361,7 @@ protected function getProfile(): ?Profile
         } catch (Exception $e) {
             $this->fail($e->getMessage());
         }
+
         return null;
     }
 
@@ -379,6 +385,7 @@ protected function grabCollector(string $collector, string $function, ?string $m
             if ($message) {
                 $this->fail($message);
             }
+
             $this->fail(
                 sprintf("The '%s' collector is needed to use the '%s' function.", $collector, $function)
             );
@@ -419,12 +426,14 @@ protected function debugResponse($url): void
                 $this->debugSection('User', 'Anonymous');
             }
         }
+
         if ($profile->hasCollector('mailer')) {
             /** @var MessageDataCollector $mailerCollector */
             $mailerCollector = $profile->getCollector('mailer');
             $emails = count($mailerCollector->getEvents()->getMessages());
             $this->debugSection('Emails', $emails . ' sent');
         }
+
         if ($profile->hasCollector('time')) {
             /** @var TimeDataCollector $timeCollector */
             $timeCollector = $profile->getCollector('time');
diff --git a/src/Codeception/Module/Symfony/BrowserAssertionsTrait.php b/src/Codeception/Module/Symfony/BrowserAssertionsTrait.php
@@ -50,6 +50,7 @@ public function seePageIsAvailable(string $url = null): void
             $this->amOnPage($url);
             $this->seeInCurrentUrl($url);
         }
+
         $this->assertThat($this->getClient()->getResponse(), new ResponseIsSuccessful());
     }
 
@@ -102,6 +103,7 @@ public function submitSymfonyForm(string $name, array $fields): void
             $fixedKey = sprintf('%s%s', $name, $key);
             $params[$fixedKey] = $value;
         }
+
         $button = sprintf('%s_submit', $name);
 
         $this->submitForm($selector, $params, $button);
diff --git a/src/Codeception/Module/Symfony/DoctrineAssertionsTrait.php b/src/Codeception/Module/Symfony/DoctrineAssertionsTrait.php
@@ -4,6 +4,7 @@
 
 namespace Codeception\Module\Symfony;
 
+use Doctrine\ORM\EntityRepository;
 use function class_exists;
 use function get_class;
 use function interface_exists;
@@ -39,6 +40,7 @@ public function grabNumRecords(string $entityClass, array $criteria = []): int
                 ->getQuery()
                 ->getSingleScalarResult();
         }
+
         return $repository->count($criteria);
     }
 
@@ -59,18 +61,20 @@ public function grabNumRecords(string $entityClass, array $criteria = []): int
      */
     public function grabRepository($mixed)
     {
-        $entityRepoClass = '\Doctrine\ORM\EntityRepository';
+        $entityRepoClass = EntityRepository::class;
         $isNotARepo = function () use ($mixed): void {
             $this->fail(
                 sprintf("'%s' is not an entity repository", $mixed)
             );
         };
-        $getRepo = function () use ($mixed, $entityRepoClass, $isNotARepo) {
+        $getRepo = function () use ($mixed, $entityRepoClass, $isNotARepo): ?EntityRepository {
             if (!$repo = $this->grabService($mixed)) return null;
+
             if (!$repo instanceof $entityRepoClass) {
                 $isNotARepo();
                 return null;
             }
+
             return $repo;
         };
 
@@ -123,7 +127,7 @@ public function seeNumRecords(int $expectedNum, string $className, array $criter
             $currentNum,
             sprintf(
                 'The number of found %s (%d) does not match expected number %d with %s',
-                $className, $currentNum, $expectedNum, json_encode($criteria)
+                $className, $currentNum, $expectedNum, json_encode($criteria, JSON_THROW_ON_ERROR)
             )
         );
     }
diff --git a/src/Codeception/Module/Symfony/FormAssertionsTrait.php b/src/Codeception/Module/Symfony/FormAssertionsTrait.php
@@ -65,6 +65,7 @@ public function seeFormErrorMessage(string $field, ?string $message = null): voi
                 if (!array_key_exists('errors', $child)) {
                     continue;
                 }
+
                 foreach ($child['errors'] as $error) {
                     $errors[$fieldName] = $error['message'];
                 }
diff --git a/src/Codeception/Module/Symfony/MailerAssertionsTrait.php b/src/Codeception/Module/Symfony/MailerAssertionsTrait.php
@@ -63,6 +63,7 @@ public function grabLastSentEmail(): ?Email
         if ($lastEmail = end($emails)) {
             return $lastEmail;
         }
+
         return null;
     }
 
diff --git a/src/Codeception/Module/Symfony/RouterAssertionsTrait.php b/src/Codeception/Module/Symfony/RouterAssertionsTrait.php
@@ -68,6 +68,7 @@ public function amOnRoute(string $routeName, array $params = []): void
         if ($router->getRouteCollection()->get($routeName) === null) {
             $this->fail(sprintf('Route with name "%s" does not exists.', $routeName));
         }
+
         $url = $router->generate($routeName, $params);
         $this->amOnPage($url);
     }
@@ -107,6 +108,7 @@ public function seeCurrentActionIs(string $action): void
                 return;
             }
         }
+
         $this->fail("Action '{$action}' does not exist");
     }
 
@@ -130,11 +132,13 @@ public function seeCurrentRouteIs(string $routeName, array $params = []): void
         }
 
         $uri = explode('?', $this->grabFromCurrentUrl())[0];
+        $match = [];
         try {
             $match = $router->match($uri);
         } catch (ResourceNotFoundException $e) {
             $this->fail(sprintf('The "%s" url does not match with any route', $uri));
         }
+
         $expected = array_merge(['_route' => $routeName], $params);
         $intersection = array_intersect_assoc($expected, $match);
 
@@ -160,6 +164,7 @@ public function seeInCurrentRoute(string $routeName): void
         }
 
         $uri = explode('?', $this->grabFromCurrentUrl())[0];
+        $matchedRouteName = '';
         try {
             $matchedRouteName = (string) $router->match($uri)['_route'];
         } catch (ResourceNotFoundException $e) {
diff --git a/src/Codeception/Module/Symfony/SecurityAssertionsTrait.php b/src/Codeception/Module/Symfony/SecurityAssertionsTrait.php
@@ -172,6 +172,7 @@ public function seeUserPasswordDoesNotNeedRehash(UserInterface $user = null): vo
                 $this->fail('No user found to validate');
             }
         }
+
         $hasher = $this->grabPasswordHasherService();
 
         $this->assertFalse($hasher->needsRehash($user), 'User password needs rehash');
diff --git a/src/Codeception/Module/Symfony/ServicesAssertionsTrait.php b/src/Codeception/Module/Symfony/ServicesAssertionsTrait.php
@@ -29,6 +29,7 @@ public function grabService(string $serviceId): object
             $this->fail("Service `{$serviceId}` is required by Codeception, but not loaded by Symfony since you're not using it anywhere in your app.\n
             Recommended solution: Set it to `public` in your `config/services_test.php`/`.yaml`, see https://symfony.com/doc/current/service_container/alias_private.html#marking-services-as-public-private");
         }
+
         return $service;
     }
 
@@ -75,9 +76,11 @@ public function unpersistService(string $serviceName): void
         if (isset($this->persistentServices[$serviceName])) {
             unset($this->persistentServices[$serviceName]);
         }
+
         if (isset($this->permanentServices[$serviceName])) {
             unset($this->permanentServices[$serviceName]);
         }
+
         if ($this->client instanceof SymfonyConnector && isset($this->client->persistentServices[$serviceName])) {
             unset($this->client->persistentServices[$serviceName]);
         }
@@ -89,6 +92,7 @@ protected function getService(string $serviceId): ?object
         if ($container->has($serviceId)) {
             return $container->get($serviceId);
         }
+
         return null;
     }
 }
diff --git a/src/Codeception/Module/Symfony/SessionAssertionsTrait.php b/src/Codeception/Module/Symfony/SessionAssertionsTrait.php
@@ -137,6 +137,7 @@ public function logoutProgrammatically(): void
                 $cookieJar->expire($cookieName);
             }
         }
+
         $cookieJar->flushExpiredCookies();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -17,25 +17,13 @@`
`17`	`17`
`18`	`18`	`class Symfony extends HttpKernelBrowser`
`19`	`19`	`{`
`20`		`- /**`
`21`		`- * @var bool`
`22`		`- */`
`23`		`- private $rebootable;`
	`20`	`+ private bool $rebootable;`
`24`	`21`
`25`		`- /**`
`26`		`- * @var bool`
`27`		`- */`
`28`		`- private $hasPerformedRequest = false;`
	`22`	`+ private bool $hasPerformedRequest = false;`
`29`	`23`
`30`		`- /**`
`31`		`- * @var ContainerInterface`
`32`		`- */`
`33`		`- private $container;`
	`24`	`+ private ?ContainerInterface $container;`
`34`	`25`
`35`		`- /**`
`36`		`- * @var array`
`37`		`- */`
`38`		`- public $persistentServices = [];`
	`26`	`+ public array $persistentServices = [];`
`39`	`27`
`40`	`28`	`/**`
`41`	`29`	`* Constructor.`
`@@ -67,6 +55,7 @@ protected function doRequest($request): Response`
`67`	`55`	`$this->hasPerformedRequest = true;`
`68`	`56`	`}`
`69`	`57`	`}`
	`58`	`+`
`70`	`59`	`return parent::doRequest($request);`
`71`	`60`	`}`
`72`	`61`
`@@ -113,6 +102,7 @@ private function getContainer(): ?ContainerInterface`
`113`	`102`	`if ($container->has('test.service_container')) {`
`114`	`103`	`$container = $container->get('test.service_container');`
`115`	`104`	`}`
	`105`	`+`
`116`	`106`	`return $container;`
`117`	`107`	`}`
`118`	`108`
`@@ -123,6 +113,7 @@ private function getProfiler(): ?Profiler`
`123`	`113`	`$profiler = $this->container->get('profiler');`
`124`	`114`	`return $profiler;`
`125`	`115`	`}`
	`116`	`+`
`126`	`117`	`return null;`
`127`	`118`	`}`
`128`	`119`
`@@ -131,10 +122,11 @@ private function getService(string $serviceName): ?object`
`131`	`122`	`if ($this->container->has($serviceName)) {`
`132`	`123`	`return $this->container->get($serviceName);`
`133`	`124`	`}`
	`125`	`+`
`134`	`126`	`return null;`
`135`	`127`	`}`
`136`	`128`
`137`		`- private function persistDoctrineConnections()`
	`129`	`+ private function persistDoctrineConnections(): void`
`138`	`130`	`{`
`139`	`131`	`if (!$this->container->hasParameter('doctrine.connections')) {`
`140`	`132`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -143,16 +143,16 @@ class Symfony extends Framework implements DoctrineProvider, PartedModule`
`143`	`143`	`use TimeAssertionsTrait;`
`144`	`144`	`use TwigAssertionsTrait;`
`145`	`145`
`146`		`- /**`
`147`		`- * @var Kernel`
`148`		`- */`
`149`		`- public $kernel;`
	`146`	`+ public Kernel $kernel;`
`150`	`147`
`151`	`148`	`/**`
`152`	`149`	`* @var SymfonyConnector`
`153`	`150`	`*/`
`154`	`151`	`public $client;`
`155`	`152`
	`153`	`+ /**`
	`154`	`+ * @var array`
	`155`	`+ */`
`156`	`156`	`public $config = [`
`157`	`157`	`'app_path' => 'app',`
`158`	`158`	`'kernel_class' => 'App\Kernel',`
`@@ -172,10 +172,7 @@ public function _parts(): array`
`172`	`172`	`return ['services'];`
`173`	`173`	`}`
`174`	`174`
`175`		`- /**`
`176`		`- * @var string\|null`
`177`		`- */`
`178`		`- protected $kernelClass;`
	`175`	`+ protected ?string $kernelClass = null;`
`179`	`176`
`180`	`177`	`/**`
`181`	`178`	`* Services that should be persistent permanently for all tests`
`@@ -229,6 +226,7 @@ public function _after(TestInterface $test): void`
`229`	`226`	`foreach (array_keys($this->permanentServices) as $serviceName) {`
`230`	`227`	`$this->permanentServices[$serviceName] = $this->grabService($serviceName);`
`231`	`228`	`}`
	`229`	`+`
`232`	`230`	`parent::_after($test);`
`233`	`231`	`}`
`234`	`232`
`@@ -250,6 +248,7 @@ public function _getEntityManager()`
`250`	`248`	`if ($this->kernel === null) {`
`251`	`249`	`$this->fail('Symfony module is not loaded');`
`252`	`250`	`}`
	`251`	`+`
`253`	`252`	`$emService = $this->config['em_service'];`
`254`	`253`	`if (!isset($this->permanentServices[$emService])) {`
`255`	`254`	`// Try to persist configured entity manager`
`@@ -258,13 +257,16 @@ public function _getEntityManager()`
`258`	`257`	`if ($container->has('doctrine')) {`
`259`	`258`	`$this->persistPermanentService('doctrine');`
`260`	`259`	`}`
	`260`	`+`
`261`	`261`	`if ($container->has('doctrine.orm.default_entity_manager')) {`
`262`	`262`	`$this->persistPermanentService('doctrine.orm.default_entity_manager');`
`263`	`263`	`}`
	`264`	`+`
`264`	`265`	`if ($container->has('doctrine.dbal.default_connection')) {`
`265`	`266`	`$this->persistPermanentService('doctrine.dbal.default_connection');`
`266`	`267`	`}`
`267`	`268`	`}`
	`269`	`+`
`268`	`270`	`return $this->permanentServices[$emService];`
`269`	`271`	`}`
`270`	`272`
`@@ -277,9 +279,11 @@ public function _getContainer(): ContainerInterface`
`277`	`279`	`if (!$container instanceof ContainerInterface) {`
`278`	`280`	`$this->fail('Could not get Symfony container');`
`279`	`281`	`}`
	`282`	`+`
`280`	`283`	`if ($container->has('test.service_container')) {`
`281`	`284`	`$container = $container->get('test.service_container');`
`282`	`285`	`}`
	`286`	`+`
`283`	`287`	`return $container;`
`284`	`288`	`}`
`285`	`289`
`@@ -348,6 +352,7 @@ protected function getProfile(): ?Profile`
`348`	`352`	`if (!$profiler = $this->getService('profiler')) {`
`349`	`353`	`return null;`
`350`	`354`	`}`
	`355`	`+`
`351`	`356`	`try {`
`352`	`357`	`$response = $this->getClient()->getResponse();`
`353`	`358`	`return $profiler->loadProfileFromResponse($response);`
`@@ -356,6 +361,7 @@ protected function getProfile(): ?Profile`
`356`	`361`	`} catch (Exception $e) {`
`357`	`362`	`$this->fail($e->getMessage());`
`358`	`363`	`}`
	`364`	`+`
`359`	`365`	`return null;`
`360`	`366`	`}`
`361`	`367`
`@@ -379,6 +385,7 @@ protected function grabCollector(string $collector, string $function, ?string $m`
`379`	`385`	`if ($message) {`
`380`	`386`	`$this->fail($message);`
`381`	`387`	`}`
	`388`	`+`
`382`	`389`	`$this->fail(`
`383`	`390`	`sprintf("The '%s' collector is needed to use the '%s' function.", $collector, $function)`
`384`	`391`	`);`
`@@ -419,12 +426,14 @@ protected function debugResponse($url): void`
`419`	`426`	`$this->debugSection('User', 'Anonymous');`
`420`	`427`	`}`
`421`	`428`	`}`
	`429`	`+`
`422`	`430`	`if ($profile->hasCollector('mailer')) {`
`423`	`431`	`/** @var MessageDataCollector $mailerCollector */`
`424`	`432`	`$mailerCollector = $profile->getCollector('mailer');`
`425`	`433`	`$emails = count($mailerCollector->getEvents()->getMessages());`
`426`	`434`	`$this->debugSection('Emails', $emails . ' sent');`
`427`	`435`	`}`
	`436`	`+`
`428`	`437`	`if ($profile->hasCollector('time')) {`
`429`	`438`	`/** @var TimeDataCollector $timeCollector */`
`430`	`439`	`$timeCollector = $profile->getCollector('time');`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public function seePageIsAvailable(string $url = null): void`
`50`	`50`	`$this->amOnPage($url);`
`51`	`51`	`$this->seeInCurrentUrl($url);`
`52`	`52`	`}`
	`53`	`+`
`53`	`54`	`$this->assertThat($this->getClient()->getResponse(), new ResponseIsSuccessful());`
`54`	`55`	`}`
`55`	`56`
`@@ -102,6 +103,7 @@ public function submitSymfonyForm(string $name, array $fields): void`
`102`	`103`	`$fixedKey = sprintf('%s%s', $name, $key);`
`103`	`104`	`$params[$fixedKey] = $value;`
`104`	`105`	`}`
	`106`	`+`
`105`	`107`	`$button = sprintf('%s_submit', $name);`
`106`	`108`
`107`	`109`	`$this->submitForm($selector, $params, $button);`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public function seeFormErrorMessage(string $field, ?string $message = null): voi`
`65`	`65`	`if (!array_key_exists('errors', $child)) {`
`66`	`66`	`continue;`
`67`	`67`	`}`
	`68`	`+`
`68`	`69`	`foreach ($child['errors'] as $error) {`
`69`	`70`	`$errors[$fieldName] = $error['message'];`
`70`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ public function grabLastSentEmail(): ?Email`
`63`	`63`	`if ($lastEmail = end($emails)) {`
`64`	`64`	`return $lastEmail;`
`65`	`65`	`}`
	`66`	`+`
`66`	`67`	`return null;`
`67`	`68`	`}`
`68`	`69`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public function amOnRoute(string $routeName, array $params = []): void`
`68`	`68`	`if ($router->getRouteCollection()->get($routeName) === null) {`
`69`	`69`	`$this->fail(sprintf('Route with name "%s" does not exists.', $routeName));`
`70`	`70`	`}`
	`71`	`+`
`71`	`72`	`$url = $router->generate($routeName, $params);`
`72`	`73`	`$this->amOnPage($url);`
`73`	`74`	`}`
`@@ -107,6 +108,7 @@ public function seeCurrentActionIs(string $action): void`
`107`	`108`	`return;`
`108`	`109`	`}`
`109`	`110`	`}`
	`111`	`+`
`110`	`112`	`$this->fail("Action '{$action}' does not exist");`
`111`	`113`	`}`
`112`	`114`
`@@ -130,11 +132,13 @@ public function seeCurrentRouteIs(string $routeName, array $params = []): void`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`$uri = explode('?', $this->grabFromCurrentUrl())[0];`
	`135`	`+ $match = [];`
`133`	`136`	`try {`
`134`	`137`	`$match = $router->match($uri);`
`135`	`138`	`} catch (ResourceNotFoundException $e) {`
`136`	`139`	`$this->fail(sprintf('The "%s" url does not match with any route', $uri));`
`137`	`140`	`}`
	`141`	`+`
`138`	`142`	`$expected = array_merge(['_route' => $routeName], $params);`
`139`	`143`	`$intersection = array_intersect_assoc($expected, $match);`
`140`	`144`
`@@ -160,6 +164,7 @@ public function seeInCurrentRoute(string $routeName): void`
`160`	`164`	`}`
`161`	`165`
`162`	`166`	`$uri = explode('?', $this->grabFromCurrentUrl())[0];`
	`167`	`+ $matchedRouteName = '';`
`163`	`168`	`try {`
`164`	`169`	`$matchedRouteName = (string) $router->match($uri)['_route'];`
`165`	`170`	`} catch (ResourceNotFoundException $e) {`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@ public function seeUserPasswordDoesNotNeedRehash(UserInterface $user = null): vo`
`172`	`172`	`$this->fail('No user found to validate');`
`173`	`173`	`}`
`174`	`174`	`}`
	`175`	`+`
`175`	`176`	`$hasher = $this->grabPasswordHasherService();`
`176`	`177`
`177`	`178`	`$this->assertFalse($hasher->needsRehash($user), 'User password needs rehash');`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public function grabService(string $serviceId): object`
`29`	`29`	$this->fail("Service `{$serviceId}` is required by Codeception, but not loaded by Symfony since you're not using it anywhere in your app.\n
`30`	`30`	Recommended solution: Set it to `public` in your `config/services_test.php`/`.yaml`, see https://symfony.com/doc/current/service_container/alias_private.html#marking-services-as-public-private");
`31`	`31`	`}`
	`32`	`+`
`32`	`33`	`return $service;`
`33`	`34`	`}`
`34`	`35`
`@@ -75,9 +76,11 @@ public function unpersistService(string $serviceName): void`
`75`	`76`	`if (isset($this->persistentServices[$serviceName])) {`
`76`	`77`	`unset($this->persistentServices[$serviceName]);`
`77`	`78`	`}`
	`79`	`+`
`78`	`80`	`if (isset($this->permanentServices[$serviceName])) {`
`79`	`81`	`unset($this->permanentServices[$serviceName]);`
`80`	`82`	`}`
	`83`	`+`
`81`	`84`	`if ($this->client instanceof SymfonyConnector && isset($this->client->persistentServices[$serviceName])) {`
`82`	`85`	`unset($this->client->persistentServices[$serviceName]);`
`83`	`86`	`}`
`@@ -89,6 +92,7 @@ protected function getService(string $serviceId): ?object`
`89`	`92`	`if ($container->has($serviceId)) {`
`90`	`93`	`return $container->get($serviceId);`
`91`	`94`	`}`
	`95`	`+`
`92`	`96`	`return null;`
`93`	`97`	`}`
`94`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ public function logoutProgrammatically(): void`
`137`	`137`	`$cookieJar->expire($cookieName);`
`138`	`138`	`}`
`139`	`139`	`}`
	`140`	`+`
`140`	`141`	`$cookieJar->flushExpiredCookies();`
`141`	`142`	`}`
`142`	`143`