diff --git a/.gitignore b/.gitignore index ec60f71..3e46fda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store vendor/ composer.lock error.log diff --git a/cli/Valet/Caddy.php b/cli/Valet/Caddy.php index 0eb6b7a..545353d 100644 --- a/cli/Valet/Caddy.php +++ b/cli/Valet/Caddy.php @@ -64,7 +64,7 @@ function installCaddyDirectory() $this->files->mkdirAsUser($caddyDirectory); } - $this->files->touchAsUser($caddyDirectory.'/.keep'); + $this->files->putAsUser($caddyDirectory.'/.keep', "\n"); $this->rewriteSecureCaddyFiles(); } diff --git a/cli/Valet/Site.php b/cli/Valet/Site.php index 9ac6ccf..f176a7d 100644 --- a/cli/Valet/Site.php +++ b/cli/Valet/Site.php @@ -211,7 +211,7 @@ function buildSecureCaddyfile($url) $path = $this->certificatesPath(); return str_replace( - ['VALET_SERVER_PATH', 'VALET_SITE', 'VALET_CERT', 'VALET_KEY'], [VALET_SERVER_PATH, $url, $path.'/'.$url.'.crt', $path.'/'.$url.'.key'], + ['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_SITE', 'VALET_CERT', 'VALET_KEY'], [VALET_HOME_PATH, VALET_SERVER_PATH, $url, $path.'/'.$url.'.crt', $path.'/'.$url.'.key'], $this->files->get(__DIR__.'/../stubs/SecureCaddyfile') ); } diff --git a/cli/valet.php b/cli/valet.php index 5b9b492..0bdc3c2 100755 --- a/cli/valet.php +++ b/cli/valet.php @@ -18,7 +18,7 @@ */ Container::setInstance(new Container); -$version = '1.2.0-alpha'; +$version = 'dev-master'; $app = new Application('Laravel Valet', $version); diff --git a/tests/CaddyTest.php b/tests/CaddyTest.php index 7c6ada1..df12e4b 100644 --- a/tests/CaddyTest.php +++ b/tests/CaddyTest.php @@ -43,7 +43,7 @@ public function test_install_caddy_directories_creates_location_for_site_specifi $files = Mockery::mock(Filesystem::class); $files->shouldReceive('isDir')->with(VALET_HOME_PATH.'/Caddy')->andReturn(false); $files->shouldReceive('mkdirAsUser')->with(VALET_HOME_PATH.'/Caddy')->once(); - $files->shouldReceive('touchAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep')->once(); + $files->shouldReceive('putAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep', "\n")->once(); swap(Filesystem::class, $files); swap(Configuration::class, Mockery::spy(Configuration::class)); @@ -59,7 +59,7 @@ public function test_caddy_directory_is_never_created_if_it_already_exists() $files = Mockery::mock(Filesystem::class); $files->shouldReceive('isDir')->with(VALET_HOME_PATH.'/Caddy')->andReturn(true); $files->shouldReceive('mkdirAsUser')->never(); - $files->shouldReceive('touchAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep'); + $files->shouldReceive('putAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep', "\n")->once(); swap(Filesystem::class, $files); swap(Configuration::class, Mockery::spy(Configuration::class)); @@ -74,8 +74,8 @@ public function test_install_caddy_directories_rewrites_secure_caddy_files() { $files = Mockery::mock(Filesystem::class); $files->shouldReceive('isDir')->with(VALET_HOME_PATH.'/Caddy')->andReturn(false); - $files->shouldReceive('mkdirAsUser')->with(VALET_HOME_PATH.'/Caddy'); - $files->shouldReceive('touchAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep'); + $files->shouldReceive('mkdirAsUser')->with(VALET_HOME_PATH.'/Caddy')->once(); + $files->shouldReceive('putAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep', "\n")->once(); swap(Filesystem::class, $files); swap(Configuration::class, $config = Mockery::spy(Configuration::class, ['read' => ['domain' => 'dev']]));