fixes

Author: Girgias

Zend/tests/constants/class_constants_005.phpt

@@ -4,7 +4,7 @@ String interning during constants substitution
 opcache.enable_cli=0
 --FILE--
 <?php
-define ("A", "." . ord(26) . ".");
+define ("A", "." . ord(2) . ".");
 eval("class A {const a = A;}");
 var_dump(A::a);
 ?>

Zend/tests/nullsafe_operator/013.phpt

@@ -53,6 +53,8 @@ Deprecated: chr(): Passing null to parameter #1 ($codepoint) of type int is depr
 string(1) "%s"
 
 Deprecated: ord(): Passing null to parameter #1 ($character) of type string is deprecated in %s on line %d
+
+Deprecated: ord(): Providing an empty string is deprecated in %s on line %d
 int(0)
 string(98) "call_user_func_array(): Argument #1 ($callback) must be a valid callback, no array or string given"
 string(77) "call_user_func_array(): Argument #2 ($args) must be of type array, null given"

ext/standard/string.c

@@ -2652,8 +2652,13 @@ PHP_FUNCTION(ord)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (UNEXPECTED(ZSTR_LEN(str) != 1)) {
-		php_error_docref(NULL, E_DEPRECATED,
-			"Providing a string which is not one byte long is deprecated, use ord($str[0]) instead");
+		if (ZSTR_LEN(str) == 0) {
+			php_error_docref(NULL, E_DEPRECATED,
+				"Providing an empty string is deprecated");
+		} else {
+			php_error_docref(NULL, E_DEPRECATED,
+				"Providing a string which is not one byte long is deprecated, use ord($str[0]) instead");
+		}
 	}
 	RETURN_LONG((unsigned char) ZSTR_VAL(str)[0]);
 }

ext/standard/tests/strings/ord_not_1_byte.phpt

@@ -8,7 +8,7 @@ var_dump(ord("Hello"));
 
 ?>
 --EXPECTF--
-Deprecated: ord(): Providing a string which is not one byte long is deprecated, use ord($str[0]) instead in %s on line 3
+Deprecated: ord(): Providing an empty string is deprecated in %s on line 3
 int(0)
 
 Deprecated: ord(): Providing a string which is not one byte long is deprecated, use ord($str[0]) instead in %s on line 4