cellog Fri, 24 Jul 2009 23:55:49 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=284730
Log: merge from HEAD changes to test Changed paths: U pecl/phar/trunk/tests/016.phpt U php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt Modified: pecl/phar/trunk/tests/016.phpt =================================================================== --- pecl/phar/trunk/tests/016.phpt 2009-07-24 23:53:24 UTC (rev 284729) +++ pecl/phar/trunk/tests/016.phpt 2009-07-24 23:55:49 UTC (rev 284730) @@ -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'; Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt 2009-07-24 23:53:24 UTC (rev 284729) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt 2009-07-24 23:55:49 UTC (rev 284730) @@ -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