[%pS migration] Use %pS in Zend/*

Zend/tests/anon/gh15994.phpt

@@ -10,4 +10,4 @@ abstract class ParentClass {
 $o = new class extends ParentClass {};
 ?>
 --EXPECTF--
-Fatal error: Class ParentClass@anonymous must implement 1 abstract method (ParentClass::f) in %sgh15994.php on line 7
+Fatal error: Class ParentClass@anonymous%0%s:7$0 must implement 1 abstract method (ParentClass::f) in %s on line %d

Zend/tests/attributes/override/constants/anon_failure.phpt

@@ -12,4 +12,4 @@ echo "Done";
 
 ?>
 --EXPECTF--
-Fatal error: class@anonymous::C has #[\Override] attribute, but no matching parent constant exists in %s on line %d
+Fatal error: class@anonymous%0%s:3$%x::C has #[\Override] attribute, but no matching parent constant exists in %s on line %d

Zend/tests/attributes/override/properties_16.phpt

@@ -18,4 +18,4 @@ echo "Done";
 
 ?>
 --EXPECTF--
-Fatal error: I@anonymous::$c has #[\Override] attribute, but no matching parent property exists in %s on line %d
+Fatal error: I@anonymous%0%s:7$%x::$c has #[\Override] attribute, but no matching parent property exists in %s on line %d

Zend/tests/dynamic_prop_deprecation_002.phpt

@@ -13,6 +13,6 @@ try {
 	echo "Exception: " .$ex->getMessage() . "\n";
 }
 ?>
---EXPECT--
-Err: Creation of dynamic property class@anonymous::$y is deprecated
-Exception: Cannot create dynamic property class@anonymous::$y
+--EXPECTF--
+Err: Creation of dynamic property class@anonymous%0%s:6$%x::$y is deprecated
+Exception: Cannot create dynamic property class@anonymous%0%s:6$%x::$y

Zend/tests/gh19304.phpt

@@ -14,5 +14,5 @@ try {
 }
 
 ?>
---EXPECT--
-Cannot assign int to property class@anonymous::$v of type self
+--EXPECTF--
+Cannot assign int to property class@anonymous%0%s:3$0::$v of type self

Zend/tests/readonly_classes/gh10377_1.phpt

@@ -12,4 +12,4 @@ $readonly_anon = new #[AllowDynamicProperties] readonly class {
 
 ?>
 --EXPECTF--
-Fatal error: Cannot apply #[\AllowDynamicProperties] to readonly class class@anonymous in %s on line %d
+Fatal error: Cannot apply #[\AllowDynamicProperties] to readonly class class@anonymous%0%s:3$%x in %s on line %d

Zend/tests/temporary_cleaning/temporary_cleaning_013.phpt

@@ -284,27 +284,27 @@ caught Exception 3
 caught Exception 4
 caught Exception 5
 
-Deprecated: Creation of dynamic property class@anonymous::$foo is deprecated in %s on line %d
+Deprecated: Creation of dynamic property class@anonymous%0%s:41$%x::$foo is deprecated in %s on line %d
 caught Exception 6
 caught Exception 7
 caught Exception 8
 caught Exception 9
 caught Exception 10
 
-Deprecated: Creation of dynamic property class@anonymous::$foo is deprecated in %s on line %d
+Deprecated: Creation of dynamic property class@anonymous%0%s:92$%x::$foo is deprecated in %s on line %d
 caught Exception 11
 
-Deprecated: Creation of dynamic property class@anonymous::$foo is deprecated in %s on line %d
+Deprecated: Creation of dynamic property class@anonymous%0%s:101$%x::$foo is deprecated in %s on line %d
 caught Exception 12
 caught Exception 13
 
-Deprecated: Creation of dynamic property class@anonymous::$foo is deprecated in %s on line %d
+Deprecated: Creation of dynamic property class@anonymous%0%s:116$%x::$foo is deprecated in %s on line %d
 caught Exception 14
 
-Notice: Indirect modification of overloaded element of ArrayAccess@anonymous has no effect in %s on line %d
+Notice: Indirect modification of overloaded element of ArrayAccess@anonymous%0%s:125$%x has no effect in %s on line %d
 caught Exception 15
 
-Notice: Indirect modification of overloaded element of ArrayAccess@anonymous has no effect in %s on line %d
+Notice: Indirect modification of overloaded element of ArrayAccess@anonymous%0%s:135$%x has no effect in %s on line %d
 caught Exception 16
 caught Exception 17
 caught Exception 18

Zend/tests/type_declarations/typed_properties_002.phpt

@@ -9,7 +9,7 @@ $thing = new class() {
 var_dump($thing->int);
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Typed property class@anonymous::$int must not be accessed before initialization in %s:%d
+Fatal error: Uncaught Error: Typed property class@anonymous%0%s:2$%x::$int must not be accessed before initialization in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line 6

Zend/tests/type_declarations/typed_properties_003.phpt

@@ -9,7 +9,7 @@ $thing = new class() {
 $var = &$thing->int;
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot access uninitialized non-nullable property class@anonymous::$int by reference in %s:%d
+Fatal error: Uncaught Error: Cannot access uninitialized non-nullable property class@anonymous%0%s:2$%x::$int by reference in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

Zend/tests/type_declarations/typed_properties_004.phpt

@@ -11,7 +11,7 @@ new class("PHP 7 is better than you, and it knows it ...") {
 };
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Cannot assign string to property class@anonymous::$int of type int in %s:%d
+Fatal error: Uncaught TypeError: Cannot assign string to property class@anonymous%0%s:2$%x::$int of type int in %s:%d
 Stack trace:
 #0 %s(%d): class@anonymous->__construct('PHP 7 is better...')
 #1 {main}

Zend/tests/type_declarations/typed_properties_005.phpt

@@ -13,7 +13,7 @@ new class(new Dummy) {
 };
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Cannot assign Dummy to property class@anonymous::$std of type stdClass in %s:%d
+Fatal error: Uncaught TypeError: Cannot assign Dummy to property class@anonymous%0%s:4$%x::$std of type stdClass in %s:%d
 Stack trace:
 #0 %s(%d): class@anonymous->__construct(Object(Dummy))
 #1 {main}

Zend/tests/type_declarations/typed_properties_033.phpt

@@ -25,7 +25,7 @@ try {
 var_dump($foo);
 ?>
 --EXPECTF--
-Cannot assign float to reference held by property class@anonymous::$qux of type int
+Cannot assign float to reference held by property class@anonymous%0%s:2$%x::$qux of type int
 object(class@anonymous)#1 (4) {
   ["foo"]=>
   int(2)

Zend/tests/type_declarations/typed_properties_034.phpt

@@ -36,13 +36,13 @@ try {
 
 var_dump($foo);
 ?>
---EXPECT--
+--EXPECTF--
 int(42)
-Cannot assign null to property class@anonymous::$baz of type int
+Cannot assign null to property class@anonymous%0%s:2$0::$baz of type int
 int(1)
 int(10)
 int(10)
-Cannot assign null to reference held by property class@anonymous::$baz of type int
+Cannot assign null to reference held by property class@anonymous%0%s:2$%x::$baz of type int
 object(class@anonymous)#1 (2) {
   ["bar"]=>
   &int(10)

Zend/tests/type_declarations/typed_properties_038.phpt

@@ -40,22 +40,22 @@ try {
 var_dump($foo);
 ?>
 --EXPECTF--
-string(82) "Cannot increment property class@anonymous::$bar of type int past its maximal value"
+string(%d) "Cannot increment property class@anonymous%0%s:3$%x::$bar of type int past its maximal value"
 object(class@anonymous)#1 (1) {
   ["bar"]=>
   int(%d)
 }
-string(65) "Cannot assign float to property class@anonymous::$bar of type int"
+string(%d) "Cannot assign float to property class@anonymous%0%s:3$%x::$bar of type int"
 object(class@anonymous)#1 (1) {
   ["bar"]=>
   int(%d)
 }
-string(82) "Cannot increment property class@anonymous::$bar of type int past its maximal value"
+string(%d) "Cannot increment property class@anonymous%0%s:3$%x::$bar of type int past its maximal value"
 object(class@anonymous)#1 (1) {
   ["bar"]=>
   int(%d)
 }
-string(65) "Cannot assign float to property class@anonymous::$bar of type int"
+string(%d) "Cannot assign float to property class@anonymous%0%s:3$%x::$bar of type int"
 object(class@anonymous)#1 (1) {
   ["bar"]=>
   int(%d)

Zend/tests/type_declarations/typed_properties_044.phpt

@@ -47,12 +47,12 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 int(0)
 int(-2)
 int(-1)
 int(-1)
-Cannot increment a reference held by property class@anonymous::$bar of type ?int past its maximal value
-Cannot increment a reference held by property class@anonymous::$bar of type ?int past its maximal value
-Cannot decrement a reference held by property class@anonymous::$bar of type ?int past its minimal value
-Cannot decrement a reference held by property class@anonymous::$bar of type ?int past its minimal value
+Cannot increment a reference held by property class@anonymous%0%s:2$%x::$bar of type ?int past its maximal value
+Cannot increment a reference held by property class@anonymous%0%s:2$%x::$bar of type ?int past its maximal value
+Cannot decrement a reference held by property class@anonymous%0%s:2$%x::$bar of type ?int past its minimal value
+Cannot decrement a reference held by property class@anonymous%0%s:2$%x::$bar of type ?int past its minimal value

Zend/tests/type_declarations/typed_properties_062.phpt

@@ -61,21 +61,21 @@ $a->_ = 1;
 var_dump($a->foo);
 
 ?>
---EXPECT--
+--EXPECTF--
 int(2)
 int(21)
-Cannot assign string to reference held by property class@anonymous::$foo of type int
+Cannot assign string to reference held by property class@anonymous%0%s:3$%x::$foo of type int
 int(21)
 int(20)
 int(19)
-Cannot decrement a reference held by property class@anonymous::$foo of type int past its minimal value
+Cannot decrement a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its minimal value
 integer
-Cannot decrement a reference held by property class@anonymous::$foo of type int past its minimal value
+Cannot decrement a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its minimal value
 integer
-Cannot increment a reference held by property class@anonymous::$foo of type int past its maximal value
+Cannot increment a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its maximal value
 integer
-Cannot increment a reference held by property class@anonymous::$foo of type int past its maximal value
+Cannot increment a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its maximal value
 integer
-Cannot assign array to reference held by property class@anonymous::$foo of type int
+Cannot assign array to reference held by property class@anonymous%0%s:3$%x::$foo of type int
 int(0)
 int(1)

Zend/tests/type_declarations/typed_properties_063.phpt

@@ -60,21 +60,21 @@ $_ = 1;
 var_dump($a->foo);
 
 ?>
---EXPECT--
+--EXPECTF--
 int(2)
 int(21)
-Cannot assign string to reference held by property class@anonymous::$foo of type int
+Cannot assign string to reference held by property class@anonymous%0%s:3$%x::$foo of type int
 int(21)
 int(20)
 int(19)
-Cannot decrement a reference held by property class@anonymous::$foo of type int past its minimal value
+Cannot decrement a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its minimal value
 integer
-Cannot decrement a reference held by property class@anonymous::$foo of type int past its minimal value
+Cannot decrement a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its minimal value
 integer
-Cannot increment a reference held by property class@anonymous::$foo of type int past its maximal value
+Cannot increment a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its maximal value
 integer
-Cannot increment a reference held by property class@anonymous::$foo of type int past its maximal value
+Cannot increment a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its maximal value
 integer
-Cannot assign array to reference held by property class@anonymous::$foo of type int
+Cannot assign array to reference held by property class@anonymous%0%s:3$%x::$foo of type int
 int(0)
 int(1)

Zend/tests/type_declarations/typed_properties_064.phpt

@@ -60,21 +60,21 @@ $_[0] = 1;
 var_dump($a->foo);
 
 ?>
---EXPECT--
+--EXPECTF--
 int(2)
 int(21)
-Cannot assign string to reference held by property class@anonymous::$foo of type int
+Cannot assign string to reference held by property class@anonymous%0%s:3$%x::$foo of type int
 int(21)
 int(20)
 int(19)
-Cannot decrement a reference held by property class@anonymous::$foo of type int past its minimal value
+Cannot decrement a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its minimal value
 integer
-Cannot decrement a reference held by property class@anonymous::$foo of type int past its minimal value
+Cannot decrement a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its minimal value
 integer
-Cannot increment a reference held by property class@anonymous::$foo of type int past its maximal value
+Cannot increment a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its maximal value
 integer
-Cannot increment a reference held by property class@anonymous::$foo of type int past its maximal value
+Cannot increment a reference held by property class@anonymous%0%s:3$%x::$foo of type int past its maximal value
 integer
-Cannot assign array to reference held by property class@anonymous::$foo of type int
+Cannot assign array to reference held by property class@anonymous%0%s:3$%x::$foo of type int
 int(0)
 int(1)

Zend/tests/type_declarations/typed_properties_065.phpt

@@ -52,7 +52,7 @@ try {
 echo gettype($a->foo),"\n";
 
 ?>
---EXPECT--
+--EXPECTF--
 offsetSet(2)
 int(1)
 offsetSet(11)
@@ -61,11 +61,11 @@ offsetSet(1e50)
 int(1)
 int(0)
 int(-1)
-Cannot decrement a reference held by property ArrayAccess@anonymous::$foo of type int past its minimal value
+Cannot decrement a reference held by property ArrayAccess@anonymous%0%s:3$%x::$foo of type int past its minimal value
 integer
-Cannot decrement a reference held by property ArrayAccess@anonymous::$foo of type int past its minimal value
+Cannot decrement a reference held by property ArrayAccess@anonymous%0%s:3$%x::$foo of type int past its minimal value
 integer
-Cannot increment a reference held by property ArrayAccess@anonymous::$foo of type int past its maximal value
+Cannot increment a reference held by property ArrayAccess@anonymous%0%s:3$%x::$foo of type int past its maximal value
 integer
-Cannot increment a reference held by property ArrayAccess@anonymous::$foo of type int past its maximal value
+Cannot increment a reference held by property ArrayAccess@anonymous%0%s:3$%x::$foo of type int past its maximal value
 integer

Zend/tests/type_declarations/typed_properties_078.phpt

@@ -42,18 +42,18 @@ $ref = new ArrayIterator();
 var_dump($ref instanceof ArrayIterator);
 
 ?>
---EXPECT--
+--EXPECTF--
 array(0) {
 }
-string(72) "Cannot assign array to property class@anonymous::$t of type ?Traversable"
+string(%d) "Cannot assign array to property class@anonymous%0%s:3$%x::$t of type ?Traversable"
 array(0) {
 }
 array(1) {
   [0]=>
   int(1)
 }
-string(92) "Cannot assign ArrayIterator to reference held by property class@anonymous::$a of type ?array"
+string(%d) "Cannot assign ArrayIterator to reference held by property class@anonymous%0%s:3$%x::$a of type ?array"
 bool(false)
-string(90) "Cannot assign array to reference held by property class@anonymous::$t of type ?Traversable"
+string(%d) "Cannot assign array to reference held by property class@anonymous%0%s:3$%x::$t of type ?Traversable"
 bool(false)
 bool(true)

Zend/tests/type_declarations/union_types/anonymous_class.phpt

@@ -26,5 +26,5 @@ try {
 }
 ?>
 --EXPECTF--
-class@anonymous(): Argument #1 ($a) must be of type class@anonymous|string, null given, called in %s on line %d
+class@anonymous%0%s:3$%x::testParam(): Argument #1 ($a) must be of type class@anonymous|string, null given, called in %s on line %d
 class@anonymous::test(): Return value must be of type class@anonymous|string, stdClass returned

Zend/zend.c

@@ -194,8 +194,8 @@ static ZEND_INI_MH(OnUpdateMaxAllowedStackSize) /* {{{ */
 	zend_long size = zend_ini_parse_quantity_warn(new_value, entry->name);
 
 	if (size < ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED) {
-		zend_error(E_WARNING, "Invalid \"%s\" setting. Value must be >= %d, but got " ZEND_LONG_FMT,
-			ZSTR_VAL(entry->name), ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED, size);
+		zend_error(E_WARNING, "Invalid \"%pS\" setting. Value must be >= %d, but got " ZEND_LONG_FMT,
+			entry->name, ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED, size);
 		return FAILURE;
 	}
 
