- Class was renamed

diff --git a/ext/phar/tests/001.phpt b/ext/phar/tests/001.phpt
index 8a18e3ffdb2fddc8945bf6c6dc7a6ce7a6649e7c..b27712cece999b9416699fde16c156239629cb9b 100644 (file)
--- a/ext/phar/tests/001.phpt
+++ b/ext/phar/tests/001.phpt
@@ -4,7 +4,7 @@ PHP_Archive::apiVersion
 <?php if (!extension_loaded("phar")) print "skip"; ?>
 --FILE--
 <?php
-echo PHP_Archive::apiVersion();
+echo Phar::apiVersion();
 ?>
 --EXPECT--
 0.7.1
\ No newline at end of file

diff --git a/ext/phar/tests/002.phpt b/ext/phar/tests/002.phpt
index 0b79d19f4935a889cc1160abc8c199fe50198e89..3016c9d7721243f22f860df0a2291cd633faa2bc 100644 (file)
--- a/ext/phar/tests/002.phpt
+++ b/ext/phar/tests/002.phpt
@@ -4,15 +4,15 @@ PHP_Archive::mapPhar truncated manifest/improper params
 <?php if (!extension_loaded("phar")) print "skip"; ?>
 --FILE--
 <?php
-PHP_Archive::mapPhar();
-PHP_Archive::mapPhar(5);
-PHP_Archive::mapPhar(5, 5);
-PHP_Archive::mapPhar(5, 'hio');
-PHP_Archive::mapPhar(5, 'hio', 'hi');
+Phar::mapPhar();
+Phar::mapPhar(5);
+Phar::mapPhar(5, 5);
+Phar::mapPhar(5, 'hio');
+Phar::mapPhar(5, 'hio', 'hi');
 __HALT_COMPILER(); ?>
 --EXPECTF--
-Warning: PHP_Archive::mapPhar() expects at least 2 parameters, 0 given in %s on line %d
+Warning: Phar::mapPhar() expects at least 2 parameters, 0 given in %s on line %d
 
-Warning: PHP_Archive::mapPhar() expects at least 2 parameters, 1 given in %s on line %d
+Warning: Phar::mapPhar() expects at least 2 parameters, 1 given in %s on line %d
 
-Fatal error: PHP_Archive::mapPhar(): internal corruption of phar "%s" (truncated manifest) in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): internal corruption of phar "%s" (truncated manifest) in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/003.phpt b/ext/phar/tests/003.phpt
index e5619e7fd2e12a7218228db78b62873e67490ed3..efebae002f0e2f88c42f4bc6908a123880bb8382 100644 (file)
--- a/ext/phar/tests/003.phpt
+++ b/ext/phar/tests/003.phpt
@@ -1,11 +1,11 @@
 --TEST--
 PHP_Archive::mapPhar zlib not loaded
 --SKIPIF--
-<?php if (!extension_loaded("phar")) print "skip";
-if (PHP_Archive::canCompress()) print "skip";?>
+<?php if (!extension_loaded("phar")) print "skip zlib is present";
+if (Phar::canCompress()) print "skip";?>
 --FILE--
 <?php
-PHP_Archive::mapPhar(5, 'hio', true);
+Phar::mapPhar(5, 'hio', true);
 ?>
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): zlib extension is required for compressed .phar files
\ No newline at end of file
+Fatal error: Phar::mapPhar(): zlib extension is required for compressed .phar files
\ No newline at end of file

diff --git a/ext/phar/tests/004.phpt b/ext/phar/tests/004.phpt
index f3ead7f3f5f89ed8efcd3e3a77a9b469beae562a..598b8648e2603eb07fbf6e5465030e6d368044a2 100644 (file)
--- a/ext/phar/tests/004.phpt
+++ b/ext/phar/tests/004.phpt
@@ -4,7 +4,7 @@ PHP_Archive::mapPhar no __HALT_COMPILER();
 <?php if (!extension_loaded("phar")) print "skip";?>
 --FILE--
 <?php
