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 <BackEndTea@gmail.com>
This commit is contained in:
parent
dc72341b75
commit
f7ef36b595
@ -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",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user