Apply fixes from StyleCI (#348)

codedge · web-flow · commit 3500180c0486 · 2022-04-27T23:40:53.000+02:00
diff --git a/src/Contracts/SourceRepositoryTypeContract.php b/src/Contracts/SourceRepositoryTypeContract.php
@@ -5,7 +5,6 @@
 namespace Codedge\Updater\Contracts;
 
 use Codedge\Updater\Models\Release;
-use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Http\Client\Response;
 
 interface SourceRepositoryTypeContract
diff --git a/src/Models/Release.php b/src/Models/Release.php
@@ -6,12 +6,10 @@
 
 use Codedge\Updater\Traits\SupportPrivateAccessToken;
 use Exception;
-use GuzzleHttp\ClientInterface;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
-use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\Finder\Finder;
 
 final class Release
@@ -195,8 +193,7 @@ public function download(): Response
                    ->withOptions([
                        'sink' => $this->getStoragePath(),
                    ])
-                   ->get($this->getDownloadUrl())
-        ;
+                   ->get($this->getDownloadUrl());
     }
 
     /**
diff --git a/src/SourceRepositoryTypes/GithubRepositoryTypes/GithubBranchType.php b/src/SourceRepositoryTypes/GithubRepositoryTypes/GithubBranchType.php
@@ -17,7 +17,6 @@
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
-use Psr\Http\Message\ResponseInterface;
 
 final class GithubBranchType extends GithubRepositoryType implements SourceRepositoryTypeContract
 {
diff --git a/src/SourceRepositoryTypes/GitlabRepositoryType.php b/src/SourceRepositoryTypes/GitlabRepositoryType.php
@@ -16,10 +16,9 @@
 use GuzzleHttp\Utils;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
-use Psr\Http\Message\ResponseInterface;
-use Illuminate\Support\Facades\Http;
 
 class GitlabRepositoryType implements SourceRepositoryTypeContract
 {
@@ -38,8 +37,7 @@ public function __construct(UpdateExecutor $updateExecutor)
         $this->release = resolve(Release::class);
         $this->release->setStoragePath(Str::finish($this->config['download_path'], DIRECTORY_SEPARATOR))
                       ->setUpdatePath(base_path(), config('self-update.exclude_folders'))
-                      ->setAccessToken($this->config['private_access_token'])
-        ;
+                      ->setAccessToken($this->config['private_access_token']);
 
         $this->updateExecutor = $updateExecutor;
     }
diff --git a/src/SourceRepositoryTypes/HttpRepositoryType.php b/src/SourceRepositoryTypes/HttpRepositoryType.php
@@ -10,7 +10,6 @@
 use Codedge\Updater\Exceptions\VersionException;
 use Codedge\Updater\Models\Release;
 use Codedge\Updater\Models\UpdateExecutor;
-use Codedge\Updater\Traits\SupportPrivateAccessToken;
 use Codedge\Updater\Traits\UseVersionFile;
 use Exception;
 use GuzzleHttp\ClientInterface;
@@ -21,7 +20,6 @@
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
-use Psr\Http\Message\ResponseInterface;
 
 class HttpRepositoryType implements SourceRepositoryTypeContract
 {
diff --git a/src/UpdaterServiceProvider.php b/src/UpdaterServiceProvider.php
@@ -5,18 +5,9 @@
 namespace Codedge\Updater;
 
 use Codedge\Updater\Commands\CheckForUpdate;
-use Codedge\Updater\Contracts\SourceRepositoryTypeContract;
-use Codedge\Updater\Models\Release;
 use Codedge\Updater\Models\UpdateExecutor;
 use Codedge\Updater\Notifications\EventHandler;
 use Codedge\Updater\SourceRepositoryTypes\GithubRepositoryType;
-use Codedge\Updater\SourceRepositoryTypes\GithubRepositoryTypes\GithubBranchType;
-use Codedge\Updater\SourceRepositoryTypes\GithubRepositoryTypes\GithubTagType;
-use Codedge\Updater\SourceRepositoryTypes\GitlabRepositoryType;
-use Codedge\Updater\SourceRepositoryTypes\HttpRepositoryType;
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
-use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\ServiceProvider;
 
 class UpdaterServiceProvider extends ServiceProvider
diff --git a/tests/Commands/CheckUpdateTest.php b/tests/Commands/CheckUpdateTest.php
@@ -8,7 +8,6 @@
 use Codedge\Updater\SourceRepositoryTypes\GithubRepositoryType;
 use Codedge\Updater\SourceRepositoryTypes\GithubRepositoryTypes\GithubTagType;
 use Codedge\Updater\Tests\TestCase;
-use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Http;
 
 final class CheckUpdateTest extends TestCase
@@ -24,8 +23,7 @@ public function it_can_run_check_update_command_without_new_version_available():
     {
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('tag'))
-            ->pushResponse($this->getResponse200ZipFile())
-        ;
+            ->pushResponse($this->getResponse200ZipFile());
 
         /** @var GithubTagType $github */
         $github = (resolve(GithubRepositoryType::class))->create();
