Skip to content

Commit

Permalink
Console 3.2 Compat and use drupal/core for composer-highest. (#2724)
Browse files Browse the repository at this point in the history
* Use patched core for composer-highest.

* Work around crap table wrapping in core-status.
  • Loading branch information
weitzman authored Apr 27, 2017
1 parent 72ea47a commit f476dd5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
"psy/psysh": "~0.6",
"league/container": "~2",
"consolidation/robo": "~1",
"symfony/config": "~2.2",
"symfony/config": "~2.2|^3",
"consolidation/annotated-command": "dev-master",
"consolidation/output-formatters": "dev-master",
"symfony/yaml": "~2.3",
"symfony/var-dumper": "~2.7",
"symfony/console": "~2.7",
"symfony/process": "~2.7",
"symfony/event-dispatcher": "~2.7",
"symfony/finder": "~2.7",
"symfony/yaml": "~2.3|^3",
"symfony/var-dumper": "~2.7|^3",
"symfony/console": "~2.7|^3",
"symfony/process": "~2.7|^3",
"symfony/event-dispatcher": "~2.7|^3",
"symfony/finder": "~2.7|^3",
"pear/console_table": "~1.3.0",
"phpdocumentor/reflection-docblock": "^2.0",
"webmozart/path-util": "~2",
Expand Down
4 changes: 2 additions & 2 deletions src/Command/DrushInputAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function getFirstArgument()
/**
* {@inheritdoc}
*/
public function hasParameterOption($values)
public function hasParameterOption($values, $onlyParams = false)
{
$values = (array) $values;

Expand All @@ -74,7 +74,7 @@ public function hasParameterOption($values)
/**
* {@inheritdoc}
*/
public function getParameterOption($values, $default = false)
public function getParameterOption($values, $default = false, $onlyParams = false)
{
$values = (array) $values;

Expand Down
4 changes: 2 additions & 2 deletions tests/backendTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ function testTarget() {
* - Insures that the drush output appears before the backend output start marker (output is displayed in 'real time' as it is produced).
*/
function testRealtimeOutput() {
$exec = sprintf('%s core-status --backend --nocolor 2>&1', self::getDrush());
$exec = sprintf('%s core-status --backend --format=yaml --nocolor 2>&1', self::getDrush());
$this->execute($exec);

$output = $this->getOutput();
$drush_version_offset = strpos($output, "Drush version");
$drush_version_offset = strpos($output, "drush-version");
$backend_output_offset = strpos($output, "DRUSH_BACKEND_OUTPUT_START>>>");

$this->assertTrue($drush_version_offset !== FALSE, "'Drush version' string appears in output.");
Expand Down
4 changes: 4 additions & 0 deletions tests/resources/codebase/composer-highest.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
{
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"type": "vcs",
"url": "https://github.com/webflo/drupal-core-8.4.x"
}
],
"require": {
Expand Down

0 comments on commit f476dd5

Please sign in to comment.