Merge pull request #38 from brunocfalcao/analysis-jLlR42

Apply fixes from StyleCI
brunocfalcao · Jan 19, 2020 · 5ac53b9 · 5ac53b9
2 parents ce96a2e + 4cd3b46
commit 5ac53b9
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 53 deletions.
diff --git a/routes/api.php b/routes/api.php
@@ -1,13 +1,13 @@
 <?php
 
-use Illuminate\Support\Facades\Route;
-use Brunocfalcao\Larapush\Http\Controllers\PingController;
+use Brunocfalcao\Larapush\Http\Controllers\CheckEnvironmentController;
 use Brunocfalcao\Larapush\Http\Controllers\DeployController;
-use Brunocfalcao\Larapush\Http\Controllers\UploadController;
+use Brunocfalcao\Larapush\Http\Controllers\PingController;
+use Brunocfalcao\Larapush\Http\Controllers\PostScriptsController;
 use Brunocfalcao\Larapush\Http\Controllers\PreChecksController;
 use Brunocfalcao\Larapush\Http\Controllers\PreScriptsController;
-use Brunocfalcao\Larapush\Http\Controllers\PostScriptsController;
-use Brunocfalcao\Larapush\Http\Controllers\CheckEnvironmentController;
+use Brunocfalcao\Larapush\Http\Controllers\UploadController;
+use Illuminate\Support\Facades\Route;
 
 /*
 |--------------------------------------------------------------------------

diff --git a/src/Abstracts/InstallerBootstrap.php b/src/Abstracts/InstallerBootstrap.php
@@ -2,11 +2,11 @@
 
 namespace Brunocfalcao\Larapush\Abstracts;
 
-use Illuminate\Console\Command;
 use Brunocfalcao\Larapush\Concerns\CanRunProcesses;
 use Brunocfalcao\Larapush\Concerns\SharedInstallerActions;
 use Brunocfalcao\Larapush\Concerns\SimplifiesConsoleOutput;
 use Brunocfalcao\Larapush\Concerns\ValidatesConsoleArguments;
+use Illuminate\Console\Command;
 
 /**
  * Parent class used for the installer commands.

diff --git a/src/Abstracts/RemoteBaseController.php b/src/Abstracts/RemoteBaseController.php
@@ -2,8 +2,8 @@
 
 namespace Brunocfalcao\Larapush\Abstracts;
 
-use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\DB;
 
 /**
  * Parent class used for all Remove Controller classes.

diff --git a/src/Commands/InstallLocalCommand.php b/src/Commands/InstallLocalCommand.php
@@ -2,8 +2,8 @@
 
 namespace Brunocfalcao\Larapush\Commands;
 
-use sixlive\DotenvEditor\DotenvEditor;
 use Brunocfalcao\Larapush\Abstracts\InstallerBootstrap;
+use sixlive\DotenvEditor\DotenvEditor;
 
 /**
  * Larapush local computer installation command.

diff --git a/src/Commands/InstallRemoteCommand.php b/src/Commands/InstallRemoteCommand.php
@@ -2,9 +2,9 @@
 
 namespace Brunocfalcao\Larapush\Commands;
 
+use Brunocfalcao\Larapush\Abstracts\InstallerBootstrap;
 use Illuminate\Support\Facades\DB;
 use sixlive\DotenvEditor\DotenvEditor;
-use Brunocfalcao\Larapush\Abstracts\InstallerBootstrap;
 
 /**
  * Larapush web server installation command.

diff --git a/src/Commands/PushCommand.php b/src/Commands/PushCommand.php
@@ -2,10 +2,10 @@
 
 namespace Brunocfalcao\Larapush\Commands;
 
-use Brunocfalcao\Larapush\Services\Local;
 use Brunocfalcao\Larapush\Abstracts\InstallerBootstrap;
-use Brunocfalcao\Larapush\Utilities\CodebaseRepository;
 use Brunocfalcao\Larapush\Concerns\SimplifiesConsoleOutput;
+use Brunocfalcao\Larapush\Services\Local;
+use Brunocfalcao\Larapush\Utilities\CodebaseRepository;
 
 /**
  * Larapush push command.

diff --git a/src/Concerns/CanRunProcesses.php b/src/Concerns/CanRunProcesses.php
@@ -2,8 +2,8 @@
 
 namespace Brunocfalcao\Larapush\Concerns;
 
-use Symfony\Component\Process\Process;
 use Symfony\Component\Process\Exception\RuntimeException;
+use Symfony\Component\Process\Process;
 
 /**
  * Trait used to allow process to be executed.

diff --git a/src/Concerns/SharedInstallerActions.php b/src/Concerns/SharedInstallerActions.php
@@ -2,8 +2,8 @@
 
 namespace Brunocfalcao\Larapush\Concerns;
 
-use sixlive\DotenvEditor\DotenvEditor;
 use Illuminate\Support\Facades\Artisan;
+use sixlive\DotenvEditor\DotenvEditor;
 
 /**
  * Trait used to share common functionality between the installer commands.

diff --git a/src/Http/Controllers/CheckEnvironmentController.php b/src/Http/Controllers/CheckEnvironmentController.php
@@ -2,9 +2,9 @@
 
 namespace Brunocfalcao\Larapush\Http\Controllers;
 
+use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
-use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
 
 /**
  * Controller that checks if this is a reserved environment.

diff --git a/src/Http/Controllers/DeployController.php b/src/Http/Controllers/DeployController.php
@@ -2,10 +2,10 @@
 
 namespace Brunocfalcao\Larapush\Http\Controllers;
 
+use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
+use Brunocfalcao\Larapush\Services\Remote;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
-use Brunocfalcao\Larapush\Services\Remote;
-use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
 
 /**
  * Controller that deploys the codebase on your web server.

diff --git a/src/Http/Controllers/PostScriptsController.php b/src/Http/Controllers/PostScriptsController.php
@@ -2,10 +2,10 @@
 
 namespace Brunocfalcao\Larapush\Http\Controllers;
 
+use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
+use Brunocfalcao\Larapush\Services\Remote;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
-use Brunocfalcao\Larapush\Services\Remote;
-use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
 
 /**
  * Controller that executes your scripts after a successful deployment.

diff --git a/src/Http/Controllers/PreChecksController.php b/src/Http/Controllers/PreChecksController.php
@@ -2,8 +2,8 @@
 
 namespace Brunocfalcao\Larapush\Http\Controllers;
 
-use Brunocfalcao\Larapush\Services\Remote;
 use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
+use Brunocfalcao\Larapush\Services\Remote;
 
 /**
  * Controller that executes the necessary pre-checks before starting to

diff --git a/src/Http/Controllers/PreScriptsController.php b/src/Http/Controllers/PreScriptsController.php
@@ -2,10 +2,10 @@
 
 namespace Brunocfalcao\Larapush\Http\Controllers;
 
+use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
+use Brunocfalcao\Larapush\Services\Remote;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
-use Brunocfalcao\Larapush\Services\Remote;
-use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
 
 /**
  * Controller that executes your scripts before a successful deployment.

diff --git a/src/Http/Controllers/UploadController.php b/src/Http/Controllers/UploadController.php
@@ -2,11 +2,11 @@
 
 namespace Brunocfalcao\Larapush\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
+use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
 use Brunocfalcao\Larapush\Services\Remote;
 use Brunocfalcao\Larapush\Utilities\CodebaseRepository;
-use Brunocfalcao\Larapush\Abstracts\RemoteBaseController;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 
 /**
  * Controller that receives your codebase and scripts to run.

diff --git a/src/LarapushServiceProvider.php b/src/LarapushServiceProvider.php
@@ -2,13 +2,13 @@
 
 namespace Brunocfalcao\Larapush;
 
-use Laravel\Passport\Passport;
-use Illuminate\Support\Facades\Route;
-use Illuminate\Support\ServiceProvider;
-use Brunocfalcao\Larapush\Commands\PushCommand;
 use Brunocfalcao\Larapush\Commands\InstallLocalCommand;
 use Brunocfalcao\Larapush\Commands\InstallRemoteCommand;
+use Brunocfalcao\Larapush\Commands\PushCommand;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
 use Laravel\Passport\Http\Middleware\CheckClientCredentials;
+use Laravel\Passport\Passport;
 
 /**
  * Class that bootstraps Larapush service provider.

diff --git a/src/Services/LocalOperation.php b/src/Services/LocalOperation.php
@@ -2,11 +2,11 @@
 
 namespace Brunocfalcao\Larapush\Services;
 
-use Brunocfalcao\Larapush\Utilities\ReSTCaller;
-use Brunocfalcao\Larapush\Structures\AccessToken;
+use Brunocfalcao\Larapush\Exceptions\AccessTokenException;
 use Brunocfalcao\Larapush\Exceptions\LocalException;
+use Brunocfalcao\Larapush\Structures\AccessToken;
 use Brunocfalcao\Larapush\Structures\ResponsePayload;
-use Brunocfalcao\Larapush\Exceptions\AccessTokenException;
+use Brunocfalcao\Larapush\Utilities\ReSTCaller;
 
 /**
  * Class that executes all operations contexted in your local web
@@ -39,7 +39,7 @@ public function askRemoteToCheckEnvironment()
         return (bool) $response->payload()['prompt'];
     }
 
-    public function runPostScripts(string $transaction) : void
+    public function runPostScripts(string $transaction): void
     {
         $response = ReSTCaller::asPost()
                       ->withHeader('Authorization', 'Bearer '.$this->accessToken->token())
@@ -51,7 +51,7 @@ public function runPostScripts(string $transaction) : void
         $this->checkResponseStatus($response);
     }
 
-    public function deploy(string $transaction) : void
+    public function deploy(string $transaction): void
     {
         $response = ReSTCaller::asPost()
                       ->withHeader('Authorization', 'Bearer '.$this->accessToken->token())
@@ -63,7 +63,7 @@ public function deploy(string $transaction) : void
         $this->checkResponseStatus($response);
     }
 
-    public function runPreScripts(string $transaction) : void
+    public function runPreScripts(string $transaction): void
     {
         $response = ReSTCaller::asPost()
                       ->withHeader('Authorization', 'Bearer '.$this->accessToken->token())
@@ -75,7 +75,7 @@ public function runPreScripts(string $transaction) : void
         $this->checkResponseStatus($response);
     }
 
-    public function uploadCodebase(string $transaction) : void
+    public function uploadCodebase(string $transaction): void
     {
         $response = ReSTCaller::asPost()
                       ->withHeader('Authorization', 'Bearer '.$this->accessToken->token())
@@ -89,7 +89,7 @@ public function uploadCodebase(string $transaction) : void
         $this->checkResponseStatus($response);
     }
 
-    public function preChecks() : void
+    public function preChecks(): void
     {
         $storagePath = app('config')->get('larapush.storage.path');
         if (! is_dir($storagePath)) {
@@ -122,7 +122,7 @@ public function getAccessToken()
         return $this;
     }
 
-    public function askRemoteForPreChecks() : void
+    public function askRemoteForPreChecks(): void
     {
         $response = ReSTCaller::asPost()
                   ->withHeader('Authorization', 'Bearer '.$this->accessToken->token())
@@ -133,7 +133,7 @@ public function askRemoteForPreChecks() : void
         $this->checkResponseStatus($response);
     }
 
-    public function ping() : void
+    public function ping(): void
     {
         $response = ReSTCaller::asPost()
                   ->withHeader('Authorization', 'Bearer '.$this->accessToken->token())

diff --git a/src/Services/RemoteOperation.php b/src/Services/RemoteOperation.php
@@ -2,12 +2,12 @@
 
 namespace Brunocfalcao\Larapush\Services;
 
-use PhpZip\ZipFile;
-use Illuminate\Support\Facades\Storage;
-use Brunocfalcao\Larapush\Utilities\Script;
 use Brunocfalcao\Larapush\Concerns\CanRunProcesses;
 use Brunocfalcao\Larapush\Exceptions\RemoteException;
 use Brunocfalcao\Larapush\Utilities\CodebaseRepository;
+use Brunocfalcao\Larapush\Utilities\Script;
+use Illuminate\Support\Facades\Storage;
+use PhpZip\ZipFile;
 
 /**
  * Class that executes all operations contexted in your web server.

diff --git a/src/Structures/ZipResource.php b/src/Structures/ZipResource.php
@@ -2,8 +2,8 @@
 
 namespace Brunocfalcao\Larapush\Structures;
 
-use PhpZip\Model\ZipInfo;
 use Illuminate\Support\Str;
+use PhpZip\Model\ZipInfo;
 
 /**
  * Class that stores a Zip resource to be later on added to the zip file.

diff --git a/src/Utilities/CodebaseRepository.php b/src/Utilities/CodebaseRepository.php
@@ -2,11 +2,11 @@
 
 namespace Brunocfalcao\Larapush\Utilities;
 
-use PhpZip\ZipFile;
-use Illuminate\Support\Facades\Storage;
-use Brunocfalcao\Larapush\Structures\ZipResource;
-use Brunocfalcao\Larapush\Structures\FileResource;
 use Brunocfalcao\Larapush\Exceptions\LocalException;
+use Brunocfalcao\Larapush\Structures\FileResource;
+use Brunocfalcao\Larapush\Structures\ZipResource;
+use Illuminate\Support\Facades\Storage;
+use PhpZip\ZipFile;
 
 /**
  * Class that stores a codebase repository structure.
@@ -80,7 +80,7 @@ private function getFileResources(array $relativePaths = [])
         return $files;
     }
 
-    public function createRepository(string $transaction) : void
+    public function createRepository(string $transaction): void
     {
         if (count(app('config')->get('larapush.codebase')) === 0) {
             throw new LocalException('No files or folders identified to upload. Please check your configuration file');
@@ -162,7 +162,7 @@ public function createRepository(string $transaction) : void
         }
     }
 
-    public function createCodebaseZip(string $fqfilename, array $glob) : void
+    public function createCodebaseZip(string $fqfilename, array $glob): void
     {
         $zipFile = new ZipFile;
 

diff --git a/src/Utilities/RequestPayload.php b/src/Utilities/RequestPayload.php
@@ -2,10 +2,10 @@
 
 namespace Brunocfalcao\Larapush\Utilities;
 
-use Zttp\Zttp;
-use Zttp\ConnectionException;
-use GuzzleHttp\Exception\RequestException;
 use Brunocfalcao\Larapush\Structures\ResponsePayload;
+use GuzzleHttp\Exception\RequestException;
+use Zttp\ConnectionException;
+use Zttp\Zttp;
 
 /**
  * Class that will store a request payload.

diff --git a/src/Utilities/Script.php b/src/Utilities/Script.php
@@ -2,9 +2,9 @@
 
 namespace Brunocfalcao\Larapush\Utilities;
 
+use Brunocfalcao\Larapush\Concerns\CanRunProcesses;
 use Exception;
 use Illuminate\Support\Facades\Artisan;
-use Brunocfalcao\Larapush\Concerns\CanRunProcesses;
 
 /**
  * Class that executes scripts in the web server.

diff --git a/src/helpers.php b/src/helpers.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Carbon;
 use Brunocfalcao\Larapush\Structures\ResponsePayload;
+use Illuminate\Support\Carbon;
 
 if (! function_exists('ascii_title')) {
     function ascii_title()