From f7ef36b595e16aa74d26bf71ac1891b962957321 Mon Sep 17 00:00:00 2001 From: Gert de Pagter Date: Tue, 8 May 2018 16:32:48 +0200 Subject: [PATCH] Require a polyfill instead of the cytpe extension Ctype is an indirect dependency due to twig, and it isn't resolved there until a later version than we require. By requiring the symfony polyfill for cytpe everything will still run, regardless of the ctype availability. Twig will require this polyfill itself in a later version, but this makes sure we still allow earlier versions of twig to be used. Signed-off-by: Gert de Pagter --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index eb976d29c0..fa1dd24e77 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,6 @@ "ext-xml": "*", "ext-pcre": "*", "ext-json": "*", - "ext-ctype": "*", "ext-hash": "*", "phpmyadmin/sql-parser": "^4.2.3", "phpmyadmin/motranslator": "^4.0", @@ -55,7 +54,8 @@ "twig/twig": "^1.34", "twig/extensions": "~1.5.1", "symfony/expression-language": "^3.2", - "symfony/polyfill-mbstring": "^1.3" + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-ctype": "^1.8" }, "conflict": { "phpseclib/phpseclib": "2.0.8",