@@ -228,8 +228,8 @@ static ZEND_INI_MH(OnUpdateReservedStackSize) /* {{{ */
 	if (size == 0) {
 		size = min;
 	} else if (size < min) {
-		zend_error(E_WARNING, "Invalid \"%s\" setting. Value must be >= " ZEND_ULONG_FMT ", but got " ZEND_ULONG_FMT "\n",
-			ZSTR_VAL(entry->name), min, size);
+		zend_error(E_WARNING, "Invalid \"%pS\" setting. Value must be >= " ZEND_ULONG_FMT ", but got " ZEND_ULONG_FMT "\n",
+			entry->name, min, size);
 		return FAILURE;
 	}
 
@@ -1830,13 +1830,9 @@ ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const c
 
 	//TODO: we can't convert compile-time errors to exceptions yet???
 	if (EG(current_execute_data) && !CG(in_compilation)) {
-		// %S is used for zend_string pointers by smart str printing, but normally
-		// is for wide character strings and so compilers complain if this is inline
-		// Use "%S" so that the message can contain null bytes.
-		const char *format = "%S";
-		zend_throw_exception_ex(exception_ce, 0, format, message);
+		zend_throw_exception_ex(exception_ce, 0, "%pS", message);
 	} else {
-		zend_error_noreturn(E_ERROR, "%s", ZSTR_VAL(message));
+		zend_error_noreturn(E_ERROR, "%pS", message);
 	}
 
 	zend_string_release(message);
