Conditionally assemble file path string

hydephp · Jun 25, 2024 · bebe45d · bebe45d
1 parent 323abb1
commit bebe45d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -25,7 +25,9 @@ public function __construct(string $file = '', ?Throwable $previous = null)
 
     protected function formatMessage(string $file, ?Throwable $previous): string
     {
-        return rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous)));
+        $fileLabel = $file ? sprintf(": '%s'", $file) : '';
+
+        return rtrim(sprintf("Invalid %s in file%s %s", $this->getTypeLabel($file), $fileLabel, $this->getContext($previous)));
     }
 
     protected function getTypeLabel(string $file): string

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -121,7 +121,7 @@ public function testParseExceptionWithDefaultMessage()
     {
         $exception = new ParseException();
 
-        $this->assertSame("Invalid data in file: ''", $exception->getMessage());
+        $this->assertSame("Invalid data in file", $exception->getMessage());
     }
 
     public function testParseExceptionWithFileName()
@@ -158,15 +158,15 @@ public function testParseExceptionWithEmptyFileNameAndCustomMessage()
         $previous = new RuntimeException('Custom error message.');
         $exception = new ParseException('', $previous);
 
-        $this->assertSame("Invalid data in file: '' (Custom error message)", $exception->getMessage());
+        $this->assertSame("Invalid data in file (Custom error message)", $exception->getMessage());
     }
 
     public function testParseExceptionWithEmptyFileNameAndEmptyPreviousMessage()
     {
         $previous = new RuntimeException('');
         $exception = new ParseException('', $previous);
 
-        $this->assertSame("Invalid data in file: ''", $exception->getMessage());
+        $this->assertSame("Invalid data in file", $exception->getMessage());
     }
 
     public function testParseExceptionWithNoPrevious()