1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00

Use Twig 2.0

`mnapoli/piwik-twig-extension` locked Twig to the 1.10 version. The new version is compatible with Twig 2.0
This commit is contained in:
Jeremy Benoist 2019-06-21 12:46:53 +02:00
parent 0a01a5f195
commit a2f4efe6d2
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
6 changed files with 56 additions and 39 deletions

49
composer.lock generated
View file

@ -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": "7e872d70c69629db503d9b8ed18e0f40",
"content-hash": "7b43c6d21bc5016660c4e95aa0fdbc12",
"packages": [
{
"name": "bdunogier/guzzle-site-authenticator",
@ -4783,24 +4783,25 @@
},
{
"name": "mnapoli/piwik-twig-extension",
"version": "1.0.0",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/mnapoli/PiwikTwigExtension.git",
"reference": "5171ab7221830a9d377add03dd60dbe6bd7b331f"
"reference": "95cafbaca13e436b1939fe0e70079f6db893fd51"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mnapoli/PiwikTwigExtension/zipball/5171ab7221830a9d377add03dd60dbe6bd7b331f",
"reference": "5171ab7221830a9d377add03dd60dbe6bd7b331f",
"url": "https://api.github.com/repos/mnapoli/PiwikTwigExtension/zipball/95cafbaca13e436b1939fe0e70079f6db893fd51",
"reference": "95cafbaca13e436b1939fe0e70079f6db893fd51",
"shasum": ""
},
"require": {
"php": ">=5.4",
"twig/twig": "~1.10"
"php": ">=7.0",
"twig/twig": "~2.10"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"php-coveralls/php-coveralls": "^2.0",
"symfony/phpunit-bridge": "^4.2"
},
"type": "library",
"autoload": {
@ -4812,7 +4813,7 @@
"license": [
"MIT"
],
"time": "2014-09-16T06:51:19+00:00"
"time": "2019-06-21T10:24:22+00:00"
},
{
"name": "monolog/monolog",
@ -8602,16 +8603,16 @@
},
{
"name": "symfony/swiftmailer-bundle",
"version": "v3.2.6",
"version": "v3.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/swiftmailer-bundle.git",
"reference": "7a83160b50a2479d37eb74ba71577380b9afe4f5"
"reference": "cb125b3648f132fb8070b55393f20cb310907d3b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/7a83160b50a2479d37eb74ba71577380b9afe4f5",
"reference": "7a83160b50a2479d37eb74ba71577380b9afe4f5",
"url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/cb125b3648f132fb8070b55393f20cb310907d3b",
"reference": "cb125b3648f132fb8070b55393f20cb310907d3b",
"shasum": ""
},
"require": {
@ -8621,6 +8622,9 @@
"symfony/dependency-injection": "~2.7|~3.3|~4.0",
"symfony/http-kernel": "~2.7|~3.3|~4.0"
},
"conflict": {
"twig/twig": "<1.41|<2.10"
},
"require-dev": {
"symfony/console": "~2.7|~3.3|~4.0",
"symfony/framework-bundle": "~2.7|~3.3|~4.0",
@ -8660,7 +8664,7 @@
],
"description": "Symfony SwiftmailerBundle",
"homepage": "http://symfony.com",
"time": "2019-04-18T15:52:54+00:00"
"time": "2019-06-18T15:27:04+00:00"
},
{
"name": "symfony/symfony",
@ -8920,21 +8924,22 @@
},
{
"name": "twig/twig",
"version": "v1.42.2",
"version": "v2.11.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "21707d6ebd05476854805e4f91b836531941bcd4"
"reference": "699ed2342557c88789a15402de5eb834dedd6792"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/21707d6ebd05476854805e4f91b836531941bcd4",
"reference": "21707d6ebd05476854805e4f91b836531941bcd4",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/699ed2342557c88789a15402de5eb834dedd6792",
"reference": "699ed2342557c88789a15402de5eb834dedd6792",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"symfony/polyfill-ctype": "^1.8"
"php": "^7.0",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3"
},
"require-dev": {
"psr/container": "^1.0",
@ -8944,7 +8949,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.42-dev"
"dev-master": "2.11-dev"
}
},
"autoload": {
@ -8982,7 +8987,7 @@
"keywords": [
"templating"
],
"time": "2019-06-18T15:35:16+00:00"
"time": "2019-06-18T15:37:11+00:00"
},
{
"name": "wallabag/php-mobi",