Simplified render arguments normalization in Twig integration tests.

MateuszKolankowski · MateuszKolankowski · commit 73283977b083 · 2026-03-11T10:13:36.000+01:00
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/FileSystemTwigIntegrationTestCase.php b/tests/lib/MVC/Symfony/Templating/Twig/Extension/FileSystemTwigIntegrationTestCase.php
@@ -23,15 +23,6 @@
  */
 abstract class FileSystemTwigIntegrationTestCase extends IntegrationTestCase
 {
-    private function normalizeOutput(string $value): string
-    {
-        return preg_replace(
-            '/(^|[\s(])\\\\([A-Za-z_\\\\][A-Za-z0-9_\\\\]*::__set_state\()/m',
-            '$1$2',
-            $value
-        ) ?? $value;
-    }
-
     /**
      * Overrides the default implementation to use the chain loader so that
      * templates used internally are correctly loaded.
@@ -124,8 +115,7 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
                 );
             }
 
-            $expected = $this->normalizeOutput(trim($match[3], "\n "));
-            $output = $this->normalizeOutput($output);
+            $expected = trim($match[3], "\n ");
 
             if ($expected != $output) {
                 echo 'Compiled template that failed:';
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/QueryRenderingExtensionTest.php b/tests/lib/MVC/Symfony/Templating/Twig/Extension/QueryRenderingExtensionTest.php
@@ -9,17 +9,52 @@
 namespace Ibexa\Tests\Core\MVC\Symfony\Templating\Twig\Extension;
 
 use Ibexa\Core\MVC\Symfony\Templating\Twig\Extension\QueryRenderingExtension;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 
 final class QueryRenderingExtensionTest extends FileSystemTwigIntegrationTestCase
 {
+    /**
+     * @param array<mixed> $options
+     *
+     * @return array{
+     *     reference: array{
+     *         controller: string,
+     *         attributes: array<mixed>,
+     *         query: array<mixed>,
+     *     },
+     *     renderer: string,
+     *     options: array<mixed>,
+     * }
+     */
+    private static function normalizeRenderArguments(
+        ControllerReference $reference,
+        string $renderer,
+        array $options
+    ): array
+    {
+        return [
+            'reference' => [
+                'controller' => $reference->controller,
+                'attributes' => $reference->attributes,
+                'query' => $reference->query,
+            ],
+            'renderer' => $renderer,
+            'options' => $options,
+        ];
+    }
+
     protected function getExtensions(): array
     {
         $fragmentHandler = $this->createMock(FragmentHandler::class);
         $fragmentHandler
             ->method('render')
-            ->willReturnCallback(static function (...$args): string {
-                return var_export($args, true);
+            ->willReturnCallback(static function (
+                ControllerReference $reference,
+                string $renderer,
+                array $options
+            ): string {
+                return var_export(self::normalizeRenderArguments($reference, $renderer, $options), true);
             });
 
         return [
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ez_render_content_query.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ez_render_content_query.test
@@ -11,10 +11,10 @@
 return array()
 --EXPECT--
 array (
-  0 => 
-  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
-     'controller' => 'ibexa_query_render::renderQuery',
-     'attributes' => 
+  'reference' => 
+  array (
+    'controller' => 'ibexa_query_render::renderQuery',
+    'attributes' => 
     array (
       'options' => 
       array (
@@ -25,12 +25,12 @@ array (
         'template' => 'latest_blog_post.html.twig',
       ),
     ),
-     'query' => 
+    'query' => 
     array (
     ),
-  )),
-  1 => 'inline',
-  2 => 
+  ),
+  'renderer' => 'inline',
+  'options' => 
   array (
   ),
 )
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ez_render_content_query_esi.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ez_render_content_query_esi.test
@@ -11,10 +11,10 @@
 return array()
 --EXPECT--
 array (
-  0 => 
-  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
-     'controller' => 'ibexa_query_render::renderQuery',
-     'attributes' => 
+  'reference' => 
+  array (
+    'controller' => 'ibexa_query_render::renderQuery',
+    'attributes' => 
     array (
       'options' => 
       array (
@@ -25,12 +25,12 @@ array (
         'template' => 'latest_blog_post.html.twig',
       ),
     ),
-     'query' => 
+    'query' => 
     array (
     ),
-  )),
-  1 => 'esi',
-  2 => 
+  ),
+  'renderer' => 'esi',
+  'options' => 
   array (
   ),
 )
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ez_render_location_query.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ez_render_location_query.test
@@ -11,10 +11,10 @@
 return array()
 --EXPECT--
 array (
-  0 => 
-  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
-     'controller' => 'ibexa_query_render::renderQuery',
-     'attributes' => 
+  'reference' => 
+  array (
+    'controller' => 'ibexa_query_render::renderQuery',
+    'attributes' => 
     array (
       'options' => 
       array (
@@ -25,12 +25,12 @@ array (
         'template' => 'latest_blog_post.html.twig',
       ),
     ),
-     'query' => 
+    'query' => 
     array (
     ),
-  )),
-  1 => 'inline',
-  2 => 
+  ),
+  'renderer' => 'inline',
+  'options' => 
   array (
   ),
 )
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ez_render_location_query_esi.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ez_render_location_query_esi.test
@@ -11,10 +11,10 @@
 return array()
 --EXPECT--
 array (
-  0 => 
-  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
-     'controller' => 'ibexa_query_render::renderQuery',
-     'attributes' => 
+  'reference' => 
+  array (
+    'controller' => 'ibexa_query_render::renderQuery',
+    'attributes' => 
     array (
       'options' => 
       array (
@@ -25,12 +25,12 @@ array (
         'template' => 'latest_blog_post.html.twig',
       ),
     ),
-     'query' => 
+    'query' => 
     array (
     ),
-  )),
-  1 => 'esi',
-  2 => 
+  ),
+  'renderer' => 'esi',
+  'options' => 
   array (
   ),
 )
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query.test
@@ -11,10 +11,10 @@
 return array()
 --EXPECT--
 array (
-  0 => 
-  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
-     'controller' => 'ibexa_query_render::renderQuery',
-     'attributes' => 
+  'reference' => 
+  array (
+    'controller' => 'ibexa_query_render::renderQuery',
+    'attributes' => 
     array (
       'options' => 
       array (
@@ -25,12 +25,12 @@ array (
         'template' => 'latest_blog_post.html.twig',
       ),
     ),
-     'query' => 
+    'query' => 
     array (
     ),
-  )),
-  1 => 'inline',
-  2 => 
+  ),
+  'renderer' => 'inline',
+  'options' => 
   array (
   ),
 )
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query_esi.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query_esi.test
@@ -11,10 +11,10 @@
 return array()
 --EXPECT--
 array (
-  0 => 
-  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
-     'controller' => 'ibexa_query_render::renderQuery',
-     'attributes' => 
+  'reference' => 
+  array (
+    'controller' => 'ibexa_query_render::renderQuery',
+    'attributes' => 
     array (
       'options' => 
       array (
@@ -25,12 +25,12 @@ array (
         'template' => 'latest_blog_post.html.twig',
       ),
     ),
-     'query' => 
+    'query' => 
     array (
     ),
-  )),
-  1 => 'esi',
-  2 => 
+  ),
+  'renderer' => 'esi',
+  'options' => 
   array (
   ),
 )
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query.test
@@ -11,10 +11,10 @@
 return array()
 --EXPECT--
 array (
-  0 => 
-  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
-     'controller' => 'ibexa_query_render::renderQuery',
-     'attributes' => 
+  'reference' => 
+  array (
+    'controller' => 'ibexa_query_render::renderQuery',
+    'attributes' => 
     array (
       'options' => 
       array (
@@ -25,12 +25,12 @@ array (
         'template' => 'latest_blog_post.html.twig',
       ),
     ),
-     'query' => 
+    'query' => 
     array (
     ),
-  )),
-  1 => 'inline',
-  2 => 
+  ),
+  'renderer' => 'inline',
+  'options' => 
   array (
   ),
 )
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query_esi.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query_esi.test
@@ -11,10 +11,10 @@
 return array()
 --EXPECT--
 array (
-  0 => 
-  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
-     'controller' => 'ibexa_query_render::renderQuery',
-     'attributes' => 
+  'reference' => 
+  array (
+    'controller' => 'ibexa_query_render::renderQuery',
+    'attributes' => 
     array (
       'options' => 
       array (
@@ -25,12 +25,12 @@ array (
         'template' => 'latest_blog_post.html.twig',
       ),
     ),
-     'query' => 
+    'query' => 
     array (
     ),
-  )),
-  1 => 'esi',
-  2 => 
+  ),
+  'renderer' => 'esi',
+  'options' => 
   array (
   ),
 )
