Merge branch 'develop'

.travis.yml

@@ -0,0 +1,20 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=ec8d28026163d5cfe9b295c14081665e8453150a5acea9304e3a2f7ce850e5c5
+language: php
+php:
+  - 7.1
+  - 7.0
+  - 5.6
+  - 5.5
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+install:
+  - composer self-update
+  - composer install --dev
+script:
+  - vendor/bin/phpunit
+after_script:
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi

README.md

@@ -1,5 +1,15 @@
 # Robo Digipolis Drupal8
 
+[![Latest Stable Version](https://poser.pugx.org/digipolisgent/robo-digipolis-drupal8/v/stable)](https://packagist.org/packages/digipolisgent/robo-digipolis-drupal8)
+[![Latest Unstable Version](https://poser.pugx.org/digipolisgent/robo-digipolis-drupal8/v/unstable)](https://packagist.org/packages/digipolisgent/robo-digipolis-drupal8)
+[![Total Downloads](https://poser.pugx.org/digipolisgent/robo-digipolis-drupal8/downloads)](https://packagist.org/packages/digipolisgent/robo-digipolis-drupal8)
+[![License](https://poser.pugx.org/digipolisgent/robo-digipolis-drupal8/license)](https://packagist.org/packages/digipolisgent/robo-digipolis-drupal8)
+
+[![Build Status](https://travis-ci.org/digipolisgent/robo-digipolis-drupal8.svg?branch=develop)](https://travis-ci.org/digipolisgent/robo-digipolis-drupal8)
+[![Maintainability](https://api.codeclimate.com/v1/badges/f3b213f3d449af134290/maintainability)](https://codeclimate.com/github/digipolisgent/robo-digipolis-drupal8/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/f3b213f3d449af134290/test_coverage)](https://codeclimate.com/github/digipolisgent/robo-digipolis-drupal8/test_coverage)
+[![PHP 7 ready](https://php7ready.timesplinter.ch/digipolisgent/robo-digipolis-drupal8/develop/badge.svg)](https://travis-ci.org/digipolisgent/robo-digipolis-drupal8)
+
 Used by digipolis, serving as an example.
 
 This package contains a RoboFileBase class that can be used in your own

composer.json

@@ -14,8 +14,7 @@
         "drupal/coder": "^8.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.4",
-        "codeclimate/php-test-reporter": "dev-master"
+        "phpunit/phpunit": "~4.4"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -4,7 +4,7 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
 >
     <testsuites>
-        <testsuite name="robo-digipolis-deploy tests">
+        <testsuite name="robo-digipolis-drupal8 tests">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>

src/RoboFileBase.php

@@ -5,8 +5,6 @@
 use DigipolisGent\Robo\Helpers\AbstractRoboFile;
 use DigipolisGent\Robo\Task\Deploy\Ssh\Auth\AbstractAuth;
 use DigipolisGent\Robo\Task\Deploy\Ssh\Auth\KeyFile;
-use function file_exists;
-use function is_file;
 use RandomLib\Factory;
 use SecurityLib\Strength;
 
@@ -414,7 +412,7 @@ public function digipolisInstallDrupal8(
         }
 
         $collection = $this->collectionBuilder();
-        $collection->taskDrushStack('vendor/bin/drush')
+        $drushInstall = $collection->taskDrushStack('vendor/bin/drush')
             ->drupalRootDirectory($this->getConfig()->get('digipolis.root.web'))
             ->dbUrl(
                 $config['driver'] . '://'
@@ -428,11 +426,15 @@ public function digipolisInstallDrupal8(
             )
             ->dbSu($config['username'])
             ->dbSuPw($config['password'])
-            ->dbPrefix($config['prefix'])
             ->siteName($opts['site-name'])
             ->accountName($opts['account-name'])
             ->accountMail($opts['account-mail'])
             ->accountPass('"' . $opts['account-pass'] . '"');
+
+        if (!empty($config['prefix'])) {
+            $drushInstall->dbPrefix($config['prefix']);
+        }
+
         if ($opts['force']) {
             // There is no force option for drush.
             // $collection->option('force');