Revert "Added tests for IBX-3035"

vidarl · vidarl · commit 8cecc06b2df4 · 2025-11-27T15:04:17.000+01:00
This reverts commit 15bedfa.
diff --git a/tests/bundle/Core/Fragment/DirectFragmentRendererTest.php b/tests/bundle/Core/Fragment/DirectFragmentRendererTest.php
@@ -31,13 +31,13 @@ public function testSubRequestBuilding(): void
         $controllerResolver
             ->expects($this->any())
             ->method('getController')
-            ->with($this->callback(static function (Request $request) {
-                self::assertEquals('/_fragment', $request->getPathInfo());
-                self::assertEquals('some::controller', $request->attributes->get('_controller'));
-                self::assertEquals('attribute_value', $request->attributes->get('some'));
-                self::assertEquals('else', $request->attributes->get('something'));
-                self::assertInstanceOf(SiteAccess::class, $request->attributes->get('siteaccess'));
-                self::assertEquals('test', $request->attributes->get('siteaccess')->name);
+            ->with($this->callback(function (Request $request) {
+                $this->assertEquals('/_fragment', $request->getPathInfo());
+                $this->assertEquals('some::controller', $request->attributes->get('_controller'));
+                $this->assertEquals('attribute_value', $request->attributes->get('some'));
+                $this->assertEquals('else', $request->attributes->get('something'));
+                $this->assertInstanceOf(SiteAccess::class, $request->attributes->get('siteaccess'));
+                $this->assertEquals('test', $request->attributes->get('siteaccess')->name);
 
                 return true;
             }))
@@ -65,7 +65,8 @@ public function testSubRequestBuilding(): void
         $directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver);
         $response = $directFragmentRenderer->render($controllerReference, $request);
 
-        self::assertSame('rendered_response', $response->getContent());
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertSame('rendered_response', $response->getContent());
     }
 
     public function testControllerResponse(): void
@@ -81,27 +82,11 @@ public function testControllerResponse(): void
         $directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver);
         $response = $directFragmentRenderer->render('', new Request(), []);
 
-        self::assertSame('response_body', $response->getContent());
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertSame('response_body', $response->getContent());
     }
 
-    /**
-     * @return iterable<array{0: array<string, string>|null}>
-     */
-    public function controllerViewResponseDataProvider(): iterable
-    {
-        yield [[
-            'my_param1' => 'custom_data',
-            'my_param2' => 'foobar',
-        ]];
-
-        yield [null];
-    }
-
-    /**
-     * @param array<string, string>|null $params
-     * @dataProvider controllerViewResponseDataProvider
-     */
-    public function testControllerViewResponse(?array $params = null): void
+    public function testControllerViewResponse(): void
     {
         $contentView = new ContentView();
         $contentView->setTemplateIdentifier('template_identifier');
@@ -120,33 +105,16 @@ public function testControllerViewResponse(?array $params = null): void
             ->expects($this->once())
             ->method('render')
             ->with($contentView)
-            ->willReturnCallback(
-                static function (ContentView $cV) use ($params): string {
-                    if ($params !== null) {
-                        foreach ($params as $key => $value) {
-                            self::assertArrayHasKey($key, $cV->getParameters());
-                        }
-                    }
-
-                    return 'rendered_' . $cV->getTemplateIdentifier();
-                }
-            );
+            ->willReturn('rendered_' . $contentView->getTemplateIdentifier());
 
         $directFragmentRenderer = $this->getDirectFragmentRenderer(
             $controllerResolverMock,
             $templateRendererMock
         );
-        $response = $directFragmentRenderer->render(
-            '',
-            new Request(),
-            [
-                'viewType' => 'line',
-                'method' => 'direct',
-                'params' => $params,
-            ]
-        );
+        $response = $directFragmentRenderer->render('', new Request(), []);
 
-        self::assertSame('rendered_template_identifier', $response->getContent());
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertSame('rendered_template_identifier', $response->getContent());
     }
 
     public function testControllerStringResponse(): void
@@ -162,7 +130,8 @@ public function testControllerStringResponse(): void
         $directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver);
         $response = $directFragmentRenderer->render('', new Request(), []);
 
-        self::assertSame('some_prerendered_response', $response->getContent());
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertSame('some_prerendered_response', $response->getContent());
     }
 
     public function testControllerUnhandledStringResponse(): void
diff --git a/tests/bundle/Core/Fragment/FragmentRendererBaseTest.php b/tests/bundle/Core/Fragment/FragmentRendererBaseTest.php
@@ -43,22 +43,22 @@ public function testRendererControllerReferenceWithCompoundMatcher(): Controller
             ->will($this->returnValue($expectedReturn));
 
         $renderer = $this->getRenderer();
-        self::assertSame($expectedReturn, $renderer->render($reference, $request, $options));
-        self::assertArrayHasKey('serialized_siteaccess', $reference->attributes);
+        $this->assertSame($expectedReturn, $renderer->render($reference, $request, $options));
+        $this->assertArrayHasKey('serialized_siteaccess', $reference->attributes);
         $serializedSiteAccess = json_encode($siteAccess);
