Refines db commands and runs phpmd over codebase.

src/Cli/AcquiaCli.php

@@ -158,6 +158,7 @@ public function injectParameters($container)
         $parameterInjection->register('AcquiaCloudApi\Endpoints\Insights', new AcquiaCliInjector);
         $parameterInjection->register('AcquiaCloudApi\Endpoints\LogForwardingDestinations', new AcquiaCliInjector);
         $parameterInjection->register('AcquiaCloudApi\Endpoints\SslCertificates', new AcquiaCliInjector);
+        $parameterInjection->register('AcquiaCloudApi\Endpoints\Organizations', new AcquiaCliInjector);
     }
 
     /**

src/Commands/AcquiaCommand.php

@@ -192,7 +192,7 @@ protected function waitForNotification($response)
                 case self::TASKFAILED:
                     // If there's one failure we should throw an exception
                     throw new \Exception('Acquia task failed.');
-                        break(2);
+                    break(2);
                     // If tasks are started or in progress, we should continue back
                     // to the top of the loop and wait until tasks are complete.
                 case self::TASKSTARTED:
@@ -203,7 +203,7 @@ protected function waitForNotification($response)
                     break(2);
                 default:
                     throw new \Exception('Unknown notification status.');
-                        break(2);
+                    break(2);
             }
 
             // Timeout if the command exceeds the configured timeout threshold.

src/Commands/ApplicationsCommand.php

@@ -179,7 +179,7 @@ public function applicationTagDelete(Applications $applicationsAdapter, $uuid, $
      * @param string $name
      *
      * @command application:rename
-     * @alias   app:rename,a:rename
+     * @aliases app:rename,a:rename
      */
     public function applicationRename(Applications $applicationsAdapter, $uuid, $name)
     {

src/Commands/CodeCommand.php

@@ -60,9 +60,9 @@ public function code(Client $client, Code $codeAdapter, $uuid, $match = null)
     /**
      * Deploys code from one environment to another.
      *
-     * @param string  $uuid
-     * @param string  $environmentFrom
-     * @param string  $environmentTo
+     * @param string $uuid
+     * @param string $environmentFrom
+     * @param string $environmentTo
      *
      * @command code:deploy
      * @aliases c:d

src/Commands/CronCommand.php

@@ -18,8 +18,8 @@ class CronCommand extends AcquiaCommand
     /**
      * Shows all cron tasks associated with an environment.
      *
-     * @param string  $uuid
-     * @param string  $environment
+     * @param string $uuid
+     * @param string $environment
      *
      * @command cron:list
      */
@@ -55,11 +55,11 @@ public function crons(Crons $cronAdapter, $uuid, $environment)
     /**
      * Adds a new cron task for an environment.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param string  $commandString The command to be run on cron wrapped in quotes.
-     * @param string  $frequency     The crontab format frequency wrapped in quotes
-     * @param string  $label         An optional label for the cron command wrapped in quotes.
+     * @param string $uuid
+     * @param string $environment
+     * @param string $commandString The command to be run on cron wrapped in quotes.
+     * @param string $frequency     The crontab format frequency wrapped in quotes
+     * @param string $label         An optional label for the cron command wrapped in quotes.
      *
      * @command cron:create
      * @aliases cron:add
@@ -75,9 +75,9 @@ public function cronAdd(Crons $cronAdapter, $uuid, $environment, $commandString,
     /**
      * Removes a cron task for an environment.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param int     $cronId
+     * @param string $uuid
+     * @param string $environment
+     * @param int    $cronId
      *
      * @command cron:delete
      * @aliases cron:remove
@@ -95,9 +95,9 @@ public function cronDelete(Crons $cronAdapter, $uuid, $environment, $cronId)
     /**
      * Enables a disabled cron entry.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param int     $cronId
+     * @param string $uuid
+     * @param string $environment
+     * @param int    $cronId
      *
      * @command cron:enable
      */
@@ -112,9 +112,9 @@ public function cronEnable(Crons $cronAdapter, $uuid, $environment, $cronId)
     /**
      * Disables an enabled cron entry.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param int     $cronId
+     * @param string $uuid
+     * @param string $environment
+     * @param int    $cronId
      *
      * @command cron:disable
      */
@@ -131,9 +131,9 @@ public function cronDisable(Crons $cronAdapter, $uuid, $environment, $cronId)
     /**
      * Shows detailed information about a single cron command.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param int     $cronId
+     * @param string $uuid
+     * @param string $environment
+     * @param int    $cronId
      *
      * @command cron:info
      */

src/Commands/DbBackupCommand.php

@@ -27,30 +27,55 @@ class DbBackupCommand extends AcquiaCommand
     /**
      * Backs up all DBs in an environment.
      *
-     * @param string  $uuid
-     * @param string  $environment
+     * @param string $uuid
+     * @param string $environment
+     *
+     * @command database:backup:all
+     * @aliases db:backup:all
+     */
+    public function dbBackupAll($uuid, $environment)
+    {
+        $environment = $this->cloudapiService->getEnvironment($uuid, $environment);
+        $this->backupAllEnvironmentDbs($uuid, $environment);
+    }
+
+    /**
+     * Backs up a DB in an environment.
+     *
+     * @param string $uuid
+     * @param string $environment
+     * @param string $dbName
      *
      * @command database:backup
      * @aliases db:backup
      */
-    public function dbBackup($uuid, $environment)
+    public function dbBackup(Databases $databaseAdapter, $uuid, $environment, $dbName)
     {
         $environment = $this->cloudapiService->getEnvironment($uuid, $environment);
-        $this->backupAllEnvironmentDbs($uuid, $environment);
+
+        // @TODO replace this call with a specific API call.
+        // https://cloudapi-docs.acquia.com/#/Environments/getEnvironmentsDatabase
+        $databases = $databaseAdapter->getAll($uuid);
+        foreach ($databases as $database) {
+            if ($database->name === $dbName) {
+                $this->backupDb($uuid, $environment, $database);
+            }
+        }
     }
 
     /**
      * Shows a list of database backups for all databases in an environment.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param string  $dbName
+     * @param string $uuid
+     * @param string $environment
+     * @param string $dbName
      *
      * @command database:backup:list
      * @aliases db:backup:list
      */
     public function dbBackupList(
         Client $client,
+        Databases $databaseAdapter,
         DatabaseBackups $databaseBackupsAdapter,
         $uuid,
         $environment,
@@ -61,8 +86,7 @@ public function dbBackupList(
         if (null !== $dbName) {
             $client->addQuery('filter', "name=${dbName}");
         }
-        $dbAdapter = new Databases($this->cloudapi);
-        $databases = $dbAdapter->getAll($uuid);
+        $databases = $databaseAdapter->getAll($uuid);
         $client->clearQuery();
 
         $table = new Table($this->output());
@@ -97,10 +121,10 @@ public function dbBackupList(
     /**
      * Restores a database from a saved backup.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param string  $dbName
-     * @param int     $backupId
+     * @param string $uuid
+     * @param string $environment
+     * @param string $dbName
+     * @param int    $backupId
      *
      * @command database:backup:restore
      * @aliases db:backup:restore
@@ -122,10 +146,10 @@ public function dbBackupRestore(DatabaseBackups $databaseBackupsAdapter, $uuid,
     /**
      * Provides a database backup link.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param string  $dbName
-     * @param int     $backupId
+     * @param string $uuid
+     * @param string $environment
+     * @param string $dbName
+     * @param int    $backupId
      *
      * @command database:backup:link
      * @aliases db:backup:link
@@ -148,9 +172,9 @@ public function dbBackupLink($uuid, $environment, $dbName, $backupId)
     /**
      * Downloads a database backup.
      *
-     * @param string  $uuid
-     * @param string  $environment
-     * @param string  $dbName
+     * @param string $uuid
+     * @param string $environment
+     * @param string $dbName
      *
      * @throws \Exception
      *

src/Commands/DbCommand.php

@@ -19,15 +19,6 @@
 class DbCommand extends AcquiaCommand
 {
 
-    protected $databaseAdapter;
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->databaseAdapter = new Databases($this->cloudapi);
-    }
-
     /**
      * Shows all databases.
      *
@@ -36,9 +27,9 @@ public function __construct()
      * @command database:list
      * @aliases db:list
      */
-    public function dbList($uuid)
+    public function dbList(Databases $databaseAdapter, $uuid)
     {
-        $databases = $this->databaseAdapter->getAll($uuid);
+        $databases = $databaseAdapter->getAll($uuid);
         $table = new Table($this->output());
         $table->setHeaders(['Databases']);
         foreach ($databases as $database) {
@@ -63,9 +54,9 @@ public function dbList($uuid)
      * @command database:create
      * @aliases database:add,db:create,db:add
      */
-    public function dbCreate($uuid, $dbName)
+    public function dbCreate(Databases $databaseAdapter, $uuid, $dbName)
     {
-        $response = $this->databaseAdapter->create($uuid, $dbName);
+        $response = $databaseAdapter->create($uuid, $dbName);
         $this->say(sprintf('Creating database (%s)', $dbName));
         $this->waitForNotification($response);
     }
@@ -79,29 +70,29 @@ public function dbCreate($uuid, $dbName)
      * @command database:delete
      * @aliases database:remove,db:remove,db:delete
      */
-    public function dbDelete($uuid, $dbName)
+    public function dbDelete(Databases $databaseAdapter, $uuid, $dbName)
     {
         if ($this->confirm('Are you sure you want to delete this database?')) {
             $this->say(sprintf('Deleting database (%s)', $dbName));
-            $response = $this->databaseAdapter->delete($uuid, $dbName);
+            $response = $databaseAdapter->delete($uuid, $dbName);
             $this->waitForNotification($response);
         }
     }
 
     /**
-     * Truncaates a database.
+     * Truncates a database (only applicable to Acquia free tier).
      *
      * @param string $uuid
      * @param string $dbName
      *
      * @command database:truncate
      * @aliases db:truncate
      */
-    public function dbTruncate($uuid, $dbName)
+    public function dbTruncate(Databases $databaseAdapter, $uuid, $dbName)
     {
         if ($this->confirm('Are you sure you want to truncate this database?')) {
             $this->say(sprintf('Truncate database (%s)', $dbName));
-            $response = $this->databaseAdapter->truncate($uuid, $dbName);
+            $response = $databaseAdapter->truncate($uuid, $dbName);
             $this->waitForNotification($response);
         }
     }

src/Commands/DomainCommand.php

@@ -70,6 +70,8 @@ public function domainInfo(OutputInterface $output, Domains $domainAdapter, $uui
 
         $table = new Table($output);
         $table->setHeaders(['Hostname', 'Active', 'DNS Resolves', 'IP Addresses', 'CNAMES']);
+        $table->setColumnStyle(1, 'center-align');
+        $table->setColumnStyle(2, 'center-align');
         $table
             ->addRows(
                 [
@@ -94,7 +96,7 @@ public function domainInfo(OutputInterface $output, Domains $domainAdapter, $uui
      * @param string $domain
      *
      * @command domain:create
-     * @alias   domain:add
+     * @aliases domain:add
      */
     public function domainCreate(Domains $domainAdapter, $uuid, $environment, $domain)
     {
@@ -112,7 +114,7 @@ public function domainCreate(Domains $domainAdapter, $uuid, $environment, $domai
      * @param string $domain
      *
      * @command domain:delete
-     * @alias   domain:remove
+     * @aliases domain:remove
      */
     public function domainDelete(Domains $domainAdapter, $uuid, $environment, $domain)
     {

src/Commands/EnvironmentsCommand.php

@@ -204,7 +204,7 @@ protected function renderEnvironmentInfo(EnvironmentResponse $environment, Serve
      * @param string $name
      *
      * @command environment:rename
-     * @alias   env:rename,e:rename
+     * @aliases env:rename,e:rename
      */
     public function environmentRename(Environments $environmentsAdapter, $uuid, $environment, $name)
     {
@@ -220,12 +220,12 @@ public function environmentRename(Environments $environmentsAdapter, $uuid, $env
      * @param string $environment
      *
      * @command environment:delete
-     * @alias   env:delete,e:d,environment:remove,env:remove
+     * @aliases env:delete,e:d,environment:remove,env:remove
      */
     public function environmentDelete(Environments $environmentsAdapter, $uuid, $environment)
     {
         $environment = $this->cloudapiService->getEnvironment($uuid, $environment);
-        if ($this->confirm("Are you sure you want to delete this environment?")) {
+        if ($this->confirm(sprintf('Are you sure you want to delete the %s environment?', $environment->label))) {
             $this->say(sprintf('Deleting %s environment', $environment->label));
             $response = $environmentsAdapter->delete($environment->uuid);
             $this->waitForNotification($response);

src/Commands/LogForwardCommand.php

@@ -62,7 +62,7 @@ public function logforwardList(
     }
 
     /**
-     * Gets information about a Log ForwaRD.
+     * Gets information about a Log Forward.
      *
      * @param string $uuid
      * @param string $environment

src/Commands/LogsCommand.php

@@ -24,9 +24,9 @@ class LogsCommand extends AcquiaCommand
     /**
      * Streams logs from an environment.
      *
-     * @param  string  $uuid
-     * @param  string  $environment
-     * @param  array   $opts
+     * @param  string $uuid
+     * @param  string $environment
+     * @param  array  $opts
      * @option $colourise Colourise the output
      * @option $logtypes  Filter to specific log types
      * @option $servers   Filter to specific servers