Fix EZP-24457: Change Request injection to RequestStack

See ezsystems/ezpublish-kernel#1286

Controller/CommentsRendererController.php

@@ -24,32 +24,26 @@ class CommentsRendererController
     /** @var \eZ\Publish\API\Repository\ContentService */
     private $contentService;
 
-    /** @var \Symfony\Component\HttpFoundation\Request */
-    private $request;
-
     public function __construct( ProviderInterface $commentsRenderer, ContentService $contentService )
     {
         $this->commentsRenderer = $commentsRenderer;
         $this->contentService = $contentService;
     }
 
-    public function setRequest( Request $request = null )
-    {
-        $this->request = $request;
-    }
-
     /**
      * Renders the comments list for content with id $contentId
      * Comment form might also be included
      *
      * @param mixed $contentId
+     *
+     * @return Response
      */
-    public function renderForContentAction( $contentId )
+    public function renderForContentAction( $contentId, Request $request )
     {
         return new Response(
             $this->commentsRenderer->renderForContent(
                 $this->contentService->loadContentInfo( $contentId ),
-                $this->request
+                $request
             )
         );
     }

Resources/config/services.yml

@@ -19,7 +19,7 @@ services:
         class: %ez_comments.twig.extension.class%
         arguments: [@ez_comments.renderer]
         calls:
-            - [setRequest, ['@?request=']]
+            - [setRequestStack, [@request_stack]]
         tags:
             - { name: twig.extension }
 
@@ -55,5 +55,3 @@ services:
     ez_comments.controller.comments_renderer:
         class: %ez_comments.controller.comments_renderer.class%
         arguments: [@ez_comments.renderer, @ezpublish.api.service.content]
-        calls:
-            - [setRequest, [@?request=]]

Twig/Extension/CommentsExtension.php

@@ -10,6 +10,7 @@
 namespace EzSystems\CommentsBundle\Twig\Extension;
 
 use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use eZ\Publish\Core\MVC\Symfony\RequestStackAware;
 use EzSystems\CommentsBundle\Comments\ProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Twig_Extension;
@@ -18,16 +19,13 @@
 
 class CommentsExtension extends Twig_Extension
 {
+    use RequestStackAware;
+
     /**
      * @var \EzSystems\CommentsBundle\Comments\ProviderInterface
      */
     private $commentsRenderer;
 
-    /**
-     * @var \Symfony\Component\HttpFoundation\Request
-     */
-    private $request;
-
     public function __construct( ProviderInterface $commentsRenderer )
     {
         $this->commentsRenderer = $commentsRenderer;
@@ -59,11 +57,6 @@ public function getFunctions()
         );
     }
 
-    public function setRequest( Request $request = null )
-    {
-        $this->request = $request;
-    }
-
     /**
      * Triggers comments rendering
      *
@@ -81,12 +74,13 @@ public function render( array $options = array(), $provider = null )
             $options['provider'] = $provider;
         }
 
-        if ( !isset( $this->request ) )
+        $request = $this->getCurrentRequest();
+        if ( !isset( $request ) )
         {
             throw new RuntimeException( 'Comments rendering needs the Request.' );
         }
 
-        return $this->commentsRenderer->render( $this->request, $options );
+        return $this->commentsRenderer->render( $request, $options );
     }
 
     /**
@@ -106,11 +100,12 @@ public function renderForContent( ContentInfo $contentInfo, array $options = arr
             $options['provider'] = $provider;
         }
 
-        if ( !isset( $this->request ) )
+        $request = $this->getCurrentRequest();
+        if ( !isset( $request ) )
         {
             throw new RuntimeException( 'Comments rendering needs the Request.' );
         }
 
-        return $this->commentsRenderer->renderForContent( $contentInfo, $this->request, $options );
+        return $this->commentsRenderer->renderForContent( $contentInfo, $request, $options );
     }
 }

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "ezsystems/ezpublish-kernel": "*",
+        "ezsystems/ezpublish-kernel": "dev-master",
         "symfony-cmf/routing": "~1.1"
     },
     "require-dev": {