From b50ecd0c8a2a40abf49086c92a315bc333052870 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 13 May 2019 13:35:43 +0200 Subject: Fix Intl Locale issue Some issue appeared after the release of PHP 7.2.17 about Intl Memory Leak / infinite loop. To fix it we should upgrade to Symfony 3.4 (which is done in wallabag 2.4) but for the 2.3 branch, we'll use a temporary fix for the Locale issue. --- composer.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 56ae3f23..0483da1d 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,8 @@ "friendsofsymfony/jsrouting-bundle": "^1.6.3", "bdunogier/guzzle-site-authenticator": "^1.0.0", "defuse/php-encryption": "^2.1", - "html2text/html2text": "^4.1" + "html2text/html2text": "^4.1", + "sulu/symfony-intl-fix": "^1.0" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", @@ -125,7 +126,11 @@ }, "autoload": { "psr-4": { "Wallabag\\": "src/Wallabag/" }, - "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] + "classmap": [ "app/AppKernel.php", "app/AppCache.php" ], + "exclude-from-classmap": [ + "vendor/symfony/intl/Locale.php", + "vendor/symfony/symfony/src/Symfony/Component/Intl/Locale.php" + ] }, "autoload-dev": { "psr-4": { "Tests\\": "tests/" } -- cgit v1.2.3