Merge pull request #1178 from cristiancalara/master

Stop root homebrew services on php version switch

cli/Valet/Brew.php

@@ -370,21 +370,59 @@ function ($exitCode, $errorOutput) use ($formula) {
         );
     }
 
+    /**
+     * Get all the currently running brew services.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public function getAllRunningServices()
+    {
+        return $this->getRunningServicesAsRoot()
+            ->concat($this->getRunningServicesAsUser())
+            ->unique();
+    }
+
+    /**
+     * Get the currently running brew services as root.
+     * i.e. /Library/LaunchDaemons (started at boot).
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public function getRunningServicesAsRoot()
+    {
+        return $this->getRunningServices();
+    }
+
     /**
      * Get the currently running brew services.
+     * i.e. ~/Library/LaunchAgents (started at login).
      *
      * @return \Illuminate\Support\Collection
      */
-    public function getRunningServices()
+    public function getRunningServicesAsUser()
     {
-        return collect(array_filter(explode(PHP_EOL, $this->cli->runAsUser(
-            'brew services list | grep started | awk \'{ print $1; }\'',
-            function ($exitCode, $errorOutput) {
-                output($errorOutput);
+        return $this->getRunningServices(true);
+    }
 
-                throw new DomainException('Brew was unable to check which services are running.');
-            }
-        ))));
+    /**
+     * Get the currently running brew services.
+     *
+     * @param  bool  $asUser
+     * @return \Illuminate\Support\Collection
+     */
+    public function getRunningServices($asUser = false)
+    {
+        $command = 'brew services list | grep started | awk \'{ print $1; }\'';
+        $onError = function ($exitCode, $errorOutput) {
+            output($errorOutput);
+
+            throw new DomainException('Brew was unable to check which services are running.');
+        };
+
+        return collect(array_filter(explode(PHP_EOL, $asUser
+            ? $this->cli->runAsUser($command, $onError)
+            : $this->cli->run('sudo '.$command, $onError)
+        )));
     }
 
     /**

cli/Valet/PhpFpm.php

@@ -159,7 +159,7 @@ public function fpmConfigPath()
     public function stopRunning()
     {
         $this->brew->stopService(
-            $this->brew->getRunningServices()
+            $this->brew->getAllRunningServices()
                 ->filter(function ($service) {
                     return substr($service, 0, 3) === 'php';
                 })

tests/BrewTest.php

@@ -307,7 +307,7 @@ public function test_getRunningServices_will_throw_exception_on_failure()
             $onError(1, 'test error output');
         });
         swap(CommandLine::class, $cli);
-        resolve(Brew::class)->getRunningServices();
+        resolve(Brew::class)->getRunningServices(true);
     }
 
     public function test_getRunningServices_will_pass_to_brew_services_list_and_return_array()
@@ -319,7 +319,7 @@ public function test_getRunningServices_will_pass_to_brew_services_list_and_retu
         ])->andReturn('service1'.PHP_EOL.'service2'.PHP_EOL.PHP_EOL.'service3'.PHP_EOL);
 
         swap(CommandLine::class, $cli);
-        $result = resolve(Brew::class)->getRunningServices('term');
+        $result = resolve(Brew::class)->getRunningServices(true);
         $this->assertInstanceOf(Collection::class, $result);
         $this->assertSame([
             'service1',
@@ -328,6 +328,42 @@ public function test_getRunningServices_will_pass_to_brew_services_list_and_retu
         ], array_values($result->all()));
     }
 
+    public function test_getAllRunningServices_will_return_both_root_and_user_services()
+    {
+        $cli = Mockery::mock(CommandLine::class);
+        $cli->shouldReceive('run')->once()->withArgs([
+            'sudo brew services list | grep started | awk \'{ print $1; }\'',
+            Mockery::type('callable'),
+        ])->andReturn('sudo_ran_service');
+        $cli->shouldReceive('runAsUser')->once()->withArgs([
+            'brew services list | grep started | awk \'{ print $1; }\'',
+            Mockery::type('callable'),
+        ])->andReturn('user_ran_service');
+
+        swap(CommandLine::class, $cli);
+        $result = resolve(Brew::class)->getAllRunningServices();
+        $this->assertSame([
+            'sudo_ran_service',
+            'user_ran_service',
+        ], array_values($result->all()));
+    }
+
+    public function test_getAllRunningServices_will_return_unique_services()
+    {
+        $cli = Mockery::mock(CommandLine::class);
+        $cli->shouldReceive('run')->once()->andReturn('service1'.PHP_EOL.'service2'.PHP_EOL.'service1'.PHP_EOL);
+        $cli->shouldReceive('runAsUser')->once()->andReturn('service3'.PHP_EOL.'service4'.PHP_EOL.'service2'.PHP_EOL);
+
+        swap(CommandLine::class, $cli);
+        $result = resolve(Brew::class)->getAllRunningServices();
+        $this->assertSame([
+            'service1',
+            'service2',
+            'service3',
+            'service4',
+        ], array_values($result->all()));
+    }
+
     /**
      * @dataProvider supportedPhpLinkPathProvider
      *

tests/PhpFpmTest.php

@@ -42,7 +42,7 @@ public function test_fpm_is_configured_with_the_correct_user_group_and_port()
     public function test_stopRunning_will_pass_filtered_result_of_getRunningServices_to_stopService()
     {
         $brewMock = Mockery::mock(Brew::class);
-        $brewMock->shouldReceive('getRunningServices')->once()
+        $brewMock->shouldReceive('getAllRunningServices')->once()
             ->andReturn(collect([
                 'php7.2',
                 '[email protected]',
@@ -83,7 +83,7 @@ public function test_use_version_will_convert_passed_php_version()
         $brewMock->shouldReceive('link')->withArgs(['[email protected]', true]);
         $brewMock->shouldReceive('linkedPhp');
         $brewMock->shouldReceive('installed');
-        $brewMock->shouldReceive('getRunningServices')->andReturn(collect());
+        $brewMock->shouldReceive('getAllRunningServices')->andReturn(collect());
         $brewMock->shouldReceive('stopService');
 
         // Test both non prefixed and prefixed
@@ -128,7 +128,7 @@ public function test_use_version_if_already_linked_php_will_unlink_before_instal
         $brewMock->shouldReceive('link')->withArgs(['[email protected]', true]);
         $brewMock->shouldReceive('linkedPhp');
         $brewMock->shouldReceive('installed');
-        $brewMock->shouldReceive('getRunningServices')->andReturn(collect());
+        $brewMock->shouldReceive('getAllRunningServices')->andReturn(collect());
         $brewMock->shouldReceive('stopService');
 
         // Test both non prefixed and prefixed