-        self::assertSame($serializedSiteAccess, $reference->attributes['serialized_siteaccess']);
-        self::assertArrayHasKey('serialized_siteaccess_matcher', $reference->attributes);
-        self::assertSame(
+        $this->assertSame($serializedSiteAccess, $reference->attributes['serialized_siteaccess']);
+        $this->assertArrayHasKey('serialized_siteaccess_matcher', $reference->attributes);
+        $this->assertSame(
             $this->getSerializer()->serialize(
                 $siteAccess->matcher,
                 'json',
                 [AbstractNormalizer::IGNORED_ATTRIBUTES => ['request', 'container', 'matcherBuilder']]
             ),
             $reference->attributes['serialized_siteaccess_matcher']
         );
-        self::assertArrayHasKey('serialized_siteaccess_sub_matchers', $reference->attributes);
+        $this->assertArrayHasKey('serialized_siteaccess_sub_matchers', $reference->attributes);
         foreach ($siteAccess->matcher->getSubMatchers() as $subMatcher) {
-            self::assertSame(
+            $this->assertSame(
                 $this->getSerializer()->serialize(
                     $subMatcher,
                     'json',
diff --git a/tests/bundle/Core/Fragment/InlineFragmentRendererTest.php b/tests/bundle/Core/Fragment/InlineFragmentRendererTest.php
@@ -11,7 +11,6 @@
 use Ibexa\Core\MVC\Symfony\Component\Serializer\SerializerTrait;
 use Ibexa\Core\MVC\Symfony\SiteAccess;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
@@ -23,24 +22,7 @@ class InlineFragmentRendererTest extends DecoratedFragmentRendererTest
 {
     use SerializerTrait;
 
-    /**
-     * @return iterable<array{0: array<string, string>|null}>
-     */
-    public function rendererControllerReferenceDataProvider(): iterable
-    {
-        yield [[
-            'my_param1' => 'custom_data',
-            'my_param2' => 'foobar',
-        ]];
-
-        yield [null];
-    }
-
-    /**
-     * @param array<string, string>|null $params
-     * @dataProvider rendererControllerReferenceDataProvider
-     */
-    public function testRendererControllerReference(?array $params = null)
+    public function testRendererControllerReference()
     {
         $reference = new ControllerReference('FooBundle:bar:baz');
         $matcher = new SiteAccess\Matcher\HostElement(1);
@@ -54,55 +36,41 @@ public function testRendererControllerReference(?array $params = null)
         $request->attributes->set('semanticPathinfo', '/foo/bar');
         $request->attributes->set('viewParametersString', '/(foo)/bar');
         $options = ['foo' => 'bar'];
-
         $expectedReturn = '/_fragment?foo=bar';
         $this->innerRenderer
             ->expects($this->once())
             ->method('render')
             ->with($reference, $request, $options)
-            ->willReturnCallback(
-                static function (ControllerReference $url, Request $request, array $callBackOptions) use ($expectedReturn, $params, $options): Response {
-                    if ($params !== null) {
-                        self::assertEquals($params, $url->attributes['params']);
-                    }
-                    self::assertEquals($options, $callBackOptions);
-
-                    return new Response($expectedReturn);
-                }
-            );
-
-        if ($params !== null) {
-            $options['params'] = $params;
-        }
+            ->will($this->returnValue($expectedReturn));
 
         $renderer = $this->getRenderer();
-        self::assertEquals(new Response($expectedReturn), $renderer->render($reference, $request, $options));
-        self::assertTrue(isset($reference->attributes['serialized_siteaccess']));
+        $this->assertSame($expectedReturn, $renderer->render($reference, $request, $options));
+        $this->assertTrue(isset($reference->attributes['serialized_siteaccess']));
         $serializedSiteAccess = json_encode($siteAccess);
-        self::assertSame($serializedSiteAccess, $reference->attributes['serialized_siteaccess']);
-        self::assertTrue(isset($reference->attributes['serialized_siteaccess_matcher']));
-        self::assertSame(
+        $this->assertSame($serializedSiteAccess, $reference->attributes['serialized_siteaccess']);
+        $this->assertTrue(isset($reference->attributes['serialized_siteaccess_matcher']));
+        $this->assertSame(
             $this->getSerializer()->serialize(
                 $siteAccess->matcher,
                 'json',
                 [AbstractNormalizer::IGNORED_ATTRIBUTES => ['request', 'container', 'matcherBuilder']]
             ),
             $reference->attributes['serialized_siteaccess_matcher']
         );
-        self::assertTrue(isset($reference->attributes['semanticPathinfo']));
-        self::assertSame('/foo/bar', $reference->attributes['semanticPathinfo']);
-        self::assertTrue(isset($reference->attributes['viewParametersString']));
-        self::assertSame('/(foo)/bar', $reference->attributes['viewParametersString']);
+        $this->assertTrue(isset($reference->attributes['semanticPathinfo']));
+        $this->assertSame('/foo/bar', $reference->attributes['semanticPathinfo']);
+        $this->assertTrue(isset($reference->attributes['viewParametersString']));
+        $this->assertSame('/(foo)/bar', $reference->attributes['viewParametersString']);
     }
 
     public function testRendererControllerReferenceWithCompoundMatcher(): ControllerReference
     {
         $reference = parent::testRendererControllerReferenceWithCompoundMatcher();
 
-        self::assertArrayHasKey('semanticPathinfo', $reference->attributes);
-        self::assertSame('/foo/bar', $reference->attributes['semanticPathinfo']);
-        self::assertArrayHasKey('viewParametersString', $reference->attributes);
-        self::assertSame('/(foo)/bar', $reference->attributes['viewParametersString']);
+        $this->assertArrayHasKey('semanticPathinfo', $reference->attributes);
+        $this->assertSame('/foo/bar', $reference->attributes['semanticPathinfo']);
+        $this->assertArrayHasKey('viewParametersString', $reference->attributes);
+        $this->assertSame('/(foo)/bar', $reference->attributes['viewParametersString']);
 
         return $reference;
     }