diff --git a/tests/Models/ReleaseTest.php b/tests/Models/ReleaseTest.php
@@ -164,7 +164,7 @@ public function it_can_download(): void
                       ->updateStoragePath();
 
         Http::fake([
-           'https://github.com/*' => $this->getResponse200Type('tag')
+            'https://github.com/*' => $this->getResponse200Type('tag'),
         ]);
 
         $response = $this->release->download();
diff --git a/tests/SourceRepositoryTypes/GithubRepositoryTypeTest.php b/tests/SourceRepositoryTypes/GithubRepositoryTypeTest.php
@@ -13,7 +13,6 @@
 use Codedge\Updater\SourceRepositoryTypes\GithubRepositoryTypes\GithubTagType;
 use Codedge\Updater\Tests\TestCase;
 use Exception;
-use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Http;
 
@@ -154,7 +153,7 @@ public function it_can_get_new_version_available_from_type_branch_without_versio
         $github->deleteVersionFile();
 
         Http::fake([
-           '*' => $this->getResponse200Type('branch')
+            '*' => $this->getResponse200Type('branch'),
         ]);
 
         $this->assertFalse($github->isNewVersionAvailable('2020-02-08T21:09:15Z'));
@@ -182,8 +181,7 @@ public function it_can_fetch_github_tag_releases_latest(): void
 
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('tag'))
-            ->pushResponse($this->getResponse200ZipFile())
-        ;
+            ->pushResponse($this->getResponse200ZipFile());
 
         $release = $github->fetch();
 
@@ -200,9 +198,7 @@ public function it_can_fetch_github_tag_releases_specific_version(): void
 
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('tag'))
-            ->pushResponse($this->getResponse200ZipFile())
-        ;
-
+            ->pushResponse($this->getResponse200ZipFile());
 
         $release = $github->fetch('2.6.0');
 
@@ -219,8 +215,7 @@ public function it_can_fetch_github_tag_releases_and_takes_latest_if_version_not
 
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('tag'))
-            ->pushResponse($this->getResponse200ZipFile())
-        ;
+            ->pushResponse($this->getResponse200ZipFile());
 
         $release = $github->fetch('v3.22.1');
 
@@ -239,8 +234,7 @@ public function it_can_fetch_github_branch_releases_latest(): void
 
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('branch'))
-            ->pushResponse($this->getResponse200ZipFile())
-        ;
+            ->pushResponse($this->getResponse200ZipFile());
 
         $release = $github->fetch();
 
@@ -259,8 +253,7 @@ public function it_can_fetch_github_branch_releases_specific_version(): void
 
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('branch'))
-            ->pushResponse($this->getResponse200ZipFile())
-        ;
+            ->pushResponse($this->getResponse200ZipFile());
 
         $release = $github->fetch('2020-02-06T09:35:51Z');
 
@@ -279,8 +272,7 @@ public function it_can_fetch_github_branch_releases_and_takes_latest_if_version_
 
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('branch'))
-            ->pushResponse($this->getResponse200ZipFile())
-        ;
+            ->pushResponse($this->getResponse200ZipFile());
 
         $release = $github->fetch('2020-01-01T11:11:11Z');
 
@@ -298,7 +290,7 @@ public function it_cannot_fetch_github_branch_releases_if_response_empty(): void
         $github = (resolve(GithubRepositoryType::class))->create();
 
         Http::fake([
-            '*' => $this->getResponseEmpty()
+            '*' => $this->getResponseEmpty(),
         ]);
 
         $this->expectException(Exception::class);
diff --git a/tests/SourceRepositoryTypes/GitlabRepositoryTypeTest.php b/tests/SourceRepositoryTypes/GitlabRepositoryTypeTest.php
@@ -11,8 +11,6 @@
 use Codedge\Updater\Models\Release;
 use Codedge\Updater\SourceRepositoryTypes\GitlabRepositoryType;
 use Codedge\Updater\Tests\TestCase;
