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

Update brew list to use runAsUser instead of directly sudoing

Browse Source
This commit is contained in:
Adam Lavin
2016-11-23 21:52:56 +00:00
parent 6aa1f4b7bf
commit b2878a6d1a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/Valet/Brew.php
View File

@@ -30,7 +30,7 @@ function __construct(CommandLine $cli, Filesystem $files)
*/
function installed($formula)
{
return in_array($formula, explode(PHP_EOL, $this->cli->run('sudo -u '.user().' brew list | grep '.$formula)));
return in_array($formula, explode(PHP_EOL, $this->cli->runAsUser('brew list | grep '.$formula)));
}
/**

10
tests/BrewTest.php
View File

@@ -30,12 +30,12 @@ public function test_brew_can_be_resolved_from_container()
public function test_installed_returns_true_when_given_formula_is_installed()
{
$cli = Mockery::mock(CommandLine::class);
$cli->shouldReceive('run')->once()->with('sudo -u '.user().' brew list | grep php70')->andReturn('php70');
$cli->shouldReceive('runAsUser')->once()->with('brew list | grep php70')->andReturn('php70');
swap(CommandLine::class, $cli);
$this->assertTrue(resolve(Brew::class)->installed('php70'));
$cli = Mockery::mock(CommandLine::class);
$cli->shouldReceive('run')->once()->with('sudo -u '.user().' brew list | grep php70')->andReturn('php70-mcrypt
$cli->shouldReceive('runAsUser')->once()->with('brew list | grep php70')->andReturn('php70-mcrypt
php70');
swap(CommandLine::class, $cli);
$this->assertTrue(resolve(Brew::class)->installed('php70'));
@@ -45,17 +45,17 @@ public function test_installed_returns_true_when_given_formula_is_installed()
public function test_installed_returns_false_when_given_formula_is_not_installed()
{
$cli = Mockery::mock(CommandLine::class);
$cli->shouldReceive('run')->once()->with('sudo -u '.user().' brew list | grep php70')->andReturn('');
$cli->shouldReceive('runAsUser')->once()->with('brew list | grep php70')->andReturn('');
swap(CommandLine::class, $cli);
$this->assertFalse(resolve(Brew::class)->installed('php70'));
$cli = Mockery::mock(CommandLine::class);
$cli->shouldReceive('run')->once()->with('sudo -u '.user().' brew list | grep php70')->andReturn('php70-mcrypt');
$cli->shouldReceive('runAsUser')->once()->with('brew list | grep php70')->andReturn('php70-mcrypt');
swap(CommandLine::class, $cli);
$this->assertFalse(resolve(Brew::class)->installed('php70'));
$cli = Mockery::mock(CommandLine::class);
$cli->shouldReceive('run')->once()->with('sudo -u '.user().' brew list | grep php70')->andReturn('php70-mcrypt
$cli->shouldReceive('runAsUser')->once()->with('brew list | grep php70')->andReturn('php70-mcrypt
php70-something-else
php7');
swap(CommandLine::class, $cli);