[php-src] master: [skip ci] Fix old {closure}() name reference in 32-bit tests

From: Date: Mon, 15 Apr 2024 11:13:26 +0000
Subject: [php-src] master: [skip ci] Fix old {closure}() name reference in 32-bit tests
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-128106@lists.php.net to get a copy of this message
Author: Ilija Tovilo (iluuu1994) Date: 2024-04-15T13:11:38+02:00 Commit: https://github.com/php/php-src/commit/89e744d1e10e0ff29179e7aa8aa6ead0920c45ee Raw diff: https://github.com/php/php-src/commit/89e744d1e10e0ff29179e7aa8aa6ead0920c45ee.diff [skip ci] Fix old {closure}() name reference in 32-bit tests Changed paths: M Zend/tests/type_declarations/scalar_return_basic.phpt M Zend/tests/type_declarations/scalar_strict.phpt Diff: diff --git a/Zend/tests/type_declarations/scalar_return_basic.phpt b/Zend/tests/type_declarations/scalar_return_basic.phpt index 0cdce348c580..1fd3d26db6d8 100644 --- a/Zend/tests/type_declarations/scalar_return_basic.phpt +++ b/Zend/tests/type_declarations/scalar_return_basic.phpt @@ -74,32 +74,32 @@ int(1) E_DEPRECATED: Implicit conversion from float 1.5 to int loses precision on line %d int(1) *** Trying string(2) "1a" -*** Caught {closure}(): Return value must be of type int, string returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d *** Trying string(1) "a" -*** Caught {closure}(): Return value must be of type int, string returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d *** Trying string(0) "" -*** Caught {closure}(): Return value must be of type int, string returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d *** Trying int(2147483647) int(2147483647) *** Trying float(NAN) -*** Caught {closure}(): Return value must be of type int, float returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, float returned in %s on line %d *** Trying bool(true) int(1) *** Trying bool(false) int(0) *** Trying NULL -*** Caught {closure}(): Return value must be of type int, null returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, null returned in %s on line %d *** Trying array(0) { } -*** Caught {closure}(): Return value must be of type int, array returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, array returned in %s on line %d *** Trying object(stdClass)#6 (0) { } -*** Caught {closure}(): Return value must be of type int, stdClass returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, stdClass returned in %s on line %d *** Trying object(StringCapable)#7 (0) { } -*** Caught {closure}(): Return value must be of type int, StringCapable returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, StringCapable returned in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}(): Return value must be of type int, resource returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type int, resource returned in %s on line %d Testing 'float' type: *** Trying int(1) @@ -111,11 +111,11 @@ float(1) *** Trying float(1.5) float(1.5) *** Trying string(2) "1a" -*** Caught {closure}(): Return value must be of type float, string returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d *** Trying string(1) "a" -*** Caught {closure}(): Return value must be of type float, string returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d *** Trying string(0) "" -*** Caught {closure}(): Return value must be of type float, string returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d *** Trying int(2147483647) float(2147483647) *** Trying float(NAN) @@ -125,18 +125,18 @@ float(1) *** Trying bool(false) float(0) *** Trying NULL -*** Caught {closure}(): Return value must be of type float, null returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type float, null returned in %s on line %d *** Trying array(0) { } -*** Caught {closure}(): Return value must be of type float, array returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type float, array returned in %s on line %d *** Trying object(stdClass)#6 (0) { } -*** Caught {closure}(): Return value must be of type float, stdClass returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type float, stdClass returned in %s on line %d *** Trying object(StringCapable)#7 (0) { } -*** Caught {closure}(): Return value must be of type float, StringCapable returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type float, StringCapable returned in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}(): Return value must be of type float, resource returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type float, resource returned in %s on line %d Testing 'string' type: *** Trying int(1) @@ -162,18 +162,18 @@ string(1) "1" *** Trying bool(false) string(0) "" *** Trying NULL -*** Caught {closure}(): Return value must be of type string, null returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type string, null returned in %s on line %d *** Trying array(0) { } -*** Caught {closure}(): Return value must be of type string, array returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type string, array returned in %s on line %d *** Trying object(stdClass)#6 (0) { } -*** Caught {closure}(): Return value must be of type string, stdClass returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type string, stdClass returned in %s on line %d *** Trying object(StringCapable)#7 (0) { } string(6) "foobar" *** Trying resource(5) of type (stream) -*** Caught {closure}(): Return value must be of type string, resource returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type string, resource returned in %s on line %d Testing 'bool' type: *** Trying int(1) @@ -199,17 +199,17 @@ bool(true) *** Trying bool(false) bool(false) *** Trying NULL -*** Caught {closure}(): Return value must be of type bool, null returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type bool, null returned in %s on line %d *** Trying array(0) { } -*** Caught {closure}(): Return value must be of type bool, array returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type bool, array returned in %s on line %d *** Trying object(stdClass)#6 (0) { } -*** Caught {closure}(): Return value must be of type bool, stdClass returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type bool, stdClass returned in %s on line %d *** Trying object(StringCapable)#7 (0) { } -*** Caught {closure}(): Return value must be of type bool, StringCapable returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type bool, StringCapable returned in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}(): Return value must be of type bool, resource returned in %s on line %d +*** Caught {closure:%s:%d}(): Return value must be of type bool, resource returned in %s on line %d Done diff --git a/Zend/tests/type_declarations/scalar_strict.phpt b/Zend/tests/type_declarations/scalar_strict.phpt index 51bb8fac1678..e89d18b2c86b 100644 --- a/Zend/tests/type_declarations/scalar_strict.phpt +++ b/Zend/tests/type_declarations/scalar_strict.phpt @@ -60,52 +60,52 @@ Testing 'int' type: int(1) *** Trying string(1) "1" -*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying float(1) -*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying string(2) "1a" -*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d *** Trying int(2147483647) int(2147483647) *** Trying float(NAN) -*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d *** Trying bool(true) -*** Caught {closure}(): Argument #1 ($i) must be of type int, true given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, true given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}(): Argument #1 ($i) must be of type int, false given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, false given, called in %s on line %d *** Trying NULL -*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}(): Argument #1 ($i) must be of type int, array given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}(): Argument #1 ($i) must be of type int, stdClass given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, stdClass given, called in %s on line %d *** Trying object(StringCapable)#6 (0) { } -*** Caught {closure}(): Argument #1 ($i) must be of type int, StringCapable given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, StringCapable given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d Testing 'float' type: @@ -113,7 +113,7 @@ Testing 'float' type: float(1) *** Trying string(1) "1" -*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying float(1) float(1) @@ -122,13 +122,13 @@ float(1) float(1.5) *** Trying string(2) "1a" -*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d *** Trying int(2147483647) float(2147483647) @@ -137,42 +137,42 @@ float(2147483647) float(NAN) *** Trying bool(true) -*** Caught {closure}(): Argument #1 ($f) must be of type float, true given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, true given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}(): Argument #1 ($f) must be of type float, false given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, false given, called in %s on line %d *** Trying NULL -*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}(): Argument #1 ($f) must be of type float, array given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}(): Argument #1 ($f) must be of type float, stdClass given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, stdClass given, called in %s on line %d *** Trying object(StringCapable)#6 (0) { } -*** Caught {closure}(): Argument #1 ($f) must be of type float, StringCapable given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, StringCapable given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d Testing 'string' type: *** Trying int(1) -*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d *** Trying string(1) "1" string(1) "1" *** Trying float(1) -*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying string(2) "1a" string(2) "1a" @@ -184,63 +184,63 @@ string(1) "a" string(0) "" *** Trying int(2147483647) -*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d *** Trying float(NAN) -*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d *** Trying bool(true) -*** Caught {closure}(): Argument #1 ($s) must be of type string, true given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, true given, called in %s on line %d *** Trying bool(false) -*** Caught {closure}(): Argument #1 ($s) must be of type string, false given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, false given, called in %s on line %d *** Trying NULL -*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}(): Argument #1 ($s) must be of type string, array given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}(): Argument #1 ($s) must be of type string, stdClass given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, stdClass given, called in %s on line %d *** Trying object(StringCapable)#6 (0) { } -*** Caught {closure}(): Argument #1 ($s) must be of type string, StringCapable given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, StringCapable given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}(): Argument #1 ($s) must be of type string, resource given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, resource given, called in %s on line %d Testing 'bool' type: *** Trying int(1) -*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d *** Trying string(1) "1" -*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying float(1) -*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying float(1.5) -*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying string(2) "1a" -*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying string(1) "a" -*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying string(0) "" -*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d *** Trying int(2147483647) -*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d *** Trying float(NAN) -*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d *** Trying bool(true) bool(true) @@ -249,21 +249,21 @@ bool(true) bool(false) *** Trying NULL -*** Caught {closure}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d *** Trying array(0) { } -*** Caught {closure}(): Argument #1 ($b) must be of type bool, array given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, array given, called in %s on line %d *** Trying object(stdClass)#5 (0) { } -*** Caught {closure}(): Argument #1 ($b) must be of type bool, stdClass given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, stdClass given, called in %s on line %d *** Trying object(StringCapable)#6 (0) { } -*** Caught {closure}(): Argument #1 ($b) must be of type bool, StringCapable given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, StringCapable given, called in %s on line %d *** Trying resource(5) of type (stream) -*** Caught {closure}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d +*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d Done

« previous php.cvs (#128106) next »