Upgrade Twig

Author: barryvdh

.github/workflows/run-tests.yml

@@ -0,0 +1,51 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "*"
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  php-tests:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
+    env:
+      COMPOSER_NO_INTERACTION: 1
+
+    strategy:
+      matrix:
+        php: [8.1, 8.0, 7.4, 7.3]
+        laravel: [8.*, 9.*]
+        dependency-version: [prefer-lowest, prefer-stable]
+        exclude:
+          - php: 8.0
+            dependency-version: prefer-lowest
+          - php: 7.4
+            laravel: 9.*
+          - php: 7.3
+            laravel: 9.*
+        include:
+          - php: 7.2
+            laravel: 6.*
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress
+          composer update --prefer-dist --no-progress
+
+      - name: Execute Unit Tests
+        run: vendor/bin phpunit

.gitignore

@@ -1,4 +1,5 @@
 /vendor
 composer.phar
 composer.lock
-.DS_Store
+.DS_Store
+.phpunit.result.cache

.travis.yml

@@ -14,7 +14,8 @@
         "illuminate/support": "^6|^7|^8",
         "symfony/form": "^4|^5|^6",
         "symfony/validator": "^4|^5|^6",
-        "symfony/twig-bridge": "^4|^5|^6"
+        "symfony/twig-bridge": "^4|^5|^6",
+        "twig/twig": "^2.13|^3.0.4"
     },
     "autoload": {
         "psr-4": {
@@ -28,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.5-dev"
+            "dev-master": "0.6-dev"
         },
         "laravel": {
             "providers": [

composer.json

@@ -4,7 +4,7 @@
 
 class HttpExtension extends AbstractExtension
 {
-    protected function loadTypeExtensions()
+    protected function loadTypeExtensions(): array
     {
         return array(
             new FormTypeHttpExtension(),

src/Extension/Http/HttpExtension.php

@@ -11,7 +11,7 @@ class SessionExtension extends AbstractExtension
     /**
      * {@inheritdoc}
      */
-    protected function loadTypeExtensions()
+    protected function loadTypeExtensions(): array
     {
         return array(
             new Session\CsrfTypeExtension,

src/Extension/SessionExtension.php

@@ -39,14 +39,14 @@ public function boot()
         $loader = $twig->getLoader();
 
         // If the loader is not already a chain, make it one
-        if (! $loader instanceof \Twig_Loader_Chain) {
-            $loader = new \Twig_Loader_Chain([$loader]);
+        if (! $loader instanceof \Twig\Loader\ChainLoader) {
+            $loader = new \Twig\Loader\ChainLoader([$loader]);
             $twig->setLoader($loader);
         }
 
-        $loader->addLoader(new \Twig_Loader_Filesystem($this->getTemplateDirectories()));
+        $loader->addLoader(new \Twig\Loader\FilesystemLoader($this->getTemplateDirectories()));
 
-        $twig->addRuntimeLoader(new \Twig_FactoryRuntimeLoader(array(
+        $twig->addRuntimeLoader(new \Twig\RuntimeLoader\FactoryRuntimeLoader(array(
             \Symfony\Component\Form\FormRenderer::class => function () {
                 return $this->app->make(\Symfony\Component\Form\FormRenderer::class);
             }
@@ -56,15 +56,15 @@ public function boot()
         $twig->addExtension(new FormExtension());
 
         // trans filter is used in the forms
-        $twig->addFilter(new \Twig_SimpleFilter('trans', function ($id = null, $replace = [], $locale = null) {
+        $twig->addFilter(new \Twig\TwigFilter('trans', function ($id = null, $replace = [], $locale = null) {
             if (empty($id)) {
                 return '';
             }
             return app('translator')->get($id, $replace, $locale);
         }));
 
         // csrf_token needs to be replaced for Laravel
-        $twig->addFunction(new \Twig_SimpleFunction('csrf_token', 'csrf_token'));
+        $twig->addFunction(new \Twig\TwigFunction('csrf_token', 'csrf_token'));
 
         $this->registerBladeDirectives();
         $this->registerViewComposer();
@@ -203,19 +203,19 @@ protected function getTemplateDirectories()
     /**
      * Get or create a new TwigEnvironment
      *
-     * @return \Twig_Environment
+     * @return \Twig\Environment
      */
     protected function getTwigEnvironment()
     {
-        if (! $this->app->bound(\Twig_Environment::class)) {
-            $this->app->singleton(\Twig_Environment::class, function () {
-                return new \Twig_Environment(new \Twig_Loader_Chain([]), [
+        if (! $this->app->bound(\Twig\Environment::class)) {
+            $this->app->singleton(\Twig\Environment::class, function () {
+                return new \Twig\Environment(new \Twig\Loader\ChainLoader([]), [
                     'cache' => storage_path('framework/views/twig'),
                 ]);
             });
         }
 
-        /** @var \Twig_Environment $twig */
-        return $this->app->make(\Twig_Environment::class);
+        /** @var \Twig\Environment $twig */
+        return $this->app->make(\Twig\Environment::class);
     }
 }

src/ServiceProvider.php

@@ -50,7 +50,7 @@ public function testInlineForm()
     {
         $crawler = $this->call('GET', 'create');
 
-        $this->assertContains('<form name="user_form" method="post">', $crawler->getContent());
+        $this->assertStringContainsString('<form name="user_form" method="post">', $crawler->getContent());
     }
 
     /**