Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Merge details:

commit 9db9cb1
Author: Jelle Sebreghts <sebreghts.jelle@gmail.com>
Date:   Mon Nov 18 14:56:01 2019

    Update README.md

commit 7f45ab8
Author: Jelle Sebreghts <sebreghts.jelle@gmail.com>
Date:   Mon Nov 18 14:53:41 2019

    Update supported PHP versions for travis.

commit 12abd88
Author: Jelle Sebreghts <sebreghts.jelle@gmail.com>
Date:   Mon Nov 18 14:52:03 2019

    Start maintaining our own robo-drush package

    - Support consolidation/robo:^2.0.
    - Merge boedah#16

commit 4a2122a
Author: Tassilo Gröper <tassilo@wondrous.ch>
Date:   Fri Apr 5 16:50:34 2019

    "Drush cache clear all" is deprecated boedah#15
  • Loading branch information
Jelle-S committed Nov 18, 2019
2 parents 1ce4869 + 9db9cb1 commit aa44420
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 11 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
language: php
php:
- 7.3
- 7.2
- 7.1
- 7.0
- 5.6
- 5.5
install:
- composer self-update
- composer install
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Extension to execute Drush commands in [Robo](https://github.com/Codegyre/Robo).

[![SensioLabsInsight](https://insight.sensiolabs.com/projects/1d842f01-b2c4-415a-b372-12af7a5516e0/mini.png)](https://insight.sensiolabs.com/projects/1d842f01-b2c4-415a-b372-12af7a5516e0) [![Build Status](https://travis-ci.org/boedah/robo-drush.svg?branch=master)](https://travis-ci.org/boedah/robo-drush) [![Latest Stable Version](https://poser.pugx.org/boedah/robo-drush/v/stable)](https://packagist.org/packages/boedah/robo-drush) [![Total Downloads](https://poser.pugx.org/boedah/robo-drush/downloads)](https://packagist.org/packages/boedah/robo-drush) [![Latest Unstable Version](https://poser.pugx.org/boedah/robo-drush/v/unstable)](https://packagist.org/packages/boedah/robo-drush) [![License](https://poser.pugx.org/boedah/robo-drush/license)](https://packagist.org/packages/boedah/robo-drush)
This package was forked from [boedah/robo-drush](https://github.com/digipolisgent/robo-drush).

Runs Drush commands in stack. You can define global options for all commands (like Drupal root and uri).

Expand Down Expand Up @@ -38,7 +38,7 @@ Use the trait (according to your used version) in your RoboFile:
```php
class RoboFile extends \Robo\Tasks
{
// if you use robo-drush ~2.1 for Robo >=0.5.2, or robo-drush >3 for Robo >=1.0.0-RC1
// if you use robo-drush ~2.1 for Robo >=0.5.2, or robo-drush >3 for Robo >=1.0.0-RC1, or robo-drush form Robo >=2.0.0
use \Boedah\Robo\Task\Drush\loadTasks;

// if you use ~1.0 for Robo ~0.4
Expand Down
9 changes: 6 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"name": "boedah/robo-drush",
"name": "digipolisgent/robo-drush",
"description": "Drush CommandStack for Robo Task Runner",
"type": "robo-tasks",
"license": "MIT",
"authors": [
{
"name": "Jelle Sebreghts",
"email": "sebreghts.jelle@gmail.com"
},
{
"name": "Peter Gasser",
"email": "dev@boedah.de"
Expand All @@ -18,8 +22,7 @@
}
},
"require": {
"php": ">=5.5.0",
"consolidation/Robo": "~1"
"consolidation/robo": "^1.0|^2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4",
Expand Down
19 changes: 16 additions & 3 deletions src/DrushStack.php
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ public function updateDb()
if (-1 === version_compare($drushVersion, '6.0')) {
$this->printTaskInfo('Will clear cache after db updates for drush '
. $drushVersion);
$this->clearCache();
$this->cacheRebuild();
} else {
$this->printTaskInfo('Will not clear cache after db updates, since drush '
. $drushVersion . ' should do it automatically');
Expand Down Expand Up @@ -345,11 +345,24 @@ public function getVersion()
*
* @return $this
*/
public function clearCache($name = 'all')
public function cacheRebuild()
{
$this->printTaskInfo('Clear cache');

return $this->drush('cc ' . $name);
return $this->drush('cache-rebuild ');
}

/**
* Clears the given cache.
*
* @deprecated Deprecated with drupal 8
* @param string $name cache name
*
* @return $this
*/
public function clearCache($name = 'all')
{
return $this->cacheRebuild();
}

/**
Expand Down

0 comments on commit aa44420

Please sign in to comment.