From 8b7b8f430d1a5eb91cac677674e69e46ed41a4db Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Mon, 6 Jan 2020 12:10:47 +0100 Subject: [PATCH] Pin twig/twig to 1.41.0 There is an incompatibility with MopaBootstap bundle yielding fatal errors when the flash messages are rendered. The current workaround is to downgrade to 1.41.0 https://github.com/phiamo/MopaBootstrapBundle/issues/1244 --- composer.json | 2 +- composer.lock | 68 +++++++++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index fd2f02d5..378a5baa 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "symfony/symfony": "3.4.*", "twbs/bootstrap": "~3.3.0", "twig/extensions": "~1.5", - "twig/twig": "~1.38" + "twig/twig": "1.41.0" }, "require-dev": { "matthiasnoback/symfony-config-test": "^2.2", diff --git a/composer.lock b/composer.lock index 6aa74ec6..8ec1e393 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a6a24f6f7e85dafb12ce43916d8eda9c", + "content-hash": "2aa16ce83e872d1a629dafa8b127cd21", "packages": [ { "name": "beberlei/assert", @@ -464,21 +464,24 @@ }, { "name": "doctrine/lexer", - "version": "v1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8", + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "^4.5" + }, "type": "library", "extra": { "branch-alias": { @@ -486,8 +489,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" } }, "notification-url": "https://packagist.org/downloads/", @@ -508,13 +511,16 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", "keywords": [ + "annotations", + "docblock", "lexer", - "parser" + "parser", + "php" ], - "time": "2014-09-09T13:34:57+00:00" + "time": "2019-06-08T11:03:04+00:00" }, { "name": "ee/dataexporter-bundle", @@ -573,22 +579,25 @@ }, { "name": "fig/link-util", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/link-util.git", - "reference": "1a07821801a148be4add11ab0603e4af55a72fac" + "reference": "47f55860678a9e202206047bc02767556d298106" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/link-util/zipball/1a07821801a148be4add11ab0603e4af55a72fac", - "reference": "1a07821801a148be4add11ab0603e4af55a72fac", + "url": "https://api.github.com/repos/php-fig/link-util/zipball/47f55860678a9e202206047bc02767556d298106", + "reference": "47f55860678a9e202206047bc02767556d298106", "shasum": "" }, "require": { "php": ">=5.5.0", "psr/link": "~1.0@dev" }, + "provide": { + "psr/link-implementation": "1.0" + }, "require-dev": { "phpunit/phpunit": "^5.1", "squizlabs/php_codesniffer": "^2.3.1" @@ -623,7 +632,7 @@ "psr-13", "rest" ], - "time": "2016-10-17T18:31:11+00:00" + "time": "2019-12-18T15:40:05+00:00" }, { "name": "fortawesome/font-awesome", @@ -3052,16 +3061,16 @@ }, { "name": "symfony/symfony", - "version": "v3.4.26", + "version": "v3.4.36", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "1b89e7baec9891c323bbf1ec81af77d901fc60c9" + "reference": "0a6fccb5772ad2467253e6849d589bd09d9eb195" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/1b89e7baec9891c323bbf1ec81af77d901fc60c9", - "reference": "1b89e7baec9891c323bbf1ec81af77d901fc60c9", + "url": "https://api.github.com/repos/symfony/symfony/zipball/0a6fccb5772ad2467253e6849d589bd09d9eb195", + "reference": "0a6fccb5772ad2467253e6849d589bd09d9eb195", "shasum": "" }, "require": { @@ -3080,9 +3089,10 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.6", - "twig/twig": "^1.35|^2.4.4" + "twig/twig": "^1.41|^2.10" }, "conflict": { + "monolog/monolog": ">=2", "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", "phpdocumentor/type-resolver": "<0.3.0", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" @@ -3159,7 +3169,7 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0", "predis/predis": "~1.0", - "symfony/phpunit-bridge": "~3.4|~4.0", + "symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0", "symfony/security-acl": "~2.8|~3.0" }, "type": "library", @@ -3203,7 +3213,7 @@ "keywords": [ "framework" ], - "time": "2019-04-17T15:57:27+00:00" + "time": "2019-12-01T13:50:53+00:00" }, { "name": "twbs/bootstrap", @@ -3313,16 +3323,16 @@ }, { "name": "twig/twig", - "version": "v1.39.1", + "version": "v1.41.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec" + "reference": "575cd5028362da591facde1ef5d7b94553c375c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec", - "reference": "23e7b6f0cfa1d7ba3de69f30d8e05cf957412fec", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/575cd5028362da591facde1ef5d7b94553c375c9", + "reference": "575cd5028362da591facde1ef5d7b94553c375c9", "shasum": "" }, "require": { @@ -3337,7 +3347,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.39-dev" + "dev-master": "1.41-dev" } }, "autoload": { @@ -3375,7 +3385,7 @@ "keywords": [ "templating" ], - "time": "2019-04-16T17:12:57+00:00" + "time": "2019-05-14T11:59:08+00:00" }, { "name": "webmozart/assert",