From 9a63ae34829929fd496e4a0e291188cbde71b3ad Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Sat, 13 Apr 2024 17:38:41 +0000
Subject: [PATCH] Merge pull request #1661 from
 hydephp/fix-extra-newline-being-written-for-failing-build-tasks

Fix extra newline being written for failing build tasks https://github.com/hydephp/develop/commit/27d01d46a6cf5fa2bc358f3d701fe45a668708b2
---
 src/Framework/Features/BuildTasks/BuildTask.php | 8 ++++----
 tests/Unit/BuildTaskUnitTest.php                | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Framework/Features/BuildTasks/BuildTask.php b/src/Framework/Features/BuildTasks/BuildTask.php
index 76a50aa3..72b491ae 100644
--- a/src/Framework/Features/BuildTasks/BuildTask.php
+++ b/src/Framework/Features/BuildTasks/BuildTask.php
@@ -50,11 +50,11 @@ public function run(?OutputStyle $output = null): int
             $this->printFinishMessage();
         } catch (Throwable $exception) {
             if ($exception instanceof BuildTaskSkippedException) {
-                $this->writeln('<bg=yellow>Skipped</>');
-                $this->writeln("<fg=gray> > {$exception->getMessage()}</>");
+                $this->write("<bg=yellow>Skipped</>\n");
+                $this->write("<fg=gray> > {$exception->getMessage()}</>");
             } else {
-                $this->writeln('<error>Failed</error>');
-                $this->writeln("<error>{$exception->getMessage()}</error>");
+                $this->write("<error>Failed</error>\n");
+                $this->write("<error>{$exception->getMessage()}</error>");
             }
 
             $this->exitCode = $exception->getCode();
diff --git a/tests/Unit/BuildTaskUnitTest.php b/tests/Unit/BuildTaskUnitTest.php
index 1a0d540c..4b484cf2 100644
--- a/tests/Unit/BuildTaskUnitTest.php
+++ b/tests/Unit/BuildTaskUnitTest.php
@@ -193,7 +193,7 @@ public function testTaskSkipping()
         });
 
         $this->assertSame(0, $task->property('exitCode'));
-        $this->assertSame('<bg=yellow>Skipped</>', $task->buffer[1]);
+        $this->assertSame('<bg=yellow>Skipped</>', trim($task->buffer[1]));
         $this->assertSame('<fg=gray> > Task was skipped</>', $task->buffer[2]);
     }
 
@@ -206,7 +206,7 @@ public function testTaskSkippingWithCustomMessage()
         });
 
         $this->assertSame(0, $task->property('exitCode'));
-        $this->assertSame('<bg=yellow>Skipped</>', $task->buffer[1]);
+        $this->assertSame('<bg=yellow>Skipped</>', trim($task->buffer[1]));
         $this->assertSame('<fg=gray> > Custom reason</>', $task->buffer[2]);
     }
 
@@ -221,7 +221,7 @@ public function testExceptionHandling()
         $task->run();
 
         $this->assertSame(123, $task->property('exitCode'));
-        $this->assertSame('<error>Failed</error>', $task->buffer[1]);
+        $this->assertSame('<error>Failed</error>', trim($task->buffer[1]));
         $this->assertSame('<error>Test exception</error>', $task->buffer[2]);
     }
 }