Normalize pattern, use only regex without enclosing slashes.

consolidation · Aug 19, 2020 · 45055ac · 45055ac
1 parent 5838ebb
commit 45055ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/Task/Archive/Pack.php b/src/Task/Archive/Pack.php
@@ -39,7 +39,7 @@ class Pack extends BaseTask implements PrintedInterface
     private $archiveFile;
 
     /**
-     * A list of patterns to exclude from the archive.
+     * A list of regex patterns to exclude from the archive.
      *
      * @var array
      */
@@ -146,20 +146,13 @@ public function add($item)
      * Allow files or folder to be excluded from the archive. Use regex, without enclosing slashes.
      *
      * @param string|string[]
-     *   A pattern to be excluded or an array of patterns.
-     *   Zip allows regexp, glob or string.
-     *   @see \Symfony\Component\Finder\Finder::notName
-     *   Tar, gz and bz2 allow only regexp.
-     *   @see \Archive_Tar::setIgnoreList
+     *   A regex (or array of) to be excluded.
      *
      * @return $this
      */
     public function exclude($ignoreList)
     {
-        if (!is_array($ignoreList)) {
-            $ignoreList = [$ignoreList];
-        }
-        $this->ignoreList = $ignoreList;
+        $this->ignoreList = array_merge($this->ignoreList, (array) $ignoreList);
         return $this;
     }
 
@@ -266,7 +259,9 @@ protected function addItemsToZip($zip, $items)
         foreach ($items as $placementLocation => $filesystemLocation) {
             if (is_dir($filesystemLocation)) {
                 $finder = new Finder();
-                $finder->files()->in($filesystemLocation)->ignoreDotFiles(false)->notName($this->ignoreList);
+                // Add slashes so Symfony Finder patterns work like Archive_Tar ones.
+                $zipIgnoreList = preg_filter('/^|$/', '/', $this->ignoreList);
+                $finder->files()->in($filesystemLocation)->ignoreDotFiles(false)->notName($zipIgnoreList)->notPath($zipIgnoreList);
 
                 foreach ($finder as $file) {
                     // Replace Windows slashes or resulting zip will have issues on *nixes.

diff --git a/tests/integration/PackExtractTest.php b/tests/integration/PackExtractTest.php
@@ -30,7 +30,7 @@ public function archiveTypeProvider()
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             return [['zip']];
         }
-        return [['tar'], ['tar'], ['tar.gz'], ['tar.bz2'], ['tgz']];
+        return [['zip'], ['tar'], ['tar.gz'], ['tar.bz2'], ['tgz']];
     }
 
     /**
@@ -57,6 +57,7 @@ public function testPackExtract($archiveType)
         $result = $this->taskPack("deeply.$archiveType")
             ->add(['deep' => 'some/deeply'])
             ->exclude(['structu3.*.re'])
+            ->exclude('nested4')
             ->run();
         $this->assertTrue($result->wasSuccessful(), $result->getMessage());
         $this->assertFileExists("deeply.$archiveType");
@@ -75,6 +76,7 @@ public function testPackExtract($archiveType)
         $this->assertFileExists("extracted-$archiveType/nested/structu.re");
         $this->assertFileNotExists("extracted-$archiveType/nested3/structu31.re");
         $this->assertFileNotExists("extracted-$archiveType/nested3/structu32.re");
+        $this->assertDirectoryNotExists("extracted-$archiveType/nested4");
         // Next, we'll extract the same archive again, this time preserving
         // the top-level folder.
         $this->taskExtract("deeply.$archiveType")
@@ -86,6 +88,7 @@ public function testPackExtract($archiveType)
         $this->assertFileExists("preserved-$archiveType/deep/nested/structu.re");
         $this->assertFileNotExists("preserved-$archiveType/deep/nested3/structu31.re");
         $this->assertFileNotExists("preserved-$archiveType/deep/nested3/structu32.re");
+        $this->assertDirectoryNotExists("preserved-$archiveType/deep/nested4");
         // Make another archive, this time composed of fanciful locations
         $result = $this->taskPack("composed.$archiveType")
             ->add(['a/b/existing_file' => 'some/deeply/existing_file'])