[PHP-CVS] cvs: php-src /ext/phar/tests/files blog.phar blog.phar.inc

2009-02-28 Thread Greg Beaver 
cellog  Sun Mar  1 07:00:22 2009 UTC

  Modified files:  
/php-src/ext/phar/tests/files   blog.phar blog.phar.inc 
  Log:
  MFB: fix blog.phar for front.phar.phpt test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/phar/tests/files/blog.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar.inc?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/phar/tests/files/blog.phar.inc
diff -u php-src/ext/phar/tests/files/blog.phar.inc:1.3 
php-src/ext/phar/tests/files/blog.phar.inc:1.4
--- php-src/ext/phar/tests/files/blog.phar.inc:1.3  Tue Sep 30 13:25:54 2008
+++ php-src/ext/phar/tests/files/blog.phar.inc  Sun Mar  1 07:00:22 2009
@@ -15,7 +15,7 @@
include install.php;
exit;
 }
-var_dump(file_get_contents(config.xml));
+var_dump(str_replace(\r\n, \n, file_get_contents(config.xml)));
 ?';
 $phar['install.php'] = '?php echo install\n; ?';
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/phar/tests/files blog.phar blog.phar.inc

2008-09-30 Thread Greg Beaver 
cellog  Tue Sep 30 13:25:54 2008 UTC

  Modified files:  
/php-src/ext/phar/tests/files   blog.phar blog.phar.inc 
  Log:
  fix test (thanks Tony)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/phar/tests/files/blog.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar.inc?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/phar/tests/files/blog.phar.inc
diff -u php-src/ext/phar/tests/files/blog.phar.inc:1.2 
php-src/ext/phar/tests/files/blog.phar.inc:1.3
--- php-src/ext/phar/tests/files/blog.phar.inc:1.2  Fri Aug  1 13:36:18 2008
+++ php-src/ext/phar/tests/files/blog.phar.inc  Tue Sep 30 13:25:54 2008
@@ -4,7 +4,9 @@
 @unlink($fname);
 
 $phar = new Phar($fname);
-$phar-setStub('?php if(file_exists(dirname(__FILE__) . /files/config.xml)) 
{
+$phar-setStub('?php
+Phar::interceptFileFuncs();
+if(file_exists(dirname(__FILE__) . /files/config.xml)) {
 Phar::mount(config.xml, dirname(__FILE__) . /files/config.xml);
 }
 Phar::webPhar(blog, index.php);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php