public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix for #2739 (and #1755), added support for directory excludes in the .gitignore file like /directory or directory/

pull/2769/head
Sandy Pleyte 2014-02-27 15:17:15 +01:00
parent e8a3fc5c1c
commit 21109ada22
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Package/Archiver/BaseExcludeFilter.php
View File

@ -140,8 +140,8 @@ abstract class BaseExcludeFilter
$pattern .= '/'; $pattern .= '/';
} }
// remove delimiters as well as caret (^) from the regex // remove delimiters as well as caret (^) and dollar sign ($) from the regex
$pattern .= substr(Finder\Glob::toRegex($rule), 2, -1); $pattern .= substr(Finder\Glob::toRegex($rule), 2, -2) . '/*.*$';
return array($pattern . '#', $negate, false); return array($pattern . '#', $negate, false);
} }

35
tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php
View File

@ -46,6 +46,24 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'B/sub/prefixD.foo', 'B/sub/prefixD.foo',
'B/sub/prefixE.foo', 'B/sub/prefixE.foo',
'B/sub/prefixF.foo', 'B/sub/prefixF.foo',
'C/prefixA.foo',
'C/prefixB.foo',
'C/prefixC.foo',
'C/prefixD.foo',
'C/prefixE.foo',
'C/prefixF.foo',
'D/prefixA',
'D/prefixB',
'D/prefixC',
'D/prefixD',
'D/prefixE',
'D/prefixF',
'E/prefixA.foo',
'E/prefixB.foo',
'E/prefixC.foo',
'E/prefixD.foo',
'E/prefixE.foo',
'E/prefixF.foo',
'toplevelA.foo', 'toplevelA.foo',
'toplevelB.foo', 'toplevelB.foo',
'prefixA.foo', 'prefixA.foo',
@ -91,6 +109,20 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'/B/sub/prefixD.foo', '/B/sub/prefixD.foo',
'/B/sub/prefixE.foo', '/B/sub/prefixE.foo',
'/B/sub/prefixF.foo', '/B/sub/prefixF.foo',
'/C/prefixA.foo',
'/C/prefixD.foo',
'/C/prefixE.foo',
'/C/prefixF.foo',
'/D/prefixA',
'/D/prefixB',
'/D/prefixC',
'/D/prefixD',
'/D/prefixE',
'/D/prefixF',
'/E/prefixA.foo',
'/E/prefixD.foo',
'/E/prefixE.foo',
'/E/prefixF.foo',
'/prefixB.foo', '/prefixB.foo',
'/prefixD.foo', '/prefixD.foo',
'/prefixE.foo', '/prefixE.foo',
@ -120,6 +152,9 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'!/*/*/prefixF.foo', '!/*/*/prefixF.foo',
'', '',
'refixD.foo', 'refixD.foo',
'/C',
'D/prefixA',
'E/'
))); )));
// git does not currently support negative git attributes // git does not currently support negative git attributes

4
tests/Composer/Test/Package/Archiver/GitExcludeFilterTest.php
View File

@ -29,8 +29,8 @@ class GitExcludeFilterTest extends \PHPUnit_Framework_TestCase
public function patterns() public function patterns()
{ {
return array( return array(
array('app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml$#', false, false)), array('app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml/*.*$#', false, false)),
array('!app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml$#', true, false)), array('!app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml/*.*$#', true, false)),
); );
} }
} }