Resolve #69

Author: codedge

src/AbstractRepositoryType.php

@@ -5,7 +5,7 @@
 namespace Codedge\Updater;
 
 use Codedge\Updater\Events\HasWrongPermissions;
-use File;
+use Illuminate\Support\Facades\File;
 use GuzzleHttp\Client;
 use Symfony\Component\Finder\Finder;
 
@@ -217,4 +217,17 @@ public function hasAccessToken(): bool
     {
         return ! empty($this->accessToken);
     }
+
+    /**
+     * Check if files in one array (i. e. directory) are also exist in a second one.
+     *
+     * @param array $directory
+     * @param array $excludedDirs
+     *
+     * @return bool
+     */
+    public function isDirectoryExcluded(array $directory, array $excludedDirs): bool
+    {
+        return count(array_intersect($directory, $excludedDirs)) ? true : false;
+    }
 }

src/SourceRepositoryTypes/GithubRepositoryType.php

@@ -9,7 +9,7 @@
 use Codedge\Updater\Events\UpdateAvailable;
 use Codedge\Updater\Events\UpdateFailed;
 use Codedge\Updater\Events\UpdateSucceeded;
-use File;
+use Illuminate\Support\Facades\File;
 use GuzzleHttp\Client;
 use Storage;
 use Symfony\Component\Finder\Finder;
@@ -138,15 +138,16 @@ public function update($version = '') : bool
             // Move all directories first
             collect((new Finder())->in($sourcePath)->exclude($this->config['exclude_folders'])->directories()->sort(function ($a, $b) {
                 return strlen($b->getRealpath()) - strlen($a->getRealpath());
-            }))->each(function ($directory) { /** @var \SplFileInfo $directory */
-                if (count(array_intersect(File::directories(
-                        $directory->getRealPath()), $this->config['exclude_folders']) == 0)
+            }))->each(function (/** @var \SplFileInfo $directory */ $directory) {
+                if (!$this->isDirectoryExcluded(
+                    File::directories($directory->getRealPath()), $this->config['exclude_folders'])
                 ) {
                     File::copyDirectory(
                         $directory->getRealPath(),
                         base_path($directory->getRelativePath()).'/'.$directory->getBasename()
                     );
                 }
+
                 File::deleteDirectory($directory->getRealPath());
             });
 

src/SourceRepositoryTypes/HttpRepositoryType.php

@@ -9,7 +9,7 @@
 use Codedge\Updater\Events\UpdateAvailable;
 use Codedge\Updater\Events\UpdateFailed;
 use Codedge\Updater\Events\UpdateSucceeded;
-use File;
+use Illuminate\Support\Facades\File;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Collection;
 use Psr\Http\Message\ResponseInterface;
@@ -153,13 +153,15 @@ public function update($version = '') : bool
             collect((new Finder())->in($sourcePath)->exclude($this->config['exclude_folders'])->directories()->sort(function ($a, $b) {
                 return strlen($b->getRealpath()) - strlen($a->getRealpath());
             }))->each(function ($directory) { /** @var \SplFileInfo $directory */
-                if (count(array_intersect(File::directories(
-                        $directory->getRealPath()), $this->config['exclude_folders'])) == 0) {
+                if (!$this->isDirectoryExcluded(
+                    File::directories($directory->getRealPath()), $this->config['exclude_folders'])
+                ) {
                     File::copyDirectory(
                         $directory->getRealPath(),
                         base_path($directory->getRelativePath()).'/'.$directory->getBasename()
                     );
                 }
+
                 File::deleteDirectory($directory->getRealPath());
             });
 

tests/AbstractRepositoryTypeTest.php

@@ -2,6 +2,8 @@
 
 namespace Codedge\Updater\Tests;
 
+use Codedge\Updater\AbstractRepositoryType;
+
 class AbstractRepositoryTypeTest extends TestCase
 {
     /**
@@ -18,6 +20,25 @@ public function testCreateReleaseFolder($storagePath, $releaseName)
         $this->assertFileNotExists($dir, 'Release folder ['.$dir.'] does not exist.');
     }
 
+    public function testFilesAllExcluded()
+    {
+        /** @var AbstractRepositoryType $mock */
+        $mock = $this->getMockBuilder(AbstractRepositoryType::class)->getMock();
+        $mock->method('isDirectoryExcluded')->willReturn(true);
+        $this->assertTrue($mock->isDirectoryExcluded(['a', 'b'], ['a']));
+        $this->assertTrue($mock->isDirectoryExcluded(['a', 'b'], ['a', 'b']));
+        $this->assertTrue($mock->isDirectoryExcluded(['a', 'b'], ['a', 'b', 'c']));
+    }
+
+    public function testFilesNotAllExcluded()
+    {
+        /** @var AbstractRepositoryType $mock */
+        $mock = $this->getMockBuilder(AbstractRepositoryType::class)->getMock();
+        $mock->method('isDirectoryExcluded')->willReturn(false);
+        $this->assertFalse($mock->isDirectoryExcluded(['a', 'b', 'c'], ['c']));
+        $this->assertFalse($mock->isDirectoryExcluded(['a', 'b', 'c'], ['a', 'c']));
+    }
+
     public function pathProvider()
     {
         return [