Skip to content

IBX-9513: Fixed obsolete ibexa_* Controller references #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 11, 2025
Merged

IBX-9513: Fixed obsolete ibexa_* Controller references #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aa4e5b
Fixed obsolete ibexa_content Controller references
alongosz Feb 7, 2025
9580714
[Behat] Fixed obsolete ibexa_query Controller references
alongosz Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/bundle/Core/Features/QueryController/setup.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Feature: Query controller
template: "@IbexaBehat/tests/dump.html.twig"
match:
Id\Location: "%location_id(QueryControllerContainer/QueryControllerItem1)%"
controller: ibexa_query:locationQueryAction
controller: ibexa_query::locationQueryAction
params:
query:
query_type: 'LocationChildren'
Expand All @@ -32,7 +32,7 @@ Feature: Query controller
template: "@IbexaBehat/tests/dump.html.twig"
match:
Id\Location: "%location_id(QueryControllerContainer/QueryControllerItem2)%"
controller: ibexa_query:pagingQueryAction
controller: ibexa_query::pagingQueryAction
params:
query:
query_type: 'LocationChildren'
Expand All @@ -43,7 +43,7 @@ Feature: Query controller
template: tests.html.twig
match:
Id\Location: "%location_id(QueryControllerContainer/QueryControllerItem3)%"
controller: ibexa_query:pagingQueryAction
controller: ibexa_query::pagingQueryAction
params:
query:
query_type: 'LocationChildren'
Expand All @@ -55,7 +55,7 @@ Feature: Query controller
template: tests.html.twig
match:
Id\Location: "%location_id(QueryControllerContainer/QueryControllerItem4)%"
controller: ibexa_query:pagingQueryAction
controller: ibexa_query::pagingQueryAction
params:
query:
query_type: 'LocationChildren'
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Core/Resources/views/content_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@
{% apply spaceless %}
{% if not ibexa_field_is_empty(content, field) and parameters.available %}
<div {{ block('field_attributes') }}>
{{ render(controller('ibexa_content:embedAction', {
{{ render(controller('ibexa_content::embedAction', {
contentId: field.value.destinationContentId,
viewType: 'asset_image',
no_layout: true,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/MVC/Symfony/View/Builder/ContentViewBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ private function canRead(Content $content, Location $location = null, bool $isEm
*/
private function isEmbed($parameters): bool
{
if ($parameters['_controller'] === 'ibexa_content:embedAction') {
if ($parameters['_controller'] === 'ibexa_content::embedAction') {
return true;
}
if (\in_array($parameters['viewType'], ['embed', 'embed-inline'])) {
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/MVC/Symfony/View/Builder/ContentViewBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public function testBuildEmbedViewWithNullMainRequest(): void

$parameters = [
'viewType' => 'embed',
'_controller' => 'ibexa_content:embedAction',
'_controller' => 'ibexa_content::embedAction',
'contentId' => $contentId,
];

Expand Down Expand Up @@ -273,7 +273,7 @@ public function testBuildEmbedViewWithNotNullMainRequest(): void

$parameters = [
'viewType' => 'embed',
'_controller' => 'ez_content:embedAction',
'_controller' => 'ibexa_content::embedAction',
'contentId' => $contentId,
];

Expand Down
Loading