Validate site root (#3)

* Initial commit.

* Validate site root.

bin/drupal.php

@@ -48,9 +48,21 @@
  exit(0);
 }
 
-if ($isValidDrupal) {
- $drupalConsoleLauncher = new DrupalConsoleLauncher();
- $drupalConsoleLauncher->launch($argvInputReader->get('root'));
+if (!$isValidDrupal) {
+ echo 'Invalid site root : ' . $argvInputReader->get('root') . PHP_EOL;
 
- exit(0);
+ exit(1);
+}
+
+$drupalConsoleLauncher = new DrupalConsoleLauncher();
+$launch = $drupalConsoleLauncher->launch($argvInputReader->get('root'));
+
+if (!$launch) {
+ /* ask to install drupal console */
+ echo 'Drupal Console is not installed at '. PHP_EOL .
+ 'Site root : ' . $argvInputReader->get('root') . PHP_EOL .
+ 'Execute:' . PHP_EOL .
+ 'composer require drupal/console:~1.0 --prefer-dist --optimize-autoloader' . PHP_EOL;
+
+ exit(1);
 }

src/Utils/ArgvInputReader.php

@@ -174,8 +174,9 @@ public function getAll()
  return $this->options;
  }
 
- public function setOptionsAsArgv() {
- foreach($this->options as $optionName => $optionValue) {
+ public function setOptionsAsArgv()
+ {
+ foreach ($this->options as $optionName => $optionValue) {
  if ($optionName == 'command') {
  continue;
  }
@@ -192,5 +193,4 @@ public function setOptionsAsArgv() {
  }
  }
  }
-
 }

src/Utils/DrupalConsoleLauncher.php

@@ -23,14 +23,16 @@ public function launch($root)
  }
 
  if (!file_exists($drupal)) {
- /* ask to install drupal console */
+ return false;
  }
 
  /* Add option to identify if pre-launched */
-// $_SERVER['argv'][] = '--pre-launch';
+ // $_SERVER['argv'][] = '--pre-launch';
 
  $drupal = realpath($drupal) . '.php';
 
  include_once $drupal;
+
+ return true;
  }
 }