Refactor Doctrine connections persistence

Author: TavoNiievez

.github/workflows/main.yml

@@ -8,6 +8,8 @@ jobs:
       matrix:
         php: [8.2, 8.3, 8.4]
         symfony: ["5.4.*", "6.4.*", "6.4wApi", "7.3.*"]
+    env:
+      only_sf_latest: &only_sf_latest ${{ matrix.symfony == '7.3.*' }}
 
     steps:
       - name: Checkout code
@@ -79,13 +81,17 @@ jobs:
           composer update --prefer-dist --no-progress
 
       - name: Run PHPStan (max)
-        if: ${{ matrix.symfony == '7.3.*' }}
+        if: *only_sf_latest
         run: composer phpstan
 
       - name: Run PHP-CS-Fixer
-        if: ${{ matrix.symfony == '7.3.*' }}
+        if: *only_sf_latest
         run: composer cs-check
 
+      - name: Run Composer Audit
+        if: *only_sf_latest
+        run: composer audit
+
       - name: Validate Composer files
         run: composer validate --strict
         working-directory: framework-tests

src/Codeception/Lib/Connector/Symfony.php

@@ -6,10 +6,8 @@
 
 use InvalidArgumentException;
 use LogicException;
-use ReflectionMethod;
-use ReflectionProperty;
-use Symfony\Bundle\FrameworkBundle\Test\TestContainer;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelBrowser;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -118,28 +116,12 @@ private function persistDoctrineConnections(): void
             return;
         }
 
-        if ($this->container instanceof TestContainer) {
-            $method = new ReflectionMethod($this->container, 'getPublicContainer');
-            $publicContainer = $method->invoke($this->container);
-        } else {
-            $publicContainer = $this->container;
-        }
-
-        if (!is_object($publicContainer) || !method_exists($publicContainer, 'getParameterBag')) {
-            return;
-        }
-
-        $target = property_exists($publicContainer, 'parameters')
-            ? $publicContainer
-            : $publicContainer->getParameterBag();
-
-        if (!is_object($target) || !property_exists($target, 'parameters')) {
-            return;
+        if ($this->container instanceof Container) {
+            try {
+                $this->container->getParameterBag()->remove('doctrine.connections');
+            } catch (LogicException) {
+                // Parameter bag is frozen and cannot be modified.
+            }
         }
-        $prop = new ReflectionProperty($target, 'parameters');
-
-        $params = (array) $prop->getValue($target);
-        unset($params['doctrine.connections']);
-        $prop->setValue($target, $params);
     }
 }

src/Codeception/Module/Symfony.php

@@ -65,6 +65,7 @@
 use function file_exists;
 use function implode;
 use function in_array;
+use function extension_loaded;
 use function ini_get;
 use function ini_set;
 use function is_object;
@@ -495,6 +496,10 @@ protected function getInternalDomains(): array
      */
     private function setXdebugMaxNestingLevel(int $max): void
     {
+        if (!extension_loaded('xdebug')) {
+            return;
+        }
+
         if ((int) ini_get('xdebug.max_nesting_level') < $max) {
             ini_set('xdebug.max_nesting_level', (string) $max);
         }

src/Codeception/Module/Symfony/BrowserAssertionsTrait.php

@@ -330,10 +330,7 @@ public function seePageRedirectsTo(string $page, string $redirectsTo): void
         $client->followRedirects(false);
         $this->amOnPage($page);
 
-        $this->assertTrue(
-            $client->getResponse()->isRedirection(),
-            'The response is not a redirection.'
-        );
+        $this->assertThatForResponse(new ResponseIsRedirected(), 'The response is not a redirection.');
 
         $client->followRedirect();
         $this->seeInCurrentUrl($redirectsTo);