Merge branch 'PHP-7.4'

* PHP-7.4:
  Revert "Went to fast and forgot to update tests"
  Revert "Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails"

Author: Girgias

ext/mbstring/mbstring.c

@@ -1533,7 +1533,7 @@ PHP_FUNCTION(mb_detect_order)
 
 static inline int php_mb_check_code_point(zend_long cp)
 {
-	if (cp < 0 || cp >= 0x110000) {
+	if (cp <= 0 || cp >= 0x110000) {
 		/* Out of Unicode range */
 		return 0;
 	}

ext/mbstring/tests/bug79448.phpt

@@ -25,7 +25,7 @@ var_dump(bin2hex(mb_convert_encoding("\xe2\x99\xa0\xe3\x81\x82", "CP932", "UTF-8
 
 var_dump(mb_substitute_character('BAD_NAME'));
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 int(12356)
 string(8) "82a282a0"
@@ -38,4 +38,6 @@ string(4) "82a0"
 bool(true)
 string(6) "entity"
 string(20) "262378323636303b82a0"
-bool(true)
+
+Warning: mb_substitute_character(): Unknown character in %s on line %d
+bool(false)

ext/mbstring/tests/mb_substitute_character.phpt

@@ -27,7 +27,7 @@ var_dump( mb_substitute_character() );
 var_dump( mb_substitute_character("b") );
 
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing mb_substitute_character() : basic functionality ***
 int(63)
 bool(true)
@@ -36,4 +36,6 @@ bool(true)
 int(1234)
 bool(true)
 string(4) "none"
-bool(true)
+
+Warning: mb_substitute_character(): Unknown character in %s on line %d
+bool(false)

ext/mbstring/tests/mb_substitute_character_basic.phpt

@@ -122,7 +122,8 @@ fclose($fp);
 *** Testing mb_substitute_character() : usage variation ***
 
 --int 0--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --int 1--
 bool(true)
@@ -150,10 +151,12 @@ Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
 bool(false)
 
 --float .5--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --empty array--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --int indexed array--
 bool(true)
@@ -165,22 +168,26 @@ bool(true)
 bool(true)
 
 --uppercase NULL--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --lowercase null--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --lowercase true--
 bool(true)
 
 --lowercase false--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --uppercase TRUE--
 bool(true)
 
 --uppercase FALSE--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --empty string DQ--
 bool(true)
@@ -189,16 +196,20 @@ bool(true)
 bool(true)
 
 --string DQ--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --string SQ--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --mixed case string--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --heredoc--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --instance of classWithToString--
 Error: 8 - Object of class classWithToString could not be converted to int, %s(%d)
@@ -209,7 +220,9 @@ Error: 8 - Object of class classWithoutToString could not be converted to int, %
 bool(true)
 
 --undefined var--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)
 
 --unset var--
-bool(true)
+Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
+bool(false)