diff --git a/src/Commands/AcquiaCommand.php b/src/Commands/AcquiaCommand.php index daa607a..12d5f81 100644 --- a/src/Commands/AcquiaCommand.php +++ b/src/Commands/AcquiaCommand.php @@ -213,7 +213,6 @@ protected function waitForTask($response) { switch ($notification->status) { case self::TASKFAILED: throw new Exception('Acquia task failed.'); - case self::TASKSTARTED: case self::TASKINPROGRESS: break; @@ -221,7 +220,6 @@ protected function waitForTask($response) { break(2); default: throw new Exception('Unknown notification status.'); - } $current = new DateTime(date('c')); $current->setTimezone($timeZone); @@ -291,22 +289,22 @@ protected function rsyncFiles(string $appUuId, string $siteName, string $envUuId $toUser = explode('@', $toUrl); $this->taskRsync() ->fromHost($fromUrl) - ->fromPath("/mnt/gfs/${fromUser[0]}/sites/${siteName}/") - ->toPath("/tmp/${siteName}/") + ->fromPath("/mnt/gfs/${fromUser[0]}/sites/$siteName/") + ->toPath("/tmp/$siteName/") ->archive() ->compress() ->excludeVcs() ->run(); $this->taskRsync() - ->fromPath("/tmp/${siteName}/") + ->fromPath("/tmp/$siteName/") ->toHost($toUrl) - ->toPath("/mnt/gfs/${toUser[0]}/sites/${siteName}/") + ->toPath("/mnt/gfs/${toUser[0]}/sites/$siteName/") ->archive() ->compress() ->excludeVcs() ->run(); $this->say('Deleting temporary file copy.'); - $this->_deleteDir("/tmp/${siteName}"); + $this->_deleteDir("/tmp/$siteName"); } /** @@ -421,7 +419,7 @@ protected function deleteDomain(string $envUuId, string $domainName) { } /** - * Perform a application file copy command. + * Perform an application file copy command. * * @param string $envUuIdFrom * The Acquia Cloud UUID Source. diff --git a/src/Commands/CopyFilesCommand.php b/src/Commands/CopyFilesCommand.php index e17d27c..7b773e7 100644 --- a/src/Commands/CopyFilesCommand.php +++ b/src/Commands/CopyFilesCommand.php @@ -44,28 +44,28 @@ public function copySiteFiles($appName, $site, $fromENv, $toEnv) { $to = explode('@', $toUrl); $rsyncDown = $this->taskRsync() ->fromHost($fromUrl) - ->fromPath("/mnt/gfs/${from[0]}/sites/${site}/") - ->toPath("/tmp/${site}/") + ->fromPath("/mnt/gfs/${from[0]}/sites/$site/") + ->toPath("/tmp/$site/") ->archive() ->compress() ->excludeVcs() ->progress(); - if ('y' === $this->ask("Do you want to copy ${site} files down? (y/n)")) { + if ('y' === $this->ask("Do you want to copy $site files down? (y/n)")) { $rsyncDown->run(); } $rsyncUp = $this->taskRsync() - ->fromPath("/tmp/${site}/") + ->fromPath("/tmp/$site/") ->toHost($toUrl) - ->toPath("/mnt/gfs/${to[0]}/sites/${site}/") + ->toPath("/mnt/gfs/${to[0]}/sites/$site/") ->archive() ->compress() ->excludeVcs() ->progress(); - if ('y' === $this->ask("Do you want to push ${site} files up? (y/n)")) { + if ('y' === $this->ask("Do you want to push $site files up? (y/n)")) { $rsyncUp->run(); } $this->say('Deleting temporary file copy.'); - $this->_deleteDir("/tmp/${site}"); + $this->_deleteDir("/tmp/$site"); } /** @@ -95,13 +95,13 @@ public function copySiteFilesDown($appName, $site, $fromEnv, $destination = NULL $from = explode('@', $fromUrl); $rsyncDown = $this->taskRsync() ->fromHost($fromUrl) - ->fromPath("/mnt/gfs/${from[0]}/sites/${site}/") - ->toPath("${destination}/${site}/") + ->fromPath("/mnt/gfs/${from[0]}/sites/$site/") + ->toPath("$destination/$site/") ->archive() ->compress() ->excludeVcs() ->progress(); - if ('y' === $this->ask("Do you want to copy ${site} files down? (y/n)")) { + if ('y' === $this->ask("Do you want to copy $site files down? (y/n)")) { $rsyncDown->run(); } } diff --git a/src/Commands/CronCommand.php b/src/Commands/CronCommand.php index e5f6cd8..a3a1bd0 100644 --- a/src/Commands/CronCommand.php +++ b/src/Commands/CronCommand.php @@ -39,7 +39,7 @@ public function listCrons($options = [ // Get a list of environments for this App UUID. $this->writeln('Getting Environment ID\'s...'); $envList = $this->getEnvironments($appUuId); - // Get the From Env for this deploy. + // Get the Env for the scheduled jobs. $envHelper = new ChoiceQuestion('Which Environment do you want to see the domain list for...', $envList); $environment = $this->doAsk($envHelper); try { diff --git a/src/Commands/DomainCommand.php b/src/Commands/DomainCommand.php index 88756e3..a96a880 100644 --- a/src/Commands/DomainCommand.php +++ b/src/Commands/DomainCommand.php @@ -145,7 +145,7 @@ public function domainDelete() { $envUuId = $this->getEnvUuIdFromApp($appUuId, $environment); } catch (Exception $e) { - $this->say('Incorect Environment and Application id.'); + $this->say('Incorrect Environment and Application id.'); } $domainList = $this->getDomains($envUuId); $domainDeleteHelper = new ChoiceQuestion('Which Domain(s) do you want to delete, separate multiple by comma', $domainList);