Skip to content

Commit

Permalink
Drush 10 compatibility (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
dbosen authored Jul 2, 2020
1 parent 587baa5 commit 82c6700
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"prefer-stable": true,
"license": "GPL-2.0-or-later",
"require": {
"php": ">=5.6.0",
"php": ">7.3",
"composer/composer": "^1.4",
"consolidation/robo": "^1.0",
"symfony/filesystem": "^3.2",
"drush/drush": "^8.1"
"drush/drush": "~9.0||~10.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/update-tester.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,9 @@ public function testUpdate(
$drushCmd->dir($absoluteDestinationDocroot);
$drushCmd->printOutput(FALSE);
$drushCmd
->arg('status')
->arg('core-status')
->option('pipe')
->option('show-passwords');
->option('fields', 'db-password,drupal-version,uri,db-driver,db-hostname,db-port,db-username,db-name,db-status,bootstrap,theme,admin-theme,php-bin,php-conf,php-os,drush-script,drush-version,drush-temp,drush-conf,install-profile,root,site,files,private,temp', '=');

/** @var \Robo\Result $resultStatus */
$resultStatus = $drushCmd->run();
Expand Down
8 changes: 4 additions & 4 deletions src/Task/CloneSite.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ protected function getSourceSiteStatus() {
$drushCmd->dir(DocrootResolver::getDocroot(realpath($this->getSource())));

$drushCmd
->arg('status')
->arg('core-status')
->option('pipe')
->option('show-passwords');
->option('fields', 'db-password,drupal-version,uri,db-driver,db-hostname,db-port,db-username,db-name,db-status,bootstrap,theme,admin-theme,php-bin,php-conf,php-os,drush-script,drush-version,drush-temp,drush-conf,install-profile,root,site,files,private,temp', '=');

/** @var \Robo\Result $result */
$result = $drushCmd->run();
Expand Down Expand Up @@ -134,9 +134,9 @@ protected function getDestinationSiteStatus() {
$drushCmd->dir(DocrootResolver::getDocroot($this->getDestination()));

$drushCmd
->arg('status')
->arg('core-status')
->option('pipe')
->option('show-passwords');
->option('fields', 'db-password,drupal-version,uri,db-driver,db-hostname,db-port,db-username,db-name,db-status,bootstrap,theme,admin-theme,php-bin,php-conf,php-os,drush-script,drush-version,drush-temp,drush-conf,install-profile,root,site,files,private,temp', '=');

/** @var \Robo\Result $result */
$result = $drushCmd->run();
Expand Down
4 changes: 1 addition & 3 deletions src/Task/Drupal/CloneFiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ public function run() {
'rsync',
realpath($this->source) . '/',
realpath($this->destination) . '/',
])
->option('include-conf')
->option('include-vcs');
]);

return $drushCmd->run();
}
Expand Down

0 comments on commit 82c6700

Please sign in to comment.