fix: remove workaround for finder bug

carlalexander · carlalexander · commit 3765c54b6085 · 2021-06-02T17:06:39.000-04:00
symfony/symfony#39257
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "symfony/dependency-injection": "^4.4",
         "symfony/event-dispatcher": "^4.4",
         "symfony/filesystem": "^4.4",
-        "symfony/finder": "^4.4",
+        "symfony/finder": "^4.4.24",
         "symfony/process": "^4.4",
         "symfony/yaml": "^4.4",
         "tightenco/collect": "^8.0"
diff --git a/src/Build/CopyWordPressFilesStep.php b/src/Build/CopyWordPressFilesStep.php
@@ -105,30 +105,6 @@ private function getBaseFinder(): Finder
             ->files();
     }
 
-    /**
-     * List of files we need to append manually because they're in the default Bedrock .gitignore file.
-     */
-    private function getBedrockFilesToAppend(): array
-    {
-        $files = [];
-
-        /**
-         * Finder can't seem to honor the .gitignore path ignoring child folders in the mu-plugins
-         * folder while keeping the files at the root of the mu-plugins folder.
-         *
-         * @see https://github.com/symfony/symfony/issues/39257
-         */
-        $finder = $this->getBaseFinder()
-            ->path('/^web\/app\/mu-plugins/')
-            ->depth('== 3');
-
-        foreach ($finder as $file) {
-            $files[] = $file;
-        }
-
-        return $files;
-    }
-
     /**
      * Get files from "include" node.
      */
@@ -157,7 +133,6 @@ private function getProjectFiles(string $projectType): Finder
             $finder->append($this->getWordPressFilesToAppend());
         } elseif ('bedrock' === $projectType) {
             $finder->exclude('web/app/uploads');
-            $finder->append($this->getBedrockFilesToAppend());
         }
 
         return $finder;
