Merge pull request #130 from defunctl/master

Fix vendor-prefixed subdirectory permissions being copied as 0700 instead of 0755
BrianHenryIE · Dec 12, 2024 · 8bbab09 · 8bbab09
2 parents c831ef3 + 024d732
commit 8bbab09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Pipeline/Copier.php b/src/Pipeline/Copier.php
@@ -16,6 +16,7 @@
 use BrianHenryIE\Strauss\Composer\Extra\StraussConfig;
 use BrianHenryIE\Strauss\Files\DiscoveredFiles;
 use BrianHenryIE\Strauss\Files\File;
+use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
 use League\Flysystem\Local\LocalFilesystemAdapter;
 
@@ -49,7 +50,9 @@ public function __construct(DiscoveredFiles $files, string $workingDir, StraussC
 
         $this->absoluteTargetDir = $workingDir . $config->getTargetDirectory();
 
-        $this->filesystem = new Filesystem(new LocalFilesystemAdapter('/'));
+        $this->filesystem = new Filesystem(new LocalFilesystemAdapter('/'), [
+            Config::OPTION_DIRECTORY_VISIBILITY => 'public',
+        ]);
     }
 
     /**
@@ -62,7 +65,6 @@ public function prepareTarget(): void
     {
         if (! is_dir($this->absoluteTargetDir)) {
             $this->filesystem->createDirectory($this->absoluteTargetDir);
-            $this->filesystem->setVisibility($this->absoluteTargetDir, 'public');
         } else {
             foreach ($this->files->getFiles() as $file) {
                 if (!$file->isDoCopy()) {

diff --git a/tests/Issues/StraussIssue104Test.php b/tests/Issues/StraussIssue104Test.php
@@ -42,5 +42,9 @@ public function test_correct_directory_permission()
         $result = substr(sprintf('%o', fileperms($this->testsWorkingDir . '/vendor-prefixed')), -4);
 
         self::assertEquals('0755', $result);
+
+        $subfolderResult = substr(sprintf('%o', fileperms($this->testsWorkingDir . '/vendor-prefixed/psr')), -4);
+
+        self::assertEquals('0755', $subfolderResult);
     }
 }