1 files changed, 70 insertions, 150 deletions
diff --git a/ext/standard/tests/file/007_basic.phpt b/ext/standard/tests/file/007_basic.phpt
index fd2e5575a9..fa25431580 100644
--- a/ext/standard/tests/file/007_basic.phpt
+++ b/ext/standard/tests/file/007_basic.phpt
@@ -51,9 +51,17 @@ for( $i=0; $i<count($modes); $i++ ) {
   // check fclose()
   var_dump( fclose($handle) );
   var_dump( $handle );
-  // confirm the closure, using ftell() and feof(), expect, false
-  var_dump( ftell($handle) );
-  var_dump( feof($handle) );
+  // confirm the closure, using ftell() and feof()
+  try {
+    var_dump( ftell($handle) );
+  } catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+  }
+  try {
+    var_dump( feof($handle) );
+  } catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+  }
 }
 
 // remove the temp file
@@ -78,9 +86,17 @@ for( $i=0; $i<count($x_modes); $i++ ) {
   // check fclose()
   var_dump( fclose($handle) );
   var_dump( $handle );
-  // confirm the closure, using ftell() and feof(), expect, false
-  var_dump( ftell($handle) );
-  var_dump( feof($handle) );
+  // confirm the closure, using ftell() and feof()
+  try {
+    var_dump( ftell($handle) );
+  } catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+  }
+  try {
+    var_dump( feof($handle) );
+  } catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+  }
   var_dump( $handle );
 
   // remove the file
@@ -97,12 +113,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'wb' --
 resource(%d) of type (stream)
@@ -110,12 +122,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'wt' --
 resource(%d) of type (stream)
@@ -123,12 +131,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'w+' --
 resource(%d) of type (stream)
@@ -136,12 +140,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'w+b' --
 resource(%d) of type (stream)
@@ -149,12 +149,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'w+t' --
 resource(%d) of type (stream)
@@ -162,12 +158,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'r' --
 resource(%d) of type (stream)
@@ -175,12 +167,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'rb' --
 resource(%d) of type (stream)
@@ -188,12 +176,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'rt' --
 resource(%d) of type (stream)
@@ -201,12 +185,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'r+' --
 resource(%d) of type (stream)
@@ -214,12 +194,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'r+b' --
 resource(%d) of type (stream)
@@ -227,12 +203,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'r+t' --
 resource(%d) of type (stream)
@@ -240,12 +212,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'a' --
 resource(%d) of type (stream)
@@ -253,12 +221,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'ab' --
 resource(%d) of type (stream)
@@ -266,12 +230,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'at' --
 resource(%d) of type (stream)
@@ -279,12 +239,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'a+' --
 resource(%d) of type (stream)
@@ -292,12 +248,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'a+t' --
 resource(%d) of type (stream)
@@ -305,12 +257,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'a+b' --
 resource(%d) of type (stream)
@@ -318,12 +266,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 
 -- Iteration with mode 'x' --
 resource(%d) of type (stream)
@@ -331,12 +275,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'xb' --
@@ -345,12 +285,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'xt' --
@@ -359,12 +295,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'x+' --
@@ -373,12 +305,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'x+b' --
@@ -387,12 +315,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'x+t' --
@@ -401,12 +325,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-
-Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
-
-Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+ftell(): supplied resource is not a valid stream resource
+feof(): supplied resource is not a valid stream resource
 resource(%d) of type (Unknown)
 
 *** Done ***