From: Joe Watkins <krakjoe@php.net>
Date: Wed, 5 Jun 2019 18:23:31 +0000 (+0200)
Subject: fix test
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6f93ca753fcfc577a0b8d528ef7a2be46e84168;p=php

fix test
---

diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt
index bee1a6d6cf..884f292b26 100644
--- a/ext/standard/tests/file/is_file_variation3.phpt
+++ b/ext/standard/tests/file/is_file_variation3.phpt
@@ -7,53 +7,42 @@ Test is_file() function: usage variations - invalid filenames
      Returns TRUE if the filename exists and is a regular file
 */
 
-/* Testing is_file() with invalid arguments -int, float, bool, NULL, resource */
-
-$file_path = __DIR__;
-$file_handle = fopen($file_path."/is_file_variation3.tmp", "w");
+/* Testing is_file() with invalid arguments -int, float, bool, NULL */
+
+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) );
+] as $filename ) {
+  printf(
+      "%s: %d\n",
+      flatten($filename), @is_file($filename));
   clearstatcache();
 }
-fclose($file_handle);
-
-echo "\n*** Done ***";
-?>
---CLEAN--
-<?php
-$file_path = __DIR__;
-unlink($file_path."/is_file_variation3.tmp");
 ?>
 --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