[PHP-CVS] Re: svn: /php/php-src/branches/PHP_5_3/ext/phar/tests/ phar_buildfromdirectory6.phpt
Brian Shire wrote: shireSat, 21 Nov 2009 05:40:16 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291108 Log: MFH: Fix phar regex test when '.php' is part of the path, instead be more specific with '.php$' regex. Changed paths: U php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt === --- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt 2009-11-21 05:38:58 UTC (rev 291107) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt 2009-11-21 05:40:16 UTC (rev 291108) @@ -15,7 +15,7 @@ try { $phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar'); - var_dump($phar-buildFromDirectory(dirname(__FILE__) . '/testdir', '/\.php/')); + var_dump($phar-buildFromDirectory(dirname(__FILE__) . '/testdir', '/\.php$/')); } catch (Exception $e) { var_dump(get_class($e)); echo $e-getMessage() . \n; Hi, Thanks for this fix, do you mind merging to pecl/phar/trunk? Thanks, Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: svn: /php/php-src/branches/PHP_5_3/ext/phar/tests/ phar_buildfromdirectory6.phpt
Greg Beaver wrote: Brian Shire wrote: shireSat, 21 Nov 2009 05:40:16 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291108 Log: MFH: Fix phar regex test when '.php' is part of the path, instead be more specific with '.php$' regex. Changed paths: U php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt === --- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt 2009-11-21 05:38:58 UTC (rev 291107) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromdirectory6.phpt 2009-11-21 05:40:16 UTC (rev 291108) @@ -15,7 +15,7 @@ try { $phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar'); - var_dump($phar-buildFromDirectory(dirname(__FILE__) . '/testdir', '/\.php/')); + var_dump($phar-buildFromDirectory(dirname(__FILE__) . '/testdir', '/\.php$/')); } catch (Exception $e) { var_dump(get_class($e)); echo $e-getMessage() . \n; Hi, Thanks for this fix, do you mind merging to pecl/phar/trunk? Yeah sorry about that, done. -shire -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php