IBX-3035: [Twig] Allowed passing parameters to ibexa render function
#674
+198
−79
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,7 +46,7 @@ public function render(ValueObject $valueObject, RenderOptions $options): string | |
|
|
||
| $renderer = $this->getFragmentRenderer($options->get('method', $this->defaultRenderer)); | ||
|
|
||
| return $renderer->render($controllerReference, $currentRequest, $options->has('params') ? ['params' => $options->get('params')] : [])->getContent(); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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); | ||
|
|
||
| return true; | ||
| })) | ||
|
|
@@ -65,8 +65,7 @@ public function testSubRequestBuilding(): void | |
| $directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver); | ||
| $response = $directFragmentRenderer->render($controllerReference, $request); | ||
|
|
||
| self::assertSame('rendered_response', $response->getContent()); | ||
| } | ||
|
|
||
| public function testControllerResponse(): void | ||
|
|
@@ -82,11 +81,27 @@ public function testControllerResponse(): void | |
| $directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver); | ||
| $response = $directFragmentRenderer->render('', new Request(), []); | ||
|
|
||
| self::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 | ||
| { | ||
| $contentView = new ContentView(); | ||
| $contentView->setTemplateIdentifier('template_identifier'); | ||
|
|
@@ -105,16 +120,33 @@ public function testControllerViewResponse(): 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(); | ||
| } | ||
| ); | ||
|
|
||
| $directFragmentRenderer = $this->getDirectFragmentRenderer( | ||
| $controllerResolverMock, | ||
| $templateRendererMock | ||
| ); | ||
| $response = $directFragmentRenderer->render( | ||
| '', | ||
| new Request(), | ||
| [ | ||
| 'viewType' => 'line', | ||
| 'method' => 'direct', | ||
| 'params' => $params, | ||
| ] | ||
| ); | ||
|
|
||
| self::assertSame('rendered_template_identifier', $response->getContent()); | ||
| } | ||
|
|
||
| public function testControllerStringResponse(): void | ||
|
|
@@ -130,8 +162,7 @@ public function testControllerStringResponse(): void | |
| $directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver); | ||
| $response = $directFragmentRenderer->render('', new Request(), []); | ||
|
|
||
| self::assertSame('some_prerendered_response', $response->getContent()); | ||
| } | ||
|
|
||
| public function testControllerUnhandledStringResponse(): void | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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); | ||
| $serializedSiteAccess = json_encode($siteAccess); | ||
| self::assertSame($serializedSiteAccess, $reference->attributes['serialized_siteaccess']); | ||
| self::assertArrayHasKey('serialized_siteaccess_matcher', $reference->attributes); | ||
| self::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); | ||
| foreach ($siteAccess->matcher->getSubMatchers() as $subMatcher) { | ||
| self::assertSame( | ||
| $this->getSerializer()->serialize( | ||
| $subMatcher, | ||
| 'json', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ | |
| 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; | ||
|
|
@@ -22,7 +23,24 @@ 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) | ||
| { | ||
| $reference = new ControllerReference('FooBundle:bar:baz'); | ||
| $matcher = new SiteAccess\Matcher\HostElement(1); | ||
|
|
@@ -36,41 +54,55 @@ public function testRendererControllerReference() | |
| $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; | ||
| } | ||
|
|
||
| $renderer = $this->getRenderer(); | ||
| self::assertEquals(new Response($expectedReturn), $renderer->render($reference, $request, $options)); | ||
| self::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->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']); | ||
| } | ||
|
|
||
| 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']); | ||
|
|
||
| return $reference; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ | |
|
|
||
| abstract class BaseRenderStrategyTest extends TestCase | ||
| { | ||
| public static function createRenderStrategy( | ||
| string $typeClass, | ||
| array $fragmentRenderers, | ||
| string $defaultMethod = 'inline', | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please refactor this so you don't rely on true-ish expression inside of the
ifstatement. This works because of implicit cast which can lead to some bugs under some circumstances. What is the real condition making this usable?!is_empty && is_array?