Fix for composer#2739 (and composer#1755), added support for director…

…y excludes in the .gitignore file like /directory or directory/
sndpl · Feb 27, 2014 · 21109ad · 21109ad
1 parent e8a3fc5
commit 21109ad
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/src/Composer/Package/Archiver/BaseExcludeFilter.php b/src/Composer/Package/Archiver/BaseExcludeFilter.php
@@ -140,8 +140,8 @@ protected function generatePattern($rule)
             $pattern .= '/';
         }
 
-        // remove delimiters as well as caret (^) from the regex
-        $pattern .= substr(Finder\Glob::toRegex($rule), 2, -1);
+        // remove delimiters as well as caret (^) and dollar sign ($) from the regex
+        $pattern .= substr(Finder\Glob::toRegex($rule), 2, -2) . '/*.*$';
 
         return array($pattern . '#', $negate, false);
     }

diff --git a/tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php b/tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php
@@ -46,6 +46,24 @@ protected function setUp()
             'B/sub/prefixD.foo',
             'B/sub/prefixE.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',
             'toplevelB.foo',
             'prefixA.foo',
@@ -91,6 +109,20 @@ public function testManualExcludes()
             '/B/sub/prefixD.foo',
             '/B/sub/prefixE.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',
             '/prefixD.foo',
             '/prefixE.foo',
@@ -120,6 +152,9 @@ public function testGitExcludes()
             '!/*/*/prefixF.foo',
             '',
             'refixD.foo',
+            '/C',
+            'D/prefixA',
+            'E/'
         )));
 
         // git does not currently support negative git attributes

diff --git a/tests/Composer/Test/Package/Archiver/GitExcludeFilterTest.php b/tests/Composer/Test/Package/Archiver/GitExcludeFilterTest.php
@@ -29,8 +29,8 @@ public function testPatternEscape($ignore, $expected)
     public function patterns()
     {
         return array(
-            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/*.*$#', false, false)),
+            array('!app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml/*.*$#', true, false)),
         );
     }
 }