Merge branch 'master' of github.com:eaudeweb/heavy-lifter

eaudeweb · Jan 6, 2021 · 9568c12 · 9568c12
2 parents e388f0a + 7c44196
commit 9568c12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/src/Robo/Plugin/Commands/GitCommands.php b/src/Robo/Plugin/Commands/GitCommands.php
@@ -29,7 +29,6 @@ public function gitPhpcsPrecommit($options = ['disable' => FALSE, 'accept-warnin
     $projectDir = $this->projectDir();
     $drupalRoot = $this->drupalRoot();
 
-
     if (!file_exists("$projectDir/.git")) {
       throw new TaskException($this, 'This command can only be run inside git repositories. Please run `git init` first.');
     }

diff --git a/src/Robo/Plugin/Commands/SiteCommands.php b/src/Robo/Plugin/Commands/SiteCommands.php
@@ -16,13 +16,6 @@ class SiteCommands extends CommandBase {
   use \Boedah\Robo\Task\Drush\loadTasks;
   use \EauDeWeb\Robo\Task\Curl\loadTasks;
 
-  /**
-   * @inheritdoc
-   */
-  protected function validateConfig() {
-    parent::validateConfig();
-  }
-
   /**
    * Setup development.
    *
@@ -94,6 +87,7 @@ public function siteDevelop($newPassword = 'password', $options = ['site' => 'de
    */
   public function siteInstall($options = ['site' => 'default']) {
     $this->allowOnlyOnLinux();
+    $this->validateConfig();
     $site = $options['site'];
     $url =  $this->configSite('sql.sync.source', $site);
     $this->validateHttpsUrl($url);
@@ -236,7 +230,6 @@ public function createProject($name = 'name') {
   public function siteUpdate($options = ['site' => 'default']) {
     $this->allowOnlyOnLinux();
     $site = $options['site'];
-    $this->validateConfig();
     $execStack = $this->taskExecStack()->stopOnFail(TRUE);
     $drush = $this->drushExecutable($site);
     $commands = [];
@@ -362,7 +355,6 @@ public function siteConfig() {
    * @throws \Robo\Exception\TaskException
    */
   public function siteStatus($options = ['site' => 'default']) {
-    $this->validateConfig();
     $site = $options['site'];
     if ($this->isDrush9()) {
       $this->taskExec("drush -l {$site} st")->run();

diff --git a/src/Robo/Plugin/Commands/SqlCommands.php b/src/Robo/Plugin/Commands/SqlCommands.php
@@ -29,6 +29,7 @@ class SqlCommands extends CommandBase {
    *
    */
   public function sqlDownload($destination, $options = ['site' => 'default']) {
+    $this->validateConfig();
     $site = $options['site'];
     $url =  $this->configSite('sql.sync.source', $site);
     $username = $this->configSite('sync.username', $site);
@@ -57,6 +58,7 @@ public function sqlDownload($destination, $options = ['site' => 'default']) {
    * @throws \Robo\Exception\TaskException
    */
   public function sqlSync($options = ['anonymize' => FALSE, 'site' => 'default']) {
+    $this->validateConfig();
     $this->allowOnlyOnLinux();
     $site = $options['site'];