fix use RequestStack instead of Request

Cookie/CookieChecker.php

@@ -10,34 +10,33 @@
 namespace ConnectHolland\CookieConsentBundle\Cookie;
 
 use ConnectHolland\CookieConsentBundle\Enum\CookieNameEnum;
-use Symfony\Component\HttpFoundation\Cookie;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 class CookieChecker
 {
     /**
-     * @var Request
+     * @var RequestStack
      */
-    private $request;
+    private $requestStack;
 
-    public function __construct(Request $request)
+    public function __construct(RequestStack $requestStack)
     {
-        $this->request = $request;
+        $this->requestStack = $requestStack;
     }
 
     /**
      * Check if cookie consent has already been saved.
      */
     public function isCookieConsentSavedByUser(): bool
     {
-        return $this->request->cookies->has(CookieNameEnum::COOKIE_CONSENT_NAME);
+        return $this->requestStack->getCurrentRequest()->cookies->has(CookieNameEnum::COOKIE_CONSENT_NAME);
     }
 
     /**
      * Check if given cookie category is permitted by user.
      */
     public function isCategoryAllowedByUser(string $category): bool
     {
-        return $this->request->cookies->get(CookieNameEnum::getCookieCategoryName($category)) === 'true';
+        return $this->requestStack->getCurrentRequest()->cookies->get(CookieNameEnum::getCookieCategoryName($category)) === 'true';
     }
 }

Resources/config/services.yaml

@@ -24,8 +24,13 @@ services:
         public: true
 
     ConnectHolland\CookieConsentBundle\Cookie\CookieChecker:
-        arguments: ["@=service('request_stack').getCurrentRequest()"]
+        arguments:
+            $requestStack: '@request_stack'
 
     ConnectHolland\CookieConsentBundle\Cookie\CookieLogger:
         arguments:
             $request: "@=service('request_stack').getCurrentRequest()"
+
+    ConnectHolland\CookieConsentBundle\Twig\CHCookieConsentTwigExtension:
+        arguments:
+            $cookieChecker: '@ConnectHolland\CookieConsentBundle\Cookie\CookieChecker'

Tests/Cookie/CookieCheckerTest.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 class CookieCheckerTest extends TestCase
 {
@@ -22,15 +23,27 @@ class CookieCheckerTest extends TestCase
      */
     private $request;
 
+    /**
+     * @var MockObject
+     */
+    private $requestStack;
+
     /**
      * @var CookieChecker
      */
     private $cookieChecker;
 
     public function setUp(): void
     {
-        $this->request       = $this->createMock(Request::class);
-        $this->cookieChecker = new CookieChecker($this->request);
+        $this->requestStack       = $this->createMock(RequestStack::class);
+        $this->request            = $this->createMock(Request::class);
+
+        $this->requestStack
+            ->expects($this->any())
+            ->method('getCurrentRequest')
+            ->willReturn($this->request);
+
+        $this->cookieChecker = new CookieChecker($this->requestStack);
     }
 
     /**

Tests/Twig/CHCookieConsentTwigExtensionTest.php

@@ -9,10 +9,9 @@
 
 namespace ConnectHolland\CookieConsentBundle\Tests\Twig;
 
+use ConnectHolland\CookieConsentBundle\Cookie\CookieChecker;
 use ConnectHolland\CookieConsentBundle\Twig\CHCookieConsentTwigExtension;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Twig\AppVariable;
-use Symfony\Component\HttpFoundation\Request;
 
 class CHCookieConsentTwigExtensionTest extends TestCase
 {
@@ -21,9 +20,15 @@ class CHCookieConsentTwigExtensionTest extends TestCase
      */
     private $chCookieConsentTwigExtension;
 
+    /**
+     * @var MockObject
+     */
+    private $cookieChecker;
+
     public function setUp(): void
     {
-        $this->chCookieConsentTwigExtension = new CHCookieConsentTwigExtension();
+        $this->cookieChecker = $this->createMock(CookieChecker::class);
+        $this->chCookieConsentTwigExtension = new CHCookieConsentTwigExtension($this->cookieChecker);
     }
 
     public function testGetFunctions(): void
@@ -37,32 +42,14 @@ public function testGetFunctions(): void
 
     public function testIsCookieConsentSavedByUser(): void
     {
-        $request  = new Request();
-
-        $appVariable = $this->createMock(AppVariable::class);
-        $appVariable
-            ->expects($this->once())
-            ->method('getRequest')
-            ->wilLReturn($request);
-
-        $context = ['app' => $appVariable];
-        $result  = $this->chCookieConsentTwigExtension->isCookieConsentSavedByUser($context);
+        $result  = $this->chCookieConsentTwigExtension->isCookieConsentSavedByUser();
 
         $this->assertSame($result, false);
     }
 
     public function testIsCategoryAllowedByUser(): void
     {
-        $request  = new Request();
-
-        $appVariable = $this->createMock(AppVariable::class);
-        $appVariable
-            ->expects($this->once())
-            ->method('getRequest')
-            ->wilLReturn($request);
-
-        $context = ['app' => $appVariable];
-        $result  = $this->chCookieConsentTwigExtension->isCategoryAllowedByUser($context, 'analytics');
+        $result  = $this->chCookieConsentTwigExtension->isCategoryAllowedByUser('analytics');
 
         $this->assertSame($result, false);
     }

Twig/CHCookieConsentTwigExtension.php

@@ -10,7 +10,6 @@
 namespace ConnectHolland\CookieConsentBundle\Twig;
 
 use ConnectHolland\CookieConsentBundle\Cookie\CookieChecker;
-use Symfony\Component\HttpFoundation\Request;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -26,42 +25,38 @@ public function getFunctions()
         return [
             new TwigFunction(
                 'chcookieconsent_isCookieConsentSavedByUser',
-                [$this, 'isCookieConsentSavedByUser'],
-                ['needs_context' => true]
+                [$this, 'isCookieConsentSavedByUser']
             ),
             new TwigFunction(
                 'chcookieconsent_isCategoryAllowedByUser',
-                [$this, 'isCategoryAllowedByUser'],
-                ['needs_context' => true]
+                [$this, 'isCategoryAllowedByUser']
             ),
         ];
     }
 
     /**
-     * Checks if user has sent cookie consent form.
+     * @var CookieChecker
      */
-    public function isCookieConsentSavedByUser(array $context): bool
-    {
-        $cookieChecker = $this->getCookieChecker($context['app']->getRequest());
+    private $cookieChecker;
 
-        return $cookieChecker->isCookieConsentSavedByUser();
+    public function __construct(CookieChecker $cookieChecker)
+    {
+        $this->cookieChecker = $cookieChecker;
     }
 
     /**
-     * Checks if user has given permission for cookie category.
+     * Checks if user has sent cookie consent form.
      */
-    public function isCategoryAllowedByUser(array $context, string $category): bool
+    public function isCookieConsentSavedByUser(): bool
     {
-        $cookieChecker = $this->getCookieChecker($context['app']->getRequest());
-
-        return $cookieChecker->isCategoryAllowedByUser($category);
+        return $this->cookieChecker->isCookieConsentSavedByUser();
     }
 
     /**
-     * Get instance of CookieChecker.
+     * Checks if user has given permission for cookie category.
      */
-    private function getCookieChecker(Request $request): CookieChecker
+    public function isCategoryAllowedByUser(string $category): bool
     {
-        return new CookieChecker($request);
+        return $this->cookieChecker->isCategoryAllowedByUser($category);
     }
 }