formatting

laravel · taylorotwell · Nov 22, 2024 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024
commit 952eb1453ddc62da8779fa2ff14a558f5c84638d
diff --git a/src/Illuminate/Console/Scheduling/CommandBuilder.php b/src/Illuminate/Console/Scheduling/CommandBuilder.php
@@ -32,15 +32,9 @@ protected function buildForegroundCommand(Event $event)
    {
        $output = ProcessUtils::escapeArgument($event->output);

-        if (laravel_cloud()) {
-            return $this->ensureCorrectUser(
-                $event, $event->command.' 2>&1 | tee '.($event->shouldAppendOutput ? '-a ' : '').$output
-            );
-        } else {
-            return $this->ensureCorrectUser(
-                $event, $event->command.($event->shouldAppendOutput ? ' >> ' : ' > ').$output.' 2>&1'
-            );
-        }
+        return laravel_cloud()
+            ? $this->ensureCorrectUser($event, $event->command.' 2>&1 | tee '.($event->shouldAppendOutput ? '-a ' : '').$output)
+            : $this->ensureCorrectUser($event, $event->command.($event->shouldAppendOutput ? ' >> ' : ' > ').$output.' 2>&1');
    }

    /**
@@ -61,14 +55,6 @@ protected function buildBackgroundCommand(Event $event)
            return 'start /b cmd /v:on /c "('.$event->command.' & '.$finished.' ^!ERRORLEVEL^!)'.$redirect.$output.' 2>&1"';
        }

-        if (laravel_cloud()) {
-            $event->storeOutput();
-
-            return $this->ensureCorrectUser($event,
-                '('.$event->command.' 2>&1 | tee '.($event->shouldAppendOutput ? '-a ' : '').$output.'; '.$finished.' "$?") 2>&1 &'
-            );
-        }
-
        return $this->ensureCorrectUser($event,
            '('.$event->command.$redirect.$output.' 2>&1 ; '.$finished.' "$?") > '
            .ProcessUtils::escapeArgument($event->getDefaultOutput()).' 2>&1 &'

diff --git a/src/Illuminate/Console/Scheduling/Event.php b/src/Illuminate/Console/Scheduling/Event.php
@@ -204,13 +204,13 @@ protected function start($container)
     */
    protected function execute($container)
    {
-        $callback = laravel_cloud()
-            ? fn ($type, $line) => fwrite($type === 'out' ? STDOUT : STDERR, $line)
-            : fn () => true;
-
        return Process::fromShellCommandline(
            $this->buildCommand(), base_path(), null, null, null
-        )->run($callback);
+        )->run(
+            laravel_cloud()
+                ? fn ($type, $line) => fwrite($type === 'out' ? STDOUT : STDERR, $line)
+                : fn () => true
+        );
    }

    /**