phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-05 00:20:08 +01:00
Code Activity

Merge pull request #449 from eberkund/master

Browse Source 
Move ~/.valet to ~/.config/valet
This commit is contained in:
Matt Stauffer
2018-08-30 08:33:28 -04:00
committed by GitHub
parent 3c50fec7b6 f33bff81e9
commit 7eb1aec410
10 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@
vendor/
composer.lock
error.log
.idea

9
cli/Valet/Configuration.php
View File

@@ -9,7 +9,7 @@ class Configuration
/**
* Create a new Valet configuration class instance.
*
* @param Filesystem $filesystem
* @param Filesystem $files
*/
function __construct(Filesystem $files)
{
@@ -42,6 +42,13 @@ function install()
function createConfigurationDirectory()
{
$this->files->ensureDirExists(VALET_HOME_PATH, user());
$oldPath = posix_getpwuid(fileowner(__FILE__))['dir'].'/.valet';
if ($this->files->isDir($oldPath)) {
$this->prependPath(VALET_HOME_PATH.'/Sites');
rename($oldPath, VALET_HOME_PATH);
}
}
/**

5
cli/Valet/DnsMasq.php
View File

@@ -89,6 +89,9 @@ function copyExampleConfig()
*/
function appendCustomConfigImport($customConfigPath)
{
$contents = preg_replace('/^conf-file=.*\/\.valet\/.*$/m', '', $this->files->get($this->configPath));
$this->files->putAsUser($this->configPath, $contents);
if (! $this->customConfigIsBeingImported($customConfigPath)) {
$this->files->appendAsUser(
$this->configPath,
@@ -142,6 +145,6 @@ function updateTld($oldTld, $newTld)
*/
function customConfigPath()
{
return $_SERVER['HOME'].'/.valet/dnsmasq.conf';
return $_SERVER['HOME'].'/.config/valet/dnsmasq.conf';
}
}

2
cli/Valet/Nginx.php
View File

@@ -91,7 +91,7 @@ function installServer()
}
/**
* Install the Nginx configuration directory to the ~/.valet directory.
* Install the Nginx configuration directory to the ~/.config/valet directory.
*
* This directory contains all site-specific Nginx servers.
*

4
cli/Valet/Site.php
View File

@@ -2,8 +2,6 @@
namespace Valet;
use DomainException;
class Site
{
var $config, $cli, $files;
@@ -72,7 +70,7 @@ function links()
$certs = $this->getCertificates($certsPath);
return $this->getLinks(VALET_HOME_PATH.'/Sites', $certs);
return $this->getLinks($this->sitesPath(), $certs);
}
/**

5
cli/Valet/Valet.php
View File

@@ -2,6 +2,8 @@
namespace Valet;
use Httpful\Request;
class Valet
{
var $cli, $files;
@@ -58,10 +60,11 @@ function extensions()
*
* @param string $currentVersion
* @return bool
* @throws \Httpful\Exception\ConnectionErrorException
*/
function onLatestVersion($currentVersion)
{
$response = \Httpful\Request::get('https://api.github.com/repos/laravel/valet/releases/latest')->send();
$response = Request::get('https://api.github.com/repos/laravel/valet/releases/latest')->send();
return version_compare($currentVersion, trim($response->body->tag_name, 'v'), '>=');
}

4
cli/includes/helpers.php
View File

@@ -8,9 +8,9 @@
use Symfony\Component\Console\Helper\Table;
/**
* Define the ~/.valet path as a constant.
* Define the ~/.config/valet path as a constant.
*/
define('VALET_HOME_PATH', $_SERVER['HOME'].'/.valet');
define('VALET_HOME_PATH', $_SERVER['HOME'].'/.config/valet');
define('VALET_SERVER_PATH', realpath(__DIR__ . '/../../server.php'));
define('VALET_STATIC_PREFIX', '41c270e4-5535-4daa-b23e-c269744c2f45');

4
server.php
View File

@@ -1,10 +1,10 @@
<?php
/**
* Define the user's "~/.valet" path.
* Define the user's "~/.config/valet" path.
*/
define('VALET_HOME_PATH', posix_getpwuid(fileowner(__FILE__))['dir'].'/.valet');
define('VALET_HOME_PATH', posix_getpwuid(fileowner(__FILE__))['dir'].'/.config/valet');
define('VALET_STATIC_PREFIX', '41c270e4-5535-4daa-b23e-c269744c2f45');
/**

3
tests/ConfigurationTest.php
View File

@@ -27,8 +27,9 @@ public function tearDown()
public function test_configuration_directory_is_created_if_it_doesnt_exist()
{
$files = Mockery::mock(Filesystem::class);
$files = Mockery::mock(Filesystem::class.'[ensureDirExists,isDir]');
$files->shouldReceive('ensureDirExists')->once()->with(VALET_HOME_PATH, user());
$files->shouldReceive('isDir')->once();
swap(Filesystem::class, $files);
resolve(Configuration::class)->createConfigurationDirectory();
}

2
valet
View File

@@ -34,7 +34,7 @@ then
HOST="${PWD##*/}"
DOMAIN=$(php "$DIR/cli/valet.php" domain)
for linkname in ~/.valet/Sites/*; do
for linkname in ~/.config/valet/Sites/*; do
if [[ "$(readlink $linkname)" = "$PWD" ]]
then
HOST="${linkname##*/}"