Merge branch 'master' into master

Author: fschwaiger

cli/Valet/Brew.php

@@ -42,8 +42,28 @@ function hasInstalledPhp()
     {
         return $this->installed('php71')
             || $this->installed('php70')
-            || $this->installed('php56')
-            || $this->installed('php55');
+            || $this->installed('php56');
+    }
+
+    /**
+     * Determine if a compatible nginx version is Homebrewed.
+     *
+     * @return bool
+     */
+    function hasInstalledNginx()
+    {
+        return $this->installed('nginx')
+            || $this->installed('nginx-full');
+    }
+
+    /**
+     * Return name of the nginx service installed via Homebrewed.
+     *
+     * @return string
+     */
+    function nginxServiceName()
+    {
+        return $this->installed('nginx-full') ? 'nginx-full' : 'nginx';
     }
 
     /**
@@ -71,6 +91,8 @@ function ensureInstalled($formula, $options = [], $taps = [])
      */
     function installOrFail($formula, $options = [], $taps = [])
     {
+        info("Installing {$formula}...");
+
         if (count($taps) > 0) {
             $this->tap($taps);
         }
@@ -109,7 +131,12 @@ function restartService($services)
         $services = is_array($services) ? $services : func_get_args();
 
         foreach ($services as $service) {
-            $this->cli->quietly('sudo brew services restart '.$service);
+            if ($this->installed($service)) {
+                info("Restarting {$service}...");
+
+                $this->cli->quietly('sudo brew services stop '.$service);
+                $this->cli->quietly('sudo brew services start '.$service);
+            }
         }
     }
 
@@ -123,7 +150,11 @@ function stopService($services)
         $services = is_array($services) ? $services : func_get_args();
 
         foreach ($services as $service) {
-            $this->cli->quietly('sudo brew services stop '.$service);
+            if ($this->installed($service)) {
+                info("Stopping {$service}...");
+
+                $this->cli->quietly('sudo brew services stop '.$service);
+            }
         }
     }
 
@@ -146,8 +177,6 @@ function linkedPhp()
             return 'php70';
         } elseif (strpos($resolvedPath, 'php56') !== false) {
             return 'php56';
-        } elseif (strpos($resolvedPath, 'php55') !== false) {
-            return 'php55';
         } else {
             throw new DomainException("Unable to determine linked PHP.");
         }
@@ -162,17 +191,4 @@ function restartLinkedPhp()
     {
         $this->restartService($this->linkedPhp());
     }
-
-    /**
-     * Create the "sudoers.d" entry for running Brew.
-     *
-     * @return void
-     */
-    function createSudoersEntry()
-    {
-        $this->files->ensureDirExists('/etc/sudoers.d');
-
-        $this->files->put('/etc/sudoers.d/brew', 'Cmnd_Alias BREW = /usr/local/bin/brew *
-%admin ALL=(root) NOPASSWD: BREW'.PHP_EOL);
-    }
 }

cli/Valet/Configuration.php

@@ -28,6 +28,7 @@ function install()
         $this->createSitesDirectory();
         $this->createExtensionsDirectory();
         $this->createLogDirectory();
+        $this->createCertificatesDirectory();
         $this->writeBaseConfiguration();
 
         $this->files->chown($this->path(), user());
@@ -94,6 +95,16 @@ function createLogDirectory()
         $this->files->touch(VALET_HOME_PATH.'/Log/nginx-error.log');
     }
 
+    /**
+     * Create the directory for SSL certificates.
+     *
+     * @return void
+     */
+    function createCertificatesDirectory()
+    {
+        $this->files->ensureDirExists(VALET_HOME_PATH.'/Certificates', user());
+    }
+
     /**
      * Write the base, initial configuration for Valet.
      */

cli/Valet/Nginx.php

@@ -2,13 +2,16 @@
 
 namespace Valet;
 
