From: Marcus Boerger <helly@php.net>
Date: Sun, 1 Jan 2006 22:58:12 +0000 (+0000)
Subject: - Class was renamed
X-Git-Tag: RELEASE_1_0_4~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c9da67d8963b70d6220b32e2038202f2e27f987;p=php

- Class was renamed
---

diff --git a/ext/phar/tests/001.phpt b/ext/phar/tests/001.phpt
index 8a18e3ffdb..b27712cece 100644
--- 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 0b79d19f49..3016c9d772 100644
--- 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 e5619e7fd2..efebae002f 100644
--- 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 f3ead7f3f5..598b8648e2 100644
--- 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 2cc46cf827..5a881c61da 100644
--- 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 973e6066d2..677ed7a28e 100644
--- 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 409a2d63dc..82e4c35d28 100644
--- 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 f517fde662..2562e8491c 100644
--- 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 66f5701089..20b652bc8f 100644
--- 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 55d986631a..8df1fd997c 100644
--- 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 d98042be12..69bf7e0477 100644
--- 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 e605415c80..b369c4b8c2 100644
--- 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 d6b442c868..95d14bc558 100644
--- 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 3cfb377038..89ccf86ce0 100644
--- 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 81aad086bf..2aa6839424 100644
--- 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 7ffe5b0e19..df6ff7d674 100644
--- 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 8d0387bcdc..fc7f73196c 100644
--- 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 3f860bfeb4..9318d48475 100644
--- 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 970de7bfcb..b79e6d67f0 100644
--- 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 31ceababce..f923a0bdeb 100644
--- 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 21f02034a4..25f7d6a306 100644
--- 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 f95c67eb2b..81202273b8 100644
--- 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));