cellog Fri, 24 Jul 2009 22:09:36 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=284724
Log: update test to work in php 6 Changed paths: U pecl/phar/trunk/tests/009.phpt U php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt U php/php-src/trunk/ext/phar/tests/009.phpt U php/php-src/trunk/ext/phar/tests/016.phpt Modified: pecl/phar/trunk/tests/009.phpt =================================================================== --- pecl/phar/trunk/tests/009.phpt 2009-07-24 21:32:22 UTC (rev 284723) +++ pecl/phar/trunk/tests/009.phpt 2009-07-24 22:09:36 UTC (rev 284724) @@ -9,7 +9,7 @@ $file = b"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; -$file .= pack('VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . str_repeat('A', 500); +$file .= (binary) pack(b'VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . (binary) str_repeat((binary)'A', 500); file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt 2009-07-24 21:32:22 UTC (rev 284723) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt 2009-07-24 22:09:36 UTC (rev 284724) @@ -9,7 +9,7 @@ $file = b"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; -$file .= pack('VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . str_repeat('A', 500); +$file .= (binary) pack(b'VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . (binary) str_repeat((binary)'A', 500); file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; Modified: php/php-src/trunk/ext/phar/tests/009.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/009.phpt 2009-07-24 21:32:22 UTC (rev 284723) +++ php/php-src/trunk/ext/phar/tests/009.phpt 2009-07-24 22:09:36 UTC (rev 284724) @@ -9,7 +9,7 @@ $file = b"<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; -$file .= pack('VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . str_repeat('A', 500); +$file .= (binary) pack(b'VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . (binary) str_repeat((binary)'A', 500); file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; Modified: php/php-src/trunk/ext/phar/tests/016.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/016.phpt 2009-07-24 21:32:22 UTC (rev 284723) +++ php/php-src/trunk/ext/phar/tests/016.phpt 2009-07-24 22:09:36 UTC (rev 284724) @@ -9,14 +9,14 @@ <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$file = "<?php __HALT_COMPILER(); ?>"; +$file = b"<?php __HALT_COMPILER(); ?>"; // file length is too short $files = array(); // "hi" gzdeflated -$files['a'] = array('cont'=>'a','comp'=> pack('H*', 'cbc80400'),'flags'=>0x00001000, 'ulen' => 1, 'clen' => 4); +$files['a'] = array('cont'=>b'a','comp'=> (binary)pack('H*', 'cbc80400'),'flags'=>0x00001000, 'ulen' => 1, 'clen' => 4); $files['b'] = $files['a']; -$files['c'] = array('cont'=>'*'); +$files['c'] = array('cont'=>b'*'); $files['d'] = $files['a']; include 'files/phar_test.inc';
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php