diff --git a/src/bundle/Core/Resources/config/routing/internal.yml b/src/bundle/Core/Resources/config/routing/internal.yml index 48f2cfd70a..f60c99d392 100644 --- a/src/bundle/Core/Resources/config/routing/internal.yml +++ b/src/bundle/Core/Resources/config/routing/internal.yml @@ -1,7 +1,7 @@ ibexa.content.translation.view: path: /view/content/{contentId}/{viewType}/{layout}/translation/{languageCode}/{locationId} defaults: - _controller: ibexa_content:viewAction + _controller: ibexa_content::viewAction viewType: full locationId: null layout: true @@ -11,7 +11,7 @@ ibexa.content.translation.view: ibexa.content.view: path: /view/content/{contentId}/{viewType}/{layout}/{locationId} defaults: - _controller: ibexa_content:viewAction + _controller: ibexa_content::viewAction viewType: full locationId: null layout: true diff --git a/src/bundle/Core/Resources/config/services.yml b/src/bundle/Core/Resources/config/services.yml index 214501681c..20b99d9821 100644 --- a/src/bundle/Core/Resources/config/services.yml +++ b/src/bundle/Core/Resources/config/services.yml @@ -139,7 +139,7 @@ services: - { name: controller.service_arguments } # This alias allows easier management for subrequests - # {{ render( controller( "ibexa_content:viewAction", {"contentId": 12, "locationId": 123, "viewType": "line"} ) ) } + # {{ render( controller( "ibexa_content::viewAction", {"contentId": 12, "locationId": 123, "viewType": "line"} ) ) } ibexa_content: public: true alias: Ibexa\Core\MVC\Symfony\Controller\Content\ViewController diff --git a/src/bundle/Core/Resources/views/content_fields.html.twig b/src/bundle/Core/Resources/views/content_fields.html.twig index 651ae0d182..fba09c35ab 100644 --- a/src/bundle/Core/Resources/views/content_fields.html.twig +++ b/src/bundle/Core/Resources/views/content_fields.html.twig @@ -282,7 +282,7 @@ {% for contentId in field.value.destinationContentIds %} {% if parameters.available[contentId] %}
  • - {{ render( controller( "ibexa_content:viewAction", {'contentId': contentId, 'viewType': 'embed', 'layout': false} ) ) }} + {{ render( controller( "ibexa_content::viewAction", {'contentId': contentId, 'viewType': 'embed', 'layout': false} ) ) }}
  • {% endif %} {% endfor %} @@ -477,7 +477,7 @@ {% apply spaceless %} {% if not ibexa_field_is_empty( content, field ) and parameters.available %}
    - {{ render( controller( "ibexa_content:viewAction", {'contentId': field.value.destinationContentId, 'viewType': 'text_linked', 'layout': false} ) ) }} + {{ render( controller( "ibexa_content::viewAction", {'contentId': field.value.destinationContentId, 'viewType': 'text_linked', 'layout': false} ) ) }}
    {% endif %} {% endapply %} diff --git a/src/bundle/Core/Resources/views/fielddefinition_settings.html.twig b/src/bundle/Core/Resources/views/fielddefinition_settings.html.twig index 3d3f2b6d87..c33974fcec 100644 --- a/src/bundle/Core/Resources/views/fielddefinition_settings.html.twig +++ b/src/bundle/Core/Resources/views/fielddefinition_settings.html.twig @@ -319,7 +319,7 @@
    {{ 'fielddefinition.selection-root.label'|trans|desc("Selection root:")}}
    {% if rootLocationId %} - {{ render( controller( "ibexa_content:viewAction", {'locationId': rootLocationId, 'viewType': 'line', 'layout': false} ), {'strategy': 'esi'}) }} + {{ render( controller( "ibexa_content::viewAction", {'locationId': rootLocationId, 'viewType': 'line', 'layout': false} ), {'strategy': 'esi'}) }} {% else %} {{ 'fielddefinition.selection-root.undefined'|trans|desc("No defined root")}} {% endif %} diff --git a/src/lib/MVC/Symfony/Controller/Content/PreviewController.php b/src/lib/MVC/Symfony/Controller/Content/PreviewController.php index a53bf669f1..b880fdd919 100644 --- a/src/lib/MVC/Symfony/Controller/Content/PreviewController.php +++ b/src/lib/MVC/Symfony/Controller/Content/PreviewController.php @@ -157,7 +157,7 @@ protected function getForwardRequest(Location $location, Content $content, SiteA if ($this->controllerChecker->usesCustomController($content, $location)) { $forwardRequestParameters = [ - '_controller' => 'ibexa_content:viewAction', + '_controller' => 'ibexa_content::viewAction', '_route' => self::CONTENT_VIEW_ROUTE, ] + $forwardRequestParameters; } diff --git a/src/lib/MVC/Symfony/Routing/UrlAliasRouter.php b/src/lib/MVC/Symfony/Routing/UrlAliasRouter.php index f354827397..3779381bed 100644 --- a/src/lib/MVC/Symfony/Routing/UrlAliasRouter.php +++ b/src/lib/MVC/Symfony/Routing/UrlAliasRouter.php @@ -32,7 +32,7 @@ class UrlAliasRouter implements ChainedRouterInterface, RequestMatcherInterface { public const URL_ALIAS_ROUTE_NAME = 'ibexa.url.alias'; - public const VIEW_ACTION = 'ibexa_content:viewAction'; + public const VIEW_ACTION = 'ibexa_content::viewAction'; /** @var \Symfony\Component\Routing\RequestContext */ protected $requestContext; diff --git a/src/lib/MVC/Symfony/View/Builder/Registry/ControllerMatch.php b/src/lib/MVC/Symfony/View/Builder/Registry/ControllerMatch.php index f258ce70c5..36fb40c5c8 100644 --- a/src/lib/MVC/Symfony/View/Builder/Registry/ControllerMatch.php +++ b/src/lib/MVC/Symfony/View/Builder/Registry/ControllerMatch.php @@ -37,7 +37,7 @@ public function addToRegistry(array $viewBuilders) /** * Returns the ViewBuilder that matches the given controller string. * - * @param string $controllerString A controller string to match against. Example: ibexa_content:viewAction. + * @param string $controllerString A controller string to match against. Example: ibexa_content::viewAction. * * @return \Ibexa\Core\MVC\Symfony\View\Builder\ViewBuilder|null */ diff --git a/tests/bundle/Core/EventListener/ViewControllerListenerTest.php b/tests/bundle/Core/EventListener/ViewControllerListenerTest.php index 946af2b29b..3bb0e06cf0 100644 --- a/tests/bundle/Core/EventListener/ViewControllerListenerTest.php +++ b/tests/bundle/Core/EventListener/ViewControllerListenerTest.php @@ -120,7 +120,7 @@ public function testGetControllerMatchedView() $this->request->attributes->add( [ - '_controller' => 'ibexa_content:viewAction', + '_controller' => 'ibexa_content::viewAction', 'contentId' => $contentId, 'locationId' => $locationId, 'viewType' => $viewType, diff --git a/tests/lib/MVC/Symfony/Controller/Controller/Content/PreviewControllerTest.php b/tests/lib/MVC/Symfony/Controller/Controller/Content/PreviewControllerTest.php index 78f67934dd..afcf038f84 100644 --- a/tests/lib/MVC/Symfony/Controller/Controller/Content/PreviewControllerTest.php +++ b/tests/lib/MVC/Symfony/Controller/Controller/Content/PreviewControllerTest.php @@ -288,7 +288,7 @@ protected function getDuplicatedRequest(Location $location, Content $content, Si $duplicatedRequest = new Request(); $duplicatedRequest->attributes->add( [ - '_controller' => 'ibexa_content:viewAction', + '_controller' => 'ibexa_content::viewAction', 'contentId' => $content->id, 'location' => $location, 'viewType' => ViewManagerInterface::VIEW_TYPE_FULL, diff --git a/tests/lib/MVC/Symfony/View/Builder/ContentViewBuilderTest.php b/tests/lib/MVC/Symfony/View/Builder/ContentViewBuilderTest.php index a59b9e5b88..353468c5ed 100644 --- a/tests/lib/MVC/Symfony/View/Builder/ContentViewBuilderTest.php +++ b/tests/lib/MVC/Symfony/View/Builder/ContentViewBuilderTest.php @@ -326,7 +326,7 @@ public function testBuildView(): void $parameters = [ 'viewType' => 'full', - '_controller' => 'ibexa_content:viewAction', + '_controller' => 'ibexa_content::viewAction', 'locationId' => 2, ];