feature #1049 Upgrade to Twig 3 (javiereguiluz)

javiereguiluz · javiereguiluz · commit 1da3dd860e62 · 2019-12-02T10:14:03.000+01:00
This PR was squashed before being merged into the master branch (closes #1049). Discussion ---------- Upgrade to Twig 3 Commits ------- c953323 Upgrade to Twig 3
diff --git a/composer.json b/composer.json
@@ -31,8 +31,8 @@
         "symfony/webpack-encore-bundle": "^1.4",
         "symfony/yaml": "5.0.*",
         "tgalopin/html-sanitizer-bundle": "^1.1",
-        "twig/extensions": "^1.5",
-        "twig/twig": "^2.6"
+        "twig/intl-extra": "^3.0",
+        "twig/twig": "^3.0"
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^6.2",
diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/twig_extensions.yaml b/config/packages/twig_extensions.yaml
diff --git a/config/services.yaml b/config/services.yaml
@@ -32,3 +32,6 @@ services:
     # 'arguments' key and define the arguments just below the service class
     App\EventSubscriber\CommentNotificationSubscriber:
         $sender: '%app.notifications.email_sender%'
+
+    # needed to activate the filters provided by Twig Intl Extension
+    Twig\Extra\Intl\IntlExtension: null
diff --git a/symfony.lock b/symfony.lock
@@ -525,17 +525,8 @@
             "ref": "26a72f38eede2c53b5d3ccbed5c150e10a93268d"
         }
     },
-    "twig/extensions": {
-        "version": "1.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "1.0",
-            "ref": "a86723ee8d8b2f9437c8ce60a5546a1c267da5ed"
-        },
-        "files": [
-            "config/packages/twig_extensions.yaml"
-        ]
+    "twig/intl-extra": {
+        "version": "v3.0.0"
     },
     "twig/twig": {
         "version": "v2.12.2"
diff --git a/templates/admin/blog/index.html.twig b/templates/admin/blog/index.html.twig
@@ -20,7 +20,7 @@
                 {# it's not mandatory to set the timezone in localizeddate(). This is done to
                    avoid errors when the 'intl' PHP extension is not available and the application
                    is forced to use the limited "intl polyfill", which only supports UTC and GMT #}
-                <td>{{ post.publishedAt|localizeddate('medium', 'short', null, 'UTC') }}</td>
+                <td>{{ post.publishedAt|format_datetime('medium', 'short', '', 'UTC') }}</td>
                 <td class="text-right">
                     <div class="item-actions">
                         <a href="{{ path('admin_post_show', {id: post.id}) }}" class="btn btn-sm btn-default">
diff --git a/templates/admin/blog/show.html.twig b/templates/admin/blog/show.html.twig
@@ -6,7 +6,7 @@
     <h1>{{ post.title }}</h1>
 
     <p class="post-metadata">
-        <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}</span>
+        <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|format_datetime('long', 'medium', '', 'UTC') }}</span>
         <span class="metadata"><i class="fa fa-user"></i> {{ post.author.fullName }}</span>
     </p>
 
diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -157,6 +157,6 @@
         {# it's not mandatory to set the timezone in localizeddate(). This is done to
            avoid errors when the 'intl' PHP extension is not available and the application
            is forced to use the limited "intl polyfill", which only supports UTC and GMT #}
-        <!-- Page rendered on {{ 'now'|localizeddate('long', 'long', null, 'UTC') }} -->
+        <!-- Page rendered on {{ 'now'|format_datetime('long', 'long', '', 'UTC') }} -->
     </body>
 </html>
diff --git a/templates/blog/about.html.twig b/templates/blog/about.html.twig
@@ -12,4 +12,4 @@
 {# it's not mandatory to set the timezone in localizeddate(). This is done to
    avoid errors when the 'intl' PHP extension is not available and the application
    is forced to use the limited "intl polyfill", which only supports UTC and GMT #}
-<!-- Fragment rendered on {{ 'now'|localizeddate('long', 'long', null, 'UTC') }} -->
+<!-- Fragment rendered on {{ 'now'|format_datetime('long', 'long', '', 'UTC') }} -->
diff --git a/templates/blog/index.html.twig b/templates/blog/index.html.twig
@@ -12,7 +12,7 @@
             </h2>
 
             <p class="post-metadata">
-                <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}</span>
+                <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|format_datetime('long', 'medium', '', 'UTC') }}</span>
                 <span class="metadata"><i class="fa fa-user"></i> {{ post.author.fullName }}</span>
             </p>
 
diff --git a/templates/blog/post_show.html.twig b/templates/blog/post_show.html.twig
@@ -6,7 +6,7 @@
     <h1>{{ post.title }}</h1>
 
     <p class="post-metadata">
-        <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}</span>
+        <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|format_datetime('long', 'medium', '', 'UTC') }}</span>
         <span class="metadata"><i class="fa fa-user"></i> {{ post.author.fullName }}</span>
     </p>
 
@@ -45,7 +45,7 @@
                 {# it's not mandatory to set the timezone in localizeddate(). This is done to
                    avoid errors when the 'intl' PHP extension is not available and the application
                    is forced to use the limited "intl polyfill", which only supports UTC and GMT #}
-                <strong>{{ comment.publishedAt|localizeddate('medium', 'short', null, 'UTC') }}</strong>
+                <strong>{{ comment.publishedAt|format_datetime('medium', 'short', '', 'UTC') }}</strong>
             </h4>
             <div class="col-sm-9">
                 {{ comment.content|md2html }}
