archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 23:14:03 +00:00
Code Activity

Improve commands CLI output (#1030)

Browse source 
* use component info/error methods

* Update src/Commands/ClearPendingTenants.php

Co-authored-by: lukinovec <lukinovec@gmail.com>

Co-authored-by: lukinovec <lukinovec@gmail.com>
This commit is contained in:
Abrar Ahmad 2022-12-14 19:08:00 +05:00 • committed by GitHub
parent 7d3298c6bb
commit 68de3600bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Commands/ClearPendingTenants.php
View file

@ -17,7 +17,7 @@ class ClearPendingTenants extends Command
public function handle(): int public function handle(): int
{ {
$this->info('Removing pending tenants.'); $this->components->info('Removing pending tenants.');
$expirationDate = now(); $expirationDate = now();
// We compare the original expiration date to the new one to check if the new one is different later // We compare the original expiration date to the new one to check if the new one is different later
@ -27,8 +27,7 @@ class ClearPendingTenants extends Command
$olderThanHours = (int) $this->option('older-than-hours'); $olderThanHours = (int) $this->option('older-than-hours');
if ($olderThanDays && $olderThanHours) { if ($olderThanDays && $olderThanHours) {
$this->line("<options=bold,reverse;fg=red> Cannot use '--older-than-days' and '--older-than-hours' together \n"); // todo@cli refactor all of these styled command outputs to use $this->components $this->components->error("Cannot use '--older-than-days' and '--older-than-hours' together. Please, choose only one of these options.");
$this->line('Please, choose only one of these options.');
return 1; // Exit code for failure return 1; // Exit code for failure
} }
@ -51,7 +50,7 @@ class ClearPendingTenants extends Command
->delete() ->delete()
->count(); ->count();
$this->info($deletedTenantCount . ' pending ' . str('tenant')->plural($deletedTenantCount) . ' deleted.'); $this->components->info($deletedTenantCount . ' pending ' . str('tenant')->plural($deletedTenantCount) . ' deleted.');
return 0; return 0;
} }

6
src/Commands/CreatePendingTenants.php
View file

@ -14,7 +14,7 @@ class CreatePendingTenants extends Command
public function handle(): int public function handle(): int
{ {
$this->info('Creating pending tenants.'); $this->components->info('Creating pending tenants.');
$maxPendingTenantCount = (int) ($this->option('count') ?? config('tenancy.pending.count')); $maxPendingTenantCount = (int) ($this->option('count') ?? config('tenancy.pending.count'));
$pendingTenantCount = $this->getPendingTenantCount(); $pendingTenantCount = $this->getPendingTenantCount();
@ -30,8 +30,8 @@ class CreatePendingTenants extends Command
$createdCount++; $createdCount++;
} }
$this->info($createdCount . ' pending ' . str('tenant')->plural($createdCount) . ' created.'); $this->components->info($createdCount . ' pending ' . str('tenant')->plural($createdCount) . ' created.');
$this->info($maxPendingTenantCount . ' pending ' . str('tenant')->plural($maxPendingTenantCount) . ' ready to be used.'); $this->components->info($maxPendingTenantCount . ' pending ' . str('tenant')->plural($maxPendingTenantCount) . ' ready to be used.');
return 0; return 0;
} }

2
src/Commands/Link.php
View file

@ -34,7 +34,7 @@ class Link extends Command
$this->createLinks($tenants); $this->createLinks($tenants);
} }
} catch (Exception $exception) { } catch (Exception $exception) {
$this->error($exception->getMessage()); $this->components->error($exception->getMessage());
return 1; return 1;
} }