Merge pull request #6151 from wallabag/fix/update-twig-3

wallabag · Dec 15, 2022 · 70f2c59 · 70f2c59
2 parents e62a9d0 + 28abfe2
commit 70f2c59
Show file tree

Hide file tree

Showing 10 changed files with 309 additions and 54 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -35,6 +35,7 @@ public function registerBundles()
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
             new Http\HttplugBundle\HttplugBundle(),
             new Sentry\SentryBundle\SentryBundle(),
+            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
 
             // wallabag bundles
             new Wallabag\CoreBundle\WallabagCoreBundle(),

diff --git a/app/config/services.yml b/app/config/services.yml
@@ -96,9 +96,6 @@ services:
     FOS\UserBundle\Model\UserManagerInterface:
         alias: fos_user.user_manager
 
-    Twig_Extensions_Extension_Text:
-        class: Twig_Extensions_Extension_Text
-
     MatomoTwigExtension\MatomoTwigExtension:
         public: false
 

diff --git a/composer.json b/composer.json
@@ -82,8 +82,8 @@
         "kphoen/rulerz-bundle": "~0.13",
         "laminas/laminas-code": "^4.7",
         "laminas/laminas-diactoros": "^2.3",
-        "lexik/form-filter-bundle": "^6.1.1",
         "lcobucci/jwt": "~4.1.5",
+        "lexik/form-filter-bundle": "^6.1.1",
         "mgargano/simplehtmldom": "~1.5",
         "mnapoli/piwik-twig-extension": "^3.0",
         "nelmio/api-doc-bundle": "^3.0",
@@ -118,8 +118,9 @@
         "symfony/swiftmailer-bundle": "^3.2",
         "symfony/symfony": "^4.0",
         "tecnickcom/tcpdf": "^6.3.0",
-        "twig/extensions": "^1.5",
-        "twig/twig": "^2.15",
+        "twig/extra-bundle": "^3.4",
+        "twig/string-extra": "^3.4",
+        "twig/twig": "^3.4.3",
         "wallabag/php-mobi": "~1.0",
         "wallabag/phpepub": "^4.0.10",
         "willdurand/hateoas": "^3.8",