Refactor code for restarting specific PHP version

Author: mattstauffer

cli/app.php

@@ -495,27 +495,32 @@ function (ConsoleCommandEvent $event) {
      * Restart the daemon services.
      */
     $app->command('restart [service]', function (OutputInterface $output, $service) {
-        $serviceContainsPhp = is_string($service) && false !== strpos($service, 'php');
+        switch ($service) {
+            case '':
+                DnsMasq::restart();
+                PhpFpm::restart();
+                Nginx::restart();
 
-        if ($service == '') {
-            DnsMasq::restart();
-            PhpFpm::restart();
-            Nginx::restart();
+                return info('Valet services have been restarted.');
+            case 'dnsmasq':
+                DnsMasq::restart();
 
-            return info('Valet services have been restarted.');
-        } elseif ($service == 'dnsmasq') {
-            DnsMasq::restart();
+                return info('dnsmasq has been restarted.');
+            case 'nginx':
+                Nginx::restart();
 
-            return info('dnsmasq has been restarted.');
-        } elseif ($service == 'nginx') {
-            Nginx::restart();
+                return info('Nginx has been restarted.');
+            case 'php':
+                PhpFpm::restart();
+
+                return info('PHP has been restarted.');
+        }
 
-            return info('Nginx has been restarted.');
-        } elseif ($serviceContainsPhp) {
-            $hasSpecifiedVersion = $service !== 'php';
-            PhpFpm::restart($hasSpecifiedVersion ? PhpFpm::normalizePhpVersion($service) : null);
+        // Handle restarting specific PHP version (e.g. `valet restart [email protected]`)
+        if (str_contains($service, 'php')) {
+            PhpFpm::restart($normalized = PhpFpm::normalizePhpVersion($service));
 
-            return info('PHP has been restarted.');
+            return info($normalized . ' has been restarted.');
         }
 
         return warning(sprintf('Invalid valet service name [%s]', $service));

tests/CliTest.php

@@ -792,7 +792,7 @@ public function test_restart_command_restarts_php_version()
         $tester->run(['command' => 'restart', 'service' => '[email protected]']);
         $tester->assertCommandIsSuccessful();
 
-        $this->assertStringContainsString('PHP has been restarted.', $tester->getDisplay());
+        $this->assertStringContainsString('[email protected] has been restarted.', $tester->getDisplay());
     }
 
     public function test_restart_command_restarts_php_denormalized_version()
@@ -813,7 +813,7 @@ public function test_restart_command_restarts_php_denormalized_version()
         $tester->run(['command' => 'restart', 'service' => 'php81']);
         $tester->assertCommandIsSuccessful();
 
-        $this->assertStringContainsString('PHP has been restarted.', $tester->getDisplay());
+        $this->assertStringContainsString('[email protected] has been restarted.', $tester->getDisplay());
     }
 
     public function test_start_command()