@@ -1857,25 +1853,24 @@ ZEND_API ZEND_COLD void zend_illegal_container_offset(const zend_string *contain
 			if (zend_string_equals(container, ZSTR_KNOWN(ZEND_STR_STRING))) {
 				zend_throw_error(NULL, "Cannot unset string offsets");
 			} else {
-				zend_type_error("Cannot unset offset of type %s on %s", zend_zval_type_name(offset), ZSTR_VAL(container));
+				zend_type_error("Cannot unset offset of type %s on %pS", zend_zval_type_name(offset), container);
 			}
 			return;
 		default:
-			zend_type_error("Cannot access offset of type %s on %s",
-				zend_zval_type_name(offset), ZSTR_VAL(container));
+			zend_type_error("Cannot access offset of type %s on %pS",
+				zend_zval_type_name(offset), container);
 			return;
 	}
 }
 
 ZEND_API ZEND_COLD void zend_type_error(const char *format, ...) /* {{{ */
 {
 	va_list va;
-	char *message = NULL;
 
 	va_start(va, format);
-	zend_vspprintf(&message, 0, format, va);
-	zend_throw_exception(zend_ce_type_error, message, 0);
-	efree(message);
+	zend_string *message = zend_vstrpprintf(0, format, va);
+	zend_throw_exception_ex(zend_ce_type_error, 0, "%pS", message);
+	zend_string_release(message);
 	va_end(va);
 } /* }}} */