Merge pull request #530 from jderusse/patch-1

Adds compatibility with Twig 3.0

Author: dbu

src/Twig/CacheTagExtension.php

@@ -12,11 +12,13 @@
 namespace FOS\HttpCacheBundle\Twig;
 
 use FOS\HttpCache\ResponseTagger;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
 /**
  * A Twig extension to allow adding cache tags from twig templates.
  */
-class CacheTagExtension extends \Twig_Extension
+class CacheTagExtension extends AbstractExtension
 {
     /**
      * @var ResponseTagger
@@ -34,7 +36,7 @@ public function __construct(ResponseTagger $responseTagger)
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('fos_httpcache_tag', [$this, 'addTag']),
+            new TwigFunction('fos_httpcache_tag', [$this, 'addTag']),
         ];
     }
 

tests/Functional/EventListener/SwitchUserListenerTest.php

@@ -60,7 +60,7 @@ public function testInvalidateContext()
 
     private function loginAsAdmin(Client $client, Session $session, $firewallName = 'secured_area', $sessionId = 'test')
     {
-        $token = new UsernamePasswordToken(new User('admin', 'admin'), null, $firewallName, ['ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH']);
+        $token = new UsernamePasswordToken(new User('admin', 'admin', ['ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH']), null, $firewallName, ['ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH']);
 
         $session->setId($sessionId);
         $session->set(sprintf('_security_%s', $firewallName), serialize($token));