From 8c31a2f43d121b07251e598bb4368b7dbae2a87a Mon Sep 17 00:00:00 2001 From: jerguslejko Date: Thu, 28 May 2020 14:19:24 +0200 Subject: [PATCH] change styling --- src/BuildProcess/CollectSecrets.php | 2 +- src/BuildProcess/CompressApplication.php | 2 +- src/BuildProcess/CompressVendor.php | 2 +- src/BuildProcess/ConfigureArtisan.php | 2 +- src/BuildProcess/ConfigureComposerAutoloader.php | 2 +- src/BuildProcess/CopyApplicationToBuildPath.php | 2 +- src/BuildProcess/ExecuteBuildCommands.php | 2 +- src/BuildProcess/ExtractAssetsToSeparateDirectory.php | 2 +- src/BuildProcess/ExtractVendorToSeparateDirectory.php | 2 +- src/BuildProcess/HarmonizeConfigurationFiles.php | 2 +- src/BuildProcess/InjectErrorPages.php | 2 +- src/BuildProcess/InjectHandlers.php | 2 +- src/BuildProcess/InjectRdsCertificate.php | 2 +- src/BuildProcess/ProcessAssets.php | 2 +- src/BuildProcess/RemoveIgnoredFiles.php | 2 +- src/BuildProcess/SetBuildEnvironment.php | 2 +- src/Commands/Command.php | 4 ---- src/Commands/CommandCommand.php | 2 +- src/Commands/DisplaysDeploymentProgress.php | 2 +- src/Commands/DownCommand.php | 2 +- src/Commands/EnvPullCommand.php | 2 +- src/Commands/EnvPushCommand.php | 2 +- src/Commands/Output/DeploymentSuccess.php | 4 ++-- src/Commands/RedeployCommand.php | 2 +- src/Commands/RollbackCommand.php | 2 +- src/Commands/UpCommand.php | 2 +- 26 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/BuildProcess/CollectSecrets.php b/src/BuildProcess/CollectSecrets.php index db540a03..66768932 100644 --- a/src/BuildProcess/CollectSecrets.php +++ b/src/BuildProcess/CollectSecrets.php @@ -17,7 +17,7 @@ class CollectSecrets */ public function __invoke() { - Helpers::step('Collecting Secrets'); + Helpers::step('Collecting Secrets'); $secrets = collect( Helpers::app(ConsoleVaporClient::class) diff --git a/src/BuildProcess/CompressApplication.php b/src/BuildProcess/CompressApplication.php index c878fefb..833f3923 100644 --- a/src/BuildProcess/CompressApplication.php +++ b/src/BuildProcess/CompressApplication.php @@ -18,7 +18,7 @@ class CompressApplication */ public function __invoke() { - Helpers::step('Compressing Application'); + Helpers::step('Compressing Application'); if (PHP_OS == 'Darwin') { $this->compressApplicationOnMac(); diff --git a/src/BuildProcess/CompressVendor.php b/src/BuildProcess/CompressVendor.php index 493c3058..a1832d09 100644 --- a/src/BuildProcess/CompressVendor.php +++ b/src/BuildProcess/CompressVendor.php @@ -23,7 +23,7 @@ public function __invoke() return; } - Helpers::step('Compressing Vendor Directory'); + Helpers::step('Compressing Vendor Directory'); if (PHP_OS == 'Darwin') { return $this->compressOnMac(); diff --git a/src/BuildProcess/ConfigureArtisan.php b/src/BuildProcess/ConfigureArtisan.php index 379a4085..dc60fcc4 100644 --- a/src/BuildProcess/ConfigureArtisan.php +++ b/src/BuildProcess/ConfigureArtisan.php @@ -17,7 +17,7 @@ class ConfigureArtisan */ public function __invoke() { - Helpers::step('Configuring Artisan'); + Helpers::step('Configuring Artisan'); file_put_contents( $this->appPath.'/artisan', diff --git a/src/BuildProcess/ConfigureComposerAutoloader.php b/src/BuildProcess/ConfigureComposerAutoloader.php index 89111bea..d3abada8 100644 --- a/src/BuildProcess/ConfigureComposerAutoloader.php +++ b/src/BuildProcess/ConfigureComposerAutoloader.php @@ -20,7 +20,7 @@ public function __invoke() return; } - Helpers::step('Configuring Composer Autoloader'); + Helpers::step('Configuring Composer Autoloader'); file_put_contents( $this->appPath.'/vendor/composer/autoload_static.php', diff --git a/src/BuildProcess/CopyApplicationToBuildPath.php b/src/BuildProcess/CopyApplicationToBuildPath.php index ba8b6847..00df7333 100644 --- a/src/BuildProcess/CopyApplicationToBuildPath.php +++ b/src/BuildProcess/CopyApplicationToBuildPath.php @@ -17,7 +17,7 @@ class CopyApplicationToBuildPath */ public function __invoke() { - Helpers::step('Copying Application Files'); + Helpers::step('Copying Application Files'); $this->ensureBuildDirectoryExists(); diff --git a/src/BuildProcess/ExecuteBuildCommands.php b/src/BuildProcess/ExecuteBuildCommands.php index fded3212..1cff3945 100644 --- a/src/BuildProcess/ExecuteBuildCommands.php +++ b/src/BuildProcess/ExecuteBuildCommands.php @@ -17,7 +17,7 @@ class ExecuteBuildCommands */ public function __invoke() { - Helpers::step('Executing Build Commands'); + Helpers::step('Executing Build Commands'); foreach (Manifest::buildCommands($this->environment) as $command) { Helpers::step('Running Command: '.$command); diff --git a/src/BuildProcess/ExtractAssetsToSeparateDirectory.php b/src/BuildProcess/ExtractAssetsToSeparateDirectory.php index fa7f5f90..def744d4 100644 --- a/src/BuildProcess/ExtractAssetsToSeparateDirectory.php +++ b/src/BuildProcess/ExtractAssetsToSeparateDirectory.php @@ -17,7 +17,7 @@ class ExtractAssetsToSeparateDirectory */ public function __invoke() { - Helpers::step('Extracting Assets'); + Helpers::step('Extracting Assets'); $this->ensureAssetDirectoryExists(); diff --git a/src/BuildProcess/ExtractVendorToSeparateDirectory.php b/src/BuildProcess/ExtractVendorToSeparateDirectory.php index 3628896e..41bfc601 100644 --- a/src/BuildProcess/ExtractVendorToSeparateDirectory.php +++ b/src/BuildProcess/ExtractVendorToSeparateDirectory.php @@ -21,7 +21,7 @@ public function __invoke() return; } - Helpers::step('Extracting Vendor Files'); + Helpers::step('Extracting Vendor Files'); (new Filesystem)->move( $this->appPath.'/vendor', diff --git a/src/BuildProcess/HarmonizeConfigurationFiles.php b/src/BuildProcess/HarmonizeConfigurationFiles.php index 85411b9f..65d0c103 100644 --- a/src/BuildProcess/HarmonizeConfigurationFiles.php +++ b/src/BuildProcess/HarmonizeConfigurationFiles.php @@ -16,7 +16,7 @@ class HarmonizeConfigurationFiles */ public function __invoke() { - Helpers::step('Harmonizing Configuration Files'); + Helpers::step('Harmonizing Configuration Files'); $configFiles = (new Finder)->files()->in($this->appPath.'/config'); diff --git a/src/BuildProcess/InjectErrorPages.php b/src/BuildProcess/InjectErrorPages.php index 8056a447..3b9371c1 100644 --- a/src/BuildProcess/InjectErrorPages.php +++ b/src/BuildProcess/InjectErrorPages.php @@ -15,7 +15,7 @@ class InjectErrorPages */ public function __invoke() { - Helpers::step('Injecting Error Pages'); + Helpers::step('Injecting Error Pages'); $stubPath = $this->appPath.'/vendor/laravel/vapor-core/stubs'; diff --git a/src/BuildProcess/InjectHandlers.php b/src/BuildProcess/InjectHandlers.php index a24d4373..61efea8b 100644 --- a/src/BuildProcess/InjectHandlers.php +++ b/src/BuildProcess/InjectHandlers.php @@ -16,7 +16,7 @@ class InjectHandlers */ public function __invoke() { - Helpers::step('Injecting Serverless Handlers'); + Helpers::step('Injecting Serverless Handlers'); if (! is_dir($this->appPath.'/vendor/laravel/vapor-core')) { Helpers::abort('Unable to find laravel/vapor-core installation.'); diff --git a/src/BuildProcess/InjectRdsCertificate.php b/src/BuildProcess/InjectRdsCertificate.php index 3d4a6771..4fc3d3ca 100644 --- a/src/BuildProcess/InjectRdsCertificate.php +++ b/src/BuildProcess/InjectRdsCertificate.php @@ -15,7 +15,7 @@ class InjectRdsCertificate */ public function __invoke() { - Helpers::step('Injecting RDS SSL Certificate'); + Helpers::step('Injecting RDS SSL Certificate'); $stubPath = $this->appPath.'/vendor/laravel/vapor-core/stubs'; diff --git a/src/BuildProcess/ProcessAssets.php b/src/BuildProcess/ProcessAssets.php index 8408cff6..6622d623 100644 --- a/src/BuildProcess/ProcessAssets.php +++ b/src/BuildProcess/ProcessAssets.php @@ -40,7 +40,7 @@ public function __construct($assetUrl = null) */ public function __invoke() { - Helpers::step('Processing Assets'); + Helpers::step('Processing Assets'); foreach (AssetFiles::get($this->appPath.'/public') as $file) { if (! Str::endsWith($file->getRealPath(), '.css')) { diff --git a/src/BuildProcess/RemoveIgnoredFiles.php b/src/BuildProcess/RemoveIgnoredFiles.php index bbd9d625..e1b7adc1 100644 --- a/src/BuildProcess/RemoveIgnoredFiles.php +++ b/src/BuildProcess/RemoveIgnoredFiles.php @@ -19,7 +19,7 @@ class RemoveIgnoredFiles */ public function __invoke() { - Helpers::step('Removing Ignored Files'); + Helpers::step('Removing Ignored Files'); $this->removeDefaultIgnoredFiles(); $this->removeDefaultIgnoredDirectories(); diff --git a/src/BuildProcess/SetBuildEnvironment.php b/src/BuildProcess/SetBuildEnvironment.php index 23913075..3bece875 100644 --- a/src/BuildProcess/SetBuildEnvironment.php +++ b/src/BuildProcess/SetBuildEnvironment.php @@ -42,7 +42,7 @@ public function __construct($environment = null, $assetUrl = null) */ public function __invoke() { - Helpers::step('Setting Build Environment'); + Helpers::step('Setting Build Environment'); if (! file_exists($envPath = $this->appPath.'/.env')) { $this->files->put($envPath, ''); diff --git a/src/Commands/Command.php b/src/Commands/Command.php index 5a27a417..a38a1261 100644 --- a/src/Commands/Command.php +++ b/src/Commands/Command.php @@ -79,10 +79,6 @@ protected function execute(InputInterface $input, OutputInterface $output) */ protected function configureOutputStyles(OutputInterface $output) { - $output->getFormatter()->setStyle( - 'bright', new OutputFormatterStyle('white', 'default', ['bold']) - ); - $output->getFormatter()->setStyle( 'finished', new OutputFormatterStyle('green', 'default', ['bold']) ); diff --git a/src/Commands/CommandCommand.php b/src/Commands/CommandCommand.php index ed55165b..39b43aef 100644 --- a/src/Commands/CommandCommand.php +++ b/src/Commands/CommandCommand.php @@ -41,7 +41,7 @@ public function handle() $this->option('command') ?? Helpers::ask('What command would you like to execute') ); - Helpers::step('Executing Function...'.PHP_EOL); + Helpers::step('Executing Function...'.PHP_EOL); // We will poll the backend service to get the invocations status and wait until // it gets done processing. Once it's done we will be able to show the status diff --git a/src/Commands/DisplaysDeploymentProgress.php b/src/Commands/DisplaysDeploymentProgress.php index f81772e1..5eceb974 100644 --- a/src/Commands/DisplaysDeploymentProgress.php +++ b/src/Commands/DisplaysDeploymentProgress.php @@ -67,7 +67,7 @@ protected function displayDeploymentSteps(Deployment $deployment) protected function displayActiveDeploymentSteps(Deployment $deployment) { foreach ($deployment->displayableSteps($this->displayedSteps) as $step) { - Helpers::step("{$step}"); + Helpers::step("{$step}"); $this->displayedSteps[] = $step; } diff --git a/src/Commands/DownCommand.php b/src/Commands/DownCommand.php index 083d12b5..f761f594 100644 --- a/src/Commands/DownCommand.php +++ b/src/Commands/DownCommand.php @@ -33,7 +33,7 @@ public function handle() { Helpers::ensure_api_token_is_available(); - Helpers::step('Initiating Maintenance Mode Deployment'); + Helpers::step('Initiating Maintenance Mode Deployment'); $deployment = $this->displayDeploymentProgress( $this->vapor->enableMaintenanceMode(Manifest::id(), $this->argument('environment')) diff --git a/src/Commands/EnvPullCommand.php b/src/Commands/EnvPullCommand.php index 3c571e68..7029153f 100644 --- a/src/Commands/EnvPullCommand.php +++ b/src/Commands/EnvPullCommand.php @@ -32,7 +32,7 @@ public function handle() $environment = $this->argument('environment'); - Helpers::step('Downloading Environment File...'); + Helpers::step('Downloading Environment File...'); file_put_contents( getcwd().'/.env.'.$environment, diff --git a/src/Commands/EnvPushCommand.php b/src/Commands/EnvPushCommand.php index 1e0ac562..6a264f7b 100644 --- a/src/Commands/EnvPushCommand.php +++ b/src/Commands/EnvPushCommand.php @@ -36,7 +36,7 @@ public function handle() Helpers::abort('The environment variables for that environment have not been downloaded.'); } - Helpers::step('Uploading Environment File...'); + Helpers::step('Uploading Environment File...'); $this->vapor->updateEnvironmentVariables( Manifest::id(), $environment, file_get_contents($file) diff --git a/src/Commands/Output/DeploymentSuccess.php b/src/Commands/Output/DeploymentSuccess.php index 5cf70ff0..a943a3eb 100644 --- a/src/Commands/Output/DeploymentSuccess.php +++ b/src/Commands/Output/DeploymentSuccess.php @@ -34,8 +34,8 @@ public function render(Deployment $deployment, DateTimeInterface $startedAt) 'Deployment ID', 'Environment URL (Copied To Clipboard)' ], [[ - "{$deployment->id}", - "https://{$deployment->vanityDomain()}", + "{$deployment->id}", + "https://{$deployment->vanityDomain()}", ]]); } } diff --git a/src/Commands/RedeployCommand.php b/src/Commands/RedeployCommand.php index aef7a1c7..9dea982b 100644 --- a/src/Commands/RedeployCommand.php +++ b/src/Commands/RedeployCommand.php @@ -33,7 +33,7 @@ public function handle() { Helpers::ensure_api_token_is_available(); - Helpers::step('Initiating Redeployment'); + Helpers::step('Initiating Redeployment'); $deployment = $this->displayDeploymentProgress( $this->vapor->redeploy(Manifest::id(), $this->argument('environment')) diff --git a/src/Commands/RollbackCommand.php b/src/Commands/RollbackCommand.php index c38a3170..7b86dda6 100644 --- a/src/Commands/RollbackCommand.php +++ b/src/Commands/RollbackCommand.php @@ -50,7 +50,7 @@ public function handle() $this->formatDeployments($deployments) ); - Helpers::step('Initiating Rollback'); + Helpers::step('Initiating Rollback'); // Once the rollback is running we will show the deployment pipeline as when // running a typical deployment. After the deployment is over we can push diff --git a/src/Commands/UpCommand.php b/src/Commands/UpCommand.php index c9ccb6b8..ff46f07d 100644 --- a/src/Commands/UpCommand.php +++ b/src/Commands/UpCommand.php @@ -33,7 +33,7 @@ public function handle() { Helpers::ensure_api_token_is_available(); - Helpers::step('Initiating Active Mode Deployment'); + Helpers::step('Initiating Active Mode Deployment'); $deployment = $this->displayDeploymentProgress( $this->vapor->disableMaintenanceMode(Manifest::id(), $this->argument('environment'))