Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/spl/tests/SplFileObject_rewind_error001.phpt

13 files changed, 15 insertions, 15 deletions

diff --git a/ext/zlib/tests/gzeof_variation1.phpt b/ext/zlib/tests/gzeof_variation1.phpt
index 6d1e0401df..77a1eccb66 100644
--- a/ext/zlib/tests/gzeof_variation1.phpt
+++ b/ext/zlib/tests/gzeof_variation1.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = dirname(__FILE__)."/temp.txt.gz";
+$filename = dirname(__FILE__)."/gzeof_variation1.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/ext/zlib/tests/gzfile_basic.phpt b/ext/zlib/tests/gzfile_basic.phpt
index 1fceea5b90..17055646d8 100644
--- a/ext/zlib/tests/gzfile_basic.phpt
+++ b/ext/zlib/tests/gzfile_basic.phpt
@@ -12,7 +12,7 @@ is a very common test
 for all languages
 EOT;
 $dirname = 'gzfile_temp';
-$filename = $dirname.'/plainfile.txt.gz';
+$filename = $dirname.'/gzfile_basic.txt.gz';
 mkdir($dirname);
 $h = gzopen($filename, 'w');
 gzwrite($h, $plaintxt);
@@ -36,4 +36,4 @@ array(3) {
   [2]=>
   string(17) "for all languages"
 }
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_basic2.phpt b/ext/zlib/tests/gzfile_basic2.phpt
index 9f31eb0f87..2bbf315a1a 100644
--- a/ext/zlib/tests/gzfile_basic2.phpt
+++ b/ext/zlib/tests/gzfile_basic2.phpt
@@ -12,7 +12,7 @@ is a very common test
 for all languages
 EOT;
 $dirname = 'gzfile_temp';
-$filename = $dirname.'/plainfile.txt';
+$filename = $dirname.'/gzfile_basic2.txt';
 mkdir($dirname);
 $h = fopen($filename, 'w');
 fwrite($h, $plaintxt);
@@ -36,4 +36,4 @@ array(3) {
   [2]=>
   string(17) "for all languages"
 }
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzopen_basic2.phpt b/ext/zlib/tests/gzopen_basic2.phpt
index 5cc02cd182..90766b1817 100644
--- a/ext/zlib/tests/gzopen_basic2.phpt
+++ b/ext/zlib/tests/gzopen_basic2.phpt
@@ -18,7 +18,7 @@ echo "*** Testing gzopen() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$filename = "temp.txt.gz";
+$filename = "gzopen_basic2.txt.gz";
 $modes = array('w', 'w+');
 $data = "This was the information that was written";
 
diff --git a/ext/zlib/tests/gzputs_basic.phpt b/ext/zlib/tests/gzputs_basic.phpt
index 7566e74e72..6456e4b55f 100644
--- a/ext/zlib/tests/gzputs_basic.phpt
+++ b/ext/zlib/tests/gzputs_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = dirname(__FILE__)."/temp.txt.gz";
+$filename = dirname(__FILE__)."/gzputs_basic.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/ext/zlib/tests/gzread_variation1.phpt b/ext/zlib/tests/gzread_variation1.phpt
index 1f50d77126..966351e736 100644
--- a/ext/zlib/tests/gzread_variation1.phpt
+++ b/ext/zlib/tests/gzread_variation1.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzread_variation1.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 var_dump(gzread($h, 100));
diff --git a/ext/zlib/tests/gzwrite_basic.phpt b/ext/zlib/tests/gzwrite_basic.phpt
index 0d7521625d..46553eedf1 100644
--- a/ext/zlib/tests/gzwrite_basic.phpt
+++ b/ext/zlib/tests/gzwrite_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzwrite_basic.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/ext/zlib/tests/gzwrite_error.phpt b/ext/zlib/tests/gzwrite_error.phpt
index b84a1db0c8..b4ddbb2ec7 100644
--- a/ext/zlib/tests/gzwrite_error.phpt
+++ b/ext/zlib/tests/gzwrite_error.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
-$filename = "temp.txt.gz";
+$filename = "gzwrite_error.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/ext/zlib/tests/gzwrite_error2.phpt b/ext/zlib/tests/gzwrite_error2.phpt
index 691275055d..5f2a4197b5 100644
--- a/ext/zlib/tests/gzwrite_error2.phpt
+++ b/ext/zlib/tests/gzwrite_error2.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzwrite_error2.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 var_dump(gzwrite( $h, $str, 0 ) );
diff --git a/ext/zlib/tests/readgzfile_basic.phpt b/ext/zlib/tests/readgzfile_basic.phpt
index 2d180c1a56..5fd539e21c 100644
--- a/ext/zlib/tests/readgzfile_basic.phpt
+++ b/ext/zlib/tests/readgzfile_basic.phpt
@@ -13,7 +13,7 @@ for all languages
 
 EOT;
 $dirname = 'readgzfile_temp';
-$filename = $dirname.'/plainfile.txt.gz';
+$filename = $dirname.'/readgzfile_basic.txt.gz';
 mkdir($dirname);
 $h = gzopen($filename, 'w');
 gzwrite($h, $plaintxt);
diff --git a/ext/zlib/tests/readgzfile_basic2.phpt b/ext/zlib/tests/readgzfile_basic2.phpt
index 99d216a55e..5402f960c2 100644
--- a/ext/zlib/tests/readgzfile_basic2.phpt
+++ b/ext/zlib/tests/readgzfile_basic2.phpt
@@ -13,7 +13,7 @@ for all languages
 
 EOT;
 $dirname = 'readgzfile_temp';
-$filename = $dirname.'/plainfile.txt';
+$filename = $dirname.'/readgzfile_basic2.txt';
 mkdir($dirname);
 $h = fopen($filename, 'w');
 fwrite($h, $plaintxt);
diff --git a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
index 74ccc0dabb..de1318cfed 100644
--- a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "zlib_wrapper_fflush_basic.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written.";
 $length = 10;
diff --git a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
index 53b140ac56..348e24505c 100644
--- a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
-$f2 = "temp.txt.gz";
+$f2 = "zlib_wrapper_ftruncate_basic.txt.gz";
 copy($f, $f2);
 
 $h = gzopen($f2, "r");