diff --git a/composer.json b/composer.json index 351ad5e6..7b5c7877 100644 --- a/composer.json +++ b/composer.json @@ -45,9 +45,8 @@ "symfony/web-link": "4.4.*", "symfony/webpack-encore-bundle": "^1.1", "symfony/yaml": "4.4.*", - "twig/extensions": "^1.5", - "twig/extra-bundle": "3.x-dev", - "twig/intl-extra": "3.x-dev", + "twig/extra-bundle": "^3.0", + "twig/intl-extra": "^3.0", "webmozart/assert": "^1.4" }, "require-dev": { diff --git a/composer.lock b/composer.lock index c0b44f1c..a8fc9087 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": "d5ab5fdad23b0879dba64df3d0c7346a", + "content-hash": "823d8542bcdaea46c533eedb6148de31", "packages": [ { "name": "clue/stream-filter", @@ -7427,64 +7427,9 @@ "homepage": "https://symfony.com", "time": "2019-11-12T14:51:11+00:00" }, - { - "name": "twig/extensions", - "version": "v1.5.4", - "source": { - "type": "git", - "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "57873c8b0c1be51caa47df2cdb824490beb16202" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/57873c8b0c1be51caa47df2cdb824490beb16202", - "reference": "57873c8b0c1be51caa47df2cdb824490beb16202", - "shasum": "" - }, - "require": { - "twig/twig": "^1.27|^2.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^3.4", - "symfony/translation": "^2.7|^3.4" - }, - "suggest": { - "symfony/translation": "Allow the time_diff output to be translated" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, - "autoload": { - "psr-0": { - "Twig_Extensions_": "lib/" - }, - "psr-4": { - "Twig\\Extensions\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Common additional features for Twig that do not directly belong in core", - "keywords": [ - "i18n", - "text" - ], - "time": "2018-12-05T18:34:18+00:00" - }, { "name": "twig/extra-bundle", - "version": "3.x-dev", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/twigphp/twig-extra-bundle.git", @@ -7543,7 +7488,7 @@ }, { "name": "twig/intl-extra", - "version": "3.x-dev", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/twigphp/intl-extra.git", @@ -9454,8 +9399,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "twig/extra-bundle": 20, - "twig/intl-extra": 20, "roave/security-advisories": 20 }, "prefer-stable": false, diff --git a/config/bundles.php b/config/bundles.php index ede2bd17..33b0cd5c 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -16,8 +16,8 @@ return [ Omines\DataTablesBundle\DataTablesBundle::class => ['all' => true], Shivas\VersioningBundle\ShivasVersioningBundle::class => ['all' => true], FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true], - Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true], Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true], + Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true], ]; diff --git a/config/packages/twig_extensions.yaml b/config/packages/twig_extensions.yaml deleted file mode 100644 index a45911f8..00000000 --- a/config/packages/twig_extensions.yaml +++ /dev/null @@ -1,11 +0,0 @@ -services: - _defaults: - public: false - autowire: true - autoconfigure: true - - # Uncomment any lines below to activate that Twig extension - #Twig\Extensions\ArrayExtension: ~ - #Twig\Extensions\DateExtension: ~ - Twig\Extensions\IntlExtension: ~ - #Twig\Extensions\TextExtension: ~ diff --git a/symfony.lock b/symfony.lock index 1e52e1cf..f7971d5a 100644 --- a/symfony.lock +++ b/symfony.lock @@ -688,20 +688,8 @@ "symfony/yaml": { "version": "v4.2.3" }, - "twig/extensions": { - "version": "1.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "1.0", - "ref": "ddb2e0a77773b7fd75d8d649545f174e664500ab" - }, - "files": [ - "./config/packages/twig_extensions.yaml" - ] - }, "twig/extra-bundle": { - "version": "3.x-dev" + "version": "v3.0.0" }, "twig/intl-extra": { "version": "3.x-dev" diff --git a/templates/AdminPages/_info.html.twig b/templates/AdminPages/_info.html.twig index 2b1727c6..acae0ae0 100644 --- a/templates/AdminPages/_info.html.twig +++ b/templates/AdminPages/_info.html.twig @@ -11,7 +11,7 @@
{% if date(entity.addedDate) > date('1900/01/01') %} - {{ entity.addedDate | localizeddate("long") }} + {{ entity.addedDate | format_datetime("long") }} {% else %} - {% endif %} @@ -24,7 +24,7 @@
{% if date(entity.lastModified) > date('1900/01/01') %} - {{ entity.lastModified | localizeddate("long") }} + {{ entity.lastModified | format_datetime("long") }} {% else %} - {% endif %} diff --git a/templates/Parts/info/_attachments_info.html.twig b/templates/Parts/info/_attachments_info.html.twig index 8a608759..28e52ba9 100644 --- a/templates/Parts/info/_attachments_info.html.twig +++ b/templates/Parts/info/_attachments_info.html.twig @@ -56,8 +56,8 @@