Update twig to 3 (#574)

* increase twig version to ^3.0 in dev * add idle_timeout to scrutinizer Co-authored-by: jurij schlaht <jurij@lillydoo.com>
liip · Oct 26, 2020 · 007dfbf · 007dfbf
1 parent 130df25
commit 007dfbf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -24,6 +24,7 @@ build:
     override:
       -
         command: 'php ./vendor/bin/phpunit --coverage-clover=coverage-clover'
+        idle_timeout: 300
         coverage:
           file: 'coverage-clover'
           format: 'php-clover'
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "symfony/twig-bundle": "^3.4.33 || ^4.4 || ^5.1",
         "symfony/validator": "^3.4.33 || ^4.4 || ^5.1",
         "symfony/yaml": "^3.4.33 || ^4.4 || ^5.1",
-        "twig/twig": "^2.0"
+        "twig/twig": "^2.0 || ^3.0"
     },
     "conflict": {
         "symfony/framework-bundle": "4.3.0"