fixing incorrect --CLEAN-- sections

diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index 846466cc05cd9ffd6d33debfbf9fcc44aadb4676..0f6a1d953fa17d44377414c9401c1f8815db5854 100644 (file)
--- a/ext/standard/tests/array/count_recursive.phpt
+++ b/ext/standard/tests/array/count_recursive.phpt
@@ -125,7 +125,6 @@ var_dump( count(array(), "") );
 
 echo "\nDone";
 
---CLEAN--
 /* closing the resource handles */
 fclose( $resource1 );
 closedir( $resource2 );

diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt
index b0475de172254a59e83c0400f857b4eadbd24e31..a99f90beb8d4401f4cf335f24ce12e85bc92ed2d 100644 (file)
--- a/ext/standard/tests/array/end.phpt
+++ b/ext/standard/tests/array/end.phpt
@@ -123,13 +123,12 @@ var_dump( end($null_array) );
 
 echo "Done\n";
 
-?>
 
---CLEAN--
 /* cleaning resource handles */
 fclose( $file_handle );  //file resource handle deleted
 closedir( $dir_handle );  //dir resource handle deleted
 
+?>
 --EXPECTF--
 *** Testing end() on different arrays ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/bug44394_2.phpt b/ext/standard/tests/general_functions/bug44394_2.phpt
index 7eb8926e1b9ce121b5f24f9088711b6c1f43543a..161483e875f0d305558f5e0373f5d9ae0ae4a3be 100644 (file)
--- a/ext/standard/tests/general_functions/bug44394_2.phpt
+++ b/ext/standard/tests/general_functions/bug44394_2.phpt
@@ -26,7 +26,6 @@ ob_end_clean();
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/sess_'.session_id());
 foreach (glob(__DIR__ . '/sess_*') as $filename) {
   unlink($filename);
 }

diff --git a/ext/standard/tests/general_functions/is_array.phpt b/ext/standard/tests/general_functions/is_array.phpt
index 68b1b089dadfe082fa0c8167ebb9e21679282db9..469a8ec6cb83b8db45f819202431f595019d3300 100644 (file)
--- a/ext/standard/tests/general_functions/is_array.phpt
+++ b/ext/standard/tests/general_functions/is_array.phpt
@@ -106,12 +106,10 @@ var_dump( is_array() );
 var_dump( is_array ($fp, $fp) );
  
 echo "Done\n";
-?>
---CLEAN--
 /* close resources */
 fclose($fp);
 closedir($dfp);
-
+?>
 --EXPECTF--
 *** Testing is_array() on different type of arrays ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt
index dc1c21660a951211b123fa939e4089c1704ec58f..250385a9efbb2beacb81a12d1d1f39f49bbc3b86 100644 (file)
--- a/ext/standard/tests/general_functions/is_bool.phpt
+++ b/ext/standard/tests/general_functions/is_bool.phpt
@@ -135,13 +135,12 @@ var_dump( is_bool() );
 var_dump( is_bool(TRUE, FALSE) );
  
 echo "Done\n";
-?>
 
---CLEAN--
 // close resources
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing is_bool() with valid boolean values ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt
index 1c610165d8cb099125cc3524a2e0693961fb8043..f6bbdaace00a5ca33a67d8c971b6d27e50a95b1c 100644 (file)
--- a/ext/standard/tests/general_functions/is_float.phpt
+++ b/ext/standard/tests/general_functions/is_float.phpt
@@ -139,13 +139,12 @@ var_dump( is_double( $floats[0], $floats[1]) );
 var_dump( is_real( $floats[0], $floats[1]) );
  
 echo "Done\n";
-?>
 
---CLEAN--
 // close the resources used 
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing is_float(), is_double() and is_real() with float values***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt
index 57a3c04da9a4e460ccd46ff372240bd04a627737..7cc3f3b2f5581c8e5a249bf413d1d2032d212802 100644 (file)
--- a/ext/standard/tests/general_functions/is_int.phpt
+++ b/ext/standard/tests/general_functions/is_int.phpt
@@ -144,13 +144,12 @@ var_dump( is_integer(TRUE, FALSE) );
 var_dump( is_long(TRUE, FALSE) );
  
 echo "Done\n";
