Skip to content

Commit

Permalink
Fixes #1593: Replacing getOutputData() with getMessage(). (#1603)
Browse files Browse the repository at this point in the history
  • Loading branch information
grasmash authored Jun 5, 2017
1 parent 72902bc commit d4feab1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/Robo/Commands/Deploy/DeployCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ protected function checkDirty($options) {
->printOutput(FALSE)
->interactive(FALSE)
->run();
$dirty = (bool) $result->getOutputData();
$dirty = (bool) $result->getMessage();
if ($dirty) {
if ($options['ignore-dirty']) {
$this->logger->warning("There are uncommitted changes on the source repository.");
Expand Down
2 changes: 1 addition & 1 deletion src/Robo/Commands/Setup/ConfigCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ protected function checkFeaturesOverrides() {
->option('bundle', $bundle)
->option('format', 'json');
$result = $task->printOutput(TRUE)->run();
$output = $result->getOutputData();
$output = $result->getMessage();
$features_overridden = preg_match('/(changed|conflicts|added)( *)$/', $output);
if ($features_overridden) {
throw new \Exception("A feature in the $bundle bundle is overridden. You must re-export this feature to incorporate the changes.");
Expand Down
2 changes: 1 addition & 1 deletion src/Robo/Commands/Tests/SecurityUpdatesCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function testsSecurityUpdates() {
->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERY_VERBOSE)
->run();

$output = $result->getOutputData();
$output = $result->getMessage();
$report = substr($output, strpos($output, '{'));
$updates = (array) json_decode($report, TRUE);
$security_updates = [];
Expand Down
8 changes: 4 additions & 4 deletions src/Robo/Inspector/Inspector.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public function isDrupalInstalled() {
protected function getDrupalInstalled() {
$this->logger->debug("Verifying that Drupal is installed...");
$result = $this->executor->drush("sqlq \"SHOW TABLES LIKE 'config'\"")->run();
$output = trim($result->getOutputData());
$output = trim($result->getMessage());
$installed = $result->wasSuccessful() && $output == 'config';

return $installed;
Expand All @@ -177,7 +177,7 @@ protected function getDrupalInstalled() {
* The result of `drush status`.
*/
public function getDrushStatus() {
$status_info = json_decode($this->executor->drush('status --format=json --show-passwords')->run()->getOutputData(), TRUE);
$status_info = json_decode($this->executor->drush('status --format=json --show-passwords')->run()->getMessage(), TRUE);

return $status_info;
}
Expand Down Expand Up @@ -261,7 +261,7 @@ public function isDrupalVmBooted() {
->printMetadata(FALSE)
->interactive(FALSE)
->run();
$output = $result->getOutputData();
$output = $result->getMessage();

$booted = strstr($output, "running");
$statement = $booted ? "is" : "is not";
Expand Down Expand Up @@ -296,7 +296,7 @@ public function isVagrantPluginInstalled($plugin) {
->interactive(FALSE)
->silent(TRUE)
->run()
->getOutputData();
->getMessage();

return $installed;
}
Expand Down

0 comments on commit d4feab1

Please sign in to comment.