Merge pull request #22 from OxCom/develop

Security update of Twig

Author: OxCom

.gitattributes

@@ -0,0 +1,5 @@
+/Test export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+phpunit.xml.dist export-ignore

.travis.yml

@@ -56,6 +56,7 @@ matrix:
 
 before_install:
     - curl -s https://getcomposer.org/installer | php
+    - php composer.phar require roave/security-advisories:dev-master --no-update
     - php composer.phar require symfony/symfony:${SYMFONY_VERSION} --no-update
     - php -dmemory_limit=-1 composer.phar update
 

Tests/SymfonyRollbarBundle/Twig/RollbarExtensionTest.php

@@ -42,7 +42,7 @@ public function testRollbarJs($env, $isDisabled)
             $this->assertNotEmpty($list);
 
             $function = $list[0];
-            $this->assertInstanceOf(\Twig_SimpleFunction::class, $function);
+            $this->assertInstanceOf(\Twig\TwigFunction::class, $function);
 
             $output = $rollbarTwig->rollbarJs();
 

Twig/RollbarExtension.php

@@ -6,7 +6,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use SymfonyRollbarBundle\DependencyInjection\SymfonyRollbarExtension;
 
-class RollbarExtension extends \Twig_Extension
+class RollbarExtension extends \Twig\Extension\AbstractExtension
 {
     /**
      * @var \Symfony\Component\DependencyInjection\ContainerInterface
@@ -48,7 +48,7 @@ public function getFunctions()
         }
 
         return [
-            new \Twig_SimpleFunction('rollbarJs', [$this, 'rollbarJs'], [
+            new \Twig\TwigFunction('rollbarJs', [$this, 'rollbarJs'], [
                 'is_safe' => ['html'],
             ]),
         ];

composer.json

@@ -44,7 +44,7 @@
         "squizlabs/php_codesniffer": "^3.2",
         "matthiasnoback/symfony-dependency-injection-test": "^1.2||^2.3",
         "symfony/phpunit-bridge": "^4.0",
-        "twig/twig": "^1.35||^2.4"
+        "twig/twig": "^1.38||^2.7"
     },
     "scripts": {
         "test": [

phpunit.xml.dist

@@ -17,6 +17,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <env name="APP_DEBUG" value="false" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
         <server name="KERNEL_DIR" value="Tests/Fixtures/app" />
         <server name="KERNEL_CLASS" value="AppKernel" />
     </php>