This commit was manufactured by cvs2svn to create branch 'PHP_5'.PHP-5

22 files changed, 0 insertions, 394 deletions

diff --git a/ext/standard/tests/image/246x247.png b/ext/standard/tests/image/246x247.png
deleted file mode 100644
index 648a64e0aa..0000000000
--- a/ext/standard/tests/image/246x247.png
+++ /dev/null
diff --git a/ext/standard/tests/image/384x385.png b/ext/standard/tests/image/384x385.png
deleted file mode 100644
index 843ddfaf08..0000000000
--- a/ext/standard/tests/image/384x385.png
+++ /dev/null
diff --git a/ext/standard/tests/image/bug13213.jpg b/ext/standard/tests/image/bug13213.jpg
deleted file mode 100644
index b90c7a4059..0000000000
--- a/ext/standard/tests/image/bug13213.jpg
+++ /dev/null
diff --git a/ext/standard/tests/image/bug13213.phpt b/ext/standard/tests/image/bug13213.phpt
deleted file mode 100644
index c97b7016b4..0000000000
--- a/ext/standard/tests/image/bug13213.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-Bug #13213 (GetImageSize and wrong JPEG Comments)
---FILE--
-<?php
-var_dump(GetImageSize(dirname(__FILE__).'/bug13213.jpg'));
-?>
---EXPECT--
-array(7) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  string(20) "width="1" height="1""
-  ["bits"]=>
-  int(8)
-  ["channels"]=>
-  int(3)
-  ["mime"]=>
-  string(10) "image/jpeg"
-}
diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt
deleted file mode 100644
index 46003cffac..0000000000
--- a/ext/standard/tests/image/getimagesize.phpt
+++ /dev/null
@@ -1,196 +0,0 @@
---TEST--
-GetImageSize()
---SKIPIF--
-<?php
-	require_once('skipif_imagetype.inc');
-?>
---FILE--
-<?php
-	// Note: SWC requires zlib
-	$dir = opendir(dirname(__FILE__)) or die('cannot open directory: '.dirname(__FILE__));
-	$result = array();
-	$files  = array();
-	while (($file = readdir($dir)) !== FALSE) {
-		if (preg_match('/^test.+pix\./',$file) && $file != "test13pix.swf") {
-			$files[] = $file;
-		}
-	}
-	closedir($dir);
-	sort($files);
-	foreach($files as $file) {
-		$result[$file] = getimagesize(dirname(__FILE__)."/$file");
-	}
-	var_dump($result);
-?>
---EXPECT--
-array(11) {
-  ["test1pix.bmp"]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-    [2]=>
-    int(6)
-    [3]=>
-    string(20) "width="1" height="1""
-    ["bits"]=>
-    int(24)
-    ["mime"]=>
-    string(9) "image/bmp"
-  }
-  ["test1pix.jp2"]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-    [2]=>
-    int(10)
-    [3]=>
-    string(20) "width="1" height="1""
-    ["bits"]=>
-    int(8)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(9) "image/jp2"
-  }
-  ["test1pix.jpc"]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-    [2]=>
-    int(9)
-    [3]=>
-    string(20) "width="1" height="1""
-    ["bits"]=>
-    int(8)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(24) "application/octet-stream"
-  }
-  ["test1pix.jpg"]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    string(20) "width="1" height="1""
-    ["bits"]=>
-    int(8)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(10) "image/jpeg"
-  }
-  ["test2pix.gif"]=>
-  array(7) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(1)
-    [2]=>
-    int(1)
-    [3]=>
-    string(20) "width="2" height="1""
-    ["bits"]=>
-    int(1)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(9) "image/gif"
-  }
-  ["test4pix.gif"]=>
-  array(7) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(1)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["bits"]=>
-    int(2)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(9) "image/gif"
-  }
-  ["test4pix.iff"]=>
-  array(6) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(14)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["bits"]=>
-    int(4)
-    ["mime"]=>
-    string(9) "image/iff"
-  }
-  ["test4pix.png"]=>
-  array(6) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(3)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["bits"]=>
-    int(4)
-    ["mime"]=>
-    string(9) "image/png"
-  }
-  ["test4pix.psd"]=>
-  array(5) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(5)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["mime"]=>
-    string(9) "image/psd"
-  }
-  ["test4pix.swf"]=>
-  array(5) {
-    [0]=>
-    int(550)
-    [1]=>
-    int(400)
-    [2]=>
-    int(4)
-    [3]=>
-    string(24) "width="550" height="400""
-    ["mime"]=>
-    string(29) "application/x-shockwave-flash"
-  }
-  ["test4pix.tif"]=>
-  array(5) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(7)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["mime"]=>
-    string(10) "image/tiff"
-  }
-}
diff --git a/ext/standard/tests/image/getimagesize_246x247.phpt b/ext/standard/tests/image/getimagesize_246x247.phpt
deleted file mode 100644
index e5a0aea779..0000000000
--- a/ext/standard/tests/image/getimagesize_246x247.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-GetImageSize() with 246x247 pixels
---SKIPIF--
-<?php
-	require_once('skipif_imagetype.inc');
-?>
---FILE--
-<?php
-	// Note: SWC requires zlib
-	$dir = opendir(dirname(__FILE__)) or die('cannot open directory: '.dirname(__FILE__));
-	$result = array();
-	$files  = array();
-	while (($file = readdir($dir)) !== FALSE) {
-		if (preg_match('/^246x247\./',$file)) {
-			$files[] = $file;
-		}
-	}
-	closedir($dir);
-	sort($files);
-	foreach($files as $file) {
-		$result[$file] = getimagesize(dirname(__FILE__)."/$file");
-	}
-	var_dump($result);
-?>
---EXPECT--
-array(1) {
-  ["246x247.png"]=>
-  array(6) {
-    [0]=>
-    int(246)
-    [1]=>
-    int(247)
-    [2]=>
-    int(3)
-    [3]=>
-    string(24) "width="246" height="247""
-    ["bits"]=>
-    int(4)
-    ["mime"]=>
-    string(9) "image/png"
-  }
-}
diff --git a/ext/standard/tests/image/getimagesize_384x385.phpt b/ext/standard/tests/image/getimagesize_384x385.phpt
deleted file mode 100644
index 0051df71e0..0000000000
--- a/ext/standard/tests/image/getimagesize_384x385.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-GetImageSize() with 384x385 pixels
---SKIPIF--
-<?php
-	require_once('skipif_imagetype.inc');
-?>
---FILE--
-<?php
-	// Note: SWC requires zlib
-	$dir = opendir(dirname(__FILE__)) or die('cannot open directory: '.dirname(__FILE__));
-	$result = array();
-	$files  = array();
-	while (($file = readdir($dir)) !== FALSE) {
-		if (preg_match('/^384x385\./',$file)) {
-			$files[] = $file;
-		}
-	}
-	closedir($dir);
-	sort($files);
-	foreach($files as $file) {
-		$result[$file] = getimagesize(dirname(__FILE__)."/$file");
-	}
-	var_dump($result);
-?>
---EXPECT--
-array(1) {
-  ["384x385.png"]=>
-  array(6) {
-    [0]=>
-    int(384)
-    [1]=>
-    int(385)
-    [2]=>
-    int(3)
-    [3]=>
-    string(24) "width="384" height="385""
-    ["bits"]=>
-    int(1)
-    ["mime"]=>
-    string(9) "image/png"
-  }
-}
diff --git a/ext/standard/tests/image/getimagesize_swc.phpt b/ext/standard/tests/image/getimagesize_swc.phpt
deleted file mode 100644
index b9b83f4373..0000000000
--- a/ext/standard/tests/image/getimagesize_swc.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-GetImageSize() for compressed swf files
---SKIPIF--
-<?php
-	if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
-		die("skip zlib extension is not avaliable");
-	}
-?>
---FILE--
-<?php
-	var_dump(getimagesize(dirname(__FILE__) . "/test13pix.swf"));
-?>
---EXPECT--
-array(5) {
-  [0]=>
-  int(550)
-  [1]=>
-  int(400)
-  [2]=>
-  int(13)
-  [3]=>
-  string(24) "width="550" height="400""
-  ["mime"]=>
-  string(29) "application/x-shockwave-flash"
-}
diff --git a/ext/standard/tests/image/image_type_to_mime_type.phpt b/ext/standard/tests/image/image_type_to_mime_type.phpt
deleted file mode 100644
index 94aabba0b9..0000000000
--- a/ext/standard/tests/image/image_type_to_mime_type.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-image_type_to_mime_type()
---SKIPIF--
-<?php 
-	if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available'); 
-	require_once('skipif_imagetype.inc');
-?>
---FILE--
-<?php
-	// Note: SWC requires zlib
-	$dir = opendir(dirname(__FILE__)) or die('cannot open directory: '.dirname(__FILE__));
-	$result = array();
-	$files  = array();
-	while (($file = readdir($dir)) !== FALSE) {
-		if (preg_match('/^test.+pix\./',$file) && $file != "test13pix.swf") {
-			$files[] = $file;
-		}
-	}
-	closedir($dir);
-	sort($files);
-	foreach($files as $file) {
-		$result[$file] = getimagesize(dirname(__FILE__)."/$file");
-		$result[$file] = image_type_to_mime_type($result[$file][2]);
-	}
-	var_dump($result);
-?>
---EXPECT--
-array(11) {
-  ["test1pix.bmp"]=>
-  string(9) "image/bmp"
-  ["test1pix.jp2"]=>
-  string(9) "image/jp2"
-  ["test1pix.jpc"]=>
-  string(24) "application/octet-stream"
-  ["test1pix.jpg"]=>
-  string(10) "image/jpeg"
-  ["test2pix.gif"]=>
-  string(9) "image/gif"
-  ["test4pix.gif"]=>
-  string(9) "image/gif"
-  ["test4pix.iff"]=>
-  string(9) "image/iff"
-  ["test4pix.png"]=>
-  string(9) "image/png"
-  ["test4pix.psd"]=>
-  string(9) "image/psd"
-  ["test4pix.swf"]=>
-  string(29) "application/x-shockwave-flash"
-  ["test4pix.tif"]=>
-  string(10) "image/tiff"
-}
\ No newline at end of file
diff --git a/ext/standard/tests/image/skipif_imagetype.inc b/ext/standard/tests/image/skipif_imagetype.inc
deleted file mode 100644
index 827f10c179..0000000000
--- a/ext/standard/tests/image/skipif_imagetype.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-if (!defined('IMAGETYPE_GIF'))     die('skip images of type GIF not supported');
-if (!defined('IMAGETYPE_JPEG'))    die('skip images of type JPEG not supported');
-if (!defined('IMAGETYPE_PNG'))     die('skip images of type PNG not supported');
-if (!defined('IMAGETYPE_SWF'))     die('skip images of type SWF not supported');
-if (!defined('IMAGETYPE_PSD'))     die('skip images of type PSD not supported');
-if (!defined('IMAGETYPE_BMP'))     die('skip images of type BMP not supported');
-if (!defined('IMAGETYPE_TIFF_II')) die('skip images of type TIFF not supported');
-if (!defined('IMAGETYPE_TIFF_MM')) die('skip images of type TIFF not supported');
-if (!defined('IMAGETYPE_JPC'))     die('skip images of type JPC not supported');
-//if (!defined('IMAGETYPE_JP2'))     die('skip images of type JP2 not supported');
-//if (!defined('IMAGETYPE_JPX'))     die('skip images of type JPX not supported');
-//if (!defined('IMAGETYPE_JB2'))     die('skip images of type JB2 not supported');
-if (!defined('IMAGETYPE_IFF'))     die('skip images of type IFF not supported');
-?>
diff --git a/ext/standard/tests/image/test13pix.swf b/ext/standard/tests/image/test13pix.swf
deleted file mode 100755
index 0d40cb743e..0000000000
--- a/ext/standard/tests/image/test13pix.swf
+++ /dev/null
diff --git a/ext/standard/tests/image/test1pix.bmp b/ext/standard/tests/image/test1pix.bmp
deleted file mode 100644
index f3799d2d1e..0000000000
--- a/ext/standard/tests/image/test1pix.bmp
+++ /dev/null
diff --git a/ext/standard/tests/image/test1pix.jp2 b/ext/standard/tests/image/test1pix.jp2
deleted file mode 100644
index 8a1172e10d..0000000000
--- a/ext/standard/tests/image/test1pix.jp2
+++ /dev/null
diff --git a/ext/standard/tests/image/test1pix.jpc b/ext/standard/tests/image/test1pix.jpc
deleted file mode 100644
index ac11c6bc81..0000000000
--- a/ext/standard/tests/image/test1pix.jpc
+++ /dev/null
diff --git a/ext/standard/tests/image/test1pix.jpg b/ext/standard/tests/image/test1pix.jpg
deleted file mode 100644
index 121decb65a..0000000000
--- a/ext/standard/tests/image/test1pix.jpg
+++ /dev/null
diff --git a/ext/standard/tests/image/test2pix.gif b/ext/standard/tests/image/test2pix.gif
deleted file mode 100644
index c4d4483544..0000000000
--- a/ext/standard/tests/image/test2pix.gif
+++ /dev/null
diff --git a/ext/standard/tests/image/test4pix.gif b/ext/standard/tests/image/test4pix.gif
deleted file mode 100644
index a02ebe9784..0000000000
--- a/ext/standard/tests/image/test4pix.gif
+++ /dev/null
diff --git a/ext/standard/tests/image/test4pix.iff b/ext/standard/tests/image/test4pix.iff
deleted file mode 100644
index fe9daebbae..0000000000
--- a/ext/standard/tests/image/test4pix.iff
+++ /dev/null
diff --git a/ext/standard/tests/image/test4pix.png b/ext/standard/tests/image/test4pix.png
deleted file mode 100644
index 2b75ac5fb2..0000000000
--- a/ext/standard/tests/image/test4pix.png
+++ /dev/null
diff --git a/ext/standard/tests/image/test4pix.psd b/ext/standard/tests/image/test4pix.psd
deleted file mode 100644
index 4c378239d7..0000000000
--- a/ext/standard/tests/image/test4pix.psd
+++ /dev/null
diff --git a/ext/standard/tests/image/test4pix.swf b/ext/standard/tests/image/test4pix.swf
deleted file mode 100755
index b1d41c6766..0000000000
--- a/ext/standard/tests/image/test4pix.swf
+++ /dev/null
diff --git a/ext/standard/tests/image/test4pix.tif b/ext/standard/tests/image/test4pix.tif
deleted file mode 100644
index 13367ee173..0000000000
--- a/ext/standard/tests/image/test4pix.tif
+++ /dev/null