Skip to content

Commit 8ee7976

Browse files
codedgecodedge
authored
Merge pull request #73 from codedge/#69-fix-count-error
Resolve #69
2 parents ab8fcf2 + 65ab58a commit 8ee7976

File tree

7 files changed

+73
-36
lines changed

7 files changed

+73
-36
lines changed

‎src/AbstractRepositoryType.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
namespace Codedge\Updater;
66

77
use Codedge\Updater\Events\HasWrongPermissions;
8-
use File;
98
use GuzzleHttp\Client;
9+
use Illuminate\Support\Facades\File;
1010
use Symfony\Component\Finder\Finder;
1111

1212
/**
@@ -45,7 +45,7 @@ abstract class AbstractRepositoryType
4545
*
4646
* @return bool
4747
*/
48-
protected function unzipArchive($file = '', $targetDir = '', $deleteZipArchive = true) : bool
48+
protected function unzipArchive($file = '', $targetDir = '', $deleteZipArchive = true): bool
4949
{
5050
if (empty($file) || ! File::exists($file)) {
5151
throw new \InvalidArgumentException("Archive [{$file}] cannot be found or is empty.");
@@ -80,7 +80,7 @@ protected function unzipArchive($file = '', $targetDir = '', $deleteZipArchive =
8080
*
8181
* @return bool
8282
*/
83-
protected function hasCorrectPermissionForUpdate() : bool
83+
protected function hasCorrectPermissionForUpdate(): bool
8484
{
8585
if (! $this->pathToUpdate) {
8686
throw new \Exception('No directory set for update. Please set the update with: setPathToUpdate(path).');
@@ -133,7 +133,7 @@ protected function downloadRelease(Client $client, $source, $storagePath)
133133
*
134134
* @return bool
135135
*/
136-
protected function isSourceAlreadyFetched($version) : bool
136+
protected function isSourceAlreadyFetched($version): bool
137137
{
138138
$storagePath = $this->config['download_path'].'/'.$version;
139139
if (! File::exists($storagePath) || empty(File::directories($storagePath))
@@ -217,4 +217,17 @@ public function hasAccessToken(): bool
217217
{
218218
return ! empty($this->accessToken);
219219
}
220+
221+
/**
222+
* Check if files in one array (i. e. directory) are also exist in a second one.
223+
*
224+
* @param array $directory
225+
* @param array $excludedDirs
226+
*
227+
* @return bool
228+
*/
229+
public function isDirectoryExcluded(array $directory, array $excludedDirs): bool
230+
{
231+
return count(array_intersect($directory, $excludedDirs)) ? true : false;
232+
}
220233
}

‎src/Contracts/SourceRepositoryTypeContract.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function fetch($version = '');
1818
*
1919
* @return bool
2020
*/
21-
public function update() : bool;
21+
public function update(): bool;
2222

2323
/**
2424
* Check repository if a newer version than the installed one is available.
@@ -29,7 +29,7 @@ public function update() : bool;
2929
*
3030
* @return bool
3131
*/
32-
public function isNewVersionAvailable($currentVersion = '') : bool;
32+
public function isNewVersionAvailable($currentVersion = ''): bool;
3333

3434
/**
3535
* Get the version that is currenly installed.
@@ -40,7 +40,7 @@ public function isNewVersionAvailable($currentVersion = '') : bool;
4040
*
4141
* @return string
4242
*/
43-
public function getVersionInstalled($prepend = '', $append = '') : string;
43+
public function getVersionInstalled($prepend = '', $append = ''): string;
4444

4545
/**
4646
* Get the latest version that has been published in a certain repository.
@@ -51,5 +51,5 @@ public function getVersionInstalled($prepend = '', $append = '') : string;
5151
*
5252
* @return string
5353
*/
54-
public function getVersionAvailable($prepend = '', $append = '') : string;
54+
public function getVersionAvailable($prepend = '', $append = ''): string;
5555
}

‎src/SourceRepository.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function fetch($version = '')
5050
*
5151
* @return bool
5252
*/
53-
public function update($version = '', $forceFetching = true) : bool
53+
public function update($version = '', $forceFetching = true): bool
5454
{
5555
$version = $version ?: $this->getVersionAvailable();
5656

@@ -72,7 +72,7 @@ public function update($version = '', $forceFetching = true) : bool
7272
*
7373
* @return bool
7474
*/
75-
public function isNewVersionAvailable($currentVersion = '') : bool
75+
public function isNewVersionAvailable($currentVersion = ''): bool
7676
{
7777
return $this->sourceRepository->isNewVersionAvailable($currentVersion);
7878
}
@@ -86,7 +86,7 @@ public function isNewVersionAvailable($currentVersion = '') : bool
8686
*
8787
* @return string
8888
*/
89-
public function getVersionInstalled($prepend = '', $append = '') : string
89+
public function getVersionInstalled($prepend = '', $append = ''): string
9090
{
9191
return $this->sourceRepository->getVersionInstalled($prepend, $append);
9292
}
@@ -100,7 +100,7 @@ public function getVersionInstalled($prepend = '', $append = '') : string
100100
*
101101
* @return string
102102
*/
103-
public function getVersionAvailable($prepend = '', $append = '') : string
103+
public function getVersionAvailable($prepend = '', $append = ''): string
104104
{
105105
return $this->sourceRepository->getVersionAvailable($prepend, $append);
106106
}

‎src/SourceRepositoryTypes/GithubRepositoryType.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
use Codedge\Updater\Events\UpdateAvailable;
1010
use Codedge\Updater\Events\UpdateFailed;
1111
use Codedge\Updater\Events\UpdateSucceeded;
12-
use File;
1312
use GuzzleHttp\Client;
13+
use Illuminate\Support\Facades\File;
1414
use Storage;
1515
use Symfony\Component\Finder\Finder;
1616

@@ -56,7 +56,7 @@ public function __construct(Client $client, array $config)
5656
*
5757
* @return bool
5858
*/
59-
public function isNewVersionAvailable($currentVersion = '') : bool
59+
public function isNewVersionAvailable($currentVersion = ''): bool
6060
{
6161
$version = $currentVersion ?: $this->getVersionInstalled();
6262

@@ -124,7 +124,7 @@ public function fetch($version = '')
124124
*
125125
* @return bool
126126
*/
127-
public function update($version = '') : bool
127+
public function update($version = ''): bool
128128
{
129129
$this->setPathToUpdate(base_path(), $this->config['exclude_folders']);
130130

@@ -138,15 +138,16 @@ public function update($version = '') : bool
138138
// Move all directories first
139139
collect((new Finder())->in($sourcePath)->exclude($this->config['exclude_folders'])->directories()->sort(function ($a, $b) {
140140
return strlen($b->getRealpath()) - strlen($a->getRealpath());
141-
}))->each(function ($directory) { /** @var \SplFileInfo $directory */
142-
if (count(array_intersect(File::directories(
143-
$directory->getRealPath()), $this->config['exclude_folders']) == 0)
141+
}))->each(function (/** @var \SplFileInfo $directory */ $directory) {
142+
if (! $this->isDirectoryExcluded(
143+
File::directories($directory->getRealPath()), $this->config['exclude_folders'])
144144
) {
145145
File::copyDirectory(
146146
$directory->getRealPath(),
147147
base_path($directory->getRelativePath()).'/'.$directory->getBasename()
148148
);
149149
}
150+
150151
File::deleteDirectory($directory->getRealPath());
151152
});
152153

@@ -178,7 +179,7 @@ public function update($version = '') : bool
178179
*
179180
* @return string
180181
*/
181-
public function getVersionInstalled($prepend = '', $append = '') : string
182+
public function getVersionInstalled($prepend = '', $append = ''): string
182183
{
183184
return $prepend.$this->config['version_installed'].$append;
184185
}
@@ -192,7 +193,7 @@ public function getVersionInstalled($prepend = '', $append = '') : string
192193
*
193194
* @return string
194195
*/
195-
public function getVersionAvailable($prepend = '', $append = '') : string
196+
public function getVersionAvailable($prepend = '', $append = ''): string
196197
{
197198
if ($this->versionFileExists()) {
198199
$version = $prepend.$this->getVersionFile().$append;
@@ -240,7 +241,7 @@ protected function getRepositoryReleases()
240241
*
241242
* @return bool
242243
*/
243-
protected function versionFileExists() : bool
244+
protected function versionFileExists(): bool
244245
{
245246
return Storage::exists(static::NEW_VERSION_FILE);
246247
}
@@ -252,7 +253,7 @@ protected function versionFileExists() : bool
252253
*
253254
* @return bool
254255
*/
255-
protected function setVersionFile(string $content) : bool
256+
protected function setVersionFile(string $content): bool
256257
{
257258
return Storage::put(static::NEW_VERSION_FILE, $content);
258259
}
@@ -262,7 +263,7 @@ protected function setVersionFile(string $content) : bool
262263
*
263264
* @return string
264265
*/
265-
protected function getVersionFile() : string
266+
protected function getVersionFile(): string
266267
{
267268
return Storage::get(static::NEW_VERSION_FILE);
268269
}
@@ -272,7 +273,7 @@ protected function getVersionFile() : string
272273
*
273274
* @return bool
274275
*/
275-
protected function deleteVersionFile() : bool
276+
protected function deleteVersionFile(): bool
276277
{
277278
return Storage::delete(static::NEW_VERSION_FILE);
278279
}

‎src/SourceRepositoryTypes/HttpRepositoryType.php

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use Codedge\Updater\Events\UpdateAvailable;
1010
use Codedge\Updater\Events\UpdateFailed;
1111
use Codedge\Updater\Events\UpdateSucceeded;
12-
use File;
1312
use GuzzleHttp\Client;
1413
use Illuminate\Database\Eloquent\Collection;
14+
use Illuminate\Support\Facades\File;
1515
use Psr\Http\Message\ResponseInterface;
1616
use Storage;
1717
use Symfony\Component\Finder\Finder;
@@ -70,7 +70,7 @@ public function __construct(Client $client, array $config)
7070
*
7171
* @return bool
7272
*/
73-
public function isNewVersionAvailable($currentVersion = '') : bool
73+
public function isNewVersionAvailable($currentVersion = ''): bool
7474
{
7575
$version = $currentVersion ?: $this->getVersionInstalled();
7676

@@ -139,7 +139,7 @@ public function fetch($version = '')
139139
*
140140
* @return bool
141141
*/
142-
public function update($version = '') : bool
142+
public function update($version = ''): bool
143143
{
144144
$this->setPathToUpdate(base_path(), $this->config['exclude_folders']);
145145

@@ -153,13 +153,15 @@ public function update($version = '') : bool
153153
collect((new Finder())->in($sourcePath)->exclude($this->config['exclude_folders'])->directories()->sort(function ($a, $b) {
154154
return strlen($b->getRealpath()) - strlen($a->getRealpath());
155155
}))->each(function ($directory) { /** @var \SplFileInfo $directory */
156-
if (count(array_intersect(File::directories(
157-
$directory->getRealPath()), $this->config['exclude_folders'])) == 0) {
156+
if (! $this->isDirectoryExcluded(
157+
File::directories($directory->getRealPath()), $this->config['exclude_folders'])
158+
) {
158159
File::copyDirectory(
159160
$directory->getRealPath(),
160161
base_path($directory->getRelativePath()).'/'.$directory->getBasename()
161162
);
162163
}
164+
163165
File::deleteDirectory($directory->getRealPath());
164166
});
165167

@@ -189,7 +191,7 @@ public function update($version = '') : bool
189191
*
190192
* @return string
191193
*/
192-
public function getVersionInstalled($prepend = '', $append = '') : string
194+
public function getVersionInstalled($prepend = '', $append = ''): string
193195
{
194196
return $this->config['version_installed'];
195197
}
@@ -205,7 +207,7 @@ public function getVersionInstalled($prepend = '', $append = '') : string
205207
*
206208
* @return string
207209
*/
208-
public function getVersionAvailable($prepend = '', $append = '') : string
210+
public function getVersionAvailable($prepend = '', $append = ''): string
209211
{
210212
$version = '';
211213
if ($this->versionFileExists()) {
@@ -264,7 +266,7 @@ protected function getPackageReleases()
264266
*
265267
* @return bool
266268
*/
267-
protected function versionFileExists() : bool
269+
protected function versionFileExists(): bool
268270
{
269271
return Storage::exists(static::NEW_VERSION_FILE);
270272
}
@@ -276,7 +278,7 @@ protected function versionFileExists() : bool
276278
*
277279
* @return bool
278280
*/
279-
protected function setVersionFile(string $content) : bool
281+
protected function setVersionFile(string $content): bool
280282
{
281283
return Storage::put(static::NEW_VERSION_FILE, $content);
282284
}
@@ -286,7 +288,7 @@ protected function setVersionFile(string $content) : bool
286288
*
287289
* @return string
288290
*/
289-
protected function getVersionFile() : string
291+
protected function getVersionFile(): string
290292
{
291293
return Storage::get(static::NEW_VERSION_FILE);
292294
}
@@ -296,7 +298,7 @@ protected function getVersionFile() : string
296298
*
297299
* @return bool
298300
*/
299-
protected function deleteVersionFile() : bool
301+
protected function deleteVersionFile(): bool
300302
{
301303
return Storage::delete(static::NEW_VERSION_FILE);
302304
}

‎src/UpdaterManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(Application $app)
5353
*
5454
* @return SourceRepository
5555
*/
56-
public function source($name = '') : SourceRepository
56+
public function source($name = ''): SourceRepository
5757
{
5858
$name = $name ?: $this->getDefaultSourceRepository();
5959

‎tests/AbstractRepositoryTypeTest.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Codedge\Updater\Tests;
44

5+
use Codedge\Updater\AbstractRepositoryType;
6+
57
class AbstractRepositoryTypeTest extends TestCase
68
{
79
/**
@@ -18,6 +20,25 @@ public function testCreateReleaseFolder($storagePath, $releaseName)
1820
$this->assertFileNotExists($dir, 'Release folder ['.$dir.'] does not exist.');
1921
}
2022

23+
public function testFilesAllExcluded()
24+
{
25+
/** @var AbstractRepositoryType $mock */
26+
$mock = $this->getMockBuilder(AbstractRepositoryType::class)->getMock();
27+
$mock->method('isDirectoryExcluded')->willReturn(true);
28+
$this->assertTrue($mock->isDirectoryExcluded(['a', 'b'], ['a']));
29+
$this->assertTrue($mock->isDirectoryExcluded(['a', 'b'], ['a', 'b']));
30+
$this->assertTrue($mock->isDirectoryExcluded(['a', 'b'], ['a', 'b', 'c']));
31+
}
32+
33+
public function testFilesNotAllExcluded()
34+
{
35+
/** @var AbstractRepositoryType $mock */
36+
$mock = $this->getMockBuilder(AbstractRepositoryType::class)->getMock();
37+
$mock->method('isDirectoryExcluded')->willReturn(false);
38+
$this->assertFalse($mock->isDirectoryExcluded(['a', 'b', 'c'], ['c']));
39+
$this->assertFalse($mock->isDirectoryExcluded(['a', 'b', 'c'], ['a', 'c']));
40+
}
41+
2142
public function pathProvider()
2243
{
2344
return [

0 commit comments

Comments
 (0)