aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-05-17 09:02:22 +0200
committerGitHub <noreply@github.com>2017-05-17 09:02:22 +0200
commit4e88a6a65138d2e46d74ff346bf0626ee791b009 (patch)
treea9f5783f485532fcc67c7c6a9f7904c8e7eecb34
parent092ed4a7874e2dc87a60af30785c114fdd4903e4 (diff)
parent8581fcae90b2504d08ee39f617d63472cf02ac30 (diff)
downloadwallabag-4e88a6a65138d2e46d74ff346bf0626ee791b009.tar.gz
wallabag-4e88a6a65138d2e46d74ff346bf0626ee791b009.tar.zst
wallabag-4e88a6a65138d2e46d74ff346bf0626ee791b009.zip
Merge pull request #3124 from wallabag/lock-guzzle-auth
Lock guzzle-site-authenticator to avoid errors
-rw-r--r--composer.json2
-rw-r--r--var/SymfonyRequirements.php6
2 files changed, 1 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index 7f16e691..9336e801 100644
--- a/composer.json
+++ b/composer.json
@@ -84,7 +84,7 @@
84 "javibravo/simpleue": "^1.0", 84 "javibravo/simpleue": "^1.0",
85 "symfony/dom-crawler": "^3.1", 85 "symfony/dom-crawler": "^3.1",
86 "friendsofsymfony/jsrouting-bundle": "^1.6", 86 "friendsofsymfony/jsrouting-bundle": "^1.6",
87 "bdunogier/guzzle-site-authenticator": "dev-master" 87 "bdunogier/guzzle-site-authenticator": "1.0.0-beta1"
88 }, 88 },
89 "require-dev": { 89 "require-dev": {
90 "doctrine/doctrine-fixtures-bundle": "~2.2", 90 "doctrine/doctrine-fixtures-bundle": "~2.2",
diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php
index 7e7a99de..3b14a402 100644
--- a/var/SymfonyRequirements.php
+++ b/var/SymfonyRequirements.php
@@ -634,12 +634,6 @@ class SymfonyRequirements extends RequirementCollection
634 ); 634 );
635 635
636 $this->addRecommendation( 636 $this->addRecommendation(
637 function_exists('iconv'),
638 'iconv() should be available',
639 'Install and enable the <strong>iconv</strong> extension.'
640 );
641
642 $this->addRecommendation(
643 function_exists('utf8_decode'), 637 function_exists('utf8_decode'),
644 'utf8_decode() should be available', 638 'utf8_decode() should be available',
645 'Install and enable the <strong>XML</strong> extension.' 639 'Install and enable the <strong>XML</strong> extension.'