]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Fix Intl Locale issue 3964/head
authorJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 13 May 2019 11:35:43 +0000 (13:35 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 13 May 2019 12:04:33 +0000 (14:04 +0200)
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

index 56ae3f23dec67b540996d8b0067adde655cd6794..0483da1d0d243eb27fb3cbd96a69ff01fc26d1ea 100644 (file)
@@ -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",
     },
     "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/" }