Merge branch 'master' into 2.x-dev

Author: emmadesilva

packages/framework/config/commands.php

@@ -58,6 +58,7 @@
         NunoMaduro\LaravelConsoleSummary\SummaryCommand::class,
         Symfony\Component\Console\Command\DumpCompletionCommand::class,
         Symfony\Component\Console\Command\HelpCommand::class,
+        \Illuminate\Cache\Console\ClearCommand::class,
         \Hyde\Console\Commands\DebugCommand::class,
         \Torchlight\Commands\Install::class,
     ],

packages/framework/src/Foundation/Kernel/Hyperlinks.php

@@ -110,7 +110,7 @@ public function mediaLink(string $destination, bool $validate = false): string
      */
     public function asset(string $name, bool $preferQualifiedUrl = false): string
     {
-        if (str_starts_with($name, 'http')) {
+        if (static::isRemote($name)) {
             return $name;
         }
 
@@ -145,7 +145,7 @@ public function url(string $path = ''): ?string
     {
         $path = $this->formatLink(trim($path, '/'));
 
-        if (str_starts_with($path, 'http')) {
+        if (static::isRemote($path)) {
             return $path;
         }
 
@@ -170,4 +170,12 @@ public function route(string $key): ?Route
     {
         return $this->kernel->routes()->get($key);
     }
+
+    /**
+     * Determine if the given URL is a remote link.
+     */
+    public static function isRemote(string $url): bool
+    {
+        return str_starts_with($url, 'http') || str_starts_with($url, '//');
+    }
 }

packages/framework/src/Framework/Factories/FeaturedImageFactory.php

@@ -8,6 +8,7 @@
 use RuntimeException;
 use Illuminate\Support\Str;
 use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 
@@ -72,7 +73,7 @@ protected function makeSource(): string
             throw new RuntimeException(sprintf('No featured image source was found in "%s"', $this->filePath ?? 'unknown file'));
         }
 
-        if (FeaturedImage::isRemote($value)) {
+        if (Hyperlinks::isRemote($value)) {
             return $value;
         }
 

packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php

@@ -9,7 +9,9 @@
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\BuildWarnings;
+use JetBrains\PhpStorm\Deprecated;
 use Illuminate\Support\Facades\Http;
+use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 
@@ -19,7 +21,6 @@
 use function filesize;
 use function sprintf;
 use function key;
-use function str_starts_with;
 
 /**
  * Object representation of a blog post's featured image.
@@ -63,7 +64,7 @@ public function __construct(
         protected readonly ?string $licenseUrl = null,
         protected readonly ?string $copyrightText = null
     ) {
-        $this->type = self::isRemote($source) ? self::TYPE_REMOTE : self::TYPE_LOCAL;
+        $this->type = Hyperlinks::isRemote($source) ? self::TYPE_REMOTE : self::TYPE_LOCAL;
         $this->source = $this->setSource($source);
     }
 
@@ -241,8 +242,14 @@ protected function getContentLengthForRemoteImage(): int
         return 0;
     }
 
+    /**
+     * @codeCoverageIgnore Deprecated method.
+     *
+     * @deprecated This method will be removed in v2.0. Please use `Hyperlinks::isRemote` instead.
+     */
+    #[Deprecated(reason: 'Replaced by the \Hyde\Foundation\Kernel\Hyperlinks::isRemote method', replacement: '\Hyde\Foundation\Kernel\Hyperlinks::isRemote(%parametersList%)', since: '1.8.0')]
     public static function isRemote(string $source): bool
     {
-        return str_starts_with($source, 'http') || str_starts_with($source, '//');
+        return Hyperlinks::isRemote($source);
     }
 }

packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php

@@ -7,8 +7,8 @@
 use Hyde\Facades\Meta;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Foundation\Kernel\Hyperlinks;
 
-use function str_starts_with;
 use function substr_count;
 use function str_repeat;
 
@@ -77,7 +77,7 @@ protected function resolveImageLink(string $image): string
     {
         // Since this is run before the page is rendered, we don't have the currentPage property.
         // So we need to run some of the same calculations here to resolve the image path link.
-        return str_starts_with($image, 'http') ? $image
+        return Hyperlinks::isRemote($image) ? $image
             : str_repeat('../', substr_count(MarkdownPost::outputDirectory().'/'.$this->page->identifier, '/')).$image;
     }
 }

packages/framework/tests/Feature/Commands/CacheClearCommandTest.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature\Commands;
+
+use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * @coversNothing
+ */
+class CacheClearCommandTest extends TestCase
+{
+    public function testCacheClearCommand()
+    {
+        Cache::remember('foo', 60, fn () => 'bar');
+
+        $this->assertSame('bar', Cache::get('foo'));
+
+        $this->artisan('cache:clear')
+            ->expectsOutputToContain('Application cache cleared successfully.')
+            ->assertExitCode(0);
+
+        $this->assertNull(Cache::get('foo'));
+    }
+}

packages/framework/tests/Feature/Foundation/HyperlinksTest.php

@@ -127,4 +127,34 @@ public function testRouteHelperWithInvalidRoute()
     {
         $this->assertNull($this->class->route('foo'));
     }
+
+    public function testIsRemoteWithHttpUrl()
+    {
+        $this->assertTrue(Hyperlinks::isRemote('http://example.com'));
+    }
+
+    public function testIsRemoteWithHttpsUrl()
+    {
+        $this->assertTrue(Hyperlinks::isRemote('https://example.com'));
+    }
+
+    public function testIsRemoteWithProtocolRelativeUrl()
+    {
+        $this->assertTrue(Hyperlinks::isRemote('//example.com'));
+    }
+
+    public function testIsRemoteWithRelativeUrl()
+    {
+        $this->assertFalse(Hyperlinks::isRemote('/path/to/resource'));
+    }
+
+    public function testIsRemoteWithAbsoluteLocalPath()
+    {
+        $this->assertFalse(Hyperlinks::isRemote('/var/www/html/index.php'));
+    }
+
+    public function testIsRemoteWithEmptyString()
+    {
+        $this->assertFalse(Hyperlinks::isRemote(''));
+    }
 }