diff --git a/cli/Valet/Brew.php b/cli/Valet/Brew.php index cc15896..b6f2aab 100644 --- a/cli/Valet/Brew.php +++ b/cli/Valet/Brew.php @@ -42,8 +42,7 @@ function hasInstalledPhp() { return $this->installed('php71') || $this->installed('php70') - || $this->installed('php56') - || $this->installed('php55'); + || $this->installed('php56'); } /** @@ -146,8 +145,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."); } diff --git a/cli/Valet/PhpFpm.php b/cli/Valet/PhpFpm.php index 3733396..e0eb42a 100644 --- a/cli/Valet/PhpFpm.php +++ b/cli/Valet/PhpFpm.php @@ -38,8 +38,7 @@ function install() { if (! $this->brew->installed('php71') && ! $this->brew->installed('php70') && - ! $this->brew->installed('php56') && - ! $this->brew->installed('php55')) { + ! $this->brew->installed('php56')) { $this->brew->ensureInstalled('php71', [], $this->taps); } @@ -88,7 +87,7 @@ function restart() */ function stop() { - $this->brew->stopService('php55', 'php56', 'php70', 'php71'); + $this->brew->stopService('php56', 'php70', 'php71'); } /** @@ -102,7 +101,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()]; diff --git a/cli/includes/compatibility.php b/cli/includes/compatibility.php index 942b7d1..adc64e5 100644 --- a/cli/includes/compatibility.php +++ b/cli/includes/compatibility.php @@ -11,8 +11,8 @@ exit(1); } -if (version_compare(PHP_VERSION, '5.5.9', '<')) { - echo "Valet requires PHP 5.5.9 or later."; +if (version_compare(PHP_VERSION, '5.6.0', '<')) { + echo "Valet requires PHP 5.6 or later."; exit(1); } diff --git a/composer.json b/composer.json index e528016..cdb852f 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ } }, "require": { - "php": ">=5.5.9", + "php": ">=5.6", "illuminate/container": "~5.1", "mnapoli/silly": "~1.0", "symfony/process": "~2.7|~3.0", diff --git a/tests/BrewTest.php b/tests/BrewTest.php index c4bd9b6..af380b9 100644 --- a/tests/BrewTest.php +++ b/tests/BrewTest.php @@ -69,21 +69,18 @@ public function test_has_installed_php_indicates_if_php_is_installed_via_brew() $brew->shouldReceive('installed')->once()->with('php71')->andReturn(true); $brew->shouldReceive('installed')->with('php70')->andReturn(true); $brew->shouldReceive('installed')->with('php56')->andReturn(true); - $brew->shouldReceive('installed')->with('php55')->andReturn(true); $this->assertTrue($brew->hasInstalledPhp()); $brew = Mockery::mock(Brew::class.'[installed]', [new CommandLine, new Filesystem]); $brew->shouldReceive('installed')->once()->with('php70')->andReturn(true); $brew->shouldReceive('installed')->with('php71')->andReturn(false); $brew->shouldReceive('installed')->with('php56')->andReturn(false); - $brew->shouldReceive('installed')->with('php55')->andReturn(false); $this->assertTrue($brew->hasInstalledPhp()); $brew = Mockery::mock(Brew::class.'[installed]', [new CommandLine, new Filesystem]); $brew->shouldReceive('installed')->once()->with('php71')->andReturn(false); $brew->shouldReceive('installed')->once()->with('php70')->andReturn(false); $brew->shouldReceive('installed')->once()->with('php56')->andReturn(false); - $brew->shouldReceive('installed')->once()->with('php55')->andReturn(false); $this->assertFalse($brew->hasInstalledPhp()); }