From 6f9a06cb74421306dc0158b28fa5b4bbb262fd9d Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Wed, 5 Jun 2019 19:24:41 +0200 Subject: [PATCH] this test is flaky on azure, and can't see why from current output so refactored, and restored an accidentally removed check (resource) --- .../tests/file/is_file_variation3.phpt | 65 +++++++++---------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt index bee1a6d6cf..0a06ad5015 100644 --- a/ext/standard/tests/file/is_file_variation3.phpt +++ b/ext/standard/tests/file/is_file_variation3.phpt @@ -9,51 +9,44 @@ Test is_file() function: usage variations - invalid filenames /* Testing is_file() with invalid arguments -int, float, bool, NULL, resource */ -$file_path = __DIR__; -$file_handle = fopen($file_path."/is_file_variation3.tmp", "w"); +function flatten($variable) { + \ob_start(); + \var_dump($variable); + $flattened = + \ob_get_contents(); + \ob_end_clean(); + return \trim($flattened); +} -echo "*** Testing Invalid file types ***\n"; -$filenames = array( +foreach([ /* Invalid filenames */ -2.34555, " ", "", - TRUE, - FALSE, - NULL, - $file_handle, + true, + false, + null, /* scalars */ 1234, - 0 -); - -/* loop through to test each element the above array */ -foreach( $filenames as $filename ) { - var_dump( is_file($filename) ); + 0, + + /* resource */ + fopen(__FILE__, "r") +] as $filename ) { + printf( + "%s: %d\n", + flatten($filename), @is_file($filename)); clearstatcache(); } -fclose($file_handle); - -echo "\n*** Done ***"; -?> ---CLEAN-- - --EXPECTF-- -*** Testing Invalid file types *** -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) - -Warning: is_file() expects parameter 1 to be a valid path, resource given in %s on line %d -NULL -bool(false) -bool(false) - -*** Done *** +float(-2.34555): 0 +string(1) " ": 0 +string(0) "": 0 +bool(true): 0 +bool(false): 0 +NULL: 0 +int(1234): 0 +int(0): 0 +resource(%d) of type (stream): 0 -- 2.50.1