Merge pull request #1727 from hydephp/code-cleanup

Code cleanup and refactors
hydephp · Jun 12, 2024 · d5fbc71 · d5fbc71
2 parents 40dc339 + 4e1b97e
commit d5fbc71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -135,16 +135,16 @@ public function hasSiteUrl(): bool
     /**
      * Return a qualified URL to the supplied path if a base URL is set.
      *
-     * @param  string  $path  optional relative path suffix. Omit to return base url.
+     * @param  string  $path  An optional relative path suffix. Omit to return the base URL.
      *
-     * @throws BaseUrlNotSetException If no site URL is set and no default is provided
+     * @throws BaseUrlNotSetException If no site URL is set and no path is provided.
      */
     public function url(string $path = ''): string
     {
         $path = $this->formatLink(trim($path, '/'));
 
         if ($this->hasSiteUrl()) {
-            return rtrim(rtrim((string) Config::getNullableString('hyde.url'), '/')."/$path", '/');
+            return rtrim(rtrim(Config::getString('hyde.url'), '/')."/$path", '/');
         }
 
         throw new BaseUrlNotSetException();

diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -35,7 +35,7 @@ public function testAssetHelperGetsRelativeWebLinkToImageStoredInSiteMediaFolder
         ];
 
         foreach ($tests as $input => $expected) {
-            $this->assertEquals($this->class->asset($input), $expected);
+            $this->assertSame($this->class->asset($input), $expected);
         }
     }
 
@@ -50,30 +50,30 @@ public function testAssetHelperResolvesPathsForNestedPages()
 
         foreach ($tests as $input => $expected) {
             $this->mockCurrentPage('foo/bar');
-            $this->assertEquals($this->class->asset($input), $expected);
+            $this->assertSame($this->class->asset($input), $expected);
         }
     }
 
     public function testAssetHelperReturnsQualifiedAbsoluteUriWhenRequestedAndSiteHasBaseUrl()
     {
-        $this->assertEquals('http://localhost/media/test.jpg', $this->class->asset('test.jpg', true));
+        $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('test.jpg', true));
     }
 
     public function testAssetHelperReturnsDefaultRelativePathWhenQualifiedAbsoluteUriIsRequestedButSiteHasNoBaseUrl()
     {
         config(['hyde.url' => null]);
-        $this->assertEquals('media/test.jpg', $this->class->asset('test.jpg', true));
+        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg', true));
     }
 
     public function testAssetHelperReturnsInputWhenQualifiedAbsoluteUriIsRequestedButImageIsAlreadyQualified()
     {
-        $this->assertEquals('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg', true));
+        $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg', true));
     }
 
     public function testAssetHelperUsesConfiguredMediaDirectory()
     {
         Hyde::setMediaDirectory('_assets');
-        $this->assertEquals('assets/test.jpg', $this->class->asset('test.jpg'));
+        $this->assertSame('assets/test.jpg', $this->class->asset('test.jpg'));
     }
 
     public function testMediaLinkHelper()