Merge remote-tracking branch 'origin/master'

2017-09-04 12:14:28 +02:00 · 2017-09-04 12:14:28 +02:00 · 81fd5d212b
commit 81fd5d212b
parent fcda63498a 0c32545c25
2 changed files with 2 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -43,6 +43,7 @@
        "ext-xml": "*",
        "ext-pcre": "*",
        "ext-json": "*",
+        "ext-ctype": "*",
        "phpmyadmin/sql-parser": "^4.2",
        "phpmyadmin/motranslator": "^3.0",
        "phpmyadmin/shapefile": "^2.0",
--- a/doc/require.rst
+++ b/doc/require.rst
@ -13,7 +13,7 @@ PHP
 ---

 * You need PHP 5.5.0 or newer, with ``session`` support, the Standard PHP Library
-  (SPL) extension, and JSON support.
+  (SPL) extension, ctype, and JSON support.

 * The ``mbstring`` extension (see :term:`mbstring`) is strongly recommended
  for performance reasons.