+use DomainException;
+
 class Nginx
 {
     var $brew;
     var $cli;
     var $files;
     var $configuration;
     var $site;
+    const NGINX_CONF = '/usr/local/etc/nginx/nginx.conf';
 
     /**
      * Create a new Nginx instance.
@@ -37,7 +40,9 @@ function __construct(Brew $brew, CommandLine $cli, Filesystem $files,
      */
     function install()
     {
-        $this->brew->ensureInstalled('nginx', ['--with-http2']);
+        if (!$this->brew->hasInstalledNginx()) {
+            $this->brew->installOrFail('nginx', ['--with-http2']);
+        }
 
         $this->installConfiguration();
         $this->installServer();
@@ -51,10 +56,12 @@ function install()
      */
     function installConfiguration()
     {
+        info('Installing nginx configuration...');
+
         $contents = $this->files->get(__DIR__.'/../stubs/nginx.conf');
 
         $this->files->putAsUser(
-            '/usr/local/etc/nginx/nginx.conf',
+            static::NGINX_CONF,
             str_replace(['VALET_USER', 'VALET_HOME_PATH'], [user(), VALET_HOME_PATH], $contents)
         );
     }
@@ -92,6 +99,8 @@ function installServer()
      */
     function installNginxDirectory()
     {
+        info('Installing nginx directory...');
+
         if (! $this->files->isDir($nginxDirectory = VALET_HOME_PATH.'/Nginx')) {
             $this->files->mkdirAsUser($nginxDirectory);
         }
@@ -101,6 +110,19 @@ function installNginxDirectory()
         $this->rewriteSecureNginxFiles();
     }
 
+    /**
+     * Check nginx.conf for errors.
+     */
+    private function lint()
+    {
+        $this->cli->quietly(
+            'sudo nginx -c '.static::NGINX_CONF.' -t',
+            function ($exitCode, $outputMessage) {
+                throw new DomainException("Nginx cannot start, please check your nginx.conf [$exitCode: $outputMessage].");
+            }
+        );
+    }
+
     /**
      * Generate fresh Nginx servers for existing secure sites.
      *
@@ -120,7 +142,9 @@ function rewriteSecureNginxFiles()
      */
     function restart()
     {
-        $this->cli->quietly('sudo brew services restart nginx');
+        $this->lint();
+
+        $this->brew->restartService($this->brew->nginxServiceName());
     }
 
     /**
@@ -130,7 +154,9 @@ function restart()
      */
     function stop()
     {
-        $this->cli->quietly('sudo brew services stop nginx');
+        info('Stopping nginx....');
+
+        $this->cli->quietly('sudo brew services stop '. $this->brew->nginxServiceName());
     }
 
     /**

cli/Valet/PhpFpm.php

@@ -36,10 +36,7 @@ function __construct(Brew $brew, CommandLine $cli, Filesystem $files)
      */
     function install()
     {
-        if (! $this->brew->installed('php71') &&
-            ! $this->brew->installed('php70') &&
-            ! $this->brew->installed('php56') &&
-            ! $this->brew->installed('php55')) {
+        if (! $this->brew->hasInstalledPhp()) {
             $this->brew->ensureInstalled('php71', [], $this->taps);
         }
 
@@ -57,6 +54,8 @@ function install()
      */
     function updateConfiguration()
     {
+        info('Updating PHP configuration...');
+
         $contents = $this->files->get($this->fpmConfigPath());
 
         $contents = preg_replace('/^user = .+$/m', 'user = '.user(), $contents);
@@ -67,6 +66,16 @@ function updateConfiguration()
         $contents = preg_replace('/^;?listen\.mode = .+$/m', 'listen.mode = 0777', $contents);
 
         $this->files->put($this->fpmConfigPath(), $contents);
+
+
+        $contents = $this->files->get(__DIR__.'/../stubs/php-memory-limits.ini');
+
+        $destFile = dirname($this->fpmConfigPath());
+        $destFile = str_replace('/php-fpm.d', '', $destFile);
+        $destFile .= '/conf.d/php-memory-limits.ini';
+        $this->files->ensureDirExists(dirname($destFile), user());
+
+        $this->files->putAsUser($destFile, $contents);
     }
 
     /**
@@ -76,8 +85,6 @@ function updateConfiguration()
      */
     function restart()
     {
-        $this->stop();
-
         $this->brew->restartLinkedPhp();
     }
 
@@ -88,7 +95,7 @@ function restart()
      */
     function stop()
     {
-        $this->brew->stopService('php55', 'php56', 'php70', 'php71');
+        $this->brew->stopService('php56', 'php70', 'php71');
     }
 
     /**
@@ -102,7 +109,6 @@ function fpmConfigPath()
             'php71' => '/usr/local/etc/php/7.1/php-fpm.d/www.conf',
             'php70' => '/usr/local/etc/php/7.0/php-fpm.d/www.conf',
             'php56' => '/usr/local/etc/php/5.6/php-fpm.conf',
-            'php55' => '/usr/local/etc/php/5.5/php-fpm.conf',
         ];
 
         return $confLookup[$this->brew->linkedPhp()];