-use Exception;
-use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
@@ -43,8 +41,7 @@ public function it_can_run_update(): void
                 ->setVersion('1.0')
                 ->setRelease('release-1.0.zip')
                 ->updateStoragePath()
-                ->setDownloadUrl('https://gitlab.com/download/target')
-        ;
+                ->setDownloadUrl('https://gitlab.com/download/target');
 
         Event::fake();
         Http::fake([
@@ -92,7 +89,7 @@ public function it_can_get_new_version_available_without_version_file(): void
 
         Event::fake();
         Http::fake([
-            '*' => $this->getResponse200Type('gitlab')
+            '*' => $this->getResponse200Type('gitlab'),
         ]);
 
         $this->assertFalse($gitlab->isNewVersionAvailable('2.7'));
@@ -113,8 +110,7 @@ public function it_cannot_fetch_releases_because_there_is_no_release(): void
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('gitlab'))
             ->pushResponse($this->getResponseEmpty())
-            ->pushResponse($this->getResponseEmpty())
-        ;
+            ->pushResponse($this->getResponseEmpty());
 
         $this->assertInstanceOf(Release::class, $gitlab->fetch());
 
@@ -133,8 +129,7 @@ public function it_can_fetch_releases(): void
         Http::fakeSequence()
             ->pushResponse($this->getResponse200Type('gitlab'))
             ->pushResponse($this->getResponse200ZipFile())
-            ->pushResponse($this->getResponse200Type('gitlab'))
-        ;
+            ->pushResponse($this->getResponse200Type('gitlab'));
 
         $release = $gitlab->fetch();
 
diff --git a/tests/SourceRepositoryTypes/HttpRepositoryTypeTest.php b/tests/SourceRepositoryTypes/HttpRepositoryTypeTest.php
@@ -9,7 +9,6 @@
 use Codedge\Updater\SourceRepositoryTypes\HttpRepositoryType;
 use Codedge\Updater\Tests\TestCase;
 use Exception;
-use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Http;
 
 final class HttpRepositoryTypeTest extends TestCase
@@ -67,8 +66,7 @@ public function it_cannot_fetch_releases_because_there_is_no_release(): void
 
         Http::fakeSequence()
             ->pushResponse($this->getResponse200HttpType())
-            ->pushResponse($this->getResponse200ZipFile())
-        ;
+            ->pushResponse($this->getResponse200ZipFile());
 
         $this->assertInstanceOf(Release::class, $http->fetch());
 
@@ -86,8 +84,7 @@ public function it_can_fetch_http_releases(): void
             ->pushResponse($this->getResponse200HttpType())
             ->pushResponse($this->getResponse200ZipFile())
             ->pushResponse($this->getResponse200HttpType())
-            ->pushResponse($this->getResponse200HttpType())
-        ;
+            ->pushResponse($this->getResponse200HttpType());
 
         $release = $http->fetch();
 
@@ -167,8 +164,7 @@ public function it_can_get_new_version_available_without_version_file(): void
 
         Http::fakeSequence()
             ->pushResponse($this->getResponse200HttpType())
-            ->pushResponse($this->getResponse200HttpType())
-        ;
+            ->pushResponse($this->getResponse200HttpType());
 
         $this->assertTrue($http->isNewVersionAvailable('4.5'));
         $this->assertFalse($http->isNewVersionAvailable('5.0'));
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -62,7 +62,7 @@ protected function getResponse200HttpType(): PromiseInterface
         $response = $stream->getContents();
 
         return Http::response($response, 200, [
-            'Content-Type' => 'application/html'
+            'Content-Type' => 'application/html',
         ]);
     }
 
@@ -72,7 +72,7 @@ protected function getResponse200Type(string $type): PromiseInterface
         $response = json_decode($stream->getContents(), true);
 
         return Http::response($response, 200, [
-            'Content-Type' => 'application/json'
+            'Content-Type' => 'application/json',
         ]);
     }
 
diff --git a/tests/UpdaterManagerTest.php b/tests/UpdaterManagerTest.php
@@ -6,7 +6,6 @@
 
 use Codedge\Updater\SourceRepository;
 use Codedge\Updater\UpdaterManager;
-use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Http;
 use InvalidArgumentException;
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`use Illuminate\Support\Facades\Http;`
`18`	`18`	`use Illuminate\Support\Facades\Log;`
`19`	`19`	`use Illuminate\Support\Str;`
`20`		`-use Psr\Http\Message\ResponseInterface;`
`21`	`20`
`22`	`21`	`final class GithubBranchType extends GithubRepositoryType implements SourceRepositoryTypeContract`
`23`	`22`	`{`