From 7bff1263c8f7dc37de9e90da1eaa38a68ff160a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 29 Nov 2017 12:50:15 +0100
Subject: [PATCH] Revert limitation on phpseclib dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Only 2.0.8 is broken, so conflict with that.

Fixes #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e2766b8768..02266a149f 100644
--- a/composer.json
+++ b/composer.json
@@ -42,9 +42,12 @@
         "phpmyadmin/motranslator": "^3.0",
         "phpmyadmin/shapefile": "^2.0",
         "tecnickcom/tcpdf": "^6.2",
-        "phpseclib/phpseclib": "^2.0,<2.0.8",
+        "phpseclib/phpseclib": "^2.0",
         "google/recaptcha": "^1.1"
     },
+    "conflict": {
+        "phpseclib/phpseclib": "2.0.8"
+    },
     "suggest": {
         "ext-openssl": "Cookie encryption",
         "ext-curl": "Updates checking",
-- 
2.11.4.GIT