Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #76704: mb_detect_order return value varies based on argument type

diff --cc NEWS
index a491bf181e65ccdd5390d89c3eba83f53814f7fe,379e1a97eeba8fd8fa5c50170ad6848a4e6de823..4bfe2168d57bf221deee25c2e701d7c87fddcc9d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,16 -1,23 +1,20 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.2.10
 +?? ??? ????, PHP 7.3.0beta2
  
 -16 Aug 2018, PHP 7.2.9
 -
 -- Calendar:
 -  . Fixed bug #52974 (jewish.c: compile error under Windows with GBK charset).
 -    (cmb)
+ - mbstring:
+   . Fixed bug #76704 (mb_detect_order return value varies based on argument
+     type). (cmb)
+ 
 +- phpdbg:
 +  . Fixed bug #76595 (phpdbg man page contains outdated information).
 +    (Kevin Abel)
  
 -- Filter:
 -  . Fixed bug #76366 (References in sub-array for filtering breaks the filter).
 -    (ZiHang Gao)
 +02 Aug 2018, PHP 7.3.0beta1
  
 -- PDO_Firebird:
 -  . Fixed bug #76488 (Memory leak when fetching a BLOB field). (Simonov Denis)
 +- Core:
 +  . Fixed bug #76667 (Segfault with divide-assign op and __get + __set).
 +    (Laruence)
  
  - PDO_PgSQL:
    . Fixed bug #75402 (Possible Memory Leak using PDO::CURSOR_SCROLL option).

diff --cc ext/mbstring/mbstring.c
index eceafdd29c931a77c159ff84e95b274b2914e5b8,2ec7f1a3a8dce60a6867f97f39495498521789d3..bb464d0008de1720bee0cd8c3b4c8d856a988b94
--- 1/ext/mbstring/mbstring.c
--- 2/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -683,33 -701,8 +683,33 @@@ static const sapi_post_entry mbstr_post
  };
  /* }}} */
  
 +static const mbfl_encoding *php_mb_get_encoding(const char *encoding_name) {
 +      if (encoding_name) {
 +              const mbfl_encoding *encoding;
 +              if (MBSTRG(last_used_encoding_name)
 +                              && !strcasecmp(encoding_name, MBSTRG(last_used_encoding_name))) {
 +                      return MBSTRG(last_used_encoding);
 +              }
 +
 +              encoding = mbfl_name2encoding(encoding_name);
 +              if (!encoding) {
 +                      php_error_docref(NULL, E_WARNING, "Unknown encoding \"%s\"", encoding_name);
 +                      return NULL;
 +              }
 +
 +              if (MBSTRG(last_used_encoding_name)) {
 +                      efree(MBSTRG(last_used_encoding_name));
 +              }
 +              MBSTRG(last_used_encoding_name) = estrdup(encoding_name);
 +              MBSTRG(last_used_encoding) = encoding;
 +              return encoding;
 +      } else {
 +              return MBSTRG(current_internal_encoding);
 +      }
 +}
 +
  /* {{{ static int php_mb_parse_encoding_list()
-  *  Return 0 if input contains any illegal encoding, otherwise 1.
+  *  Return FAILURE if input contains any illegal encoding, otherwise SUCCESS.
   *  Even if any illegal encoding is detected the result may contain a list
   *  of parsed encodings.
   */