Merge pull request #1399 from hydephp/general-bugfixes

emmadesilva · web-flow · commit cda8c665540f · 2023-10-27T19:35:30.000+02:00
Use a custom exception message when failing to get image size
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -30,6 +30,7 @@ This serves two purposes:
 - Updated dropdown navigation menus to support setting priority in config in https://github.com/hydephp/develop/pull/1387 (fixing https://github.com/hydephp/hyde/issues/229)
 - Updated the vendor publish command to support parent Laravel Prompts implementation in https://github.com/hydephp/develop/pull/1388
 - Fixed wrong version constant in https://github.com/hydephp/develop/pull/1391
+- Fixed improperly formatted exception message in https://github.com/hydephp/develop/pull/1399
 
 ### Security
 - in case of vulnerabilities.
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -217,7 +217,7 @@ protected function getContentLengthForLocalImage(): int
         $storagePath = Hyde::mediaPath($this->source);
 
         if (! file_exists($storagePath)) {
-            throw new FileNotFoundException(sprintf('Image at %s does not exist', Hyde::pathToRelative($storagePath)));
+            throw new FileNotFoundException(customMessage: sprintf('Featured image [%s] not found.', Hyde::pathToRelative($storagePath)));
         }
 
         return filesize($storagePath);
diff --git a/packages/framework/tests/Unit/FeaturedImageUnitTest.php b/packages/framework/tests/Unit/FeaturedImageUnitTest.php
@@ -124,7 +124,7 @@ public function testGetContentLength()
     public function testFeaturedImageGetContentLengthWithNoSource()
     {
         $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('Image at _media/foo does not exist');
+        $this->expectExceptionMessage('Featured image [_media/foo] not found.');
 
         $image = new FeaturedImage('_media/foo', ...$this->defaultArguments());
         $this->assertEquals(0, $image->getContentLength());

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ protected function getContentLengthForLocalImage(): int`
`217`	`217`	`$storagePath = Hyde::mediaPath($this->source);`
`218`	`218`
`219`	`219`	`if (! file_exists($storagePath)) {`
`220`		`- throw new FileNotFoundException(sprintf('Image at %s does not exist', Hyde::pathToRelative($storagePath)));`
	`220`	`+ throw new FileNotFoundException(customMessage: sprintf('Featured image [%s] not found.', Hyde::pathToRelative($storagePath)));`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`return filesize($storagePath);`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function testGetContentLength()`
`124`	`124`	`public function testFeaturedImageGetContentLengthWithNoSource()`
`125`	`125`	`{`
`126`	`126`	`$this->expectException(FileNotFoundException::class);`
`127`		`- $this->expectExceptionMessage('Image at _media/foo does not exist');`
	`127`	`+ $this->expectExceptionMessage('Featured image [_media/foo] not found.');`
`128`	`128`
`129`	`129`	`$image = new FeaturedImage('_media/foo', ...$this->defaultArguments());`
`130`	`130`	`$this->assertEquals(0, $image->getContentLength());`