From b9087624b3a402ab8ad1aef1129ea393f3724bab Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Mon, 16 Aug 2021 18:54:38 +0000
Subject: [PATCH] Remove direct dependency on obsolete twig/extensions.
Only transitive dependency remains now.
---
composer.json | 3 +-
composer.lock | 161 +++++++++++++++++++++++-
lib/SimpleSAML/XHTML/Template.php | 2 +-
modules/admin/templates/federation.twig | 4 +-
4 files changed, 164 insertions(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index b59bcddf8..3cd2f7c03 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,8 @@
"symfony/routing": "^4.0 || ^5.0",
"symfony/var-exporter": "^5.0",
"symfony/yaml": "^4.0 || ^5.0",
- "twig/twig": "~2.0"
+ "twig/twig": "~2.0",
+ "twig/intl-extra": "^3.3"
},
"require-dev": {
"ext-curl": "*",
diff --git a/composer.lock b/composer.lock
index 241f351dd..2aa46e86c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "e425394cf88dd3a94d731868d6b880f5",
+ "content-hash": "3f7b1c658a21ed99cf2359c5ac11761f",
"packages": [
{
"name": "gettext/gettext",
@@ -1944,6 +1944,94 @@
],
"time": "2021-06-17T14:18:27+00:00"
},
+ {
+ "name": "symfony/intl",
+ "version": "v5.3.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/intl.git",
+ "reference": "f1d1420771b3a94fcf2fda06728c61eba5de4b90"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/intl/zipball/f1d1420771b3a94fcf2fda06728c61eba5de4b90",
+ "reference": "f1d1420771b3a94fcf2fda06728c61eba5de4b90",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2.5",
+ "symfony/deprecation-contracts": "^2.1",
+ "symfony/polyfill-php80": "^1.16"
+ },
+ "require-dev": {
+ "symfony/filesystem": "^4.4|^5.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Intl\\": ""
+ },
+ "classmap": [
+ "Resources/stubs"
+ ],
+ "files": [
+ "Resources/functions.php"
+ ],
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ },
+ {
+ "name": "Eriksen Costa",
+ "email": "eriksen.costa@infranology.com.br"
+ },
+ {
+ "name": "Igor Wiedler",
+ "email": "igor@wiedler.ch"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Provides a PHP replacement layer for the C intl extension that includes additional data from the ICU library",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "i18n",
+ "icu",
+ "internationalization",
+ "intl",
+ "l10n",
+ "localization"
+ ],
+ "support": {
+ "source": "https://github.com/symfony/intl/tree/v5.3.4"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2021-07-23T15:55:36+00:00"
+ },
{
"name": "symfony/polyfill-ctype",
"version": "v1.23.0",
@@ -3057,6 +3145,75 @@
"abandoned": true,
"time": "2018-12-05T18:34:18+00:00"
},
+ {
+ "name": "twig/intl-extra",
+ "version": "v3.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/twigphp/intl-extra.git",
+ "reference": "919e8f945c30bd3efeb6a4d79722cda538116658"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/919e8f945c30bd3efeb6a4d79722cda538116658",
+ "reference": "919e8f945c30bd3efeb6a4d79722cda538116658",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1.3",
+ "symfony/intl": "^4.3|^5.0",
+ "twig/twig": "^2.4|^3.0"
+ },
+ "require-dev": {
+ "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Twig\\Extra\\Intl\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ }
+ ],
+ "description": "A Twig extension for Intl",
+ "homepage": "https://twig.symfony.com",
+ "keywords": [
+ "intl",
+ "twig"
+ ],
+ "support": {
+ "source": "https://github.com/twigphp/intl-extra/tree/v3.3.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2021-01-01T14:58:18+00:00"
+ },
{
"name": "twig/twig",
"version": "v2.14.6",
@@ -6325,5 +6482,5 @@
"platform-dev": {
"ext-curl": "*"
},
- "plugin-api-version": "2.1.0"
+ "plugin-api-version": "2.0.0"
}
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 6c1957c2d..6d3e5fde5 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -295,7 +295,7 @@ class Template extends Response
$twig = new Twig_Environment($loader, $options);
$twig->addExtension(new Twig_Extensions_Extension_I18n());
- $twig->addExtension(new \Twig\Extensions\DateExtension());
+ $twig->addExtension(new \Twig\Extra\Intl\IntlExtension());
$twig->addFunction(new TwigFunction('moduleURL', [Module::class, 'getModuleURL']));
diff --git a/modules/admin/templates/federation.twig b/modules/admin/templates/federation.twig
index 7d7f2cf90..300ab0811 100644
--- a/modules/admin/templates/federation.twig
+++ b/modules/admin/templates/federation.twig
@@ -118,9 +118,9 @@
</a>
{% if entity.expire is defined %}
{% if entity.expire < date().timestamp %}
- <span class="entity-expired"> ({% trans %}expired{% endtrans %} {{ entity.expire | time_diff }})</span>
+ <span class="entity-expired"> ({% trans %}expired{% endtrans %} {{ entity.expire | format_datetime }})</span>
{% else %}
- <span class="entity-expires"> ({% trans %}expires{% endtrans %} {{ entity.expire | time_diff }})</span>
+ <span class="entity-expires"> ({% trans %}expires{% endtrans %} {{ entity.expire | format_datetime }})</span>
{% endif %}
{% endif %}
</li>
--
GitLab