aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2019-05-13 13:35:43 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-05-13 14:04:33 +0200
commitb50ecd0c8a2a40abf49086c92a315bc333052870 (patch)
treea2b9b910ea1b5f40a8563b07358f25aee1e11586
parenta73cb8a689431a035d1ffca10d9654e84de5b58c (diff)
downloadwallabag-b50ecd0c8a2a40abf49086c92a315bc333052870.tar.gz
wallabag-b50ecd0c8a2a40abf49086c92a315bc333052870.tar.zst
wallabag-b50ecd0c8a2a40abf49086c92a315bc333052870.zip
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.
-rw-r--r--composer.json9
1 files 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 @@
86 "friendsofsymfony/jsrouting-bundle": "^1.6.3", 86 "friendsofsymfony/jsrouting-bundle": "^1.6.3",
87 "bdunogier/guzzle-site-authenticator": "^1.0.0", 87 "bdunogier/guzzle-site-authenticator": "^1.0.0",
88 "defuse/php-encryption": "^2.1", 88 "defuse/php-encryption": "^2.1",
89 "html2text/html2text": "^4.1" 89 "html2text/html2text": "^4.1",
90 "sulu/symfony-intl-fix": "^1.0"
90 }, 91 },
91 "require-dev": { 92 "require-dev": {
92 "doctrine/doctrine-fixtures-bundle": "~2.2", 93 "doctrine/doctrine-fixtures-bundle": "~2.2",
@@ -125,7 +126,11 @@
125 }, 126 },
126 "autoload": { 127 "autoload": {
127 "psr-4": { "Wallabag\\": "src/Wallabag/" }, 128 "psr-4": { "Wallabag\\": "src/Wallabag/" },
128 "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] 129 "classmap": [ "app/AppKernel.php", "app/AppCache.php" ],
130 "exclude-from-classmap": [
131 "vendor/symfony/intl/Locale.php",
132 "vendor/symfony/symfony/src/Symfony/Component/Intl/Locale.php"
133 ]
129 }, 134 },
130 "autoload-dev": { 135 "autoload-dev": {
131 "psr-4": { "Tests\\": "tests/" } 136 "psr-4": { "Tests\\": "tests/" }