1 files changed, 17 insertions, 28 deletions
diff --git a/ext/standard/tests/file/glob_variation.phpt b/ext/standard/tests/file/glob_variation.phpt
index 056cf62bec..eb5aff0cf4 100644
--- a/ext/standard/tests/file/glob_variation.phpt
+++ b/ext/standard/tests/file/glob_variation.phpt
@@ -48,12 +48,16 @@ $counter = 1;
    using glob() */
 foreach($patterns as $pattern) {
   echo "\n-- Iteration $counter --\n";
-  var_dump( glob($pattern) );  // default arguments
-  var_dump( glob($pattern, GLOB_MARK) );
-  var_dump( glob($pattern, GLOB_NOSORT) );
-  var_dump( glob($pattern, GLOB_NOCHECK) );
-  var_dump( glob($pattern, GLOB_NOESCAPE) );
-  var_dump( glob($pattern, GLOB_ERR) );
+  try {
+    var_dump( glob($pattern) );  // default arguments
+    var_dump( glob($pattern, GLOB_MARK) );
+    var_dump( glob($pattern, GLOB_NOSORT) );
+    var_dump( glob($pattern, GLOB_NOCHECK) );
+    var_dump( glob($pattern, GLOB_NOESCAPE) );
+    var_dump( glob($pattern, GLOB_ERR) );
+  } catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+  }
   $counter++;
 }
 
@@ -75,7 +79,11 @@ $counter = 1;
    using glob() */
 foreach($patterns as $pattern) {
   echo "-- Iteration $counter --\n";
-  var_dump( glob($pattern, GLOB_ONLYDIR) );
+  try {
+    var_dump( glob($pattern, GLOB_ONLYDIR) );
+  } catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+  }
   $counter++;
 }
 
@@ -328,24 +336,7 @@ array(0) {
 }
 
 -- Iteration 8 --
-
-Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
-
-Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
-
-Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
-
-Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
-
-Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
-
-Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
+glob() expects parameter 1 to be a valid path, string given
 
 -- Iteration 9 --
 array(0) {
@@ -448,9 +439,7 @@ array(1) {
 array(0) {
 }
 -- Iteration 8 --
-
-Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
-NULL
+glob() expects parameter 1 to be a valid path, string given
 -- Iteration 9 --
 array(0) {
 }