From da881c1c085a1a1a09732217b8ac39c396854778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C5=A1a=20Stamenkovi=C4=87?= Date: Fri, 20 Jul 2018 21:04:34 +0200 Subject: [PATCH] Dependency bump (#61) --- .travis.yml | 5 ++--- composer.json | 20 ++++++++++---------- twig-gettext-extractor | 6 +----- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45c77e3..3b732b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: php php: - - 5.5 - - 5.6 - - 7.0 + - 7.1 + - 7.2 before_script: - sudo apt-get -qq update diff --git a/composer.json b/composer.json index e1f7b41..61428d5 100644 --- a/composer.json +++ b/composer.json @@ -10,19 +10,19 @@ } ], "require": { - "php": ">=5.5.9", - "twig/twig": "~1.23|~2.0", + "php": "^7.1", + "twig/twig": "^2.0", "twig/extensions": "~1.0", - "symfony/twig-bridge": "~3.0|~4.0", - "symfony/routing": "~3.0|~4.0", - "symfony/filesystem": "~3.0|~4.0", - "symfony/translation": "~3.0|~4.0", - "symfony/form": "~3.0|~4.0", - "symfony/asset": "~2.8|~3.0|~4.0" + "symfony/twig-bridge": "^4.0", + "symfony/routing": "^4.0", + "symfony/filesystem": "^4.0", + "symfony/translation": "^4.0", + "symfony/form": "^4.0", + "symfony/asset": "^4.0" }, "require-dev": { - "symfony/config": "~3.0|~4.0", - "phpunit/phpunit": "~4.8|~6.0" + "symfony/config": "^4.0", + "phpunit/phpunit": "^6.0" }, "autoload": { "psr-0": { "Twig\\Gettext": "." } diff --git a/twig-gettext-extractor b/twig-gettext-extractor index 57e5c1b..d45aed5 100755 --- a/twig-gettext-extractor +++ b/twig-gettext-extractor @@ -33,11 +33,7 @@ $twig->addExtension(new Symfony\Bridge\Twig\Extension\TranslationExtension( $twig->addExtension(new Symfony\Bridge\Twig\Extension\RoutingExtension( new Twig\Gettext\Routing\Generator\UrlGenerator() )); -$twig->addExtension(new Symfony\Bridge\Twig\Extension\FormExtension( - new Symfony\Bridge\Twig\Form\TwigRenderer( - new Symfony\Bridge\Twig\Form\TwigRendererEngine() - ) -)); +$twig->addExtension(new Symfony\Bridge\Twig\Extension\FormExtension()); $twig->addExtension(new Symfony\Bridge\Twig\Extension\AssetExtension( new Symfony\Component\Asset\Packages() ));