1 files changed, 25 insertions, 45 deletions
diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt
index eae1f7fa51..c34b643600 100644
--- a/ext/standard/tests/strings/basename_variation.phpt
+++ b/ext/standard/tests/strings/basename_variation.phpt
@@ -6,13 +6,11 @@ $file_path_variations = array (
   /* paths with shortcut home dir char, with suffix variation */
   array("~/home/user/bar"),
   array("~/home/user/bar", ""),
-  array("~/home/user/bar", NULL),
   array("~/home/user/bar", ' '),
   array("~/home/user/bar.tar", ".tar"),
   array("~/home/user/bar.tar", "~"),
   array("~/home/user/bar.tar/", "~"),
   array("~/home/user/bar.tar/", ""),
-  array("~/home/user/bar.tar", NULL),
   array("~/home/user/bar.tar", ''),
   array("~/home/user/bar.tar", " "),
 
@@ -29,7 +27,6 @@ $file_path_variations = array (
   array("hostname:/home/user/My Pics.gz/", "Pics.gz"),
   array("hostname:/home/user/My Pics.gz/", ".gz"),
   array("hostname:/home/user/My Pics.gz/"),
-  array("hostname:/home/user/My Pics.gz/", NULL),
   array("hostname:/home/user/My Pics.gz/", ' '),
   array("hostname:/home/user/My Pics.gz/", ''),
   array("hostname:/home/user/My Pics.gz/", "My Pics.gz"),
@@ -52,7 +49,6 @@ $file_path_variations = array (
   array("/bar.gz/", "/bar.gz/"),
   array(" ", " "),
   array(' ', ' '),
-  array(NULL, NULL),
 
   /* path with spaces */
   array(" "),
@@ -61,7 +57,6 @@ $file_path_variations = array (
   /* empty paths */
   array(""),
   array(''),
-  array(NULL),
 );
 
 function check_basename( $path_arrays ) {
@@ -97,7 +92,7 @@ string(3) "bar"
 string(3) "bar"
 
 --Iteration 5--
-string(3) "bar"
+string(7) "bar.tar"
 
 --Iteration 6--
 string(7) "bar.tar"
@@ -118,13 +113,13 @@ string(7) "bar.tar"
 string(7) "bar.tar"
 
 --Iteration 12--
-string(7) "bar.tar"
+string(1) "t"
 
 --Iteration 13--
-string(7) "bar.tar"
+string(7) "tbar.gz"
 
 --Iteration 14--
-string(1) "t"
+string(7) "tbar.gz"
 
 --Iteration 15--
 string(7) "tbar.gz"
@@ -133,22 +128,22 @@ string(7) "tbar.gz"
 string(7) "tbar.gz"
 
 --Iteration 17--
-string(7) "tbar.gz"
+string(10) "My Pics.gz"
 
 --Iteration 18--
-string(7) "tbar.gz"
+string(10) "My Pics.gz"
 
 --Iteration 19--
-string(10) "My Pics.gz"
+string(3) "My "
 
 --Iteration 20--
-string(10) "My Pics.gz"
+string(7) "My Pics"
 
 --Iteration 21--
-string(3) "My "
+string(10) "My Pics.gz"
 
 --Iteration 22--
-string(7) "My Pics"
+string(10) "My Pics.gz"
 
 --Iteration 23--
 string(10) "My Pics.gz"
@@ -157,16 +152,16 @@ string(10) "My Pics.gz"
 string(10) "My Pics.gz"
 
 --Iteration 25--
-string(10) "My Pics.gz"
+string(4) "10.5"
 
 --Iteration 26--
-string(10) "My Pics.gz"
+string(2) "10"
 
 --Iteration 27--
-string(10) "My Pics.gz"
+string(4) "10.5"
 
 --Iteration 28--
-string(4) "10.5"
+string(2) "10"
 
 --Iteration 29--
 string(2) "10"
@@ -175,56 +170,41 @@ string(2) "10"
 string(4) "10.5"
 
 --Iteration 31--
-string(2) "10"
+string(4) "10.5"
 
 --Iteration 32--
-string(2) "10"
+string(5) "10.gz"
 
 --Iteration 33--
-string(4) "10.5"
+string(1) "0"
 
 --Iteration 34--
-string(4) "10.5"
+string(1) "0"
 
 --Iteration 35--
-string(5) "10.gz"
+string(6) "bar.gz"
 
 --Iteration 36--
-string(1) "0"
+string(6) "bar.gz"
 
 --Iteration 37--
-string(1) "0"
+string(6) "bar.gz"
 
 --Iteration 38--
-string(6) "bar.gz"
+string(1) " "
 
 --Iteration 39--
-string(6) "bar.gz"
+string(1) " "
 
 --Iteration 40--
-string(6) "bar.gz"
+string(1) " "
 
 --Iteration 41--
 string(1) " "
 
 --Iteration 42--
-string(1) " "
-
---Iteration 43--
 string(0) ""
 
---Iteration 44--
-string(1) " "
-
---Iteration 45--
-string(1) " "
-
---Iteration 46--
-string(0) ""
-
---Iteration 47--
-string(0) ""
-
---Iteration 48--
+--Iteration 43--
 string(0) ""
 Done