Skip to content

Zend: applied fixers to improve test robustness (7/8) #23315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickSdot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Zend: applied fixers to improve test robustness (7/8) #23315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Zend/tests/type_declarations/scalar_none.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ foreach ($functions as $type => $function) {
try {
var_dump($function());
} catch (Throwable $e) {
echo "*** Caught " . $e->getMessage() . PHP_EOL;
echo $e::class, ': ', $e->getMessage(), "\n";
}
}
echo PHP_EOL . "Done";
?>
--EXPECTF--
Testing int:
*** Caught Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
ArgumentCountError: Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
Testing float:
*** Caught Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
ArgumentCountError: Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
Testing string:
*** Caught Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
ArgumentCountError: Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
Testing bool:
*** Caught Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
ArgumentCountError: Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
Testing int nullable:
NULL
Testing float nullable:
Expand Down
10 changes: 5 additions & 5 deletions Zend/tests/type_declarations/scalar_null.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ foreach ($functions as $type => $function) {
try {
var_dump($function(null));
} catch (TypeError $e) {
echo "*** Caught " . $e->getMessage() . PHP_EOL;
echo $e::class, ': ', $e->getMessage(), "\n";
}
}

echo PHP_EOL . "Done";
?>
--EXPECTF--
Testing int:
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d
TypeError: {closure:%s:%d}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d
Testing float:
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d
TypeError: {closure:%s:%d}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d
Testing string:
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d
TypeError: {closure:%s:%d}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d
Testing bool:
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d
TypeError: {closure:%s:%d}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d
Testing int nullable:
NULL
Testing float nullable:
Expand Down
54 changes: 27 additions & 27 deletions Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ foreach ($functions as $type => $function) {
try {
var_dump($function($value));
} catch (TypeError $e) {
echo "*** Caught ", $e->getMessage(), " in ", $e->getFile(), " on line ", $e->getLine(), PHP_EOL;
echo $e::class, ': ', $e->getMessage(), ' in ', $e->getFile(), ' on line ', $e->getLine(), "\n";
}
}
}
Expand All @@ -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:%s:%d}(): Return value must be of type int, string returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d
*** Trying string(1) "a"
*** Caught {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d
*** Trying string(0) ""
*** Caught {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d
*** Trying int(9223372036854775807)
int(9223372036854775807)
*** Trying float(NAN)
*** Caught {closure:%s:%d}(): Return value must be of type int, float returned in %s on line %d
TypeError: {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:%s:%d}(): Return value must be of type int, null returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type int, null returned in %s on line %d
*** Trying array(0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type int, array returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type int, array returned in %s on line %d
*** Trying object(stdClass)#%d (0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type int, stdClass returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type int, stdClass returned in %s on line %d
*** Trying object(StringCapable)#%d (0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type int, StringCapable returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type int, StringCapable returned in %s on line %d
*** Trying resource(%d) of type (stream)
*** Caught {closure:%s:%d}(): Return value must be of type int, resource returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type int, resource returned in %s on line %d

Testing 'float' type:
*** Trying int(1)
Expand All @@ -111,11 +111,11 @@ float(1)
*** Trying float(1.5)
float(1.5)
*** Trying string(2) "1a"
*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
*** Trying string(1) "a"
*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
*** Trying string(0) ""
*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
*** Trying int(9223372036854775807)
float(9.223372036854776E+18)
*** Trying float(NAN)
Expand All @@ -125,18 +125,18 @@ float(1)
*** Trying bool(false)
float(0)
*** Trying NULL
*** Caught {closure:%s:%d}(): Return value must be of type float, null returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type float, null returned in %s on line %d
*** Trying array(0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type float, array returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type float, array returned in %s on line %d
*** Trying object(stdClass)#%d (0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type float, stdClass returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type float, stdClass returned in %s on line %d
*** Trying object(StringCapable)#%d (0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type float, StringCapable returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type float, StringCapable returned in %s on line %d
*** Trying resource(%d) of type (stream)
*** Caught {closure:%s:%d}(): Return value must be of type float, resource returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type float, resource returned in %s on line %d

Testing 'string' type:
*** Trying int(1)
Expand All @@ -163,18 +163,18 @@ string(1) "1"
*** Trying bool(false)
string(0) ""
*** Trying NULL
*** Caught {closure:%s:%d}(): Return value must be of type string, null returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type string, null returned in %s on line %d
*** Trying array(0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type string, array returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type string, array returned in %s on line %d
*** Trying object(stdClass)#%d (0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type string, stdClass returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type string, stdClass returned in %s on line %d
*** Trying object(StringCapable)#%d (0) {
}
string(6) "foobar"
*** Trying resource(%d) of type (stream)
*** Caught {closure:%s:%d}(): Return value must be of type string, resource returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type string, resource returned in %s on line %d

Testing 'bool' type:
*** Trying int(1)
Expand All @@ -201,17 +201,17 @@ bool(true)
*** Trying bool(false)
bool(false)
*** Trying NULL
*** Caught {closure:%s:%d}(): Return value must be of type bool, null returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type bool, null returned in %s on line %d
*** Trying array(0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type bool, array returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type bool, array returned in %s on line %d
*** Trying object(stdClass)#%d (0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type bool, stdClass returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type bool, stdClass returned in %s on line %d
*** Trying object(StringCapable)#%d (0) {
}
*** Caught {closure:%s:%d}(): Return value must be of type bool, StringCapable returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type bool, StringCapable returned in %s on line %d
*** Trying resource(%d) of type (stream)
*** Caught {closure:%s:%d}(): Return value must be of type bool, resource returned in %s on line %d
TypeError: {closure:%s:%d}(): Return value must be of type bool, resource returned in %s on line %d

Done
Loading
Loading