OPENEUROPA-287: Add sanity check before starting site install. #53
Conversation
src/Commands/DrupalCommands.php
Outdated
| 'database-port' => InputOption::VALUE_REQUIRED, | ||
| 'database-name' => InputOption::VALUE_REQUIRED, | ||
| 'sites-subdir' => InputOption::VALUE_REQUIRED, | ||
| ]) | ||
| { |
There was a problem hiding this comment.
Why do we have these indentations?
src/Commands/DrupalCommands.php
Outdated
|
|
||
| // Check that if site directory exists it is writable. | ||
| if (file_exists($siteDirectory)) { | ||
| if (!is_writable($siteDirectory)) { |
There was a problem hiding this comment.
I'd merge this condition into the previous one.
src/Commands/DrupalCommands.php
Outdated
| } | ||
| // Check that if site directory exists it is writable. | ||
| if (file_exists($siteDirectory.'/settings.php')) { | ||
| if (!is_writable($siteDirectory.'/settings.php')) { |
There was a problem hiding this comment.
I'd merge this condition into the previous one.
src/Commands/DrupalCommands.php
Outdated
| ->databaseName($options['database-name']) | ||
| ->sitesSubdir($options['sites-subdir']) | ||
| ->siteProfile($options['site-profile']); | ||
| $task = $this->taskDrush($drush) |
There was a problem hiding this comment.
Where is this coming from, I'm starting to see this since a couple of days and I don't know what to think about it yet.
There was a problem hiding this comment.
I would remove it as these are considered as unrelated changes in this PR.
src/Commands/DrupalCommands.php
Outdated
| 'root' => InputOption::VALUE_REQUIRED, | ||
| 'config-dir' => InputOption::VALUE_REQUIRED, | ||
| 'root' => InputOption::VALUE_REQUIRED, | ||
| 'config-dir' => InputOption::VALUE_REQUIRED, |
There was a problem hiding this comment.
I would remove it as these are considered as unrelated changes in this PR.
src/Commands/DrupalCommands.php
Outdated
| @@ -237,7 +263,7 @@ public function drushSetup(array $options = [ | |||
| * @return \Robo\Collection\CollectionBuilder | |||
| */ | |||
| public function settingsSetup(array $options = [ | |||
| 'root' => InputOption::VALUE_REQUIRED, | |||
| 'root' => InputOption::VALUE_REQUIRED, | |||
There was a problem hiding this comment.
I would remove it as these are considered as unrelated changes in this PR.
src/Commands/DrupalCommands.php
Outdated
| public function validateSiteInstall(CommandData $commandData) | ||
| { | ||
| $input = $commandData->input(); | ||
| $siteDirectory = getcwd().'/'.$input->getOption('root').'/sites/'.$input->getOption('sites-subdir'); |
There was a problem hiding this comment.
$siteDirectory = implode('/', [getcwd(), $input->getOption('root'), 'sites', $input->getOption('sites-subdir')]);
src/Commands/DrupalCommands.php
Outdated
| $requiredFiles = [$siteDirectory, $siteDirectory.'/settings.php']; | ||
| foreach ($requiredFiles as $requiredFile) { | ||
| if (file_exists($requiredFile) && !is_writable($requiredFile)) { | ||
| throw new \Exception("The file/folder '$requiredFile' must be writable for installation to continue."); |
There was a problem hiding this comment.
sprintf('The file or the folder '%s' does not exist or is not writable.', $requiredFile);
src/Commands/DrupalCommands.php
Outdated
| $input = $commandData->input(); | ||
| $siteDirectory = getcwd().'/'.$input->getOption('root').'/sites/'.$input->getOption('sites-subdir'); | ||
|
|
||
| // Check that if files/folders required exist and they are writable. |
There was a problem hiding this comment.
// Check if required files/folders exist and they are writable.
Validate hook added to check access to pre-exisiting site folder and settings.php