Revert "Added tests for IBX-3035" - Reverted Making createRenderStrategy static

vidarl · vidarl · commit 0eccc2906231 · 2025-12-01T14:52:52.000+01:00
This reverts commit 15bedfa.
diff --git a/tests/lib/MVC/Symfony/Templating/BaseRenderStrategyTest.php b/tests/lib/MVC/Symfony/Templating/BaseRenderStrategyTest.php
@@ -24,7 +24,7 @@
 
 abstract class BaseRenderStrategyTest extends TestCase
 {
-    public static function createRenderStrategy(
+    public function createRenderStrategy(
         string $typeClass,
         array $fragmentRenderers,
         string $defaultMethod = 'inline',
diff --git a/tests/lib/MVC/Symfony/Templating/RenderContentStrategyTest.php b/tests/lib/MVC/Symfony/Templating/RenderContentStrategyTest.php
@@ -25,7 +25,7 @@ class RenderContentStrategyTest extends BaseRenderStrategyTest
 {
     public function testUnsupportedValueObject(): void
     {
-        $renderContentStrategy = self::createRenderStrategy(
+        $renderContentStrategy = $this->createRenderStrategy(
             RenderContentStrategy::class,
             [
                 $this->createFragmentRenderer(),
@@ -42,7 +42,7 @@ public function testUnsupportedValueObject(): void
 
     public function testDefaultFragmentRenderer(): void
     {
-        $renderContentStrategy = self::createRenderStrategy(
+        $renderContentStrategy = $this->createRenderStrategy(
             RenderContentStrategy::class,
             [
                 $this->createFragmentRenderer('inline'),
@@ -61,7 +61,7 @@ public function testDefaultFragmentRenderer(): void
 
     public function testUnknownFragmentRenderer(): void
     {
-        $renderContentStrategy = self::createRenderStrategy(
+        $renderContentStrategy = $this->createRenderStrategy(
             RenderContentStrategy::class,
             [],
         );
@@ -75,7 +75,7 @@ public function testUnknownFragmentRenderer(): void
 
     public function testMultipleFragmentRenderers(): void
     {
-        $renderContentStrategy = self::createRenderStrategy(
+        $renderContentStrategy = $this->createRenderStrategy(
             RenderContentStrategy::class,
             [
                 $this->createFragmentRenderer('method_a'),
@@ -155,7 +155,7 @@ public static function forwardParamOptionsToFragmentRenderer(MockObject $fragmen
 
     public function testDuplicatedFragmentRenderers(): void
     {
-        $renderContentStrategy = self::createRenderStrategy(
+        $renderContentStrategy = $this->createRenderStrategy(
             RenderContentStrategy::class,
             [
                 $this->createFragmentRenderer('method_a', 'decorator service used'),
@@ -210,7 +210,7 @@ public function testExpectedMethodRenderArgumentsFormat(): void
             ->with($controllerReferenceCallback, $requestCallback)
             ->willReturn(new Response('some_rendered_content'));
 
-        $renderContentStrategy = self::createRenderStrategy(
+        $renderContentStrategy = $this->createRenderStrategy(
             RenderContentStrategy::class,
             [
                 $this->createFragmentRenderer('method_a'),
diff --git a/tests/lib/MVC/Symfony/Templating/RenderLocationStrategyTest.php b/tests/lib/MVC/Symfony/Templating/RenderLocationStrategyTest.php
@@ -23,7 +23,7 @@ class RenderLocationStrategyTest extends BaseRenderStrategyTest
 {
     public function testUnsupportedValueObject(): void
     {
-        $renderLocationStrategy = self::createRenderStrategy(
+        $renderLocationStrategy = $this->createRenderStrategy(
             RenderLocationStrategy::class,
             [
                 $this->createFragmentRenderer(),
@@ -40,7 +40,7 @@ public function testUnsupportedValueObject(): void
 
     public function testDefaultFragmentRenderer(): void
     {
-        $renderLocationStrategy = self::createRenderStrategy(
+        $renderLocationStrategy = $this->createRenderStrategy(
             RenderLocationStrategy::class,
             [
                 $this->createFragmentRenderer('inline'),
@@ -59,7 +59,7 @@ public function testDefaultFragmentRenderer(): void
 
     public function testUnknownFragmentRenderer(): void
     {
-        $renderLocationStrategy = self::createRenderStrategy(
+        $renderLocationStrategy = $this->createRenderStrategy(
             RenderLocationStrategy::class,
             [],
         );
@@ -73,7 +73,7 @@ public function testUnknownFragmentRenderer(): void
 
     public function testMultipleFragmentRenderers(): void
     {
-        $renderLocationStrategy = self::createRenderStrategy(
+        $renderLocationStrategy = $this->createRenderStrategy(
             RenderLocationStrategy::class,
             [
                 $this->createFragmentRenderer('method_a'),
@@ -141,7 +141,7 @@ public function testExpectedMethodRenderRequestFormat(): void
             ->with($controllerReferenceCallback, $requestCallback)
             ->willReturn(new Response('some_rendered_content'));
 
-        $renderLocationStrategy = self::createRenderStrategy(
+        $renderLocationStrategy = $this->createRenderStrategy(
             RenderLocationStrategy::class,
             [
                 $this->createFragmentRenderer('method_a'),

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`abstract class BaseRenderStrategyTest extends TestCase`
`26`	`26`	`{`
`27`		`- public static function createRenderStrategy(`
	`27`	`+ public function createRenderStrategy(`
`28`	`28`	`string $typeClass,`
`29`	`29`	`array $fragmentRenderers,`
`30`	`30`	`string $defaultMethod = 'inline',`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class RenderContentStrategyTest extends BaseRenderStrategyTest`
`25`	`25`	`{`
`26`	`26`	`public function testUnsupportedValueObject(): void`
`27`	`27`	`{`
`28`		`- $renderContentStrategy = self::createRenderStrategy(`
	`28`	`+ $renderContentStrategy = $this->createRenderStrategy(`
`29`	`29`	`RenderContentStrategy::class,`
`30`	`30`	`[`
`31`	`31`	`$this->createFragmentRenderer(),`
`@@ -42,7 +42,7 @@ public function testUnsupportedValueObject(): void`
`42`	`42`
`43`	`43`	`public function testDefaultFragmentRenderer(): void`
`44`	`44`	`{`
`45`		`- $renderContentStrategy = self::createRenderStrategy(`
	`45`	`+ $renderContentStrategy = $this->createRenderStrategy(`
`46`	`46`	`RenderContentStrategy::class,`
`47`	`47`	`[`
`48`	`48`	`$this->createFragmentRenderer('inline'),`
`@@ -61,7 +61,7 @@ public function testDefaultFragmentRenderer(): void`
`61`	`61`
`62`	`62`	`public function testUnknownFragmentRenderer(): void`
`63`	`63`	`{`
`64`		`- $renderContentStrategy = self::createRenderStrategy(`
	`64`	`+ $renderContentStrategy = $this->createRenderStrategy(`
`65`	`65`	`RenderContentStrategy::class,`
`66`	`66`	`[],`
`67`	`67`	`);`
`@@ -75,7 +75,7 @@ public function testUnknownFragmentRenderer(): void`
`75`	`75`
`76`	`76`	`public function testMultipleFragmentRenderers(): void`
`77`	`77`	`{`
`78`		`- $renderContentStrategy = self::createRenderStrategy(`
	`78`	`+ $renderContentStrategy = $this->createRenderStrategy(`
`79`	`79`	`RenderContentStrategy::class,`
`80`	`80`	`[`
`81`	`81`	`$this->createFragmentRenderer('method_a'),`
`@@ -155,7 +155,7 @@ public static function forwardParamOptionsToFragmentRenderer(MockObject $fragmen`
`155`	`155`
`156`	`156`	`public function testDuplicatedFragmentRenderers(): void`
`157`	`157`	`{`
`158`		`- $renderContentStrategy = self::createRenderStrategy(`
	`158`	`+ $renderContentStrategy = $this->createRenderStrategy(`
`159`	`159`	`RenderContentStrategy::class,`
`160`	`160`	`[`
`161`	`161`	`$this->createFragmentRenderer('method_a', 'decorator service used'),`
`@@ -210,7 +210,7 @@ public function testExpectedMethodRenderArgumentsFormat(): void`
`210`	`210`	`->with($controllerReferenceCallback, $requestCallback)`
`211`	`211`	`->willReturn(new Response('some_rendered_content'));`
`212`	`212`
`213`		`- $renderContentStrategy = self::createRenderStrategy(`
	`213`	`+ $renderContentStrategy = $this->createRenderStrategy(`
`214`	`214`	`RenderContentStrategy::class,`
`215`	`215`	`[`
`216`	`216`	`$this->createFragmentRenderer('method_a'),`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class RenderLocationStrategyTest extends BaseRenderStrategyTest`
`23`	`23`	`{`
`24`	`24`	`public function testUnsupportedValueObject(): void`
`25`	`25`	`{`
`26`		`- $renderLocationStrategy = self::createRenderStrategy(`
	`26`	`+ $renderLocationStrategy = $this->createRenderStrategy(`
`27`	`27`	`RenderLocationStrategy::class,`
`28`	`28`	`[`
`29`	`29`	`$this->createFragmentRenderer(),`
`@@ -40,7 +40,7 @@ public function testUnsupportedValueObject(): void`
`40`	`40`
`41`	`41`	`public function testDefaultFragmentRenderer(): void`
`42`	`42`	`{`
`43`		`- $renderLocationStrategy = self::createRenderStrategy(`
	`43`	`+ $renderLocationStrategy = $this->createRenderStrategy(`
`44`	`44`	`RenderLocationStrategy::class,`
`45`	`45`	`[`
`46`	`46`	`$this->createFragmentRenderer('inline'),`
`@@ -59,7 +59,7 @@ public function testDefaultFragmentRenderer(): void`
`59`	`59`
`60`	`60`	`public function testUnknownFragmentRenderer(): void`
`61`	`61`	`{`
`62`		`- $renderLocationStrategy = self::createRenderStrategy(`
	`62`	`+ $renderLocationStrategy = $this->createRenderStrategy(`
`63`	`63`	`RenderLocationStrategy::class,`
`64`	`64`	`[],`
`65`	`65`	`);`
`@@ -73,7 +73,7 @@ public function testUnknownFragmentRenderer(): void`
`73`	`73`
`74`	`74`	`public function testMultipleFragmentRenderers(): void`
`75`	`75`	`{`
`76`		`- $renderLocationStrategy = self::createRenderStrategy(`
	`76`	`+ $renderLocationStrategy = $this->createRenderStrategy(`
`77`	`77`	`RenderLocationStrategy::class,`
`78`	`78`	`[`
`79`	`79`	`$this->createFragmentRenderer('method_a'),`
`@@ -141,7 +141,7 @@ public function testExpectedMethodRenderRequestFormat(): void`
`141`	`141`	`->with($controllerReferenceCallback, $requestCallback)`
`142`	`142`	`->willReturn(new Response('some_rendered_content'));`
`143`	`143`
`144`		`- $renderLocationStrategy = self::createRenderStrategy(`
	`144`	`+ $renderLocationStrategy = $this->createRenderStrategy(`
`145`	`145`	`RenderLocationStrategy::class,`
`146`	`146`	`[`
`147`	`147`	`$this->createFragmentRenderer('method_a'),`