-PHP_Archive::mapPhar(5, 'hio', false);
+Phar::mapPhar(5, 'hio', false);
 ?>
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): __HALT_COMPILER(); must be declared in a phar in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): __HALT_COMPILER(); must be declared in a phar in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/005.phpt b/ext/phar/tests/005.phpt
index 2cc46cf82772a2a88aabe4e7e56b2e259bde0c30..5a881c61da73d61179168a58c21ae3f55e6e8066 100644 (file)
--- a/ext/phar/tests/005.phpt
+++ b/ext/phar/tests/005.phpt
@@ -4,7 +4,7 @@ PHP_Archive::mapPhar truncated manifest (none)
 <?php if (!extension_loaded("phar")) print "skip";?>
 --FILE--
 <?php
-PHP_Archive::mapPhar(5, 'hio', false);
+Phar::mapPhar(5, 'hio', false);
 __HALT_COMPILER(); ?>
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): internal corruption of phar "%s" (truncated manifest) in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): internal corruption of phar "%s" (truncated manifest) in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/006.phpt b/ext/phar/tests/006.phpt
index 973e6066d2ef9174ffe1f2d62b3818f630406882..677ed7a28e322773631956b5cdf7c443d20bb6bd 100644 (file)
--- a/ext/phar/tests/006.phpt
+++ b/ext/phar/tests/006.phpt
@@ -4,7 +4,7 @@ PHP_Archive::mapPhar truncated manifest (manifest length truncated)
 <?php if (!extension_loaded("phar")) print "skip";?>
 --FILE--
 <?php
-PHP_Archive::mapPhar(5, 'hio', false);
+Phar::mapPhar(5, 'hio', false);
 __HALT_COMPILER(); ?>()
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): internal corruption of phar "%s" (truncated manifest) in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): internal corruption of phar "%s" (truncated manifest) in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/007.phpt b/ext/phar/tests/007.phpt
index 409a2d63dc1fe9116028b19a98df0fa0e96269e1..82e4c35d2896271bf5cfd8f95b9c4444fefd11f4 100644 (file)
--- a/ext/phar/tests/007.phpt
+++ b/ext/phar/tests/007.phpt
@@ -4,7 +4,7 @@ PHP_Archive::mapPhar manifest too big
 <?php if (!extension_loaded("phar")) print "skip";?>
 --FILE--
 <?php
-PHP_Archive::mapPhar(5, 'hio', false);
+Phar::mapPhar(5, 'hio', false);
 __HALT_COMPILER(); ?>~~~~
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): manifest cannot be larger than 1 MB in phar "%s" in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): manifest cannot be larger than 1 MB in phar "%s" in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/008.phpt b/ext/phar/tests/008.phpt
index f517fde662ebc798f011126dad7fa92d1aa73daa..2562e8491c591babb6919b023a089c4dc40e978b 100644 (file)
--- a/ext/phar/tests/008.phpt
+++ b/ext/phar/tests/008.phpt
@@ -7,11 +7,11 @@ PHP_Archive::mapPhar truncated manifest (not enough for manifest length)
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar(5, 'hio', false);
+Phar::mapPhar(5, 'hio', false);
 __HALT_COMPILER(); ?>";
 $file .= pack('V', 500) . 'notenough';
 file_put_contents(dirname(__FILE__) . '/008_phar.php', $file);
 include dirname(__FILE__) . '/008_phar.php';
 ?>
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): internal corruption of phar "%s" (truncated manifest) in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): internal corruption of phar "%s" (truncated manifest) in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/009.phpt b/ext/phar/tests/009.phpt
index 66f5701089a9e6437ad9f12a859eb5e08c3d78d9..20b652bc8f1b443a64ee269e0f530d5b33d05bfd 100644 (file)
--- a/ext/phar/tests/009.phpt
+++ b/ext/phar/tests/009.phpt
@@ -7,11 +7,11 @@ PHP_Archive::mapPhar too many manifest entries
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar(5, 'hio', false);
+Phar::mapPhar(5, 'hio', false);
 __HALT_COMPILER(); ?>";
 $file .= pack('VV', 500, 500) . str_repeat('A', 500);
 file_put_contents(dirname(__FILE__) . '/008_phar.php', $file);
 include dirname(__FILE__) . '/008_phar.php';
 ?>
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): too many manifest entries for size of manifest in phar "%s" in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): too many manifest entries for size of manifest in phar "%s" in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/010.phpt b/ext/phar/tests/010.phpt
index 55d986631a85ddc09092a33a1a162dc799d960b1..8df1fd997c036052b7649b931d5934c151244df0 100644 (file)
--- a/ext/phar/tests/010.phpt
+++ b/ext/phar/tests/010.phpt
@@ -7,7 +7,7 @@ PHP_Archive::mapPhar buffer overrun
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar(5, 'hio', false);
+Phar::mapPhar(5, 'hio', false);
 __HALT_COMPILER(); ?>";
 $manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 1);
 // this fails because the manifest length does not include the 4-byte "length of manifest" data
