From: Zoe Slattery <zoe@php.net>
Date: Thu, 16 Apr 2009 10:54:45 +0000 (+0000)
Subject: fixing incorrect --CLEAN-- sections
X-Git-Tag: php-5.3.0RC2~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c80613cce2a8f3d4a1fd16885e4b460843142b4a;p=php

fixing incorrect --CLEAN-- sections
---

diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index 846466cc05..0f6a1d953f 100644
--- 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 b0475de172..a99f90beb8 100644
--- 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 7eb8926e1b..161483e875 100644
--- 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 68b1b089da..469a8ec6cb 100644
--- 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 dc1c21660a..250385a9ef 100644
--- 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 1c610165d8..f6bbdaace0 100644
--- 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 57a3c04da9..7cc3f3b2f5 100644
--- 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 f39ada28eb..b01b195697 100644
--- 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 1b68201485..e6edffdb14 100644
--- 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 5b7719202c..33fd422e76 100644
--- 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 699057db9c..d3e2fa572b 100644
--- 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 f7a8185d0a..b8c82b187b 100644
--- 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 bcaa5b90f0..1789e41d66 100644
--- 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 --