-?>
 
---CLEAN--
 // close the resources
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing is_int(), is_integer() & is_long()  with valid integer values ***
 --Iteration 1--

diff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt
index f39ada28ebf1ec3d45b226fd594a15dea288c709..b01b1956971692033259d9b38a548cd0412e95ee 100644 (file)
--- a/ext/standard/tests/general_functions/is_null.phpt
+++ b/ext/standard/tests/general_functions/is_null.phpt
@@ -135,13 +135,12 @@ var_dump( is_null() );
 var_dump( is_null(NULL, null) );
  
 echo "Done\n";
-?>
 
---CLEAN--
 // close the resources used
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing is_null() with valid null values ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt
index 1b682014857774cadad271ab2ade94fd9435c938..e6edffdb14814b30acbd08314b285ac55412b1a3 100644 (file)
--- a/ext/standard/tests/general_functions/is_numeric.phpt
+++ b/ext/standard/tests/general_functions/is_numeric.phpt
@@ -154,13 +154,12 @@ var_dump( is_numeric() );
 var_dump( is_numeric("10", "20") );
  
 echo "Done\n";
-?>
 
---CLEAN--
 // close the resources used
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing is_numeric() with valid numeric values ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/is_object.phpt b/ext/standard/tests/general_functions/is_object.phpt
index 5b7719202ca86024072361016e4a7fa9e23e319a..33fd422e769a7b33053ebe27834dca431e530dea 100644 (file)
--- a/ext/standard/tests/general_functions/is_object.phpt
+++ b/ext/standard/tests/general_functions/is_object.phpt
@@ -146,13 +146,12 @@ var_dump( is_object() );
 var_dump( is_object($myClass_object, $myClass_object) );
  
 echo "Done\n";
-?>
 
---CLEAN--
 // close the resources used
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing is_object() with valid objects ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/is_scalar.phpt b/ext/standard/tests/general_functions/is_scalar.phpt
index 699057db9c3f6ec79b36794a1a936dc959e324cd..d3e2fa572b1f97939da2022a3e3dea738b91de07 100644 (file)
--- a/ext/standard/tests/general_functions/is_scalar.phpt
+++ b/ext/standard/tests/general_functions/is_scalar.phpt
@@ -114,13 +114,12 @@ var_dump( is_scalar( $scalar_variables[2], $scalar_variables[2]) );
 var_dump( is_scalar( new stdclass, new stdclass) );
 
 echo "Done\n";  
-?>
 
---CLEAN--
 // close the resources used
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing basic operations ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/is_string.phpt b/ext/standard/tests/general_functions/is_string.phpt
index f7a8185d0acb838bde31840dae79c0170ca1efc7..b8c82b187bd71d23f98dd2d8b39d200de70ef91a 100644 (file)
--- a/ext/standard/tests/general_functions/is_string.phpt
+++ b/ext/standard/tests/general_functions/is_string.phpt
@@ -148,13 +148,12 @@ var_dump( is_string() );
 var_dump( is_string("string", "test") );
  
 echo "Done\n";
-?>
 
---CLEAN--
 // close the resources used
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing is_string() with valid string values ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt
index bcaa5b90f064b1686121711b9896882e5865c0f1..1789e41d668821d41ed44fa77f5ec0198670a6cd 100644 (file)
--- a/ext/standard/tests/general_functions/strval.phpt
+++ b/ext/standard/tests/general_functions/strval.phpt
@@ -149,13 +149,12 @@ var_dump( strval() );
 var_dump( strval( $scalars[0], $scalars[1]) );
  
 echo "Done\n";
-?>
 
---CLEAN--
 // close the resources used
 fclose($fp);
 closedir($dfp);
 
+?>
 --EXPECTF--
 *** Testing str_val() with scalar values***
 -- Iteration 1 --