@@ -17,4 +17,4 @@ include dirname(__FILE__) . '/008_phar.php';
 echo file_get_contents('phar://hio/a');
 ?>
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): internal corruption of phar "%s" (buffer overrun) in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): internal corruption of phar "%s" (buffer overrun) in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/011.phpt b/ext/phar/tests/011.phpt
index d98042be129b1ff1996cd7cf104772ea6535c1b4..69bf7e04778abb2095f7ed62f67d2d51559a15bc 100644 (file)
--- a/ext/phar/tests/011.phpt
+++ b/ext/phar/tests/011.phpt
@@ -7,7 +7,7 @@ PHP_Archive::mapPhar filesize too small in manifest
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar(5, 'hio', false);
+Phar::mapPhar(5, 'hio', false);
 __HALT_COMPILER(); ?>";
 // compressed file length does not include 8 bytes for crc/file length and should
 $manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 1);
@@ -17,4 +17,4 @@ include dirname(__FILE__) . '/008_phar.php';
 echo file_get_contents('phar://hio/a');
 ?>
 --EXPECTF--
-Fatal error: PHP_Archive::mapPhar(): internal corruption of phar "%s" (file size in phar is not large enough) in %s on line %d
\ No newline at end of file
+Fatal error: Phar::mapPhar(): internal corruption of phar "%s" (file size in phar is not large enough) in %s on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/012.phpt b/ext/phar/tests/012.phpt
index e605415c80133c529bf0511d6dd132e033095712..b369c4b8c207ce4a9d337a63746b0636d4aa92c3 100644 (file)
--- a/ext/phar/tests/012.phpt
+++ b/ext/phar/tests/012.phpt
@@ -7,7 +7,7 @@ PHP_Archive::mapPhar valid file
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', false);
+Phar::mapPhar('hio', false);
 __HALT_COMPILER(); ?>";
 $manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);
 $file .= pack('VV', strlen($manifest) + 4, 1) . $manifest . pack('VV', crc32('a'), 1) . 'a';

diff --git a/ext/phar/tests/013.phpt b/ext/phar/tests/013.phpt
index d6b442c8686d4bde3163569b6b08618f5b8c3173..95d14bc558d8d347488a4a588ef28f2fd54db23a 100644 (file)
--- a/ext/phar/tests/013.phpt
+++ b/ext/phar/tests/013.phpt
@@ -7,7 +7,7 @@ PHP_Archive::mapPhar filesize mismatch
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', false);
+Phar::mapPhar('hio', false);
 __HALT_COMPILER(); ?>";
 // filesize should be 1, and is 2
 $manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);

diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt
index 3cfb37703878225170a3a458e0461fe1b673a6de..89ccf86ce0c3cae795e57897d74972518dc9cc80 100644 (file)
--- a/ext/phar/tests/014.phpt
+++ b/ext/phar/tests/014.phpt
@@ -7,7 +7,7 @@ PHP_Archive::mapPhar filesize mismatch
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', false);
+Phar::mapPhar('hio', false);
 __HALT_COMPILER(); ?>";
 // wrong crc32
 $manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);

diff --git a/ext/phar/tests/015.phpt b/ext/phar/tests/015.phpt
index 81aad086bf24169d1eb8b26fd7e37ada3010c73f..2aa6839424ee8a4a3ffd930ec8dbd5a133403d8c 100644 (file)
--- a/ext/phar/tests/015.phpt
+++ b/ext/phar/tests/015.phpt
@@ -8,7 +8,7 @@ if (!PHP_Archive::canCompress()) print "skip"; ?>
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', true);
+Phar::mapPhar('hio', true);
 __HALT_COMPILER(); ?>";
 $manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 11);
 $file .= pack('VV', strlen($manifest) + 4, 1) . $manifest . pack('VV', crc32('a'), 1) . chr(75) . chr(4) . chr(0); // 'a' gzdeflated

diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt
index 7ffe5b0e19cd60c159af2a21c2db33ca7a405846..df6ff7d6743651ba8f04aad02bf54615da572386 100644 (file)
--- a/ext/phar/tests/016.phpt
+++ b/ext/phar/tests/016.phpt
@@ -8,7 +8,7 @@ if (!PHP_Archive::canCompress()) print "skip"; ?>
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', true);
+Phar::mapPhar('hio', true);
 __HALT_COMPILER(); ?>";
 // file length is too short
 $manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);

diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt
index 8d0387bcdc0f75a970530655c3e7be75d307b290..fc7f73196cc395192058455d5d098e32a1108a3a 100644 (file)
--- a/ext/phar/tests/017.phpt
+++ b/ext/phar/tests/017.phpt
@@ -7,7 +7,7 @@ opendir test - no dir specified at all
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', true);
+Phar::mapPhar('hio', true);
 __HALT_COMPILER(); ?>";
 // file length is too short
 $manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);

diff --git a/ext/phar/tests/018.phpt b/ext/phar/tests/018.phpt
index 3f860bfeb47db2f9377bc8d326b2eb1a77d65ce2..9318d48475eb357f634205fb19b2edbf29340c14 100644 (file)
--- a/ext/phar/tests/018.phpt
+++ b/ext/phar/tests/018.phpt
@@ -7,7 +7,7 @@ opendir test, root directory
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', true);
+Phar::mapPhar('hio', true);
 __HALT_COMPILER(); ?>";
 $manifest = '';
 $manifest .= pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);

diff --git a/ext/phar/tests/019.phpt b/ext/phar/tests/019.phpt
index 970de7bfcbf9862e1581225c457fdc3384e12059..b79e6d67f020c1cf0fcc00055de4bfa1674e4bd1 100644 (file)
--- a/ext/phar/tests/019.phpt
+++ b/ext/phar/tests/019.phpt
@@ -7,7 +7,7 @@ opendir test, subdirectory
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', true);
+Phar::mapPhar('hio', true);
 __HALT_COMPILER(); ?>";
 $manifest = '';
 $manifest .= pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);

diff --git a/ext/phar/tests/020.phpt b/ext/phar/tests/020.phpt
index 31ceababce5356c381c416d88894d7ab955569ce..f923a0bdeb38e7f8daff2328b695137a2ed6f9cd 100644 (file)
--- a/ext/phar/tests/020.phpt
+++ b/ext/phar/tests/020.phpt
@@ -7,7 +7,7 @@ url stat
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', false);
+Phar::mapPhar('hio', false);
 __HALT_COMPILER(); ?>";
 $manifest = '';
 $manifest .= pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);

diff --git a/ext/phar/tests/021.phpt b/ext/phar/tests/021.phpt
index 21f02034a4c32597e7aae2b37efd43baa046815c..25f7d6a30619f5b61bfc8bc04742abae33288b18 100644 (file)
--- a/ext/phar/tests/021.phpt
+++ b/ext/phar/tests/021.phpt
@@ -7,7 +7,7 @@ stream stat
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', false);
+Phar::mapPhar('hio', false);
 __HALT_COMPILER(); ?>";
 $manifest = '';
 $manifest .= pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);

diff --git a/ext/phar/tests/022.phpt b/ext/phar/tests/022.phpt
index f95c67eb2bd4a2bdef030cc06036ba1d6a234fcf..81202273b8a429392fd5d9ebcab22839d1ff9cb5 100644 (file)
--- a/ext/phar/tests/022.phpt
+++ b/ext/phar/tests/022.phpt
@@ -7,7 +7,7 @@ stream stat
 function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
 register_shutdown_function('cleanup');
 $file = "<?php
-PHP_Archive::mapPhar('hio', false);
+Phar::mapPhar('hio', false);
 __HALT_COMPILER(); ?>";
 $contents = 'abcdefg';
 $manifest = pack('V', 1) . 'a' . pack('VVVV', strlen($contents), time(), 0, 8 + strlen($contents));