Merge remote-tracking branch 'upstream/master'

Author: fschwaiger

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 vendor/
 composer.lock
 error.log

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
 
 env:
   global:
@@ -15,6 +15,10 @@ sudo: false
 before_install:
   - travis_retry composer self-update
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 install:
   - if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-dist; fi
   - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable; fi

bin/CaddyLicense.txt

@@ -30,7 +30,7 @@ function __construct(CommandLine $cli, Filesystem $files)
      */
     function installed($formula)
     {
-        return in_array($formula, explode(PHP_EOL, $this->cli->run('brew list | grep '.$formula)));
+        return in_array($formula, explode(PHP_EOL, $this->cli->runAsUser('brew list | grep '.$formula)));
     }
 
     /**
@@ -40,7 +40,8 @@ function installed($formula)
      */
     function hasInstalledPhp()
     {
-        return $this->installed('php70')
+        return $this->installed('php71')
+            || $this->installed('php70')
             || $this->installed('php56')
             || $this->installed('php55');
     }
@@ -49,40 +50,42 @@ function hasInstalledPhp()
      * Ensure that the given formula is installed.
      *
      * @param  string  $formula
+     * @param  array  $options
      * @param  array  $taps
      * @return void
      */
-    function ensureInstalled($formula, array $taps = [])
+    function ensureInstalled($formula, $options = [], $taps = [])
     {
         if (! $this->installed($formula)) {
-            $this->installOrFail($formula, $taps);
+            $this->installOrFail($formula, $options, $taps);
         }
     }
 
     /**
      * Install the given formula and throw an exception on failure.
      *
      * @param  string  $formula
+     * @param  array  $options
      * @param  array  $taps
      * @return void
      */
-    function installOrFail($formula, array $taps = [])
+    function installOrFail($formula, $options = [], $taps = [])
     {
         if (count($taps) > 0) {
             $this->tap($taps);
         }
 
         output('<info>['.$formula.'] is not installed, installing it now via Brew...</info> 🍻');
 
-        $this->cli->runAsUser('brew install '.$formula, function ($exitCode, $errorOutput) use ($formula) {
+        $this->cli->runAsUser(trim('brew install '.$formula.' '.implode(' ', $options)), function ($exitCode, $errorOutput) use ($formula) {
             output($errorOutput);
 
             throw new DomainException('Brew was unable to install ['.$formula.'].');
         });
     }
 
     /**
-     * Tag the given formulas.
+     * Tap the given formulas.
      *
      * @param  dynamic[string]  $formula
      * @return void
@@ -137,7 +140,9 @@ function linkedPhp()
 
         $resolvedPath = $this->files->readLink('/usr/local/bin/php');
 
-        if (strpos($resolvedPath, 'php70') !== false) {
+        if (strpos($resolvedPath, 'php71') !== false) {
+            return 'php71';
+        } elseif (strpos($resolvedPath, 'php70') !== false) {
             return 'php70';
         } elseif (strpos($resolvedPath, 'php56') !== false) {
             return 'php56';