From 788004106c91c7591b6f9d1012689e0a9fccaf62 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:16:49 +0200
Subject: [PATCH 001/328] Create spec.md

---
 spec.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 spec.md

diff --git a/spec.md b/spec.md
new file mode 100644
index 00000000000..531a8f21b68
--- /dev/null
+++ b/spec.md
@@ -0,0 +1,45 @@
+# Asset API Overview
+
+## Abstract
+
+In order to rework the Asset API, we need to analyze the current state of the API, to find what can be improved.
+
+## Current State
+
+### Asset Facade
+
+```php
+Asset::cdnLink(string $file) // Gets remote URL to any file in /dist/ in the HydeFront version
+Asset::mediaLink(string $file) // Returns Hyde::mediaLink but with a cache buster
+Asset::hasMediaFile(string $file) // Returns file_exists(Hyde::mediaPath($file))
+
+/**
+ * Real implementations of the facade methods:
+ * 
+ * @see \Hyde\Framework\Services\AssetService::cdnLink
+ * @see \Hyde\Framework\Services\AssetService::mediaLink
+ * @see \Hyde\Framework\Services\AssetService::hasMediaFile
+ */
+```
+
+### Hyde Facade
+
+```php
+Hyde::mediaPath() // Get the absolute path to the media source directory, or a file within it. (Intended as a sibling to Hyde::path and Hyde::sitePath helpers, and the HydePage::path methods)
+Hyde::mediaLink() // Gets a relative web link to the given file stored in the _site/media folder. (Intended as a sibling to Hyde::relativeLink, which is called by this) (A second $validate parameter will return throw an exception if the file does not exist)
+Hyde::asset() // Gets a relative web link to the given image stored in the _site/media folder. (But leaves remote URLs alone) (A second $preferQualifiedUrl parameter will return a fully qualified URL if a site URL is set)
+
+/**
+ * Real implementations of the facade methods:
+ * 
+ * @see \Hyde\Foundation\HydeKernel::mediaPath {@see \Hyde\Foundation\Kernel\Filesystem::mediaPath}
+ * @see \Hyde\Foundation\HydeKernel::mediaLink {@see \Hyde\Foundation\Kernel\Hyperlinks::mediaLink}
+ * @see \Hyde\Foundation\HydeKernel::asset {@see \Hyde\Foundation\Kernel\Hyperlinks::asset}
+ */
+```
+
+### Helper Functions
+
+```php
+asset() // Calls Hyde::asset 
+```

From a05d56076fd136b8dd38d794a75647f7bd9b55ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:24:57 +0200
Subject: [PATCH 002/328] Add AI context

---
 spec.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/spec.md b/spec.md
index 531a8f21b68..6d20f397d73 100644
--- a/spec.md
+++ b/spec.md
@@ -43,3 +43,67 @@ Hyde::asset() // Gets a relative web link to the given image stored in the _site
 ```php
 asset() // Calls Hyde::asset 
 ```
+
+## AI Context
+
+Please provide feedback on how we can improve the Asset API.
+
+For context: This is for static site generator HydePHP, based on Laravel.
+
+Motto: "Simplicity first. Power when you need it. Quality always."
+Tagline: Create static websites with the tools you already know and love with HydePHP.
+
+The Hyde Philosophy:
+> Developing Hyde sites, and contributing to the framework should be a joy. Great Developer Experience (DX) is our top priority.
+> Code should make sense and be intuitive, especially user-facing APIs. Convention over configuration, but not at the expense of flexibility.
+> Making sites should not be boring and repetitive - Hyde is all about taking focus away from boilerplate, and letting users focus on the content.
+
+Considerations: While HydePHP targets developers, not all users necessarily are familiar with Laravel, or PHP. So while we want to provide a familiar interface for Laravel/PHP users, we also want to make sure that the API is intuitive and easy to use for all users.
+
+For additional context on the naming conventions, here is the entire Hyde facade methods:
+
+ * @method static string path(string $path = '')
+ * @method static string vendorPath(string $path = '', string $package = 'framework')
+ * @method static string pathToAbsolute(string $path)
+ * @method static string pathToRelative(string $path)
+ * @method static string sitePath(string $path = '')
+ * @method static string mediaPath(string $path = '')
+ * @method static string siteMediaPath(string $path = '')
+ * @method static string formatLink(string $destination)
+ * @method static string relativeLink(string $destination)
+ * @method static string mediaLink(string $destination, bool $validate = false)
+ * @method static string asset(string $name, bool $preferQualifiedUrl = false)
+ * @method static string url(string $path = '')
+ * @method static Route|null route(string $key)
+ * @method static string makeTitle(string $value)
+ * @method static string normalizeNewlines(string $string)
+ * @method static string stripNewlines(string $string)
+ * @method static string trimSlashes(string $string)
+ * @method static HtmlString markdown(string $text, bool $stripIndentation = false)
+ * @method static string currentPage()
+ * @method static string currentRouteKey()
+ * @method static string getBasePath()
+ * @method static string getSourceRoot()
+ * @method static string getOutputDirectory()
+ * @method static string getMediaDirectory()
+ * @method static string getMediaOutputDirectory()
+ * @method static Features features()
+ * @method static Collection<string, PostAuthor> authors()
+ * @method static FileCollection files()
+ * @method static PageCollection pages()
+ * @method static RouteCollection routes()
+ * @method static Route|null currentRoute()
+ * @method static HydeKernel getInstance()
+ * @method static Filesystem filesystem()
+ * @method static array getRegisteredExtensions()
+ * @method static bool hasFeature(Feature $feature)
+ * @method static bool hasSiteUrl()
+ * @method static void setInstance(HydeKernel $instance)
+ * @method static void setBasePath(string $basePath)
+ * @method static void setOutputDirectory(string $outputDirectory)
+ * @method static void setMediaDirectory(string $mediaDirectory)
+ * @method static void setSourceRoot(string $sourceRoot)
+ * @method static void shareViewData(HydePage $page)
+ * @method static array toArray()
+ * @method static bool isBooted()
+ * @method static void boot()

From 91e06e2cadd4d3d6776ba60319518243c5e37abb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:27:23 +0200
Subject: [PATCH 003/328] Update AI context

---
 spec.md | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/spec.md b/spec.md
index 6d20f397d73..05db70ad84d 100644
--- a/spec.md
+++ b/spec.md
@@ -46,7 +46,7 @@ asset() // Calls Hyde::asset
 
 ## AI Context
 
-Please provide feedback on how we can improve the Asset API.
+Please provide feedback on how we for HydePHP v2 can improve the Asset API, designed to make it easy to interact with Asset files stored in the `_media` directory.
 
 For context: This is for static site generator HydePHP, based on Laravel.
 
@@ -62,6 +62,7 @@ Considerations: While HydePHP targets developers, not all users necessarily are
 
 For additional context on the naming conventions, here is the entire Hyde facade methods:
 
+```php
  * @method static string path(string $path = '')
  * @method static string vendorPath(string $path = '', string $package = 'framework')
  * @method static string pathToAbsolute(string $path)
@@ -107,3 +108,78 @@ For additional context on the naming conventions, here is the entire Hyde facade
  * @method static array toArray()
  * @method static bool isBooted()
  * @method static void boot()
+```
+
+We also have a MediaFile class that looks like this:
+
+```php
+
+/**
+ * File abstraction for a project media file.
+ */
+class MediaFile extends ProjectFile
+{
+    /** @var array<string> The default extensions for media types */
+    final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
+
+    /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
+    public static function all(): array
+    {
+        return static::discoverMediaAssetFiles();
+    }
+
+    /** @return array<string> Array of filenames relative to the _media/ directory */
+    public static function files(): array
+    {
+        return array_keys(static::all());
+    }
+
+    public function getIdentifier(): string
+    {
+        return Str::after($this->getPath(), Hyde::getMediaDirectory().'/');
+    }
+
+    public function toArray(): array
+    {
+        return array_merge(parent::toArray(), [
+            'length' => $this->getContentLength(),
+            'mimeType' => $this->getMimeType(),
+        ]);
+    }
+
+    public function getContentLength(): int
+    {
+        if (! is_file($this->getAbsolutePath())) {
+            throw new FileNotFoundException($this->path);
+        }
+
+        return filesize($this->getAbsolutePath());
+    }
+
+    public function getMimeType(): string
+    {
+        return mime_content_type($this->getAbsolutePath());
+    }
+
+    protected static function discoverMediaAssetFiles(): array
+    {
+        return collect(static::getMediaAssetFiles())->mapWithKeys(function (string $path): array {
+            $file = static::make($path);
+
+            return [$file->getIdentifier() => $file];
+        })->all();
+    }
+
+    protected static function getMediaAssetFiles(): array
+    {
+        return glob(Hyde::path(static::getMediaGlobPattern()), GLOB_BRACE) ?: [];
+    }
+
+    protected static function getMediaGlobPattern(): string
+    {
+        return sprintf(Hyde::getMediaDirectory().'/{*,**/*,**/*/*}.{%s}', implode(',',
+            Config::getArray('hyde.media_extensions', self::EXTENSIONS)
+        ));
+    }
+}
+```

From 946b23974805f2c346fb0703e2a13cbee60f5881 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:28:13 +0200
Subject: [PATCH 004/328] Formatting

---
 spec.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec.md b/spec.md
index 05db70ad84d..b36609db605 100644
--- a/spec.md
+++ b/spec.md
@@ -113,7 +113,6 @@ For additional context on the naming conventions, here is the entire Hyde facade
 We also have a MediaFile class that looks like this:
 
 ```php
-
 /**
  * File abstraction for a project media file.
  */

From 7dfff263dc44e4eb3545cafd12b9b29877390f50 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:29:57 +0200
Subject: [PATCH 005/328] Fluent Asset API proposal

---
 spec.md | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

diff --git a/spec.md b/spec.md
index b36609db605..efa9c8ba471 100644
--- a/spec.md
+++ b/spec.md
@@ -182,3 +182,138 @@ class MediaFile extends ProjectFile
     }
 }
 ```
+
+## Proposals
+
+### Fluent Asset API
+
+Author: Claude 3.5 Sonnet
+
+Based on the provided information and the goals of HydePHP, here are some suggestions to improve the Asset API for version 2:
+
+1. Consolidate and simplify the API:
+   The current API is spread across multiple facades (Asset, Hyde) and helper functions. To improve clarity and ease of use, consider consolidating these into a single, intuitive API.
+
+
+
+```php
+class Asset
+{
+    // Get the absolute path to a media file
+    public static function path(string $file = ''): string
+    {
+        // Implementation
+    }
+
+    // Get a relative web link to a media file
+    public static function link(string $file, bool $validate = false): string
+    {
+        // Implementation
+    }
+
+    // Get a CDN link for a file
+    public static function cdnLink(string $file): string
+    {
+        // Implementation
+    }
+
+    // Check if a media file exists
+    public static function exists(string $file): bool
+    {
+        // Implementation
+    }
+
+    // Get all media files
+    public static function all(): array
+    {
+        // Implementation using MediaFile::all()
+    }
+
+    // Get a MediaFile instance
+    public static function file(string $file): MediaFile
+    {
+        // Implementation
+    }
+}
+
+```
+
+This consolidated API provides a cleaner, more intuitive interface for working with assets. It combines functionality from the current Asset and Hyde facades, making it easier for developers to find and use the methods they need.
+
+2. Improve method naming:
+   Some current method names like `cdnLink` and `mediaLink` might be confusing. Consider using more descriptive names that clearly indicate their purpose.
+
+3. Consistent return types:
+   Ensure that all methods have consistent return types. For example, always return strings for paths and links, and use type hinting to make the API more predictable.
+
+4. Fluent interface:
+   Consider implementing a fluent interface for chaining operations on assets. This can make the API more flexible and expressive.
+
+
+
+```php
+class AssetFile
+{
+    protected $file;
+
+    public function __construct(string $file)
+    {
+        $this->file = $file;
+    }
+
+    public function path(): string
+    {
+        // Implementation
+    }
+
+    public function link(bool $validate = false): string
+    {
+        // Implementation
+    }
+
+    public function cdnLink(): string
+    {
+        // Implementation
+    }
+
+    public function exists(): bool
+    {
+        // Implementation
+    }
+
+    public function content(): string
+    {
+        // Implementation
+    }
+}
+
+class Asset
+{
+    public static function file(string $file): AssetFile
+    {
+        return new AssetFile($file);
+    }
+
+    // Other static methods...
+}
+
+// Usage example
+$assetUrl = Asset::file('image.jpg')->cdnLink();
+$assetContent = Asset::file('styles.css')->content();
+
+```
+
+5. Better integration with MediaFile:
+   Leverage the existing MediaFile class more prominently in the API. This can provide a richer set of operations on individual files.
+
+6. Consistent error handling:
+   Implement a consistent approach to error handling. Consider using custom exceptions that provide clear, actionable error messages.
+
+7. Caching:
+   Implement intelligent caching for asset operations to improve performance, especially for repeated operations.
+
+8. Configuration:
+   Provide a clear way to configure asset-related settings, such as CDN URLs or custom media directories, through a dedicated configuration file or section.
+
+These improvements aim to create a more intuitive, powerful, and flexible Asset API that aligns with HydePHP's philosophy and goals. The consolidated and fluent interfaces should make it easier for both Laravel-familiar and new users to work with assets effectively.
+

From 0e8e7e3fd9d14de8904bdc23c0515a9e62ae673d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:35:37 +0200
Subject: [PATCH 006/328] Add link

---
 spec.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec.md b/spec.md
index efa9c8ba471..953bc3a4cd3 100644
--- a/spec.md
+++ b/spec.md
@@ -188,6 +188,7 @@ class MediaFile extends ProjectFile
 ### Fluent Asset API
 
 Author: Claude 3.5 Sonnet
+Link: https://claude.ai/chat/3b4529e1-79f5-48b9-ac8f-d35fa705a377
 
 Based on the provided information and the goals of HydePHP, here are some suggestions to improve the Asset API for version 2:
 

From 99462466208d08cf3f5c8cef6df787b5eec6524e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:38:22 +0200
Subject: [PATCH 007/328] Update line

---
 spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec.md b/spec.md
index 953bc3a4cd3..42effd5dd97 100644
--- a/spec.md
+++ b/spec.md
@@ -110,7 +110,7 @@ For additional context on the naming conventions, here is the entire Hyde facade
  * @method static void boot()
 ```
 
-We also have a MediaFile class that looks like this:
+We also have a MediaFile class that looks like this, maybe we can unify this as well:
 
 ```php
 /**

From a990c488ca7252e9ac71badbdd64b24d7dcf6cce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:41:18 +0200
Subject: [PATCH 008/328] Refined Fluent Asset API proposal

---
 spec.md | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 199 insertions(+)

diff --git a/spec.md b/spec.md
index 42effd5dd97..f3a8d3592f6 100644
--- a/spec.md
+++ b/spec.md
@@ -318,3 +318,202 @@ $assetContent = Asset::file('styles.css')->content();
 
 These improvements aim to create a more intuitive, powerful, and flexible Asset API that aligns with HydePHP's philosophy and goals. The consolidated and fluent interfaces should make it easier for both Laravel-familiar and new users to work with assets effectively.
 
+### Fluent Asset API (Refined)
+
+Author: Claude 3.5 Sonnet
+Link: https://claude.ai/chat/3b4529e1-79f5-48b9-ac8f-d35fa705a377
+
+Thank you for providing those additional considerations and the detailed API reference. Let's refine the proposal based on this new information. We'll focus on merging with MediaFiles, adjusting for the limited CDN use case, and aligning with the existing Hyde page classes API structure.
+
+
+
+```php
+abstract class Asset
+{
+    protected string $identifier;
+    protected string $sourceDirectory = '_media';
+    protected string $outputDirectory = 'media';
+    protected string $fileExtension;
+
+    public function __construct(string $identifier)
+    {
+        $this->identifier = $identifier;
+        $this->fileExtension = pathinfo($identifier, PATHINFO_EXTENSION);
+    }
+
+    public static function make(string $identifier): static
+    {
+        return new static($identifier);
+    }
+
+    public static function isDiscoverable(): bool
+    {
+        return true;
+    }
+
+    public static function get(string $identifier): static
+    {
+        if (!static::exists($identifier)) {
+            throw new FileNotFoundException("Asset not found: {$identifier}");
+        }
+        return new static($identifier);
+    }
+
+    public static function parse(string $identifier): static
+    {
+        return static::get($identifier);
+    }
+
+    public static function files(): array
+    {
+        // Implementation to get all asset file identifiers
+    }
+
+    public static function all(): AssetCollection
+    {
+        // Implementation to get all assets as a collection
+    }
+
+    public static function sourceDirectory(): string
+    {
+        return (new static(''))->sourceDirectory;
+    }
+
+    public static function outputDirectory(): string
+    {
+        return (new static(''))->outputDirectory;
+    }
+
+    public static function setSourceDirectory(string $sourceDirectory): void
+    {
+        (new static(''))->sourceDirectory = $sourceDirectory;
+    }
+
+    public static function setOutputDirectory(string $outputDirectory): void
+    {
+        (new static(''))->outputDirectory = $outputDirectory;
+    }
+
+    public function sourcePath(): string
+    {
+        return Hyde::path($this->sourceDirectory . '/' . $this->identifier);
+    }
+
+    public function outputPath(): string
+    {
+        return Hyde::sitePath($this->outputDirectory . '/' . $this->identifier);
+    }
+
+    public static function exists(string $identifier): bool
+    {
+        return file_exists((new static($identifier))->sourcePath());
+    }
+
+    public function getIdentifier(): string
+    {
+        return $this->identifier;
+    }
+
+    public function getLink(): string
+    {
+        return '/' . $this->outputDirectory . '/' . $this->identifier;
+    }
+
+    public function getContents(): string
+    {
+        return file_get_contents($this->sourcePath());
+    }
+
+    public function getMimeType(): string
+    {
+        return mime_content_type($this->sourcePath());
+    }
+
+    public function getSize(): int
+    {
+        return filesize($this->sourcePath());
+    }
+
+    public function copy(): bool
+    {
+        return copy($this->sourcePath(), $this->outputPath());
+    }
+
+    // HydeFront specific method
+    public static function cdnLink(string $file): string
+    {
+        // Implementation for HydeFront CDN links
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'identifier' => $this->getIdentifier(),
+            'sourcePath' => $this->sourcePath(),
+            'outputPath' => $this->outputPath(),
+            'link' => $this->getLink(),
+            'mimeType' => $this->getMimeType(),
+            'size' => $this->getSize(),
+        ];
+    }
+}
+
+class AssetCollection extends Collection
+{
+    // Implement any asset-specific collection methods here
+}
+
+```
+
+This refined Asset API proposal addresses the considerations you mentioned:
+
+1. Merging with MediaFiles:
+   The new `Asset` class incorporates functionality from both the current Asset facade and the MediaFile class. It provides methods for working with individual assets as well as collections of assets.
+
+2. CDN links:
+   The `cdnLink` method is retained but as a static method, reflecting its specific use for HydeFront files. This keeps the functionality available without overemphasizing its importance for general asset handling.
+
+3. Alignment with Hyde page classes:
+   The API structure closely follows the pattern established by the Hyde page classes. It includes similar static methods for file discovery and management, as well as instance methods for working with individual assets.
+
+Key improvements and features:
+
+1. Consistent API:
+   The new API provides a consistent interface for working with assets, following patterns familiar to users of other Hyde classes.
+
+2. Flexible file handling:
+   Methods like `sourcePath()`, `outputPath()`, `getLink()`, and `copy()` provide flexible ways to work with asset files throughout the build process.
+
+3. Asset information:
+   Methods like `getMimeType()`, `getSize()`, and `getContents()` provide easy access to important asset information.
+
+4. Collection support:
+   The `AssetCollection` class allows for easy management and manipulation of multiple assets.
+
+5. Extensibility:
+   As an abstract class, `Asset` can be extended for specific asset types if needed in the future.
+
+Usage examples:
+
+```php
+// Get all assets
+$assets = Asset::all();
+
+// Get a specific asset
+$logo = Asset::get('images/logo.png');
+
+// Get the web-accessible link to an asset
+$logoUrl = $logo->getLink();
+
+// Copy an asset to the output directory
+$logo->copy();
+
+// Get asset information
+$size = $logo->getSize();
+$mimeType = $logo->getMimeType();
+
+// HydeFront CDN link (for app.js or app.css)
+$appJsUrl = Asset::cdnLink('app.js');
+```
+
+This API maintains the simplicity-first approach of Hyde while providing power when needed. It should be intuitive for both Laravel-familiar developers and those new to the framework, aligning well with Hyde's philosophy and goals.

From 2296be6bdc4d1c4b326fce0fe2c3fba5ac8f0fdb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:42:45 +0200
Subject: [PATCH 009/328] Unified Asset API proposal

---
 spec.md | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 261 insertions(+)

diff --git a/spec.md b/spec.md
index f3a8d3592f6..9636e744d17 100644
--- a/spec.md
+++ b/spec.md
@@ -517,3 +517,264 @@ $appJsUrl = Asset::cdnLink('app.js');
 ```
 
 This API maintains the simplicity-first approach of Hyde while providing power when needed. It should be intuitive for both Laravel-familiar developers and those new to the framework, aligning well with Hyde's philosophy and goals.
+
+### Unified Asset API
+
+Author: Claude 3.5 Sonnet
+Link: https://claude.ai/chat/9c1c98cc-db92-41cc-9a8e-1f51fd9a04d5
+
+Certainly, I'd be happy to help you improve the Asset API for HydePHP v2. Based on your requirements and the HydePHP philosophy, I've come up with a proposal for a new, more unified Asset API. Here's the proposed new API and implementation plan:
+
+```php
+<?php
+
+namespace Hyde\Framework\Facades;
+
+use Hyde\Framework\Contracts\AssetContract;
+use Hyde\Framework\Services\AssetService;
+
+/**
+ * @method static string get(string $path, bool $absolute = false)
+ * @method static string url(string $path)
+ * @method static bool exists(string $path)
+ * @method static int size(string $path)
+ * @method static string mime(string $path)
+ * @method static string|null hash(string $path)
+ * @method static AssetContract instance(string $path)
+ */
+class Asset extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return AssetService::class;
+    }
+}
+
+// AssetService.php
+class AssetService implements AssetContract
+{
+    protected $validateExistence;
+
+    public function __construct(bool $validateExistence = false)
+    {
+        $this->validateExistence = $validateExistence;
+    }
+
+    public function get(string $path, bool $absolute = false): string
+    {
+        if ($this->validateExistence && !$this->exists($path)) {
+            throw new AssetNotFoundException("Asset not found: {$path}");
+        }
+
+        return $absolute ? $this->getAbsolutePath($path) : $this->getRelativePath($path);
+    }
+
+    public function url(string $path): string
+    {
+        if (filter_var($path, FILTER_VALIDATE_URL)) {
+            return $path;
+        }
+
+        return Hyde::url($this->get($path));
+    }
+
+    public function exists(string $path): bool
+    {
+        return file_exists($this->getAbsolutePath($path));
+    }
+
+    public function size(string $path): int
+    {
+        return filesize($this->getAbsolutePath($path));
+    }
+
+    public function mime(string $path): string
+    {
+        return mime_content_type($this->getAbsolutePath($path));
+    }
+
+    public function hash(string $path): ?string
+    {
+        $file = $this->getAbsolutePath($path);
+        return file_exists($file) ? md5_file($file) : null;
+    }
+
+    public function instance(string $path): AssetContract
+    {
+        return new Asset($path);
+    }
+
+    protected function getAbsolutePath(string $path): string
+    {
+        return Hyde::mediaPath($path);
+    }
+
+    protected function getRelativePath(string $path): string
+    {
+        return Hyde::mediaLink($path);
+    }
+}
+
+// Asset.php (implements AssetContract)
+class Asset implements AssetContract
+{
+    protected $path;
+
+    public function __construct(string $path)
+    {
+        $this->path = $path;
+    }
+
+    public function get(bool $absolute = false): string
+    {
+        return app(AssetService::class)->get($this->path, $absolute);
+    }
+
+    public function url(): string
+    {
+        return app(AssetService::class)->url($this->path);
+    }
+
+    public function exists(): bool
+    {
+        return app(AssetService::class)->exists($this->path);
+    }
+
+    public function size(): int
+    {
+        return app(AssetService::class)->size($this->path);
+    }
+
+    public function mime(): string
+    {
+        return app(AssetService::class)->mime($this->path);
+    }
+
+    public function hash(): ?string
+    {
+        return app(AssetService::class)->hash($this->path);
+    }
+}
+
+// Helper function
+function asset(string $path, bool $absolute = false): string
+{
+    return Asset::get($path, $absolute);
+}
+
+```
+
+This new API proposal aims to simplify and unify the asset-related functions while maintaining flexibility and adhering to the HydePHP philosophy. Here's a breakdown of the changes and the implementation plan:
+
+1. Unified API:
+   - All asset-related functions are now under the `Asset` facade.
+   - The `get()` method replaces both `mediaLink()` and `asset()`, with an optional parameter for absolute paths.
+   - Added `url()` method to handle both local and remote URLs.
+   - Included utility methods like `exists()`, `size()`, `mime()`, and `hash()` for common operations.
+
+2. Validation:
+   - Instead of a parameter to validate, we've added a constructor parameter in the `AssetService` that can be set via configuration or environment variable.
+
+3. Flexibility:
+   - The `instance()` method allows for object-oriented usage when needed.
+
+Implementation Plan:
+
+1. Deprecation process in v1:
+   - Add deprecation notices to the existing methods in the `Asset` and `Hyde` facades.
+   - Introduce the new `Asset` facade with the proposed methods, marking them as `@since 1.x`.
+   - Update the documentation to recommend using the new `Asset` facade.
+
+2. Implementation in v2:
+   - Remove the deprecated methods from the `Asset` and `Hyde` facades.
+   - Fully implement the new `AssetService` and `Asset` classes.
+   - Update all internal usage to use the new API.
+
+3. Configuration:
+   - Add a new configuration option in `config/hyde.php`:
+     ```php
+     'assets' => [
+         'validate_existence' => env('HYDE_VALIDATE_ASSETS', false),
+     ],
+     ```
+
+4. Release Notes:
+   ```markdown
+   # HydePHP v2.0 Release Notes
+
+   ## Asset API Overhaul
+
+   We've completely revamped the Asset API to provide a more intuitive and unified interface for handling media files. Key changes include:
+
+   - New `Asset` facade with streamlined methods
+   - Simplified asset retrieval with `Asset::get()`
+   - Built-in URL handling with `Asset::url()`
+   - Additional utility methods: `exists()`, `size()`, `mime()`, `hash()`
+   - Object-oriented usage available through `Asset::instance()`
+   - Global `asset()` helper function updated
+
+   These changes aim to improve developer experience and make asset handling more straightforward and consistent.
+   ```
+
+5. Upgrade Guide:
+   ```markdown
+   # Upgrading to HydePHP v2.0
+
+   ## Asset API Changes
+
+   1. Replace all usage of `Hyde::mediaLink()`, `Hyde::asset()`, and `Asset::mediaLink()` with `Asset::get()`:
+
+      ```php
+      // Old
+      $path = Hyde::mediaLink('image.jpg');
+      $path = Hyde::asset('image.jpg');
+      $path = Asset::mediaLink('image.jpg');
+
+      // New
+      $path = Asset::get('image.jpg');
+      ```
+
+   2. For absolute paths, use the second parameter of `Asset::get()`:
+
+      ```php
+      $absolutePath = Asset::get('image.jpg', true);
+      ```
+
+   3. Use `Asset::url()` for handling both local and remote URLs:
+
+      ```php
+      $url = Asset::url('image.jpg');
+      $url = Asset::url('https://example.com/image.jpg');
+      ```
+
+   4. Take advantage of new utility methods:
+
+      ```php
+      if (Asset::exists('image.jpg')) {
+          $size = Asset::size('image.jpg');
+          $mime = Asset::mime('image.jpg');
+          $hash = Asset::hash('image.jpg');
+      }
+      ```
+
+   5. For object-oriented usage, use `Asset::instance()`:
+
+      ```php
+      $asset = Asset::instance('image.jpg');
+      $path = $asset->get();
+      $exists = $asset->exists();
+      ```
+
+   6. Update your configuration file to include the new asset validation option:
+
+      ```php
+      // config/hyde.php
+      'assets' => [
+          'validate_existence' => env('HYDE_VALIDATE_ASSETS', false),
+      ],
+      ```
+
+   These changes will ensure your project is compatible with HydePHP v2.0 and takes full advantage of the new Asset API.
+   ```
+
+This proposal aims to simplify the Asset API while maintaining flexibility and power. It adheres to the HydePHP philosophy by providing an intuitive interface that should be easy to use for both Laravel developers and those less familiar with the framework. The implementation plan ensures a smooth transition from v1 to v2, with clear deprecation notices and comprehensive upgrade instructions.

From 3bde4836b7e6000d0758af2603849a2d50945c60 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:43:28 +0200
Subject: [PATCH 010/328] Fix formatting

---
 spec.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec.md b/spec.md
index 9636e744d17..e2f85013582 100644
--- a/spec.md
+++ b/spec.md
@@ -775,6 +775,5 @@ Implementation Plan:
       ```
 
    These changes will ensure your project is compatible with HydePHP v2.0 and takes full advantage of the new Asset API.
-   ```
 
 This proposal aims to simplify the Asset API while maintaining flexibility and power. It adheres to the HydePHP philosophy by providing an intuitive interface that should be easy to use for both Laravel developers and those less familiar with the framework. The implementation plan ensures a smooth transition from v1 to v2, with clear deprecation notices and comprehensive upgrade instructions.

From bc78d745a977bd2884033c6f2bfafba9f807f983 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:47:01 +0200
Subject: [PATCH 011/328] Add Proposal Summary and Analysis

---
 spec.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/spec.md b/spec.md
index e2f85013582..76ae89c8a98 100644
--- a/spec.md
+++ b/spec.md
@@ -777,3 +777,56 @@ Implementation Plan:
    These changes will ensure your project is compatible with HydePHP v2.0 and takes full advantage of the new Asset API.
 
 This proposal aims to simplify the Asset API while maintaining flexibility and power. It adheres to the HydePHP philosophy by providing an intuitive interface that should be easy to use for both Laravel developers and those less familiar with the framework. The implementation plan ensures a smooth transition from v1 to v2, with clear deprecation notices and comprehensive upgrade instructions.
+
+### Proposal Summary and Analysis
+
+Independent Claude 3.5 Sonnet executive summary of the three proposals for improving the Asset API in HydePHP v2:
+
+1. Fluent Asset API
+
+This proposal introduces a consolidated `Asset` class with both static and instance methods, integrating functionality from the current Asset and Hyde facades. It offers a fluent interface for chaining operations on assets.
+
+Benefits:
+- Simplified, intuitive API
+- Fluent interface for expressive chaining
+- Consistent with Laravel patterns
+
+Drawbacks:
+- Significant departure from current API, potentially high upgrade friction
+- Increased complexity with new classes (AssetFile, AssetCollection)
+
+2. Fluent Asset API (Refined)
+
+This refined proposal merges functionality from the Asset facade and MediaFile class into an abstract `Asset` class. It aligns more closely with existing Hyde page classes and retains some current naming conventions.
+
+Benefits:
+- Better alignment with existing Hyde patterns
+- Comprehensive asset handling (discovery, manipulation, information)
+- Extensibility through abstract class
+
+Drawbacks:
+- Still represents a major change from current API
+- Potential learning curve for users unfamiliar with Hyde patterns
+
+3. Unified Asset API
+
+This proposal focuses on unifying asset-related functions under a single `Asset` facade, with a backing `AssetService`. It aims for a balance between simplification and maintaining familiarity.
+
+Benefits:
+- Maintains facade pattern, reducing upgrade friction
+- Simplifies API while retaining familiar method names
+- Includes a clear deprecation and upgrade path
+
+Drawbacks:
+- Less dramatic improvement in DX compared to fluent proposals
+- Retains some potential for confusion with multiple ways to access assets
+
+#### Final Recommendation:
+
+Based on the analysis, the Unified Asset API (Proposal 3) appears to be the most balanced approach. It offers significant improvements in developer experience and API consistency while minimizing upgrade friction and implementation complexity. The clear deprecation process and upgrade path will ease the transition for existing users.
+
+This proposal aligns well with HydePHP's philosophy of "Simplicity first. Power when you need it." It provides a more intuitive API without a complete overhaul, allowing for gradual adoption of new features. The retained facade pattern and familiar method names will help maintain accessibility for developers of varying experience levels.
+
+While the fluent API proposals offer more dramatic improvements in expressiveness, the associated increase in complexity and potential for confusion may outweigh these benefits. The Unified Asset API strikes a good balance between enhancing DX and maintaining continuity with the current system.
+
+Recommendation: Proceed with implementing the Unified Asset API (Proposal 3), ensuring thorough documentation and clear upgrade guides to support users through the transition.

From 9788f7362661f30ef272efdbbdcc05073aa89366 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 21:55:24 +0200
Subject: [PATCH 012/328] Add obscure but relevant method

---
 spec.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec.md b/spec.md
index 76ae89c8a98..12e1b45ea3e 100644
--- a/spec.md
+++ b/spec.md
@@ -28,6 +28,7 @@ Asset::hasMediaFile(string $file) // Returns file_exists(Hyde::mediaPath($file))
 Hyde::mediaPath() // Get the absolute path to the media source directory, or a file within it. (Intended as a sibling to Hyde::path and Hyde::sitePath helpers, and the HydePage::path methods)
 Hyde::mediaLink() // Gets a relative web link to the given file stored in the _site/media folder. (Intended as a sibling to Hyde::relativeLink, which is called by this) (A second $validate parameter will return throw an exception if the file does not exist)
 Hyde::asset() // Gets a relative web link to the given image stored in the _site/media folder. (But leaves remote URLs alone) (A second $preferQualifiedUrl parameter will return a fully qualified URL if a site URL is set)
+Hyde::siteMediaPath() //  Get the absolute path to the compiled site's media directory, or a file within it. (Intended as a sibling to Hyde::sitePath)
 
 /**
  * Real implementations of the facade methods:
@@ -35,6 +36,7 @@ Hyde::asset() // Gets a relative web link to the given image stored in the _site
  * @see \Hyde\Foundation\HydeKernel::mediaPath {@see \Hyde\Foundation\Kernel\Filesystem::mediaPath}
  * @see \Hyde\Foundation\HydeKernel::mediaLink {@see \Hyde\Foundation\Kernel\Hyperlinks::mediaLink}
  * @see \Hyde\Foundation\HydeKernel::asset {@see \Hyde\Foundation\Kernel\Hyperlinks::asset}
+ * @see \Hyde\Foundation\HydeKernel::siteMediaPath {@see \Hyde\Foundation\Kernel\Filesystem::siteMediaPath}
  */
 ```
 

From 9731c8448cc67768f849e815f7244575c3e0fdf9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 22:02:18 +0200
Subject: [PATCH 013/328] Add background

---
 spec.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/spec.md b/spec.md
index 12e1b45ea3e..bd834a652e2 100644
--- a/spec.md
+++ b/spec.md
@@ -4,6 +4,58 @@
 
 In order to rework the Asset API, we need to analyze the current state of the API, to find what can be improved.
 
+### Background
+
+Remember the original problem: The current system is confusing and unintuitive with multiple and inconsistent ways to access assets.
+
+Additionally, keep in mind that most ways users will commonly use this API is to link to assets in the `_media` directory, and to check if they exist.
+
+For example: Consider these Blade snippets from the default views, showing common usages that actual end users may use:
+
+```blade
+{{-- The compiled Tailwind/App styles --}}
+@if(config('hyde.load_app_styles_from_cdn', false))
+    <link rel="stylesheet" href="{{ Asset::cdnLink('app.css') }}">
+@elseif(Asset::hasMediaFile('app.css'))
+    <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
+@endif
+
+{{-- The compiled Laravel Mix scripts --}}
+@if(Asset::hasMediaFile('app.js'))
+    <script defer src="{{ Asset::mediaLink('app.js') }}"></script>
+@endif
+
+@if (file_exists(Hyde::mediaPath('favicon.ico')))
+    <link rel="shortcut icon" href="{{ Hyde::relativeLink('media/favicon.ico') }}" type="image/x-icon">
+@endif
+```
+
+Some other example usages could be things like:
+
+```blade
+<img src="{{ asset('images/logo.png') }}" alt="Logo">
+```
+
+We also use the Asset API helpers in the internal codebase that actually powers the static site generator. These kinds of usages would usually only be used by us, package developers, and serious power users. They have an important, but secondary role in the API design. Here are some examples from our codebase:
+
+```php
+// Code that transfers media assets from the source directory to the site output directory
+$this->createDirectoryifItDoesNotExist(Hyde::siteMediaPath());
+$this->mapWithProgressBar(MediaFile::files(), function (string $identifier): void {
+   copy(Hyde::mediaPath($identifier), Hyde::siteMediaPath($identifier));
+});
+
+// Helpers in the featured image class
+public function getSource(): string {
+    return Hyde::mediaLink($this->source);
+}
+
+protected function setSource(string $source): string {
+   // Normalize away any leading media path prefixes.
+   return Str::after($source, Hyde::getMediaDirectory().'/');
+}
+```
+
 ## Current State
 
 ### Asset Facade

From 0a0a4bdcabb1781c39410517c3e55105feb54e7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 09:57:04 +0200
Subject: [PATCH 014/328] Add example AI prompt

---
 spec.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec.md b/spec.md
index bd834a652e2..6d43377d19e 100644
--- a/spec.md
+++ b/spec.md
@@ -237,6 +237,15 @@ class MediaFile extends ProjectFile
 }
 ```
 
+### AI Example Prompt
+
+```markdown
+Task: Split out the HydeFront related parts of the AssetService to a new facade class.
+Motivation: We are simplifying the Asset API in https://github.com/hydephp/develop/pull/1904, and most users won't need the HydeFront related parts of the AssetService. Later, we will be able to merge the simplified AssetService into the other Asset helpers.
+Implementation: Make the necessary changes to the code and tests. Also update the release notes to detail all breaking changes and the upgrade path. Make sure the release notes contains all necessary information, but is not too verbose and should not contain any fluff. Also write a brief pull request description.
+Context: This is for v2 of static site generator HydePHP.
+```
+
 ## Proposals
 
 ### Fluent Asset API

From cca95dbc113645c819bff8c1753c8d931bb34715 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 09:59:07 +0200
Subject: [PATCH 015/328] Update context

---
 spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec.md b/spec.md
index 6d43377d19e..dd02d41f5c7 100644
--- a/spec.md
+++ b/spec.md
@@ -243,7 +243,7 @@ class MediaFile extends ProjectFile
 Task: Split out the HydeFront related parts of the AssetService to a new facade class.
 Motivation: We are simplifying the Asset API in https://github.com/hydephp/develop/pull/1904, and most users won't need the HydeFront related parts of the AssetService. Later, we will be able to merge the simplified AssetService into the other Asset helpers.
 Implementation: Make the necessary changes to the code and tests. Also update the release notes to detail all breaking changes and the upgrade path. Make sure the release notes contains all necessary information, but is not too verbose and should not contain any fluff. Also write a brief pull request description.
-Context: This is for v2 of static site generator HydePHP.
+Context: This is for v2 of static site generator HydePHP. Remember to match the code style of the existing codebase.
 ```
 
 ## Proposals

From 2f930e9be6fe1c3b5e77dae725c1e152109a4b1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 10:20:38 +0200
Subject: [PATCH 016/328] Update context

---
 spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec.md b/spec.md
index dd02d41f5c7..b404251e8ea 100644
--- a/spec.md
+++ b/spec.md
@@ -242,7 +242,7 @@ class MediaFile extends ProjectFile
 ```markdown
 Task: Split out the HydeFront related parts of the AssetService to a new facade class.
 Motivation: We are simplifying the Asset API in https://github.com/hydephp/develop/pull/1904, and most users won't need the HydeFront related parts of the AssetService. Later, we will be able to merge the simplified AssetService into the other Asset helpers.
-Implementation: Make the necessary changes to the code and tests. Also update the release notes to detail all breaking changes and the upgrade path. Make sure the release notes contains all necessary information, but is not too verbose and should not contain any fluff. Also write a brief pull request description.
+Implementation: Make the necessary changes to the code and tests. Also update the release notes to detail all breaking changes and the upgrade path. Make sure the release notes contains all necessary information, but is not too verbose and should not contain any fluff. Also write a brief pull request description detailing the changes made and why they were made.
 Context: This is for v2 of static site generator HydePHP. Remember to match the code style of the existing codebase.
 ```
 

From 67ae2114d1a3a48b94fd16e94b62003e2b1acfae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 10:43:52 +0200
Subject: [PATCH 017/328] Remove the HydeFront version and CDN URL
 configuration options

I can't see a good reason to want to change the version to load assets that are unlikely to work with the versions in the views in the project Hyde version. Changing the CDN URL could be useful if you want to change the host to another CDN provider, but this current system is way too convoluted for that.
---
 config/hyde.php                               |  5 ---
 docs/digging-deeper/customization.md          | 14 -------
 packages/framework/config/hyde.php            |  5 ---
 .../src/Framework/Services/AssetService.php   |  4 +-
 .../tests/Unit/AssetServiceUnitTest.php       | 39 -------------------
 5 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 67c1da3b43b..87f5481d00e 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -470,11 +470,6 @@
     // Where should the build manifest be saved? (Relative to project root, for example _site/build-manifest.json)
     'build_manifest_path' => 'app/storage/framework/cache/build-manifest.json',
 
-    // Here you can specify HydeFront version and URL for when loading app.css from the CDN.
-    // Only change these if you know what you're doing as some versions may be incompatible with your Hyde version.
-    'hydefront_version' => \Hyde\Framework\Services\AssetService::HYDEFRONT_VERSION,
-    'hydefront_cdn_url' => \Hyde\Framework\Services\AssetService::HYDEFRONT_CDN_URL,
-
     // Should the theme toggle buttons be displayed in the layouts?
     'theme_toggle_buttons' => true,
 
diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index f9c7a0f5682..95965376d78 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -342,20 +342,6 @@ Specifies the path where the build manifest should be saved, relative to the pro
 'build_manifest_path' => 'app/storage/framework/cache/build-manifest.json',
 ```
 
-### `hydefront_version` and `hydefront_cdn_url`
-
-These options allow you to specify the HydeFront version and CDN URL when loading `app.css` from the CDN.
-
-Only change these if you know what you're doing as some versions may be incompatible with your Hyde version.
-
-```php
-// filepath config/hyde.php
-use \Hyde\Framework\Services\AssetService;
-
-'hydefront_version' => AssetService::HYDEFRONT_VERSION,
-'hydefront_cdn_url' => AssetService::HYDEFRONT_CDN_URL,
-```
-
 ### `theme_toggle_buttons`
 
 >info This feature was added in HydePHP v1.7.0
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 67c1da3b43b..87f5481d00e 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -470,11 +470,6 @@
     // Where should the build manifest be saved? (Relative to project root, for example _site/build-manifest.json)
     'build_manifest_path' => 'app/storage/framework/cache/build-manifest.json',
 
-    // Here you can specify HydeFront version and URL for when loading app.css from the CDN.
-    // Only change these if you know what you're doing as some versions may be incompatible with your Hyde version.
-    'hydefront_version' => \Hyde\Framework\Services\AssetService::HYDEFRONT_VERSION,
-    'hydefront_cdn_url' => \Hyde\Framework\Services\AssetService::HYDEFRONT_CDN_URL,
-
     // Should the theme toggle buttons be displayed in the layouts?
     'theme_toggle_buttons' => true,
 
diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index 9373b676e10..d1f9bd54179 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -41,8 +41,8 @@ class AssetService
 
     public function __construct()
     {
-        $this->version = Config::getString('hyde.hydefront_version', self::HYDEFRONT_VERSION);
-        $this->cdnUrl = Config::getString('hyde.hydefront_url', self::HYDEFRONT_CDN_URL);
+        $this->version = self::HYDEFRONT_VERSION;
+        $this->cdnUrl = self::HYDEFRONT_CDN_URL;
     }
 
     public function version(): string
diff --git a/packages/framework/tests/Unit/AssetServiceUnitTest.php b/packages/framework/tests/Unit/AssetServiceUnitTest.php
index 9267b4715a6..352d8144101 100644
--- a/packages/framework/tests/Unit/AssetServiceUnitTest.php
+++ b/packages/framework/tests/Unit/AssetServiceUnitTest.php
@@ -36,50 +36,11 @@ public function testVersionStringDefaultsToConstant()
         $this->assertSame(AssetService::HYDEFRONT_VERSION, (new AssetService())->version());
     }
 
-    public function testVersionCanBeSetInConfig()
-    {
-        self::mockConfig(['hyde.hydefront_version' => '1.0.0']);
-        $this->assertSame('1.0.0', (new AssetService())->version());
-    }
-
     public function testCdnPatternConstant()
     {
         $this->assertSame('https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}', AssetService::HYDEFRONT_CDN_URL);
     }
 
-    public function testCanSetCustomCdnUrlInConfig()
-    {
-        self::mockConfig(['hyde.hydefront_url' => 'https://example.com']);
-        $this->assertSame('https://example.com', (new AssetService())->cdnLink(''));
-    }
-
-    public function testCanUseCustomCdnUrlWithVersion()
-    {
-        self::mockConfig(['hyde.hydefront_url' => '{{ $version }}']);
-        $this->assertSame('v3.4', (new AssetService())->cdnLink(''));
-    }
-
-    public function testCanUseCustomCdnUrlWithFile()
-    {
-        self::mockConfig(['hyde.hydefront_url' => '{{ $file }}']);
-        $this->assertSame('styles.css', (new AssetService())->cdnLink('styles.css'));
-    }
-
-    public function testCanUseCustomCdnUrlWithVersionAndFile()
-    {
-        self::mockConfig(['hyde.hydefront_url' => '{{ $version }}/{{ $file }}']);
-        $this->assertSame('v3.4/styles.css', (new AssetService())->cdnLink('styles.css'));
-    }
-
-    public function testCanUseCustomCdnUrlWithCustomVersion()
-    {
-        self::mockConfig([
-            'hyde.hydefront_url' => '{{ $version }}',
-            'hyde.hydefront_version' => '1.0.0',
-        ]);
-        $this->assertSame('1.0.0', (new AssetService())->cdnLink(''));
-    }
-
     public function testCdnLinkHelper()
     {
         $this->assertSame(

From 73cc657fb1fa3a6f8aae84e561e2ffecd2c889a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 10:51:25 +0200
Subject: [PATCH 018/328] Draft Asset API change section

---
 RELEASE_NOTES.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 86740ca0d9c..780688dfe65 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -239,6 +239,12 @@ The following methods in the `Features` class have been renamed to follow a more
 
 Note that this class was previously marked as internal in v1, but the change is logged here in case it was used in configuration files or custom code.
 
+### Asset API Changes
+
+The overall asset API has been improved and cleaned up. Unfortunately, this means that there are some breaking changes to the API.
+
+
+
 ## Low impact
 
 ### Navigation internal changes

From d7c1a225b427dff2d59abfc06c710018ff743635 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 10:54:25 +0200
Subject: [PATCH 019/328] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 86740ca0d9c..3852a7188b6 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -59,6 +59,7 @@ This serves two purposes:
 - Moved the sidebar documentation to the documentation pages section for better organization.
 - The build command now groups together all `InMemoryPage` instances under one progress bar group in https://github.com/hydephp/develop/pull/1897
 - The `Markdown::render()` method will now always render Markdown using the custom HydePHP Markdown service (thus getting smart features like our Markdown processors) in https://github.com/hydephp/develop/pull/1900
+- The HydeFront asset version and CDN URL are now hardcoded in the `AssetService` class instead of being configurable in https://github.com/hydephp/develop/pull/1909
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -66,6 +67,7 @@ This serves two purposes:
 ### Removed
 - Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 - Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
+- Breaking: Removed the `hydefront_version` and `hydefront_cdn_url` configuration options from the `hyde.php` config file in https://github.com/hydephp/develop/pull/1909
 - Removed the deprecated global`unslash()` function, replaced with the namespaced `\Hyde\unslash()` function in https://github.com/hydephp/develop/pull/1754
 - Removed the deprecated `BaseUrlNotSetException` class, with the `Hyde::url()` helper now throwing `BadMethodCallException` if no base URL is set in https://github.com/hydephp/develop/pull/1760
 - Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`) in https://github.com/hydephp/develop/pull/1782
@@ -239,6 +241,31 @@ The following methods in the `Features` class have been renamed to follow a more
 
 Note that this class was previously marked as internal in v1, but the change is logged here in case it was used in configuration files or custom code.
 
+### Asset API Changes
+
+The overall asset API has been improved and cleaned up. Unfortunately, this means that there are some breaking changes to the API.
+
+#### Removal of HydeFront version and CDN URL configuration options
+
+The `hydefront_version` and `hydefront_cdn_url` configuration options have been removed from the `config/hyde.php` file. These options were previously used to specify the HydeFront version and CDN URL for loading assets.
+
+**Impact:** Low. This change will only affect users who have customized these options.
+
+**Upgrade steps:**
+
+<!-- TODO: Deprecate the constants in v1 -->
+
+1. Remove the following lines from your `config/hyde.php` file if they exist:
+   ```php
+   'hydefront_version' => \Hyde\Framework\Services\AssetService::HYDEFRONT_VERSION,
+   'hydefront_cdn_url' => \Hyde\Framework\Services\AssetService::HYDEFRONT_CDN_URL,
+   ```
+2. If you were using a custom CDN URL, you will need to implement your own solution for serving HydeFront assets from a different CDN. Consider copying the assets to your preferred CDN and updating your templates accordingly.
+
+**Rationale:** The ability to change the HydeFront version was removed because using a different version than the one bundled with your Hyde project could lead to compatibility issues. The CDN URL configuration was removed to simplify the asset loading process.
+
+If you need to use a different CDN for serving HydeFront assets, you should implement a custom solution tailored to your specific needs. You may also open a feature request if you believe this functionality should be added back in a future release.
+
 ## Low impact
 
 ### Navigation internal changes

From 1393a9c8a15afb8efd213b3e175d458b9b328aec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 11:40:48 +0200
Subject: [PATCH 020/328] Remove useless constructor

---
 packages/framework/src/Framework/Services/AssetService.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index d1f9bd54179..718a8dd6f81 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -39,12 +39,6 @@ class AssetService
     protected string $version = self::HYDEFRONT_VERSION;
     protected string $cdnUrl = self::HYDEFRONT_CDN_URL;
 
-    public function __construct()
-    {
-        $this->version = self::HYDEFRONT_VERSION;
-        $this->cdnUrl = self::HYDEFRONT_CDN_URL;
-    }
-
     public function version(): string
     {
         return $this->version;

From 6e16df9aac7c3230bfcd54bbdc5ac3f4abfcc755 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 11:45:12 +0200
Subject: [PATCH 021/328] Breaking: Make the AssetService constants protected

---
 .../src/Framework/Services/AssetService.php       |  4 ++--
 .../framework/tests/Unit/AssetServiceUnitTest.php | 15 ---------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index 718a8dd6f81..c306f623a09 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -31,10 +31,10 @@
 class AssetService
 {
     /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
-    final public const HYDEFRONT_VERSION = 'v3.4';
+    final protected const HYDEFRONT_VERSION = 'v3.4';
 
     /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
-    final public const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
+    final protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
 
     protected string $version = self::HYDEFRONT_VERSION;
     protected string $cdnUrl = self::HYDEFRONT_CDN_URL;
diff --git a/packages/framework/tests/Unit/AssetServiceUnitTest.php b/packages/framework/tests/Unit/AssetServiceUnitTest.php
index 352d8144101..02c33795d15 100644
--- a/packages/framework/tests/Unit/AssetServiceUnitTest.php
+++ b/packages/framework/tests/Unit/AssetServiceUnitTest.php
@@ -21,26 +21,11 @@ protected function setUp(): void
         self::mockConfig();
     }
 
-    public function testVersionStringConstant()
-    {
-        $this->assertSame('v3.4', AssetService::HYDEFRONT_VERSION);
-    }
-
     public function testServiceHasVersionString()
     {
         $this->assertIsString((new AssetService())->version());
     }
 
-    public function testVersionStringDefaultsToConstant()
-    {
-        $this->assertSame(AssetService::HYDEFRONT_VERSION, (new AssetService())->version());
-    }
-
-    public function testCdnPatternConstant()
-    {
-        $this->assertSame('https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}', AssetService::HYDEFRONT_CDN_URL);
-    }
-
     public function testCdnLinkHelper()
     {
         $this->assertSame(

From 95a7955f82064df13d0d3ed5be14d5415f9833f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:32:37 +0200
Subject: [PATCH 022/328] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3852a7188b6..57e542a72f0 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -33,6 +33,7 @@ This serves two purposes:
 - **Breaking:** The `Author::get()` method now returns `null` if an author is not found, rather than creating a new instance. For more information, see below.
 - **Breaking:** The custom navigation item configuration now uses array inputs instead of the previous format. For more information, see the upgrade guide below.
 - **Breaking:** Renamed the `hyde.navigation.subdirectories` configuration option to `hyde.navigation.subdirectory_display`.
+- **Breaking:** The `HYDEFRONT_VERSION` and `HYDEFRONT_CDN_URL` constants in the `AssetService` class have been changed from `public` to `protected`. This improves encapsulation but may affect code that directly accessed these constants. For more information, see below.
 - Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
@@ -73,6 +74,7 @@ This serves two purposes:
 - Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`) in https://github.com/hydephp/develop/pull/1782
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 - Removed the deprecated `FeaturedImage::isRemote()` method in https://github.com/hydephp/develop/pull/1883. Use `Hyperlinks::isRemote()` instead.
+- The `HYDEFRONT_VERSION` and `HYDEFRONT_CDN_URL` constants in the `AssetService` class have been removed from the public API in https://github.com/hydephp/develop/pull/1910
 
 ### Fixed
 - Added missing collection key types in Hyde facade method annotations in https://github.com/hydephp/develop/pull/1784
@@ -266,6 +268,33 @@ The `hydefront_version` and `hydefront_cdn_url` configuration options have been
 
 If you need to use a different CDN for serving HydeFront assets, you should implement a custom solution tailored to your specific needs. You may also open a feature request if you believe this functionality should be added back in a future release.
 
+#### AssetService constants visibility changes
+
+The `HYDEFRONT_VERSION` and `HYDEFRONT_CDN_URL` constants in the `AssetService` class are now `protected` instead of `public`. This change improves encapsulation and reduces the public API surface.
+
+**Impact:** Low. This change will only affect users who directly accessed these constants in their custom code.
+
+**Upgrade steps:**
+
+1. If you were directly accessing `AssetService::HYDEFRONT_VERSION` or `AssetService::HYDEFRONT_CDN_URL` in your code, you will need to update your implementation.
+2. Instead of using these constants directly, use the public methods provided by the `AssetService` class to interact with asset-related functionality.
+
+For example, if you were using:
+
+```php
+$version = AssetService::HYDEFRONT_VERSION;
+```
+
+You should now use:
+
+```php
+$version = (new AssetService())->version();
+```
+
+If you need access to the CDN URL pattern, consider using the `cdnLink()` method of the `AssetService` class instead.
+
+These changes were implemented to improve the API design and encapsulation of the `AssetService` class. If you have any custom implementations that relied on these constants, please review and update your code accordingly.
+
 ## Low impact
 
 ### Navigation internal changes

From 97c7b5a05aef19bf9e34f44931cd72532bfee2fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:36:04 +0200
Subject: [PATCH 023/328] Reset release note changes that may get out of date

---
 RELEASE_NOTES.md | 56 ------------------------------------------------
 1 file changed, 56 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 57e542a72f0..86740ca0d9c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -33,7 +33,6 @@ This serves two purposes:
 - **Breaking:** The `Author::get()` method now returns `null` if an author is not found, rather than creating a new instance. For more information, see below.
 - **Breaking:** The custom navigation item configuration now uses array inputs instead of the previous format. For more information, see the upgrade guide below.
 - **Breaking:** Renamed the `hyde.navigation.subdirectories` configuration option to `hyde.navigation.subdirectory_display`.
-- **Breaking:** The `HYDEFRONT_VERSION` and `HYDEFRONT_CDN_URL` constants in the `AssetService` class have been changed from `public` to `protected`. This improves encapsulation but may affect code that directly accessed these constants. For more information, see below.
 - Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
@@ -60,7 +59,6 @@ This serves two purposes:
 - Moved the sidebar documentation to the documentation pages section for better organization.
 - The build command now groups together all `InMemoryPage` instances under one progress bar group in https://github.com/hydephp/develop/pull/1897
 - The `Markdown::render()` method will now always render Markdown using the custom HydePHP Markdown service (thus getting smart features like our Markdown processors) in https://github.com/hydephp/develop/pull/1900
-- The HydeFront asset version and CDN URL are now hardcoded in the `AssetService` class instead of being configurable in https://github.com/hydephp/develop/pull/1909
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -68,13 +66,11 @@ This serves two purposes:
 ### Removed
 - Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 - Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
-- Breaking: Removed the `hydefront_version` and `hydefront_cdn_url` configuration options from the `hyde.php` config file in https://github.com/hydephp/develop/pull/1909
 - Removed the deprecated global`unslash()` function, replaced with the namespaced `\Hyde\unslash()` function in https://github.com/hydephp/develop/pull/1754
 - Removed the deprecated `BaseUrlNotSetException` class, with the `Hyde::url()` helper now throwing `BadMethodCallException` if no base URL is set in https://github.com/hydephp/develop/pull/1760
 - Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`) in https://github.com/hydephp/develop/pull/1782
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 - Removed the deprecated `FeaturedImage::isRemote()` method in https://github.com/hydephp/develop/pull/1883. Use `Hyperlinks::isRemote()` instead.
-- The `HYDEFRONT_VERSION` and `HYDEFRONT_CDN_URL` constants in the `AssetService` class have been removed from the public API in https://github.com/hydephp/develop/pull/1910
 
 ### Fixed
 - Added missing collection key types in Hyde facade method annotations in https://github.com/hydephp/develop/pull/1784
@@ -243,58 +239,6 @@ The following methods in the `Features` class have been renamed to follow a more
 
 Note that this class was previously marked as internal in v1, but the change is logged here in case it was used in configuration files or custom code.
 
-### Asset API Changes
-
-The overall asset API has been improved and cleaned up. Unfortunately, this means that there are some breaking changes to the API.
-
-#### Removal of HydeFront version and CDN URL configuration options
-
-The `hydefront_version` and `hydefront_cdn_url` configuration options have been removed from the `config/hyde.php` file. These options were previously used to specify the HydeFront version and CDN URL for loading assets.
-
-**Impact:** Low. This change will only affect users who have customized these options.
-
-**Upgrade steps:**
-
-<!-- TODO: Deprecate the constants in v1 -->
-
-1. Remove the following lines from your `config/hyde.php` file if they exist:
-   ```php
-   'hydefront_version' => \Hyde\Framework\Services\AssetService::HYDEFRONT_VERSION,
-   'hydefront_cdn_url' => \Hyde\Framework\Services\AssetService::HYDEFRONT_CDN_URL,
-   ```
-2. If you were using a custom CDN URL, you will need to implement your own solution for serving HydeFront assets from a different CDN. Consider copying the assets to your preferred CDN and updating your templates accordingly.
-
-**Rationale:** The ability to change the HydeFront version was removed because using a different version than the one bundled with your Hyde project could lead to compatibility issues. The CDN URL configuration was removed to simplify the asset loading process.
-
-If you need to use a different CDN for serving HydeFront assets, you should implement a custom solution tailored to your specific needs. You may also open a feature request if you believe this functionality should be added back in a future release.
-
-#### AssetService constants visibility changes
-
-The `HYDEFRONT_VERSION` and `HYDEFRONT_CDN_URL` constants in the `AssetService` class are now `protected` instead of `public`. This change improves encapsulation and reduces the public API surface.
-
-**Impact:** Low. This change will only affect users who directly accessed these constants in their custom code.
-
-**Upgrade steps:**
-
-1. If you were directly accessing `AssetService::HYDEFRONT_VERSION` or `AssetService::HYDEFRONT_CDN_URL` in your code, you will need to update your implementation.
-2. Instead of using these constants directly, use the public methods provided by the `AssetService` class to interact with asset-related functionality.
-
-For example, if you were using:
-
-```php
-$version = AssetService::HYDEFRONT_VERSION;
-```
-
-You should now use:
-
-```php
-$version = (new AssetService())->version();
-```
-
-If you need access to the CDN URL pattern, consider using the `cdnLink()` method of the `AssetService` class instead.
-
-These changes were implemented to improve the API design and encapsulation of the `AssetService` class. If you have any custom implementations that relied on these constants, please review and update your code accordingly.
-
 ## Low impact
 
 ### Navigation internal changes

From 4959e3b8356f594068e8daf41a8b605635d07b54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:38:22 +0200
Subject: [PATCH 024/328] Deprecate the AssetService class

---
 packages/framework/src/Framework/Services/AssetService.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index c306f623a09..82804bb6920 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -21,6 +21,8 @@
 /**
  * Handles the retrieval of core asset files. Commonly used through the Asset facade.
  *
+ * @deprecated Will be merged into the Asset facade.
+ *
  * This class is loaded into the service container, making it easy to access and modify.
  *
  * The class also provides helper methods for interacting with versioned files,

From 7e2b51acc5ca2bc164d07a7ec41aa59b37d207e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:46:06 +0200
Subject: [PATCH 025/328] Remove mixin for deprecated AssetService

---
 _ide_helper.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_ide_helper.php b/_ide_helper.php
index 228893b3169..a838afac059 100644
--- a/_ide_helper.php
+++ b/_ide_helper.php
@@ -33,7 +33,6 @@
 class Hyde extends \Hyde\Hyde {}
 class Site extends \Hyde\Facades\Site {}
 class Meta extends \Hyde\Facades\Meta {}
-/** @mixin \Hyde\Framework\Services\AssetService */
 class Asset extends \Hyde\Facades\Asset {}
 class Author extends \Hyde\Facades\Author {}
 class Features extends \Hyde\Facades\Features {}

From 19c7d17b930a9aac8ae849e2b922ca5e2c81ac2c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:50:54 +0200
Subject: [PATCH 026/328] Remove kernel binding test for deprecated
 AssetService

---
 .../framework/tests/Feature/HydeServiceProviderTest.php   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 6904c5b11d6..ee7d35ae140 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -9,7 +9,6 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Hyde\Console\ConsoleServiceProvider;
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Hyde;
@@ -54,13 +53,6 @@ public function testProviderHasBootMethod()
         $this->assertTrue(method_exists($this->provider, 'boot'));
     }
 
-    public function testProviderRegistersAssetServiceAsSingleton()
-    {
-        $this->assertTrue($this->app->bound(AssetService::class));
-        $this->assertInstanceOf(AssetService::class, $this->app->make(AssetService::class));
-        $this->assertSame($this->app->make(AssetService::class), $this->app->make(AssetService::class));
-    }
-
     public function testProviderRegistersBuildTaskServiceAsSingleton()
     {
         $this->assertTrue($this->app->bound(BuildTaskService::class));

From 293234076c1c20558799f19bb82afbd6afaaa7f0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:51:42 +0200
Subject: [PATCH 027/328] Extend unit test case

---
 packages/framework/tests/Unit/Facades/AssetFacadeTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
index df8344a3771..5bc4f02d01a 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
@@ -6,12 +6,12 @@
 
 use Hyde\Facades\Asset;
 use Hyde\Framework\Services\AssetService;
-use Hyde\Testing\TestCase;
+use Hyde\Testing\UnitTestCase;
 
 /**
  * @covers \Hyde\Facades\Asset
  */
-class AssetFacadeTest extends TestCase
+class AssetFacadeTest extends UnitTestCase
 {
     public function testAssetFacadeReturnsTheAssetService()
     {

From 730f17783fabd039c9d1c658d52d381498be2e3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:52:04 +0200
Subject: [PATCH 028/328] Remove legacy facade implementation tests

---
 .../tests/Unit/Facades/AssetFacadeTest.php      | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
index 5bc4f02d01a..8335c4c7159 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Unit\Facades;
 
 use Hyde\Facades\Asset;
-use Hyde\Framework\Services\AssetService;
 use Hyde\Testing\UnitTestCase;
 
 /**
@@ -13,19 +12,5 @@
  */
 class AssetFacadeTest extends UnitTestCase
 {
-    public function testAssetFacadeReturnsTheAssetService()
-    {
-        $this->assertInstanceOf(AssetService::class, Asset::getFacadeRoot());
-    }
-
-    public function testFacadeReturnsSameInstanceAsBoundByTheContainer()
-    {
-        $this->assertSame(Asset::getFacadeRoot(), app(AssetService::class));
-    }
-
-    public function testAssetFacadeCanCallMethodsOnTheAssetService()
-    {
-        $service = new AssetService();
-        $this->assertEquals($service->version(), Asset::version());
-    }
+    //
 }

From 3e4d02377139f8bdaeb51e79ae43ba26bfc92f8f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:52:59 +0200
Subject: [PATCH 029/328] Move unit tests to new code location

---
 .../tests/Unit/AssetServiceUnitTest.php       | 50 +------------------
 .../tests/Unit/Facades/AssetFacadeTest.php    | 50 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/packages/framework/tests/Unit/AssetServiceUnitTest.php b/packages/framework/tests/Unit/AssetServiceUnitTest.php
index 02c33795d15..21f80004078 100644
--- a/packages/framework/tests/Unit/AssetServiceUnitTest.php
+++ b/packages/framework/tests/Unit/AssetServiceUnitTest.php
@@ -4,9 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Services\AssetService;
 use Hyde\Testing\UnitTestCase;
-use Hyde\Hyde;
 
 /**
  * @covers \Hyde\Framework\Services\AssetService
@@ -15,51 +13,5 @@
  */
 class AssetServiceUnitTest extends UnitTestCase
 {
-    protected function setUp(): void
-    {
-        self::needsKernel();
-        self::mockConfig();
-    }
-
-    public function testServiceHasVersionString()
-    {
-        $this->assertIsString((new AssetService())->version());
-    }
-
-    public function testCdnLinkHelper()
-    {
-        $this->assertSame(
-            'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css',
-            (new AssetService())->cdnLink('styles.css')
-        );
-    }
-
-    public function testHasMediaFileHelper()
-    {
-        $this->assertFalse((new AssetService())->hasMediaFile('styles.css'));
-    }
-
-    public function testHasMediaFileHelperReturnsTrueForExistingFile()
-    {
-        $this->assertTrue((new AssetService())->hasMediaFile('app.css'));
-    }
-
-    public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
-    {
-        $service = new AssetService();
-        $this->assertIsString($config = $service->injectTailwindConfig());
-        $this->assertStringContainsString("darkMode: 'class'", $config);
-        $this->assertStringContainsString('theme: {', $config);
-        $this->assertStringContainsString('extend: {', $config);
-        $this->assertStringContainsString('typography: {', $config);
-        $this->assertStringNotContainsString('plugins', $config);
-    }
-
-    public function testInjectTailwindConfigHandlesMissingConfigFileGracefully()
-    {
-        rename(Hyde::path('tailwind.config.js'), Hyde::path('tailwind.config.js.bak'));
-        $this->assertIsString((new AssetService())->injectTailwindConfig());
-        $this->assertSame('', (new AssetService())->injectTailwindConfig());
-        rename(Hyde::path('tailwind.config.js.bak'), Hyde::path('tailwind.config.js'));
-    }
+    //
 }
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
index 8335c4c7159..7d65f59d626 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
@@ -4,13 +4,61 @@
 
 namespace Hyde\Framework\Testing\Unit\Facades;
 
+use Hyde\Hyde;
 use Hyde\Facades\Asset;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Framework\Services\AssetService;
 
 /**
  * @covers \Hyde\Facades\Asset
  */
 class AssetFacadeTest extends UnitTestCase
 {
-    //
+    protected function setUp(): void
+    {
+        self::needsKernel();
+        self::mockConfig();
+    }
+
+    public function testServiceHasVersionString()
+    {
+        $this->assertIsString((new AssetService())->version());
+    }
+
+    public function testCdnLinkHelper()
+    {
+        $this->assertSame(
+            'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css',
+            (new AssetService())->cdnLink('styles.css')
+        );
+    }
+
+    public function testHasMediaFileHelper()
+    {
+        $this->assertFalse((new AssetService())->hasMediaFile('styles.css'));
+    }
+
+    public function testHasMediaFileHelperReturnsTrueForExistingFile()
+    {
+        $this->assertTrue((new AssetService())->hasMediaFile('app.css'));
+    }
+
+    public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
+    {
+        $service = new AssetService();
+        $this->assertIsString($config = $service->injectTailwindConfig());
+        $this->assertStringContainsString("darkMode: 'class'", $config);
+        $this->assertStringContainsString('theme: {', $config);
+        $this->assertStringContainsString('extend: {', $config);
+        $this->assertStringContainsString('typography: {', $config);
+        $this->assertStringNotContainsString('plugins', $config);
+    }
+
+    public function testInjectTailwindConfigHandlesMissingConfigFileGracefully()
+    {
+        rename(Hyde::path('tailwind.config.js'), Hyde::path('tailwind.config.js.bak'));
+        $this->assertIsString((new AssetService())->injectTailwindConfig());
+        $this->assertSame('', (new AssetService())->injectTailwindConfig());
+        rename(Hyde::path('tailwind.config.js.bak'), Hyde::path('tailwind.config.js'));
+    }
 }

From e8d9939ad2724f6234a4031268eb04aca0dd1f86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:56:26 +0200
Subject: [PATCH 030/328] Add temporary test interoperability

---
 packages/framework/tests/Unit/Facades/AssetFacadeTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
index 7d65f59d626..a2dae835e85 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
@@ -18,6 +18,9 @@ protected function setUp(): void
     {
         self::needsKernel();
         self::mockConfig();
+
+        // Temporary interoperability with the old AssetService
+        Asset::swap(new AssetService());
     }
 
     public function testServiceHasVersionString()

From 422e96612c16947a11da0c15330659e0ffd8ff8e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:57:16 +0200
Subject: [PATCH 031/328] Call tests using the facade

---
 .../framework/tests/Unit/Facades/AssetFacadeTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
index a2dae835e85..a2e5ec2bf28 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
@@ -25,25 +25,25 @@ protected function setUp(): void
 
     public function testServiceHasVersionString()
     {
-        $this->assertIsString((new AssetService())->version());
+        $this->assertIsString(Asset::version());
     }
 
     public function testCdnLinkHelper()
     {
         $this->assertSame(
             'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css',
-            (new AssetService())->cdnLink('styles.css')
+            Asset::cdnLink('styles.css')
         );
     }
 
     public function testHasMediaFileHelper()
     {
-        $this->assertFalse((new AssetService())->hasMediaFile('styles.css'));
+        $this->assertFalse(Asset::hasMediaFile('styles.css'));
     }
 
     public function testHasMediaFileHelperReturnsTrueForExistingFile()
     {
-        $this->assertTrue((new AssetService())->hasMediaFile('app.css'));
+        $this->assertTrue(Asset::hasMediaFile('app.css'));
     }
 
     public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
@@ -60,8 +60,8 @@ public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
     public function testInjectTailwindConfigHandlesMissingConfigFileGracefully()
     {
         rename(Hyde::path('tailwind.config.js'), Hyde::path('tailwind.config.js.bak'));
-        $this->assertIsString((new AssetService())->injectTailwindConfig());
-        $this->assertSame('', (new AssetService())->injectTailwindConfig());
+        $this->assertIsString(Asset::injectTailwindConfig());
+        $this->assertSame('', Asset::injectTailwindConfig());
         rename(Hyde::path('tailwind.config.js.bak'), Hyde::path('tailwind.config.js'));
     }
 }

From db2e12ecb18421ebf6cb0c8d843b866fae80d316 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:57:18 +0200
Subject: [PATCH 032/328] Delete AssetServiceUnitTest.php

---
 .../tests/Unit/AssetServiceUnitTest.php         | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 packages/framework/tests/Unit/AssetServiceUnitTest.php

diff --git a/packages/framework/tests/Unit/AssetServiceUnitTest.php b/packages/framework/tests/Unit/AssetServiceUnitTest.php
deleted file mode 100644
index 21f80004078..00000000000
--- a/packages/framework/tests/Unit/AssetServiceUnitTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Unit;
-
-use Hyde\Testing\UnitTestCase;
-
-/**
- * @covers \Hyde\Framework\Services\AssetService
- *
- * @see \Hyde\Framework\Testing\Feature\AssetServiceTest
- */
-class AssetServiceUnitTest extends UnitTestCase
-{
-    //
-}

From 3e53c3ba847a975fa92cf47fd568337fea853030 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:57:30 +0200
Subject: [PATCH 033/328] Rename test 'AssetFacadeTest' to
 'AssetFacadeUnitTest'

---
 .../Facades/{AssetFacadeTest.php => AssetFacadeUnitTest.php}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/Unit/Facades/{AssetFacadeTest.php => AssetFacadeUnitTest.php} (97%)

diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
similarity index 97%
rename from packages/framework/tests/Unit/Facades/AssetFacadeTest.php
rename to packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index a2e5ec2bf28..724981cfea6 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -12,7 +12,7 @@
 /**
  * @covers \Hyde\Facades\Asset
  */
-class AssetFacadeTest extends UnitTestCase
+class AssetFacadeUnitTest extends UnitTestCase
 {
     protected function setUp(): void
     {

From 9d393ab21f5b2311dea166a889c80cfcebe10044 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:58:17 +0200
Subject: [PATCH 034/328] Rename test 'AssetServiceTest' to 'AssetFacadeTest'

---
 .../tests/Feature/{AssetServiceTest.php => AssetFacadeTest.php} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/Feature/{AssetServiceTest.php => AssetFacadeTest.php} (97%)

diff --git a/packages/framework/tests/Feature/AssetServiceTest.php b/packages/framework/tests/Feature/AssetFacadeTest.php
similarity index 97%
rename from packages/framework/tests/Feature/AssetServiceTest.php
rename to packages/framework/tests/Feature/AssetFacadeTest.php
index ae8661b8118..2b1bcfa2be2 100644
--- a/packages/framework/tests/Feature/AssetServiceTest.php
+++ b/packages/framework/tests/Feature/AssetFacadeTest.php
@@ -13,7 +13,7 @@
  *
  * @see \Hyde\Framework\Testing\Unit\AssetServiceUnitTest
  */
-class AssetServiceTest extends TestCase
+class AssetFacadeTest extends TestCase
 {
     public function testMediaLinkReturnsMediaPathWithCacheKey()
     {

From 171c4ac22dff39182285ea2d4c191b41e215bbb7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:58:30 +0200
Subject: [PATCH 035/328] Update covers annotation

---
 packages/framework/tests/Feature/AssetFacadeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AssetFacadeTest.php b/packages/framework/tests/Feature/AssetFacadeTest.php
index 2b1bcfa2be2..eb61d40829a 100644
--- a/packages/framework/tests/Feature/AssetFacadeTest.php
+++ b/packages/framework/tests/Feature/AssetFacadeTest.php
@@ -9,7 +9,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Services\AssetService
+ * @covers \Hyde\Facades\Asset
  *
  * @see \Hyde\Framework\Testing\Unit\AssetServiceUnitTest
  */

From 5d5f14d53cf82321cff5b18eb8b2438c6ecfb9b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:58:59 +0200
Subject: [PATCH 036/328] Update test crosslinks

---
 packages/framework/tests/Feature/AssetFacadeTest.php          | 2 +-
 packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AssetFacadeTest.php b/packages/framework/tests/Feature/AssetFacadeTest.php
index eb61d40829a..20af8244fef 100644
--- a/packages/framework/tests/Feature/AssetFacadeTest.php
+++ b/packages/framework/tests/Feature/AssetFacadeTest.php
@@ -11,7 +11,7 @@
 /**
  * @covers \Hyde\Facades\Asset
  *
- * @see \Hyde\Framework\Testing\Unit\AssetServiceUnitTest
+ * @see \Hyde\Framework\Testing\Unit\Facades\AssetFacadeUnitTest
  */
 class AssetFacadeTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index 724981cfea6..4d210b8e071 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -11,6 +11,8 @@
 
 /**
  * @covers \Hyde\Facades\Asset
+ *
+ * @see \Hyde\Framework\Testing\Feature\AssetFacadeTest
  */
 class AssetFacadeUnitTest extends UnitTestCase
 {

From 69b8f39353d0cce0fcdb6c84125c319c800a604a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 13:59:50 +0200
Subject: [PATCH 037/328] Call tests using the facade

---
 packages/framework/tests/Feature/AssetFacadeTest.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AssetFacadeTest.php b/packages/framework/tests/Feature/AssetFacadeTest.php
index 20af8244fef..103230b296d 100644
--- a/packages/framework/tests/Feature/AssetFacadeTest.php
+++ b/packages/framework/tests/Feature/AssetFacadeTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Asset;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -17,9 +18,7 @@ class AssetFacadeTest extends TestCase
 {
     public function testMediaLinkReturnsMediaPathWithCacheKey()
     {
-        $service = new AssetService();
-
-        $this->assertIsString($path = $service->mediaLink('app.css'));
+        $this->assertIsString($path = Asset::mediaLink('app.css'));
         $this->assertSame('media/app.css?v='.md5_file(Hyde::path('_media/app.css')), $path);
     }
 
@@ -27,8 +26,7 @@ public function testMediaLinkReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisa
     {
         config(['hyde.enable_cache_busting' => false]);
 
-        $service = new AssetService();
-        $path = $service->mediaLink('app.css');
+        $path = Asset::mediaLink('app.css');
 
         $this->assertIsString($path);
         $this->assertSame('media/app.css', $path);
@@ -41,8 +39,7 @@ public function testMediaLinkSupportsCustomMediaDirectories()
 
         Hyde::setMediaDirectory('_assets');
 
-        $service = new AssetService();
-        $path = $service->mediaLink('app.css');
+        $path = Asset::mediaLink('app.css');
 
         $this->assertIsString($path);
         $this->assertSame('assets/app.css?v='.md5_file(Hyde::path('_assets/app.css')), $path);

From 5b48cef8bf7782b4bb4d4a5121dde41ed6163e95 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:03:12 +0200
Subject: [PATCH 038/328] Refactor class to be static

---
 .../src/Framework/Services/AssetService.php   | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index 82804bb6920..7391d1bcfdb 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -23,9 +23,7 @@
  *
  * @deprecated Will be merged into the Asset facade.
  *
- * This class is loaded into the service container, making it easy to access and modify.
- *
- * The class also provides helper methods for interacting with versioned files,
+ * This class provides static methods for interacting with versioned files,
  * as well as the HydeFront CDN service and the media directories.
  *
  * @see \Hyde\Facades\Asset
@@ -41,27 +39,27 @@ class AssetService
     protected string $version = self::HYDEFRONT_VERSION;
     protected string $cdnUrl = self::HYDEFRONT_CDN_URL;
 
-    public function version(): string
+    public static function version(): string
     {
-        return $this->version;
+        return static::HYDEFRONT_VERSION;
     }
 
-    public function cdnLink(string $file): string
+    public static function cdnLink(string $file): string
     {
-        return $this->constructCdnPath($file);
+        return static::constructCdnPath($file);
     }
 
-    public function mediaLink(string $file): string
+    public static function mediaLink(string $file): string
     {
-        return Hyde::mediaLink($file).$this->getCacheBustKey($file);
+        return Hyde::mediaLink($file).static::getCacheBustKey($file);
     }
 
-    public function hasMediaFile(string $file): bool
+    public static function hasMediaFile(string $file): bool
     {
         return file_exists(Hyde::mediaPath($file));
     }
 
-    public function injectTailwindConfig(): string
+    public static function injectTailwindConfig(): string
     {
         if (! file_exists(Hyde::path('tailwind.config.js'))) {
             return '';
@@ -79,15 +77,15 @@ public function injectTailwindConfig(): string
         return preg_replace('/\s+/', ' ', "/* tailwind.config.js */ \n".rtrim($config, ",\n\r"));
     }
 
-    protected function constructCdnPath(string $file): string
+    protected static function constructCdnPath(string $file): string
     {
         return str_replace(
-            ['{{ $version }}', '{{ $file }}'], [$this->version(), $file],
-            $this->cdnUrl
+            ['{{ $version }}', '{{ $file }}'], [static::version(), $file],
+            static::HYDEFRONT_CDN_URL
         );
     }
 
-    protected function getCacheBustKey(string $file): string
+    protected static function getCacheBustKey(string $file): string
     {
         return Config::getBool('hyde.enable_cache_busting', true)
             ? '?v='.md5_file(Hyde::mediaPath("$file"))

From e4886a729ba7518dcbc542eede7fafc578aabcb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:03:26 +0200
Subject: [PATCH 039/328] Remove now unused properties

---
 packages/framework/src/Framework/Services/AssetService.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index 7391d1bcfdb..6796f31a9d8 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -36,9 +36,6 @@ class AssetService
     /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
     final protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
 
-    protected string $version = self::HYDEFRONT_VERSION;
-    protected string $cdnUrl = self::HYDEFRONT_CDN_URL;
-
     public static function version(): string
     {
         return static::HYDEFRONT_VERSION;

From 50600abebe5a3fcb4a92b830873f8b24f249b204 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:05:41 +0200
Subject: [PATCH 040/328] Call tests using the facade

---
 packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index 4d210b8e071..b7545267e0f 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -50,8 +50,7 @@ public function testHasMediaFileHelperReturnsTrueForExistingFile()
 
     public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
     {
-        $service = new AssetService();
-        $this->assertIsString($config = $service->injectTailwindConfig());
+        $this->assertIsString($config = Asset::injectTailwindConfig());
         $this->assertStringContainsString("darkMode: 'class'", $config);
         $this->assertStringContainsString('theme: {', $config);
         $this->assertStringContainsString('extend: {', $config);

From f801942c40ac6eb9651a84e0a52a23f7df523d42 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:05:53 +0200
Subject: [PATCH 041/328] Revert temporary test interoperability

---
 packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index b7545267e0f..c300236bc8d 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -7,7 +7,6 @@
 use Hyde\Hyde;
 use Hyde\Facades\Asset;
 use Hyde\Testing\UnitTestCase;
-use Hyde\Framework\Services\AssetService;
 
 /**
  * @covers \Hyde\Facades\Asset
@@ -20,9 +19,6 @@ protected function setUp(): void
     {
         self::needsKernel();
         self::mockConfig();
-
-        // Temporary interoperability with the old AssetService
-        Asset::swap(new AssetService());
     }
 
     public function testServiceHasVersionString()

From 1675dd09a17443a86219210a29eb492eb2973765 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:06:33 +0200
Subject: [PATCH 042/328] Merge the AssetService into the Asset facade class

---
 packages/framework/src/Facades/Asset.php      | 84 ++++++++++++++++---
 .../src/Framework/Services/AssetService.php   | 76 +----------------
 2 files changed, 72 insertions(+), 88 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index f0bd3b6c651..49065d3b352 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -4,25 +4,83 @@
 
 namespace Hyde\Facades;
 
-use Hyde\Framework\Services\AssetService;
-use Illuminate\Support\Facades\Facade;
+use Hyde\Hyde;
+use Illuminate\Support\Str;
+
+use function rtrim;
+use function explode;
+use function implode;
+use function md5_file;
+use function file_exists;
+use function str_replace;
+use function preg_replace;
+use function str_contains;
+use function file_get_contents;
 
 /**
  * Handles the retrieval of core asset files, either from the HydeFront CDN or from the local media folder.
  *
- * @see \Hyde\Framework\Services\AssetService
- *
- * @method static string version()
- * @method static string cdnLink(string $file)
- * @method static string mediaLink(string $file)
- * @method static bool hasMediaFile(string $file)
- * @method static string injectTailwindConfig()
+ * This class provides static methods for interacting with versioned files,
+ * as well as the HydeFront CDN service and the media directories.
  */
-class Asset extends Facade
+class Asset
 {
-    /** @psalm-return AssetService::class */
-    protected static function getFacadeAccessor(): string
+    /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
+    final protected const HYDEFRONT_VERSION = 'v3.4';
+
+    /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
+    final protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
+
+    public static function version(): string
+    {
+        return static::HYDEFRONT_VERSION;
+    }
+
+    public static function cdnLink(string $file): string
+    {
+        return static::constructCdnPath($file);
+    }
+
+    public static function mediaLink(string $file): string
+    {
+        return Hyde::mediaLink($file).static::getCacheBustKey($file);
+    }
+
+    public static function hasMediaFile(string $file): bool
+    {
+        return file_exists(Hyde::mediaPath($file));
+    }
+
+    public static function injectTailwindConfig(): string
+    {
+        if (! file_exists(Hyde::path('tailwind.config.js'))) {
+            return '';
+        }
+
+        $config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');
+
+        // Remove the plugins array, as it is not used in the frontend.
+        if (str_contains($config, 'plugins: [')) {
+            $tokens = explode('plugins: [', $config, 2);
+            $tokens[1] = Str::after($tokens[1], ']');
+            $config = implode('', $tokens);
+        }
+
+        return preg_replace('/\s+/', ' ', "/* tailwind.config.js */ \n".rtrim($config, ",\n\r"));
+    }
+
+    protected static function constructCdnPath(string $file): string
+    {
+        return str_replace(
+            ['{{ $version }}', '{{ $file }}'], [static::version(), $file],
+            static::HYDEFRONT_CDN_URL
+        );
+    }
+
+    protected static function getCacheBustKey(string $file): string
     {
-        return AssetService::class;
+        return Config::getBool('hyde.enable_cache_busting', true)
+            ? '?v='.md5_file(Hyde::mediaPath("$file"))
+            : '';
     }
 }
diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index 6796f31a9d8..d6159d32535 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -4,88 +4,14 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Hyde;
-use Hyde\Facades\Config;
-use Illuminate\Support\Str;
-
-use function rtrim;
-use function explode;
-use function implode;
-use function md5_file;
-use function file_exists;
-use function str_replace;
-use function preg_replace;
-use function str_contains;
-use function file_get_contents;
-
 /**
  * Handles the retrieval of core asset files. Commonly used through the Asset facade.
  *
  * @deprecated Will be merged into the Asset facade.
  *
- * This class provides static methods for interacting with versioned files,
- * as well as the HydeFront CDN service and the media directories.
- *
  * @see \Hyde\Facades\Asset
  */
 class AssetService
 {
-    /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
-    final protected const HYDEFRONT_VERSION = 'v3.4';
-
-    /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
-    final protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
-
-    public static function version(): string
-    {
-        return static::HYDEFRONT_VERSION;
-    }
-
-    public static function cdnLink(string $file): string
-    {
-        return static::constructCdnPath($file);
-    }
-
-    public static function mediaLink(string $file): string
-    {
-        return Hyde::mediaLink($file).static::getCacheBustKey($file);
-    }
-
-    public static function hasMediaFile(string $file): bool
-    {
-        return file_exists(Hyde::mediaPath($file));
-    }
-
-    public static function injectTailwindConfig(): string
-    {
-        if (! file_exists(Hyde::path('tailwind.config.js'))) {
-            return '';
-        }
-
-        $config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');
-
-        // Remove the plugins array, as it is not used in the frontend.
-        if (str_contains($config, 'plugins: [')) {
-            $tokens = explode('plugins: [', $config, 2);
-            $tokens[1] = Str::after($tokens[1], ']');
-            $config = implode('', $tokens);
-        }
-
-        return preg_replace('/\s+/', ' ', "/* tailwind.config.js */ \n".rtrim($config, ",\n\r"));
-    }
-
-    protected static function constructCdnPath(string $file): string
-    {
-        return str_replace(
-            ['{{ $version }}', '{{ $file }}'], [static::version(), $file],
-            static::HYDEFRONT_CDN_URL
-        );
-    }
-
-    protected static function getCacheBustKey(string $file): string
-    {
-        return Config::getBool('hyde.enable_cache_busting', true)
-            ? '?v='.md5_file(Hyde::mediaPath("$file"))
-            : '';
-    }
+    //
 }

From fb0e40c4c22eb82aac6f08411360d960a25161be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:06:46 +0200
Subject: [PATCH 043/328] Delete AssetService.php

---
 .../src/Framework/Services/AssetService.php     | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Services/AssetService.php

diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
deleted file mode 100644
index d6159d32535..00000000000
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Services;
-
-/**
- * Handles the retrieval of core asset files. Commonly used through the Asset facade.
- *
- * @deprecated Will be merged into the Asset facade.
- *
- * @see \Hyde\Facades\Asset
- */
-class AssetService
-{
-    //
-}

From bf257a54be49685675c90b52864b52d361dc6661 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:08:04 +0200
Subject: [PATCH 044/328] Remove unused import

---
 packages/framework/tests/Feature/AssetFacadeTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AssetFacadeTest.php b/packages/framework/tests/Feature/AssetFacadeTest.php
index 103230b296d..3e934eab38b 100644
--- a/packages/framework/tests/Feature/AssetFacadeTest.php
+++ b/packages/framework/tests/Feature/AssetFacadeTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Facades\Asset;
-use Hyde\Framework\Services\AssetService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 

From f0192f58f34404aa0d19406e0ab2707fa237e660 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:08:15 +0200
Subject: [PATCH 045/328] Remove AssetService container binding

---
 packages/framework/src/Framework/HydeServiceProvider.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index c2896efdc9b..e3dbd7eb5ea 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -10,7 +10,6 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Concerns\RegistersFileLocations;
 use Illuminate\Support\ServiceProvider;
@@ -29,7 +28,6 @@ public function register(): void
     {
         $this->kernel = HydeKernel::getInstance();
 
-        $this->app->singleton(AssetService::class, AssetService::class);
         $this->app->singleton(BuildTaskService::class, BuildTaskService::class);
 
         $this->kernel->setSourceRoot(Config::getString('hyde.source_root', ''));

From 83e69f8d43cec53483a341158306e67dfbf816b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:12:35 +0200
Subject: [PATCH 046/328] Update internal docs for removed asset service

---
 monorepo/docs/hydefront.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monorepo/docs/hydefront.md b/monorepo/docs/hydefront.md
index 377f920e6e0..cb7733eabcd 100644
--- a/monorepo/docs/hydefront.md
+++ b/monorepo/docs/hydefront.md
@@ -64,6 +64,6 @@ This will create commits in both the monorepo and submodule. Now follow the foll
 9. Update the monorepo to use the new version.
     - [ ] `npm update hydefront`
     - **Note:** On major/minor version bumps, **remember to update** the `package.json` in the `packages/hyde` directory to use the new version!
-    - **Note:** On major version bumps, **remember to update the HydeFront version in the Asset Service!**
+    - **Note:** On major version bumps, **remember to update the HydeFront version in the Asset Facade!**
 10. Amend the monorepo commit with the updated files (package-lock.json, _media/app.css, packages\hydefront, packages\hyde\package.json)
-    - [ ] `git add packages/hydefront && git add packages/hyde/package.json && git add package-lock.json && git add _media/app.css && git add packages/framework/src/Framework/Services/AssetService.php && git commit --amend --no-edit`
+    - [ ] `git add packages/hydefront && git add packages/hyde/package.json && git add package-lock.json && git add _media/app.css && git add packages/framework/src/Facades/Asset.php && git commit --amend --no-edit`

From 251ed8bea4111d8effdffc137dcf9f46333ec3be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:13:41 +0200
Subject: [PATCH 047/328] Clean up test

---
 packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index c300236bc8d..ddfafe2ec72 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -46,7 +46,9 @@ public function testHasMediaFileHelperReturnsTrueForExistingFile()
 
     public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
     {
-        $this->assertIsString($config = Asset::injectTailwindConfig());
+        $config = Asset::injectTailwindConfig();
+
+        $this->assertIsString($config);
         $this->assertStringContainsString("darkMode: 'class'", $config);
         $this->assertStringContainsString('theme: {', $config);
         $this->assertStringContainsString('extend: {', $config);

From 02dbc14b919b7c495d9d535d0e5f39248fdbbaff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:25:19 +0200
Subject: [PATCH 048/328] Create HydeFront.php

---
 packages/framework/src/Facades/HydeFront.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Facades/HydeFront.php

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
new file mode 100644
index 00000000000..5f5448313ee
--- /dev/null
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Facades;
+
+class HydeFront
+{
+    //
+}

From 718ac2a22749edbec9424005a934bc4e0b0d9277 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:26:32 +0200
Subject: [PATCH 049/328] Create HydeFrontFacadeTest.php

---
 .../tests/Unit/Facades/HydeFrontFacadeTest.php    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php

diff --git a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
new file mode 100644
index 00000000000..e4c6d9e192f
--- /dev/null
+++ b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Facades;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Facades\HydeFront
+ */
+class HydeFrontFacadeTest extends UnitTestCase
+{
+    //
+}

From ecfafc85efeef288a82f104c722e795ca4e0b15d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:26:53 +0200
Subject: [PATCH 050/328] Alias the HydeFront facade

---
 app/config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/config.php b/app/config.php
index 143a4a6dda4..009c0f586b7 100644
--- a/app/config.php
+++ b/app/config.php
@@ -94,6 +94,7 @@
         'Meta' => \Hyde\Facades\Meta::class,
         'Asset' => \Hyde\Facades\Asset::class,
         'Author' => \Hyde\Facades\Author::class,
+        'HydeFront' => \Hyde\Facades\HydeFront::class,
         'Features' => \Hyde\Facades\Features::class,
         'Config' => \Hyde\Facades\Config::class,
         'Filesystem' => \Hyde\Facades\Filesystem::class,

From ee69a0a9e0b44afa58d7fce5f326450673292157 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:48:20 +0200
Subject: [PATCH 051/328] Move HydeFront related methods to the new HydeFront
 facade

---
 packages/framework/src/Facades/Asset.php      | 53 ++++++++-----------
 packages/framework/src/Facades/HydeFront.php  | 27 +++++++++-
 .../Unit/Facades/AssetFacadeUnitTest.php      | 13 -----
 .../Unit/Facades/HydeFrontFacadeTest.php      | 12 ++++-
 4 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 49065d3b352..6d7a3afaeb3 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -6,15 +6,10 @@
 
 use Hyde\Hyde;
 use Illuminate\Support\Str;
+use JetBrains\PhpStorm\Deprecated;
 
-use function rtrim;
-use function explode;
-use function implode;
 use function md5_file;
 use function file_exists;
-use function str_replace;
-use function preg_replace;
-use function str_contains;
 use function file_get_contents;
 
 /**
@@ -25,22 +20,6 @@
  */
 class Asset
 {
-    /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
-    final protected const HYDEFRONT_VERSION = 'v3.4';
-
-    /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
-    final protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
-
-    public static function version(): string
-    {
-        return static::HYDEFRONT_VERSION;
-    }
-
-    public static function cdnLink(string $file): string
-    {
-        return static::constructCdnPath($file);
-    }
-
     public static function mediaLink(string $file): string
     {
         return Hyde::mediaLink($file).static::getCacheBustKey($file);
@@ -69,18 +48,32 @@ public static function injectTailwindConfig(): string
         return preg_replace('/\s+/', ' ', "/* tailwind.config.js */ \n".rtrim($config, ",\n\r"));
     }
 
-    protected static function constructCdnPath(string $file): string
-    {
-        return str_replace(
-            ['{{ $version }}', '{{ $file }}'], [static::version(), $file],
-            static::HYDEFRONT_CDN_URL
-        );
-    }
-
     protected static function getCacheBustKey(string $file): string
     {
         return Config::getBool('hyde.enable_cache_busting', true)
             ? '?v='.md5_file(Hyde::mediaPath("$file"))
             : '';
     }
+
+    /**
+     * @deprecated Use HydeFront::version() instead.
+     *
+     * @codeCoverageIgnore Deprecated method.
+     */
+    #[Deprecated(reason: 'Use HydeFront::version() instead.', replacement: '\Hyde\Facades\HydeFront::version()')]
+    public static function version(): string
+    {
+        return HydeFront::version();
+    }
+
+    /**
+     * @deprecated Use HydeFront::cdnLink() instead.
+     *
+     * @codeCoverageIgnore Deprecated method.
+     */
+    #[Deprecated(reason: 'Use HydeFront::cdnLink() instead.', replacement: '\Hyde\Facades\HydeFront::cdnLink()')]
+    public static function cdnLink(string $file): string
+    {
+        return HydeFront::cdnLink($file);
+    }
 }
diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 5f5448313ee..e3b5c76f606 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -4,7 +4,32 @@
 
 namespace Hyde\Facades;
 
+use function str_replace;
+
 class HydeFront
 {
-    //
+    /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
+    final protected const HYDEFRONT_VERSION = 'v3.4';
+
+    /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
+    final protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
+
+    public static function version(): string
+    {
+        return static::HYDEFRONT_VERSION;
+    }
+
+    public static function cdnLink(string $file): string
+    {
+        return static::constructCdnPath($file);
+    }
+
+    protected static function constructCdnPath(string $file): string
+    {
+        return str_replace(
+            ['{{ $version }}', '{{ $file }}'],
+            [static::version(), $file],
+            static::HYDEFRONT_CDN_URL
+        );
+    }
 }
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index ddfafe2ec72..81cbfc029b4 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -21,19 +21,6 @@ protected function setUp(): void
         self::mockConfig();
     }
 
-    public function testServiceHasVersionString()
-    {
-        $this->assertIsString(Asset::version());
-    }
-
-    public function testCdnLinkHelper()
-    {
-        $this->assertSame(
-            'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css',
-            Asset::cdnLink('styles.css')
-        );
-    }
-
     public function testHasMediaFileHelper()
     {
         $this->assertFalse(Asset::hasMediaFile('styles.css'));
diff --git a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
index e4c6d9e192f..37425127bf7 100644
--- a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Facades;
 
+use Hyde\Facades\HydeFront;
 use Hyde\Testing\UnitTestCase;
 
 /**
@@ -11,5 +12,14 @@
  */
 class HydeFrontFacadeTest extends UnitTestCase
 {
-    //
+    public function testVersionReturnsString()
+    {
+        $this->assertIsString(HydeFront::version());
+    }
+
+    public function testCdnLinkReturnsCorrectUrl()
+    {
+        $expected = 'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css';
+        $this->assertSame($expected, HydeFront::cdnLink('styles.css'));
+    }
 }

From 3db1b29adce5f88299de0fc990ce3b19ad3ecfd8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:54:25 +0200
Subject: [PATCH 052/328] Use the new HydeFront facade

---
 packages/framework/resources/views/layouts/styles.blade.php | 2 +-
 .../framework/tests/Unit/Views/StylesComponentViewTest.php  | 4 ++--
 spec.md                                                     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/resources/views/layouts/styles.blade.php b/packages/framework/resources/views/layouts/styles.blade.php
index 497e524ae1b..2a345a4ce18 100644
--- a/packages/framework/resources/views/layouts/styles.blade.php
+++ b/packages/framework/resources/views/layouts/styles.blade.php
@@ -3,7 +3,7 @@
 
 {{-- The compiled Tailwind/App styles --}}
 @if(config('hyde.load_app_styles_from_cdn', false))
-    <link rel="stylesheet" href="{{ Asset::cdnLink('app.css') }}">
+    <link rel="stylesheet" href="{{ HydeFront::cdnLink('app.css') }}">
 @elseif(Asset::hasMediaFile('app.css'))
     <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
 @endif
diff --git a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
index bfe078d00f1..bb5358f9e08 100644
--- a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Facades\Filesystem;
-use Hyde\Facades\Asset;
+use Hyde\Facades\HydeFront;
 use Hyde\Hyde;
 use Hyde\Support\Facades\Render;
 use Hyde\Testing\TestCase;
@@ -80,7 +80,7 @@ public function testComponentRendersTailwindPlayCdnLinkWhenEnabledInConfig()
     public function testComponentRendersAppCdnLinkWhenEnabledInConfig()
     {
         config(['hyde.load_app_styles_from_cdn' => true]);
-        $this->assertStringContainsString(Asset::cdnLink('app.css'), $this->renderTestView());
+        $this->assertStringContainsString(HydeFront::cdnLink('app.css'), $this->renderTestView());
     }
 
     public function testComponentDoesNotRenderLinkToLocalAppCssWhenCdnLinkIsEnabledInConfig()
diff --git a/spec.md b/spec.md
index b404251e8ea..a1ca493ac41 100644
--- a/spec.md
+++ b/spec.md
@@ -15,7 +15,7 @@ For example: Consider these Blade snippets from the default views, showing commo
 ```blade
 {{-- The compiled Tailwind/App styles --}}
 @if(config('hyde.load_app_styles_from_cdn', false))
-    <link rel="stylesheet" href="{{ Asset::cdnLink('app.css') }}">
+    <link rel="stylesheet" href="{{ HydeFront::cdnLink('app.css') }}">
 @elseif(Asset::hasMediaFile('app.css'))
     <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
 @endif
@@ -61,7 +61,7 @@ protected function setSource(string $source): string {
 ### Asset Facade
 
 ```php
-Asset::cdnLink(string $file) // Gets remote URL to any file in /dist/ in the HydeFront version
+HydeFront::cdnLink(string $file) // Gets remote URL to any file in /dist/ in the HydeFront version
 Asset::mediaLink(string $file) // Returns Hyde::mediaLink but with a cache buster
 Asset::hasMediaFile(string $file) // Returns file_exists(Hyde::mediaPath($file))
 
@@ -576,7 +576,7 @@ $size = $logo->getSize();
 $mimeType = $logo->getMimeType();
 
 // HydeFront CDN link (for app.js or app.css)
-$appJsUrl = Asset::cdnLink('app.js');
+$appJsUrl = HydeFront::cdnLink('app.js');
 ```
 
 This API maintains the simplicity-first approach of Hyde while providing power when needed. It should be intuitive for both Laravel-familiar developers and those new to the framework, aligning well with Hyde's philosophy and goals.

From f5b752610ac5d9f8027afcaa13428669215b8110 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:52:35 +0200
Subject: [PATCH 053/328] Remove deprecated Asset facade methods

See https://github.com/hydephp/develop/pull/1904 for why we are skipping the normal deprecation process.
---
 packages/framework/src/Facades/Asset.php | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 6d7a3afaeb3..2300dd6dc72 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Illuminate\Support\Str;
-use JetBrains\PhpStorm\Deprecated;
 
 use function md5_file;
 use function file_exists;
@@ -54,26 +53,4 @@ protected static function getCacheBustKey(string $file): string
             ? '?v='.md5_file(Hyde::mediaPath("$file"))
             : '';
     }
-
-    /**
-     * @deprecated Use HydeFront::version() instead.
-     *
-     * @codeCoverageIgnore Deprecated method.
-     */
-    #[Deprecated(reason: 'Use HydeFront::version() instead.', replacement: '\Hyde\Facades\HydeFront::version()')]
-    public static function version(): string
-    {
-        return HydeFront::version();
-    }
-
-    /**
-     * @deprecated Use HydeFront::cdnLink() instead.
-     *
-     * @codeCoverageIgnore Deprecated method.
-     */
-    #[Deprecated(reason: 'Use HydeFront::cdnLink() instead.', replacement: '\Hyde\Facades\HydeFront::cdnLink()')]
-    public static function cdnLink(string $file): string
-    {
-        return HydeFront::cdnLink($file);
-    }
 }

From 48a8a94aa8a54f85b3cbeab72594aae8189f3f2e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 14:58:06 +0200
Subject: [PATCH 054/328] Remove unnecessary final modifiers from protected
 constants

---
 packages/framework/src/Facades/HydeFront.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index e3b5c76f606..22a25793caa 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -9,10 +9,10 @@
 class HydeFront
 {
     /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
-    final protected const HYDEFRONT_VERSION = 'v3.4';
+    protected const HYDEFRONT_VERSION = 'v3.4';
 
     /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
-    final protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
+    protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
 
     public static function version(): string
     {

From 57835e62662f90e7eae97d630b992e0f93d1f209 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:00:14 +0200
Subject: [PATCH 055/328] Inline helper method

---
 packages/framework/src/Facades/HydeFront.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 22a25793caa..aa45b7cfc3a 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -20,11 +20,6 @@ public static function version(): string
     }
 
     public static function cdnLink(string $file): string
-    {
-        return static::constructCdnPath($file);
-    }
-
-    protected static function constructCdnPath(string $file): string
     {
         return str_replace(
             ['{{ $version }}', '{{ $file }}'],

From 84a686456893f91fcf56ffed0e1fa6422af6fbda Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:00:37 +0200
Subject: [PATCH 056/328] Clean up helper method

---
 packages/framework/src/Facades/HydeFront.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index aa45b7cfc3a..b2a43426e92 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -22,8 +22,7 @@ public static function version(): string
     public static function cdnLink(string $file): string
     {
         return str_replace(
-            ['{{ $version }}', '{{ $file }}'],
-            [static::version(), $file],
+            ['{{ $version }}', '{{ $file }}'], [static::version(), $file],
             static::HYDEFRONT_CDN_URL
         );
     }

From 324b316ab148ed325df19391a220b28378f9e62d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:03:14 +0200
Subject: [PATCH 057/328] Simplify helper method implementation

With the private API we can now use a more specific and cleaner implementation
---
 packages/framework/src/Facades/HydeFront.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index b2a43426e92..13892a380e1 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -4,15 +4,15 @@
 
 namespace Hyde\Facades;
 
-use function str_replace;
+use function sprintf;
 
 class HydeFront
 {
     /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
     protected const HYDEFRONT_VERSION = 'v3.4';
 
-    /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
-    protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
+    /** @var string The default HydeFront CDN path pattern. */
+    protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@%s/dist/%s';
 
     public static function version(): string
     {
@@ -21,9 +21,6 @@ public static function version(): string
 
     public static function cdnLink(string $file): string
     {
-        return str_replace(
-            ['{{ $version }}', '{{ $file }}'], [static::version(), $file],
-            static::HYDEFRONT_CDN_URL
-        );
+        return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);
     }
 }

From f2c63bcf3186a5d98973409e79fd39d38fe5f952 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:04:33 +0200
Subject: [PATCH 058/328] Add HydeFront facade class documentation

---
 packages/framework/src/Facades/HydeFront.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 13892a380e1..5c9223b7c85 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -6,6 +6,11 @@
 
 use function sprintf;
 
+/**
+ * HydeFront is the NPM package that bundles the default precompiled CSS and JavaScript assets for HydePHP.
+ *
+ * This facade makes it easy to access these assets from the HydeFront CDN, automatically getting the correct version.
+ */
 class HydeFront
 {
     /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */

From 24571037a9a2ba5eac12f03ffd60267756b9ca67 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:11:24 +0200
Subject: [PATCH 059/328] Add rich PHPDoc method annotations

---
 packages/framework/src/Facades/HydeFront.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 5c9223b7c85..00f5a6ce543 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -19,11 +19,21 @@ class HydeFront
     /** @var string The default HydeFront CDN path pattern. */
     protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@%s/dist/%s';
 
+    /**
+     * Get the current version of the HydeFront package.
+     *
+     * @return string {@see HYDEFRONT_VERSION}
+     */
     public static function version(): string
     {
         return static::HYDEFRONT_VERSION;
     }
 
+    /**
+     * Get the CDN link for a specific file.
+     *
+     * @param  'app.css'|'hyde.css'|'hyde.css.map'  $file
+     */
     public static function cdnLink(string $file): string
     {
         return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);

From e33c8213a700df0da06636fdb347674d4540117b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:13:03 +0200
Subject: [PATCH 060/328] Add more tests

---
 .../tests/Unit/Facades/HydeFrontFacadeTest.php       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
index 37425127bf7..4afe8ee9e36 100644
--- a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
@@ -22,4 +22,16 @@ public function testCdnLinkReturnsCorrectUrl()
         $expected = 'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css';
         $this->assertSame($expected, HydeFront::cdnLink('styles.css'));
     }
+
+    public function testCdnLinkReturnsCorrectUrlForHydeCss()
+    {
+        $expected = 'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/hyde.css';
+        $this->assertSame($expected, HydeFront::cdnLink('hyde.css'));
+    }
+
+    public function testCdnLinkReturnsCorrectUrlForInvalidFile()
+    {
+        $expected = 'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/invalid';
+        $this->assertSame($expected, HydeFront::cdnLink('invalid'));
+    }
 }

From f00db0771ef14e40b146f6a5cc359ba2953bfef4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:13:28 +0200
Subject: [PATCH 061/328] Update constant comment

---
 packages/framework/src/Facades/HydeFront.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 00f5a6ce543..b566839b999 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -16,7 +16,7 @@ class HydeFront
     /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
     protected const HYDEFRONT_VERSION = 'v3.4';
 
-    /** @var string The default HydeFront CDN path pattern. */
+    /** @var string The default HydeFront CDN path pattern used to assemble CDN links. */
     protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@%s/dist/%s';
 
     /**

From dc129051b7831a23ebe81f41e37783d5f8a2fac7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:17:26 +0200
Subject: [PATCH 062/328] Add todo

---
 packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
index 4afe8ee9e36..fd4336eff3a 100644
--- a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
@@ -12,6 +12,8 @@
  */
 class HydeFrontFacadeTest extends UnitTestCase
 {
+    // Todo: Check the version is correct? (When running in monorepo)
+
     public function testVersionReturnsString()
     {
         $this->assertIsString(HydeFront::version());

From 397e19e3d0e622dad4267d219dc159326f903d9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:52:48 +0200
Subject: [PATCH 063/328] Move Tailwind config injection to HydeFront facade

This is more coupled to HydeFront than general Asset services
---
 .../resources/views/layouts/styles.blade.php  |  2 +-
 packages/framework/src/Facades/Asset.php      | 20 ----------------
 packages/framework/src/Facades/HydeFront.php  | 21 +++++++++++++++++
 .../Unit/Facades/AssetFacadeUnitTest.php      | 21 -----------------
 .../Unit/Facades/HydeFrontFacadeTest.php      | 23 +++++++++++++++++++
 5 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/packages/framework/resources/views/layouts/styles.blade.php b/packages/framework/resources/views/layouts/styles.blade.php
index 2a345a4ce18..d1b374d73cf 100644
--- a/packages/framework/resources/views/layouts/styles.blade.php
+++ b/packages/framework/resources/views/layouts/styles.blade.php
@@ -11,7 +11,7 @@
 {{-- Dynamic TailwindCSS Play CDN --}}
 @if(config('hyde.use_play_cdn', false))
     <script src="https://cdn.tailwindcss.com?plugins=typography"></script>
-    <script>tailwind.config = { {!! Asset::injectTailwindConfig() !!} }</script>
+    <script>tailwind.config = { {!! HydeFront::injectTailwindConfig() !!} }</script>
     <script>console.warn('The HydePHP TailwindCSS Play CDN is enabled. This is for development purposes only and should not be used in production.', 'See https://hydephp.com/docs/1.x/managing-assets');</script>
 @endif
 
diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 2300dd6dc72..9691a43c211 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -5,11 +5,9 @@
 namespace Hyde\Facades;
 
 use Hyde\Hyde;
-use Illuminate\Support\Str;
 
 use function md5_file;
 use function file_exists;
-use function file_get_contents;
 
 /**
  * Handles the retrieval of core asset files, either from the HydeFront CDN or from the local media folder.
@@ -29,24 +27,6 @@ public static function hasMediaFile(string $file): bool
         return file_exists(Hyde::mediaPath($file));
     }
 
-    public static function injectTailwindConfig(): string
-    {
-        if (! file_exists(Hyde::path('tailwind.config.js'))) {
-            return '';
-        }
-
-        $config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');
-
-        // Remove the plugins array, as it is not used in the frontend.
-        if (str_contains($config, 'plugins: [')) {
-            $tokens = explode('plugins: [', $config, 2);
-            $tokens[1] = Str::after($tokens[1], ']');
-            $config = implode('', $tokens);
-        }
-
-        return preg_replace('/\s+/', ' ', "/* tailwind.config.js */ \n".rtrim($config, ",\n\r"));
-    }
-
     protected static function getCacheBustKey(string $file): string
     {
         return Config::getBool('hyde.enable_cache_busting', true)
diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index b566839b999..546989442a8 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Facades;
 
+use Hyde\Hyde;
+use Illuminate\Support\Str;
+
 use function sprintf;
 
 /**
@@ -38,4 +41,22 @@ public static function cdnLink(string $file): string
     {
         return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);
     }
+
+    public static function injectTailwindConfig(): string
+    {
+        if (! file_exists(Hyde::path('tailwind.config.js'))) {
+            return '';
+        }
+
+        $config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');
+
+        // Remove the plugins array, as it is not used in the frontend.
+        if (str_contains($config, 'plugins: [')) {
+            $tokens = explode('plugins: [', $config, 2);
+            $tokens[1] = Str::after($tokens[1], ']');
+            $config = implode('', $tokens);
+        }
+
+        return preg_replace('/\s+/', ' ', "/* tailwind.config.js */ \n".rtrim($config, ",\n\r"));
+    }
 }
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index 81cbfc029b4..4c62090bbae 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Unit\Facades;
 
-use Hyde\Hyde;
 use Hyde\Facades\Asset;
 use Hyde\Testing\UnitTestCase;
 
@@ -30,24 +29,4 @@ public function testHasMediaFileHelperReturnsTrueForExistingFile()
     {
         $this->assertTrue(Asset::hasMediaFile('app.css'));
     }
-
-    public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
-    {
-        $config = Asset::injectTailwindConfig();
-
-        $this->assertIsString($config);
-        $this->assertStringContainsString("darkMode: 'class'", $config);
-        $this->assertStringContainsString('theme: {', $config);
-        $this->assertStringContainsString('extend: {', $config);
-        $this->assertStringContainsString('typography: {', $config);
-        $this->assertStringNotContainsString('plugins', $config);
-    }
-
-    public function testInjectTailwindConfigHandlesMissingConfigFileGracefully()
-    {
-        rename(Hyde::path('tailwind.config.js'), Hyde::path('tailwind.config.js.bak'));
-        $this->assertIsString(Asset::injectTailwindConfig());
-        $this->assertSame('', Asset::injectTailwindConfig());
-        rename(Hyde::path('tailwind.config.js.bak'), Hyde::path('tailwind.config.js'));
-    }
 }
diff --git a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
index fd4336eff3a..3bcdf3a096d 100644
--- a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Facades;
 
+use Hyde\Hyde;
 use Hyde\Facades\HydeFront;
 use Hyde\Testing\UnitTestCase;
 
@@ -12,6 +13,8 @@
  */
 class HydeFrontFacadeTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+
     // Todo: Check the version is correct? (When running in monorepo)
 
     public function testVersionReturnsString()
@@ -36,4 +39,24 @@ public function testCdnLinkReturnsCorrectUrlForInvalidFile()
         $expected = 'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/invalid';
         $this->assertSame($expected, HydeFront::cdnLink('invalid'));
     }
+
+    public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
+    {
+        $config = HydeFront::injectTailwindConfig();
+
+        $this->assertIsString($config);
+        $this->assertStringContainsString("darkMode: 'class'", $config);
+        $this->assertStringContainsString('theme: {', $config);
+        $this->assertStringContainsString('extend: {', $config);
+        $this->assertStringContainsString('typography: {', $config);
+        $this->assertStringNotContainsString('plugins', $config);
+    }
+
+    public function testInjectTailwindConfigHandlesMissingConfigFileGracefully()
+    {
+        rename(Hyde::path('tailwind.config.js'), Hyde::path('tailwind.config.js.bak'));
+        $this->assertIsString(HydeFront::injectTailwindConfig());
+        $this->assertSame('', HydeFront::injectTailwindConfig());
+        rename(Hyde::path('tailwind.config.js.bak'), Hyde::path('tailwind.config.js'));
+    }
 }

From eb5136a7e392c2edae6cbc6c5065a1b9b4864cff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:55:21 +0200
Subject: [PATCH 064/328] Mark method as internal

---
 packages/framework/src/Facades/HydeFront.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 546989442a8..2529d2c2d91 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -42,6 +42,9 @@ public static function cdnLink(string $file): string
         return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);
     }
 
+    /**
+     * @internal This method is used to inject the Tailwind CSS configuration into the Play CDN integration.
+     */
     public static function injectTailwindConfig(): string
     {
         if (! file_exists(Hyde::path('tailwind.config.js'))) {

From bbd960b49b7843a6b5afb714f333f8326b8b5dfd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:55:24 +0200
Subject: [PATCH 065/328] Revert "Mark method as internal"

This reverts commit eb5136a7e392c2edae6cbc6c5065a1b9b4864cff.
---
 packages/framework/src/Facades/HydeFront.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 2529d2c2d91..546989442a8 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -42,9 +42,6 @@ public static function cdnLink(string $file): string
         return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);
     }
 
-    /**
-     * @internal This method is used to inject the Tailwind CSS configuration into the Play CDN integration.
-     */
     public static function injectTailwindConfig(): string
     {
         if (! file_exists(Hyde::path('tailwind.config.js'))) {

From fc5b464287f3e840def2aa718fcb90720bb5c58f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:55:55 +0200
Subject: [PATCH 066/328] Document method

---
 packages/framework/src/Facades/HydeFront.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 546989442a8..97cc2bdb091 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -42,6 +42,9 @@ public static function cdnLink(string $file): string
         return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);
     }
 
+    /**
+     * This method is used to inject the Tailwind CSS configuration into the Play CDN integration.
+     */
     public static function injectTailwindConfig(): string
     {
         if (! file_exists(Hyde::path('tailwind.config.js'))) {

From 63b414a88724af984843ee2c77b95e586ae986a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 15:56:09 +0200
Subject: [PATCH 067/328] Compress comment formatting

---
 packages/framework/src/Facades/HydeFront.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 97cc2bdb091..ed2def95db9 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -42,9 +42,7 @@ public static function cdnLink(string $file): string
         return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);
     }
 
-    /**
-     * This method is used to inject the Tailwind CSS configuration into the Play CDN integration.
-     */
+    /** This method is used to inject the Tailwind CSS configuration into the Play CDN integration. */
     public static function injectTailwindConfig(): string
     {
         if (! file_exists(Hyde::path('tailwind.config.js'))) {

From 9ba410a818c2c4875a65634d4cd6cf51fd67f58a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:00:24 +0200
Subject: [PATCH 068/328] Refactor to merge feature test into unit test

---
 .../tests/Feature/AssetFacadeTest.php         | 46 -------------------
 .../Unit/Facades/AssetFacadeUnitTest.php      | 44 +++++++++++++++++-
 2 files changed, 42 insertions(+), 48 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/AssetFacadeTest.php

diff --git a/packages/framework/tests/Feature/AssetFacadeTest.php b/packages/framework/tests/Feature/AssetFacadeTest.php
deleted file mode 100644
index 3e934eab38b..00000000000
--- a/packages/framework/tests/Feature/AssetFacadeTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use Hyde\Facades\Asset;
-use Hyde\Hyde;
-use Hyde\Testing\TestCase;
-
-/**
- * @covers \Hyde\Facades\Asset
- *
- * @see \Hyde\Framework\Testing\Unit\Facades\AssetFacadeUnitTest
- */
-class AssetFacadeTest extends TestCase
-{
-    public function testMediaLinkReturnsMediaPathWithCacheKey()
-    {
-        $this->assertIsString($path = Asset::mediaLink('app.css'));
-        $this->assertSame('media/app.css?v='.md5_file(Hyde::path('_media/app.css')), $path);
-    }
-
-    public function testMediaLinkReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled()
-    {
-        config(['hyde.enable_cache_busting' => false]);
-
-        $path = Asset::mediaLink('app.css');
-
-        $this->assertIsString($path);
-        $this->assertSame('media/app.css', $path);
-    }
-
-    public function testMediaLinkSupportsCustomMediaDirectories()
-    {
-        $this->directory('_assets');
-        $this->file('_assets/app.css');
-
-        Hyde::setMediaDirectory('_assets');
-
-        $path = Asset::mediaLink('app.css');
-
-        $this->assertIsString($path);
-        $this->assertSame('assets/app.css?v='.md5_file(Hyde::path('_assets/app.css')), $path);
-    }
-}
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index 4c62090bbae..a004e805399 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -4,20 +4,31 @@
 
 namespace Hyde\Framework\Testing\Unit\Facades;
 
+use Hyde\Hyde;
 use Hyde\Facades\Asset;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Facades\Render;
+use Hyde\Support\Models\RenderData;
+use Hyde\Testing\CreatesTemporaryFiles;
 
 /**
  * @covers \Hyde\Facades\Asset
- *
- * @see \Hyde\Framework\Testing\Feature\AssetFacadeTest
  */
 class AssetFacadeUnitTest extends UnitTestCase
 {
+    use CreatesTemporaryFiles;
+
     protected function setUp(): void
     {
         self::needsKernel();
         self::mockConfig();
+
+        Render::swap(new RenderData());
+    }
+
+    protected function tearDown(): void
+    {
+        $this->cleanUpFilesystem();
     }
 
     public function testHasMediaFileHelper()
@@ -29,4 +40,33 @@ public function testHasMediaFileHelperReturnsTrueForExistingFile()
     {
         $this->assertTrue(Asset::hasMediaFile('app.css'));
     }
+
+    public function testMediaLinkReturnsMediaPathWithCacheKey()
+    {
+        $this->assertIsString($path = Asset::mediaLink('app.css'));
+        $this->assertSame('media/app.css?v='.md5_file(Hyde::path('_media/app.css')), $path);
+    }
+
+    public function testMediaLinkReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled()
+    {
+        self::mockConfig(['hyde.enable_cache_busting' => false]);
+
+        $path = Asset::mediaLink('app.css');
+
+        $this->assertIsString($path);
+        $this->assertSame('media/app.css', $path);
+    }
+
+    public function testMediaLinkSupportsCustomMediaDirectories()
+    {
+        $this->directory('_assets');
+        $this->file('_assets/app.css');
+
+        Hyde::setMediaDirectory('_assets');
+
+        $path = Asset::mediaLink('app.css');
+
+        $this->assertIsString($path);
+        $this->assertSame('assets/app.css?v='.md5_file(Hyde::path('_assets/app.css')), $path);
+    }
 }

From 9edfe944225a12e696f99183e305a98b0cb633cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:12:38 +0200
Subject: [PATCH 069/328] Refactor test to be a unit test

---
 .../{Feature => Unit}/Support/MediaFileTest.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
 rename packages/framework/tests/{Feature => Unit}/Support/MediaFileTest.php (93%)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
similarity index 93%
rename from packages/framework/tests/Feature/Support/MediaFileTest.php
rename to packages/framework/tests/Unit/Support/MediaFileTest.php
index 0782bfaf3bc..a4798f0db52 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -2,19 +2,30 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Testing\Feature\Support;
+namespace Hyde\Framework\Testing\Unit\Support;
 
 use Hyde\Facades\Filesystem;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
-use Hyde\Testing\TestCase;
+use Hyde\Testing\UnitTestCase;
+use Hyde\Testing\CreatesTemporaryFiles;
 
 /**
  * @covers \Hyde\Support\Filesystem\MediaFile
  */
-class MediaFileTest extends TestCase
+class MediaFileTest extends UnitTestCase
 {
+    use CreatesTemporaryFiles;
+
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
+    protected function tearDown(): void
+    {
+        $this->cleanUpFilesystem();
+    }
+
     public function testCanConstruct()
     {
         $file = new MediaFile('foo');

From b6eed88c1161093f44daee2b30a4c0474a113212 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:19:28 +0200
Subject: [PATCH 070/328] Draft new mediaPath helper

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 45298a50694..e5f0fba95bf 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -41,6 +41,14 @@ public static function files(): array
         return array_keys(static::all());
     }
 
+    /**
+     * Get the absolute path to the media source directory, or a file within it.
+     */
+    public static function mediaPath(string $path = ''): string
+    {
+        return Hyde::mediaPath($path);
+    }
+
     public function getIdentifier(): string
     {
         return Str::after($this->getPath(), Hyde::getMediaDirectory().'/');

From ccca1d773052be4e37f5204b774b1104983a3a76 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:20:01 +0200
Subject: [PATCH 071/328] Draft new siteMediaPath helper

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index e5f0fba95bf..418ea84e73c 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -49,6 +49,14 @@ public static function mediaPath(string $path = ''): string
         return Hyde::mediaPath($path);
     }
 
+    /**
+     * Get the absolute path to the compiled site's media directory, or a file within it.
+     */
+    public static function siteMediaPath(string $path = ''): string
+    {
+        return Hyde::siteMediaPath($path);
+    }
+
     public function getIdentifier(): string
     {
         return Str::after($this->getPath(), Hyde::getMediaDirectory().'/');

From b6a1269272b9f9391f0ceb7a08539b426b3e1dfd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:21:31 +0200
Subject: [PATCH 072/328] Inline kernel access

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 418ea84e73c..539ac68f3fe 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
@@ -46,7 +47,7 @@ public static function files(): array
      */
     public static function mediaPath(string $path = ''): string
     {
-        return Hyde::mediaPath($path);
+        return HydeKernel::getInstance()->mediaPath($path);
     }
 
     /**
@@ -54,7 +55,7 @@ public static function mediaPath(string $path = ''): string
      */
     public static function siteMediaPath(string $path = ''): string
     {
-        return Hyde::siteMediaPath($path);
+        return HydeKernel::getInstance()->siteMediaPath($path);
     }
 
     public function getIdentifier(): string

From ecd98dbd436cc29663d956fbb9b0ab94ab89c768 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:22:14 +0200
Subject: [PATCH 073/328] Rename added methods to match HydePage siblings

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 539ac68f3fe..3b514361caf 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -45,7 +45,7 @@ public static function files(): array
     /**
      * Get the absolute path to the media source directory, or a file within it.
      */
-    public static function mediaPath(string $path = ''): string
+    public static function sourcePath(string $path = ''): string
     {
         return HydeKernel::getInstance()->mediaPath($path);
     }
@@ -53,7 +53,7 @@ public static function mediaPath(string $path = ''): string
     /**
      * Get the absolute path to the compiled site's media directory, or a file within it.
      */
-    public static function siteMediaPath(string $path = ''): string
+    public static function outputPath(string $path = ''): string
     {
         return HydeKernel::getInstance()->siteMediaPath($path);
     }

From beaf5114a3c086274430db9c2961a598c603062d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:23:27 +0200
Subject: [PATCH 074/328] Refactor base implementations to be class independent

---
 packages/framework/src/Foundation/Kernel/Filesystem.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index a8f36a32df1..cdd1685b295 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -97,10 +97,10 @@ public function pathToRelative(string $path): string
     public function mediaPath(string $path = ''): string
     {
         if (empty($path)) {
-            return $this->path(Hyde::getMediaDirectory());
+            return Hyde::path(Hyde::getMediaDirectory());
         }
 
-        return $this->path(path_join(Hyde::getMediaDirectory(), unslash($path)));
+        return Hyde::path(path_join(Hyde::getMediaDirectory(), unslash($path)));
     }
 
     /**
@@ -121,12 +121,12 @@ public function sitePath(string $path = ''): string
     public function siteMediaPath(string $path = ''): string
     {
         if (empty($path)) {
-            return $this->sitePath(Hyde::getMediaOutputDirectory());
+            return Hyde::sitePath(Hyde::getMediaOutputDirectory());
         }
 
         $path = unslash($path);
 
-        return $this->sitePath(Hyde::getMediaOutputDirectory()."/$path");
+        return Hyde::sitePath(Hyde::getMediaOutputDirectory()."/$path");
     }
 
     /**

From 9aa1f66db9d946cf41e7f1b16f0e5f04f8a0ceba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:24:53 +0200
Subject: [PATCH 075/328] Move method logic to new code location

---
 .../src/Foundation/Kernel/Filesystem.php        | 15 +++------------
 .../src/Support/Filesystem/MediaFile.php        | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index cdd1685b295..c637ed271b9 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PharSupport;
+use Hyde\Support\Filesystem\MediaFile;
 use Illuminate\Support\Collection;
 
 use function collect;
@@ -96,11 +97,7 @@ public function pathToRelative(string $path): string
      */
     public function mediaPath(string $path = ''): string
     {
-        if (empty($path)) {
-            return Hyde::path(Hyde::getMediaDirectory());
-        }
-
-        return Hyde::path(path_join(Hyde::getMediaDirectory(), unslash($path)));
+        return MediaFile::sourcePath($path);
     }
 
     /**
@@ -120,13 +117,7 @@ public function sitePath(string $path = ''): string
      */
     public function siteMediaPath(string $path = ''): string
     {
-        if (empty($path)) {
-            return Hyde::sitePath(Hyde::getMediaOutputDirectory());
-        }
-
-        $path = unslash($path);
-
-        return Hyde::sitePath(Hyde::getMediaOutputDirectory()."/$path");
+        return MediaFile::outputPath($path);
     }
 
     /**
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 3b514361caf..fbf6f04ea9b 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -6,10 +6,11 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
+use function Hyde\unslash;
+use function Hyde\path_join;
 use function extension_loaded;
 use function file_exists;
 use function array_merge;
@@ -47,7 +48,11 @@ public static function files(): array
      */
     public static function sourcePath(string $path = ''): string
     {
-        return HydeKernel::getInstance()->mediaPath($path);
+        if (empty($path)) {
+            return Hyde::path(Hyde::getMediaDirectory());
+        }
+
+        return Hyde::path(path_join(Hyde::getMediaDirectory(), unslash($path)));
     }
 
     /**
@@ -55,7 +60,13 @@ public static function sourcePath(string $path = ''): string
      */
     public static function outputPath(string $path = ''): string
     {
-        return HydeKernel::getInstance()->siteMediaPath($path);
+        if (empty($path)) {
+            return Hyde::sitePath(Hyde::getMediaOutputDirectory());
+        }
+
+        $path = unslash($path);
+
+        return Hyde::sitePath(Hyde::getMediaOutputDirectory()."/$path");
     }
 
     public function getIdentifier(): string

From 5863d03613db465499d3f26e6344f66480c01b9b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:27:20 +0200
Subject: [PATCH 076/328] Reorder methods to match sibling order

---
 .../hyde-kernel-filesystem-methods.md            | 10 +++++-----
 .../Foundation/Concerns/ForwardsFilesystem.php   |  8 ++++----
 .../src/Foundation/Kernel/Filesystem.php         | 16 ++++++++--------
 spec.md                                          |  4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
index bdbe12dd34d..204bb419328 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2023-03-11 11:17:34 in 0.10ms -->
+<!-- Generated by HydePHP DocGen script at 2024-07-26 14:30:44 in 0.13ms -->
 
 #### `filesystem()`
 
@@ -35,20 +35,20 @@ No description provided.
 Hyde::mediaPath(string $path): string
 ```
 
-#### `sitePath()`
+#### `siteMediaPath()`
 
 No description provided.
 
 ```php
-Hyde::sitePath(string $path): string
+Hyde::siteMediaPath(string $path): string
 ```
 
-#### `siteMediaPath()`
+#### `sitePath()`
 
 No description provided.
 
 ```php
-Hyde::siteMediaPath(string $path): string
+Hyde::sitePath(string $path): string
 ```
 
 #### `pathToAbsolute()`
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index 88e8aba452b..c0ac1518277 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -33,14 +33,14 @@ public function mediaPath(string $path = ''): string
         return $this->filesystem->mediaPath($path);
     }
 
-    public function sitePath(string $path = ''): string
+    public function siteMediaPath(string $path = ''): string
     {
-        return $this->filesystem->sitePath($path);
+        return $this->filesystem->siteMediaPath($path);
     }
 
-    public function siteMediaPath(string $path = ''): string
+    public function sitePath(string $path = ''): string
     {
-        return $this->filesystem->siteMediaPath($path);
+        return $this->filesystem->sitePath($path);
     }
 
     public function pathToAbsolute(string|array $path): string|array
diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index c637ed271b9..f254440d3e8 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -100,6 +100,14 @@ public function mediaPath(string $path = ''): string
         return MediaFile::sourcePath($path);
     }
 
+    /**
+     * Get the absolute path to the compiled site's media directory, or a file within it.
+     */
+    public function siteMediaPath(string $path = ''): string
+    {
+        return MediaFile::outputPath($path);
+    }
+
     /**
      * Get the absolute path to the compiled site directory, or a file within it.
      */
@@ -112,14 +120,6 @@ public function sitePath(string $path = ''): string
         return $this->path(path_join(Hyde::getOutputDirectory(), unslash($path)));
     }
 
-    /**
-     * Get the absolute path to the compiled site's media directory, or a file within it.
-     */
-    public function siteMediaPath(string $path = ''): string
-    {
-        return MediaFile::outputPath($path);
-    }
-
     /**
      * Works similarly to the path() function, but returns a file in the Framework package.
      *
diff --git a/spec.md b/spec.md
index a1ca493ac41..cb78e76674c 100644
--- a/spec.md
+++ b/spec.md
@@ -78,17 +78,17 @@ Asset::hasMediaFile(string $file) // Returns file_exists(Hyde::mediaPath($file))
 
 ```php
 Hyde::mediaPath() // Get the absolute path to the media source directory, or a file within it. (Intended as a sibling to Hyde::path and Hyde::sitePath helpers, and the HydePage::path methods)
+Hyde::siteMediaPath() //  Get the absolute path to the compiled site's media directory, or a file within it. (Intended as a sibling to Hyde::sitePath)
 Hyde::mediaLink() // Gets a relative web link to the given file stored in the _site/media folder. (Intended as a sibling to Hyde::relativeLink, which is called by this) (A second $validate parameter will return throw an exception if the file does not exist)
 Hyde::asset() // Gets a relative web link to the given image stored in the _site/media folder. (But leaves remote URLs alone) (A second $preferQualifiedUrl parameter will return a fully qualified URL if a site URL is set)
-Hyde::siteMediaPath() //  Get the absolute path to the compiled site's media directory, or a file within it. (Intended as a sibling to Hyde::sitePath)
 
 /**
  * Real implementations of the facade methods:
  * 
  * @see \Hyde\Foundation\HydeKernel::mediaPath {@see \Hyde\Foundation\Kernel\Filesystem::mediaPath}
+ * @see \Hyde\Foundation\HydeKernel::siteMediaPath {@see \Hyde\Foundation\Kernel\Filesystem::siteMediaPath}
  * @see \Hyde\Foundation\HydeKernel::mediaLink {@see \Hyde\Foundation\Kernel\Hyperlinks::mediaLink}
  * @see \Hyde\Foundation\HydeKernel::asset {@see \Hyde\Foundation\Kernel\Hyperlinks::asset}
- * @see \Hyde\Foundation\HydeKernel::siteMediaPath {@see \Hyde\Foundation\Kernel\Filesystem::siteMediaPath}
  */
 ```
 

From a60e91b61659925ed17a370e37c5c69fc293bf5a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:37:07 +0200
Subject: [PATCH 077/328] Move tests to match new code locations

---
 .../Feature/Foundation/FilesystemTest.php     | 25 +++++-----------
 .../tests/Unit/Support/MediaFileTest.php      | 30 +++++++++++++++++++
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 6c2c2811cd8..0be01b45c22 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -13,6 +13,7 @@
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\UnitTestCase;
 
 use function Hyde\normalize_slashes;
@@ -263,31 +264,19 @@ public function testHelperForDocumentationPages()
     public function testHelperForMediaPath()
     {
         $this->assertSame(Hyde::path('_media'), Hyde::mediaPath());
-    }
-
-    public function testHelperForMediaPathReturnsPathToFileWithinTheDirectory()
-    {
-        $this->assertSame(Hyde::path('_media/foo.css'), Hyde::mediaPath('foo.css'));
-    }
+        $this->assertSame(MediaFile::sourcePath(), Hyde::mediaPath());
 
-    public function testGetMediaPathReturnsAbsolutePath()
-    {
-        $this->assertSame(Hyde::path('_media'), Hyde::mediaPath());
+        $this->assertSame(Hyde::path('_media/foo.png'), Hyde::mediaPath('foo.png'));
+        $this->assertSame(MediaFile::sourcePath('foo.png'), Hyde::mediaPath('foo.png'));
     }
 
     public function testHelperForMediaOutputPath()
     {
         $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
-    }
-
-    public function testHelperForMediaOutputPathReturnsPathToFileWithinTheDirectory()
-    {
-        $this->assertSame(Hyde::path('_site/media/foo.css'), Hyde::siteMediaPath('foo.css'));
-    }
+        $this->assertSame(MediaFile::outputPath(), Hyde::siteMediaPath());
 
-    public function testGetMediaOutputPathReturnsAbsolutePath()
-    {
-        $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
+        $this->assertSame(Hyde::path('_site/media/foo.png'), Hyde::siteMediaPath('foo.png'));
+        $this->assertSame(MediaFile::outputPath('foo.png'), Hyde::siteMediaPath('foo.png'));
     }
 
     public function testHelperForSiteOutputPath()
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index a4798f0db52..86969b4d3ab 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -211,4 +211,34 @@ public function testGetIdentifierWithSubdirectory()
     {
         $this->assertSame('foo/bar', MediaFile::make('foo/bar')->getIdentifier());
     }
+
+    public function testHelperForMediaPath()
+    {
+        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());
+    }
+
+    public function testHelperForMediaPathReturnsPathToFileWithinTheDirectory()
+    {
+        $this->assertSame(Hyde::path('_media/foo.css'), MediaFile::sourcePath('foo.css'));
+    }
+
+    public function testGetMediaPathReturnsAbsolutePath()
+    {
+        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());
+    }
+
+    public function testHelperForMediaOutputPath()
+    {
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
+    }
+
+    public function testHelperForMediaOutputPathReturnsPathToFileWithinTheDirectory()
+    {
+        $this->assertSame(Hyde::path('_site/media/foo.css'), MediaFile::outputPath('foo.css'));
+    }
+
+    public function testGetMediaOutputPathReturnsAbsolutePath()
+    {
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
+    }
 }

From 8cfe0cd6d471f8c81bf259e0d1bc5066a57765f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:38:13 +0200
Subject: [PATCH 078/328] Add todos to move more tests to match new code
 locations

---
 packages/framework/tests/Feature/HydeKernelTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 8c1470b4206..bd22206502d 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -393,17 +393,23 @@ public function testGetMediaOutputDirectoryNameUsesTrimmedVersionOfMediaSourceDi
 
     public function testCanGetSiteMediaOutputDirectory()
     {
+        // Todo: Move to MediaFileTest
+
         $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
     }
 
     public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDirectory()
     {
+        // Todo: Move to MediaFileTest
+
         Hyde::setMediaDirectory('_foo');
         $this->assertSame(Hyde::path('_site/foo'), Hyde::siteMediaPath());
     }
 
     public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory()
     {
+        // Todo: Move to MediaFileTest
+
         Hyde::setOutputDirectory(Hyde::path('foo'));
         Hyde::setMediaDirectory('bar');
 

From 89d0e52d4693ced01185fb7766c2d96208b47828 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:44:01 +0200
Subject: [PATCH 079/328] Create new internal trait for transitioning to v2

---
 packages/framework/src/Hyde.php                   |  3 +++
 .../framework/src/Support/V1Compatibility.php     | 15 +++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 packages/framework/src/Support/V1Compatibility.php

diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index cc309a3b21c..105b42de812 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -7,6 +7,7 @@
 use Hyde\Enums\Feature;
 use Hyde\Facades\Features;
 use Hyde\Foundation\HydeKernel;
+use Hyde\Support\V1Compatibility;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\FileCollection;
 use Hyde\Foundation\Kernel\Filesystem;
@@ -79,6 +80,8 @@
  */
 class Hyde extends Facade
 {
+    use V1Compatibility;
+
     public static function version(): string
     {
         return HydeKernel::version();
diff --git a/packages/framework/src/Support/V1Compatibility.php b/packages/framework/src/Support/V1Compatibility.php
new file mode 100644
index 00000000000..ed03754713d
--- /dev/null
+++ b/packages/framework/src/Support/V1Compatibility.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Support;
+
+/**
+ * @internal Hyde Facade support to aid in the v1 to v2 transition.
+ *
+ * @deprecated All code here is deprecated, and exists to help you transition.
+ */
+trait V1Compatibility
+{
+    //
+}

From 4091051785fcc5cba66b6b4eb76abe0c23008655 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:46:05 +0200
Subject: [PATCH 080/328] Ignore class from code coverage

---
 packages/framework/src/Support/V1Compatibility.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Support/V1Compatibility.php b/packages/framework/src/Support/V1Compatibility.php
index ed03754713d..d26d62cd504 100644
--- a/packages/framework/src/Support/V1Compatibility.php
+++ b/packages/framework/src/Support/V1Compatibility.php
@@ -8,6 +8,8 @@
  * @internal Hyde Facade support to aid in the v1 to v2 transition.
  *
  * @deprecated All code here is deprecated, and exists to help you transition.
+ *
+ * @codeCoverageIgnore This class is ignored from code coverage.
  */
 trait V1Compatibility
 {

From 2004a4e67e8fd80b20ffb4f96d6dd177bf26b773 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:59:19 +0200
Subject: [PATCH 081/328] Revert "Ignore class from code coverage"

This reverts commit 4091051785fcc5cba66b6b4eb76abe0c23008655.
---
 packages/framework/src/Support/V1Compatibility.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Support/V1Compatibility.php b/packages/framework/src/Support/V1Compatibility.php
index d26d62cd504..ed03754713d 100644
--- a/packages/framework/src/Support/V1Compatibility.php
+++ b/packages/framework/src/Support/V1Compatibility.php
@@ -8,8 +8,6 @@
  * @internal Hyde Facade support to aid in the v1 to v2 transition.
  *
  * @deprecated All code here is deprecated, and exists to help you transition.
- *
- * @codeCoverageIgnore This class is ignored from code coverage.
  */
 trait V1Compatibility
 {

From 650d5a7e815033bdbdc60c6eb0e6c4a7899883b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 16:54:58 +0200
Subject: [PATCH 082/328] Manually proxy and deprecate legacy facade methods

This is so we can get an overview of the outdated methods that are inconsistently named

This means they are lost from the HydeKernel which could be a problem to review before merge.
---
 .../hyde-kernel-filesystem-methods.md         | 18 +--------------
 .../Concerns/ForwardsFilesystem.php           | 10 --------
 .../src/Foundation/Kernel/Filesystem.php      | 17 --------------
 packages/framework/src/Hyde.php               |  2 --
 .../framework/src/Support/V1Compatibility.php | 23 ++++++++++++++++++-
 5 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
index 204bb419328..eb5983597e6 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2024-07-26 14:30:44 in 0.13ms -->
+<!-- Generated by HydePHP DocGen script at 2024-07-26 15:15:12 in 0.09ms -->
 
 #### `filesystem()`
 
@@ -27,22 +27,6 @@ No description provided.
 Hyde::vendorPath(string $path, string $package): string
 ```
 
-#### `mediaPath()`
-
-No description provided.
-
-```php
-Hyde::mediaPath(string $path): string
-```
-
-#### `siteMediaPath()`
-
-No description provided.
-
-```php
-Hyde::siteMediaPath(string $path): string
-```
-
 #### `sitePath()`
 
 No description provided.
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index c0ac1518277..cea06f5bbc2 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -28,16 +28,6 @@ public function vendorPath(string $path = '', string $package = 'framework'): st
         return $this->filesystem->vendorPath($path, $package);
     }
 
-    public function mediaPath(string $path = ''): string
-    {
-        return $this->filesystem->mediaPath($path);
-    }
-
-    public function siteMediaPath(string $path = ''): string
-    {
-        return $this->filesystem->siteMediaPath($path);
-    }
-
     public function sitePath(string $path = ''): string
     {
         return $this->filesystem->sitePath($path);
diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index f254440d3e8..8f3bb2fd2aa 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -7,7 +7,6 @@
 use Hyde\Hyde;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PharSupport;
-use Hyde\Support\Filesystem\MediaFile;
 use Illuminate\Support\Collection;
 
 use function collect;
@@ -92,22 +91,6 @@ public function pathToRelative(string $path): string
             : $path);
     }
 
-    /**
-     * Get the absolute path to the media source directory, or a file within it.
-     */
-    public function mediaPath(string $path = ''): string
-    {
-        return MediaFile::sourcePath($path);
-    }
-
-    /**
-     * Get the absolute path to the compiled site's media directory, or a file within it.
-     */
-    public function siteMediaPath(string $path = ''): string
-    {
-        return MediaFile::outputPath($path);
-    }
-
     /**
      * Get the absolute path to the compiled site directory, or a file within it.
      */
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 105b42de812..9590fb6133a 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -34,8 +34,6 @@
  * @method static string pathToAbsolute(string $path)
  * @method static string pathToRelative(string $path)
  * @method static string sitePath(string $path = '')
- * @method static string mediaPath(string $path = '')
- * @method static string siteMediaPath(string $path = '')
  * @method static string formatLink(string $destination)
  * @method static string relativeLink(string $destination)
  * @method static string mediaLink(string $destination, bool $validate = false)
diff --git a/packages/framework/src/Support/V1Compatibility.php b/packages/framework/src/Support/V1Compatibility.php
index ed03754713d..f6bd2de40c7 100644
--- a/packages/framework/src/Support/V1Compatibility.php
+++ b/packages/framework/src/Support/V1Compatibility.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Support;
 
+use JetBrains\PhpStorm\Deprecated;
+use Hyde\Support\Filesystem\MediaFile;
+
 /**
  * @internal Hyde Facade support to aid in the v1 to v2 transition.
  *
@@ -11,5 +14,23 @@
  */
 trait V1Compatibility
 {
-    //
+    /**
+     * @deprecated Use MediaFile::sourcePath() instead.
+     * @see \Hyde\Support\Filesystem\MediaFile::sourcePath()
+     */
+    #[Deprecated(reason: 'Use MediaFile::sourcePath() instead', replacement: '\Hyde\Support\Filesystem\MediaFile::sourcePath()')]
+    public static function mediaPath(string $path = ''): string
+    {
+        return MediaFile::sourcePath($path);
+    }
+
+    /**
+     * @deprecated Use MediaFile::outputPath() instead.
+     * @see \Hyde\Support\Filesystem\MediaFile::outputPath()
+     */
+    #[Deprecated(reason: 'Use MediaFile::outputPath() instead', replacement: '\Hyde\Support\Filesystem\MediaFile::outputPath()')]
+    public static function siteMediaPath(string $path = ''): string
+    {
+        return MediaFile::outputPath($path);
+    }
 }

From 8228d7a474666aeaf63b9d6d072f48e63305782f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 17:04:58 +0200
Subject: [PATCH 083/328] Set the parameters list

---
 packages/framework/src/Support/V1Compatibility.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/V1Compatibility.php b/packages/framework/src/Support/V1Compatibility.php
index f6bd2de40c7..863734b99cd 100644
--- a/packages/framework/src/Support/V1Compatibility.php
+++ b/packages/framework/src/Support/V1Compatibility.php
@@ -18,7 +18,7 @@ trait V1Compatibility
      * @deprecated Use MediaFile::sourcePath() instead.
      * @see \Hyde\Support\Filesystem\MediaFile::sourcePath()
      */
-    #[Deprecated(reason: 'Use MediaFile::sourcePath() instead', replacement: '\Hyde\Support\Filesystem\MediaFile::sourcePath()')]
+    #[Deprecated(reason: 'Use MediaFile::sourcePath() instead', replacement: '\Hyde\Support\Filesystem\MediaFile::sourcePath(%parametersList%)')]
     public static function mediaPath(string $path = ''): string
     {
         return MediaFile::sourcePath($path);
@@ -28,7 +28,7 @@ public static function mediaPath(string $path = ''): string
      * @deprecated Use MediaFile::outputPath() instead.
      * @see \Hyde\Support\Filesystem\MediaFile::outputPath()
      */
-    #[Deprecated(reason: 'Use MediaFile::outputPath() instead', replacement: '\Hyde\Support\Filesystem\MediaFile::outputPath()')]
+    #[Deprecated(reason: 'Use MediaFile::outputPath() instead', replacement: '\Hyde\Support\Filesystem\MediaFile::outputPath(%parametersList%)')]
     public static function siteMediaPath(string $path = ''): string
     {
         return MediaFile::outputPath($path);

From 2e96631d81859d470251c4e86706971ea969eb46 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 17:05:43 +0200
Subject: [PATCH 084/328] Alias the MediaFile class

---
 app/config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/config.php b/app/config.php
index 009c0f586b7..aed2519bbce 100644
--- a/app/config.php
+++ b/app/config.php
@@ -105,6 +105,7 @@
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
         'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,
         'DocumentationPage' => \Hyde\Pages\DocumentationPage::class,
+        'MediaFile' => \Hyde\Support\Filesystem\MediaFile::class,
         'DataCollection' => \Hyde\Support\DataCollection::class,
         'Includes' => \Hyde\Support\Includes::class,
         'Feature' => \Hyde\Enums\Feature::class,

From bbe66f46095bb275661de093239aa2acf9fbd824 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 17:09:33 +0200
Subject: [PATCH 085/328] Update deprecated method usages with new helpers

---
 .../resources/views/layouts/head.blade.php       |  2 +-
 packages/framework/src/Facades/Asset.php         |  5 +++--
 .../Actions/PreBuildTasks/CleanSiteDirectory.php |  3 ++-
 .../PreBuildTasks/TransferMediaAssets.php        |  7 +++----
 .../Features/Blogging/Models/FeaturedImage.php   |  3 ++-
 .../src/Framework/Services/ValidationService.php |  5 +++--
 .../tests/Feature/Foundation/FilesystemTest.php  | 16 ++++++++--------
 .../framework/tests/Feature/HydeKernelTest.php   | 11 ++++++-----
 8 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/packages/framework/resources/views/layouts/head.blade.php b/packages/framework/resources/views/layouts/head.blade.php
index 32ed4390d8b..111aced665b 100644
--- a/packages/framework/resources/views/layouts/head.blade.php
+++ b/packages/framework/resources/views/layouts/head.blade.php
@@ -2,7 +2,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>{{ $page->title() }}</title>
 
-@if (file_exists(Hyde::mediaPath('favicon.ico')))
+@if (file_exists(MediaFile::sourcePath('favicon.ico')))
     <link rel="shortcut icon" href="{{ Hyde::relativeLink('media/favicon.ico') }}" type="image/x-icon">
 @endif
 
diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 9691a43c211..45e16a0a881 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -5,6 +5,7 @@
 namespace Hyde\Facades;
 
 use Hyde\Hyde;
+use Hyde\Support\Filesystem\MediaFile;
 
 use function md5_file;
 use function file_exists;
@@ -24,13 +25,13 @@ public static function mediaLink(string $file): string
 
     public static function hasMediaFile(string $file): bool
     {
-        return file_exists(Hyde::mediaPath($file));
+        return file_exists(MediaFile::sourcePath($file));
     }
 
     protected static function getCacheBustKey(string $file): string
     {
         return Config::getBool('hyde.enable_cache_busting', true)
-            ? '?v='.md5_file(Hyde::mediaPath("$file"))
+            ? '?v='.md5_file(MediaFile::sourcePath("$file"))
             : '';
     }
 }
diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/CleanSiteDirectory.php b/packages/framework/src/Framework/Actions/PreBuildTasks/CleanSiteDirectory.php
index 849f077b7cb..ba64f24ee76 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/CleanSiteDirectory.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/CleanSiteDirectory.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Facades\Filesystem;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Features\BuildTasks\PreBuildTask;
 
 use function basename;
@@ -22,7 +23,7 @@ public function handle(): void
     {
         if ($this->isItSafeToCleanOutputDirectory()) {
             Filesystem::unlink(glob(Hyde::sitePath('*.{html,json}'), GLOB_BRACE));
-            Filesystem::cleanDirectory(Hyde::siteMediaPath());
+            Filesystem::cleanDirectory(MediaFile::outputPath());
         }
     }
 
diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index fdec03a75ff..3acb112ea9d 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Actions\PreBuildTasks;
 
-use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Features\BuildTasks\PreBuildTask;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
@@ -17,14 +16,14 @@ class TransferMediaAssets extends PreBuildTask
 
     public function handle(): void
     {
-        $this->needsDirectory(Hyde::siteMediaPath());
+        $this->needsDirectory(MediaFile::outputPath());
 
         $this->newLine();
 
         $this->withProgressBar(MediaFile::files(), function (string $identifier): void {
-            $sitePath = Hyde::siteMediaPath($identifier);
+            $sitePath = MediaFile::outputPath($identifier);
             $this->needsParentDirectory($sitePath);
-            copy(Hyde::mediaPath($identifier), $sitePath);
+            copy(MediaFile::sourcePath($identifier), $sitePath);
         });
 
         $this->newLine();
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 0f42f961c87..5c4acef1996 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -11,6 +11,7 @@
 use Hyde\Support\BuildWarnings;
 use Illuminate\Support\Facades\Http;
 use Hyde\Foundation\Kernel\Hyperlinks;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 
@@ -213,7 +214,7 @@ protected function has(string $property): bool
 
     protected function getContentLengthForLocalImage(): int
     {
-        $storagePath = Hyde::mediaPath($this->source);
+        $storagePath = MediaFile::sourcePath($this->source);
 
         if (! file_exists($storagePath)) {
             throw new FileNotFoundException(customMessage: sprintf('Featured image [%s] not found.', Hyde::pathToRelative($storagePath)));
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index 88deee3496b..052486d4041 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -11,6 +11,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Enums\Feature;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Support\Models\ValidationResult as Result;
 
 use function count;
@@ -102,12 +103,12 @@ public function check_documentation_site_has_an_index_page(Result $result): Resu
 
     public function check_site_has_an_app_css_stylesheet(Result $result): Result
     {
-        if (file_exists(Hyde::siteMediaPath('/app.css')) || file_exists(Hyde::mediaPath('app.css'))) {
+        if (file_exists(MediaFile::outputPath('/app.css')) || file_exists(MediaFile::sourcePath('app.css'))) {
             return $result->pass('Your site has an app.css stylesheet');
         }
 
         return $result->fail(sprintf('Could not find an app.css file in the %s or %s directory!',
-            Hyde::pathToRelative(Hyde::siteMediaPath()), Hyde::getMediaDirectory()
+            Hyde::pathToRelative(MediaFile::outputPath()), Hyde::getMediaDirectory()
         ))->withTip('You may need to run `npm run dev`.`');
     }
 
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 0be01b45c22..86bc2c76479 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -263,20 +263,20 @@ public function testHelperForDocumentationPages()
 
     public function testHelperForMediaPath()
     {
-        $this->assertSame(Hyde::path('_media'), Hyde::mediaPath());
-        $this->assertSame(MediaFile::sourcePath(), Hyde::mediaPath());
+        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());
+        $this->assertSame(MediaFile::sourcePath(), MediaFile::sourcePath());
 
-        $this->assertSame(Hyde::path('_media/foo.png'), Hyde::mediaPath('foo.png'));
-        $this->assertSame(MediaFile::sourcePath('foo.png'), Hyde::mediaPath('foo.png'));
+        $this->assertSame(Hyde::path('_media/foo.png'), MediaFile::sourcePath('foo.png'));
+        $this->assertSame(MediaFile::sourcePath('foo.png'), MediaFile::sourcePath('foo.png'));
     }
 
     public function testHelperForMediaOutputPath()
     {
-        $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
-        $this->assertSame(MediaFile::outputPath(), Hyde::siteMediaPath());
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
+        $this->assertSame(MediaFile::outputPath(), MediaFile::outputPath());
 
-        $this->assertSame(Hyde::path('_site/media/foo.png'), Hyde::siteMediaPath('foo.png'));
-        $this->assertSame(MediaFile::outputPath('foo.png'), Hyde::siteMediaPath('foo.png'));
+        $this->assertSame(Hyde::path('_site/media/foo.png'), MediaFile::outputPath('foo.png'));
+        $this->assertSame(MediaFile::outputPath('foo.png'), MediaFile::outputPath('foo.png'));
     }
 
     public function testHelperForSiteOutputPath()
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index bd22206502d..9ff8799dd06 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -13,6 +13,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Enums\Feature;
 use Hyde\Foundation\Kernel\Filesystem;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
@@ -262,9 +263,9 @@ public function testFluentModelSourcePathHelpers()
         $this->assertSame(Hyde::path('_pages'), MarkdownPage::path());
         $this->assertSame(Hyde::path('_docs'), DocumentationPage::path());
 
-        $this->assertSame(Hyde::path('_media'), Hyde::mediaPath());
+        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
         $this->assertSame(Hyde::path('_site'), Hyde::sitePath());
-        $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
     }
 
     public function testPathToRelativeHelperReturnsRelativePathForGivenPath()
@@ -395,7 +396,7 @@ public function testCanGetSiteMediaOutputDirectory()
     {
         // Todo: Move to MediaFileTest
 
-        $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
     }
 
     public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDirectory()
@@ -403,7 +404,7 @@ public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDi
         // Todo: Move to MediaFileTest
 
         Hyde::setMediaDirectory('_foo');
-        $this->assertSame(Hyde::path('_site/foo'), Hyde::siteMediaPath());
+        $this->assertSame(Hyde::path('_site/foo'), MediaFile::outputPath());
     }
 
     public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory()
@@ -413,7 +414,7 @@ public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory
         Hyde::setOutputDirectory(Hyde::path('foo'));
         Hyde::setMediaDirectory('bar');
 
-        $this->assertSame(Hyde::path('foo/bar'), Hyde::siteMediaPath());
+        $this->assertSame(Hyde::path('foo/bar'), MediaFile::outputPath());
     }
 
     public function testMediaOutputDirectoryCanBeChangedInConfiguration()

From 74059a5cd81546649f58859c38ed9d0d28e521a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 17:10:58 +0200
Subject: [PATCH 086/328] Remove inconsistent infix from internal helper
 methods

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index fbf6f04ea9b..3ed834e7562 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -34,7 +34,7 @@ class MediaFile extends ProjectFile
     /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
     public static function all(): array
     {
-        return static::discoverMediaAssetFiles();
+        return static::discoverMediaFiles();
     }
 
     /** @return array<string> Array of filenames relative to the _media/ directory */
@@ -123,16 +123,16 @@ public function getMimeType(): string
         return 'text/plain';
     }
 
-    protected static function discoverMediaAssetFiles(): array
+    protected static function discoverMediaFiles(): array
     {
-        return collect(static::getMediaAssetFiles())->mapWithKeys(function (string $path): array {
+        return collect(static::getMediaFiles())->mapWithKeys(function (string $path): array {
             $file = static::make($path);
 
             return [$file->getIdentifier() => $file];
         })->all();
     }
 
-    protected static function getMediaAssetFiles(): array
+    protected static function getMediaFiles(): array
     {
         return glob(Hyde::path(static::getMediaGlobPattern()), GLOB_BRACE) ?: [];
     }

From 678b6f75c1c4fd60d989d2642e4f34aecae97d07 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 17:12:30 +0200
Subject: [PATCH 087/328] Reapply "Ignore class from code coverage"

This reverts commit 2004a4e67e8fd80b20ffb4f96d6dd177bf26b773.
---
 packages/framework/src/Support/V1Compatibility.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Support/V1Compatibility.php b/packages/framework/src/Support/V1Compatibility.php
index 863734b99cd..3d8f5b5cd0c 100644
--- a/packages/framework/src/Support/V1Compatibility.php
+++ b/packages/framework/src/Support/V1Compatibility.php
@@ -11,6 +11,8 @@
  * @internal Hyde Facade support to aid in the v1 to v2 transition.
  *
  * @deprecated All code here is deprecated, and exists to help you transition.
+ *
+ * @codeCoverageIgnore This class is ignored from code coverage.
  */
 trait V1Compatibility
 {

From 46473331102f32baf8d6b5d0b374c084c1b6dda5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 18:32:38 +0200
Subject: [PATCH 088/328] Move the tests to the new code location

---
 .../tests/Feature/HydeKernelTest.php          | 25 -------------------
 .../tests/Unit/Support/MediaFileTest.php      | 19 ++++++++++++++
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 9ff8799dd06..b12a5ea19bb 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -392,31 +392,6 @@ public function testGetMediaOutputDirectoryNameUsesTrimmedVersionOfMediaSourceDi
         $this->assertSame('foo', Hyde::getMediaOutputDirectory());
     }
 
-    public function testCanGetSiteMediaOutputDirectory()
-    {
-        // Todo: Move to MediaFileTest
-
-        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
-    }
-
-    public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDirectory()
-    {
-        // Todo: Move to MediaFileTest
-
-        Hyde::setMediaDirectory('_foo');
-        $this->assertSame(Hyde::path('_site/foo'), MediaFile::outputPath());
-    }
-
-    public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory()
-    {
-        // Todo: Move to MediaFileTest
-
-        Hyde::setOutputDirectory(Hyde::path('foo'));
-        Hyde::setMediaDirectory('bar');
-
-        $this->assertSame(Hyde::path('foo/bar'), MediaFile::outputPath());
-    }
-
     public function testMediaOutputDirectoryCanBeChangedInConfiguration()
     {
         $this->assertSame('_media', Hyde::getMediaDirectory());
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 86969b4d3ab..44ded0474c5 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -241,4 +241,23 @@ public function testGetMediaOutputPathReturnsAbsolutePath()
     {
         $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
     }
+
+    public function testCanGetSiteMediaOutputDirectory()
+    {
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
+    }
+
+    public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDirectory()
+    {
+        Hyde::setMediaDirectory('_foo');
+        $this->assertSame(Hyde::path('_site/foo'), MediaFile::outputPath());
+    }
+
+    public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory()
+    {
+        Hyde::setOutputDirectory(Hyde::path('foo'));
+        Hyde::setMediaDirectory('bar');
+
+        $this->assertSame(Hyde::path('foo/bar'), MediaFile::outputPath());
+    }
 }

From a130f0321f44f3df2870ae25e748a863a15db7f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 18:55:14 +0200
Subject: [PATCH 089/328] Deprecate the `preferQualifiedUrl` parameter in the
 asset helper

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 3 ++-
 packages/framework/src/helpers.php                      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index e127cdfaa82..ab6866a6600 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -8,6 +8,7 @@
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\HydeKernel;
+use JetBrains\PhpStorm\Deprecated;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
@@ -109,7 +110,7 @@ public function mediaLink(string $destination, bool $validate = false): string
      * If true is passed as the second argument, and a base URL is set,
      * the image will be returned with a qualified absolute URL.
      */
-    public function asset(string $name, bool $preferQualifiedUrl = false): string
+    public function asset(string $name, #[Deprecated(reason: 'This will be enabled automatically when a site URL is set')] bool $preferQualifiedUrl = false): string
     {
         if (static::isRemote($name)) {
             return $name;
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 34e8f9da12b..54f689619d3 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -4,6 +4,7 @@
 
 namespace {
     use Hyde\Foundation\HydeKernel;
+    use JetBrains\PhpStorm\Deprecated;
 
     if (! function_exists('hyde')) {
         /**
@@ -22,7 +23,7 @@ function hyde(): HydeKernel
             /**
              * Get a relative link or URL to an asset in the media directory.
              */
-            function asset(string $name, bool $preferQualifiedUrl = false): string
+            function asset(string $name, #[Deprecated(reason: 'This will be enabled automatically when a site URL is set')] bool $preferQualifiedUrl = false): string
             {
                 return hyde()->asset($name, $preferQualifiedUrl);
             }

From 54f8f0314aca05f27b5d83482318ff9a5ec0685c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 20:01:18 +0200
Subject: [PATCH 090/328] No longer use the `preferQualifiedUrl` parameter

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index ab6866a6600..04dedf77f6a 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -118,7 +118,7 @@ public function asset(string $name, #[Deprecated(reason: 'This will be enabled a
 
         $name = Str::start($name, "{$this->kernel->getMediaOutputDirectory()}/");
 
-        if ($preferQualifiedUrl && $this->hasSiteUrl()) {
+        if ($this->hasSiteUrl()) {
             return $this->url($name);
         }
 

From 7f773b30deefb8803c9c8e119a1a01d686adc00b Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 26 Jul 2024 18:11:31 +0000
Subject: [PATCH 091/328] Remove the `preferQualifiedUrl` parameter

---
 .../hyde-kernel-hyperlink-methods.md          |  4 ++--
 docs/architecture-concepts/the-hydekernel.md  |  2 +-
 .../Concerns/ForwardsHyperlinks.php           |  4 ++--
 .../src/Foundation/Kernel/Hyperlinks.php      |  6 ++----
 packages/framework/src/Hyde.php               |  2 +-
 packages/framework/src/helpers.php            |  5 ++---
 .../Feature/Foundation/HyperlinksTest.php     | 20 +++++++++----------
 .../framework/tests/Feature/HelpersTest.php   | 18 ++++++++---------
 8 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
index 1dceb9c542d..bd8d609104b 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-hyperlink-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsHyperlinks -->
-<!-- Generated by HydePHP DocGen script at 2024-02-25 19:02:29 in 0.09ms -->
+<!-- Generated by HydePHP DocGen script at 2024-07-26 18:20:22 in 0.13ms -->
 
 #### `formatLink()`
 
@@ -32,7 +32,7 @@ Hyde::mediaLink(string $destination, bool $validate): string
 No description provided.
 
 ```php
-Hyde::asset(string $name, bool $preferQualifiedUrl): string
+Hyde::asset(string $name): string
 ```
 
 #### `url()`
diff --git a/docs/architecture-concepts/the-hydekernel.md b/docs/architecture-concepts/the-hydekernel.md
index c9c9bf2577a..b4c3dab6dbf 100644
--- a/docs/architecture-concepts/the-hydekernel.md
+++ b/docs/architecture-concepts/the-hydekernel.md
@@ -218,7 +218,7 @@ Hyde::mediaLink(string $destination, bool $validate): string
 No description provided.
 
 ```php
-Hyde::asset(string $name, bool $preferQualifiedUrl): string
+Hyde::asset(string $name): string
 ```
 
 #### `url()`
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index 9d194fd5f42..d797c3cd983 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -28,9 +28,9 @@ public function mediaLink(string $destination, bool $validate = false): string
         return $this->hyperlinks->mediaLink($destination, $validate);
     }
 
-    public function asset(string $name, bool $preferQualifiedUrl = false): string
+    public function asset(string $name): string
     {
-        return $this->hyperlinks->asset($name, $preferQualifiedUrl);
+        return $this->hyperlinks->asset($name);
     }
 
     public function url(string $path = ''): string
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 04dedf77f6a..e32b7af793f 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -8,7 +8,6 @@
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\HydeKernel;
-use JetBrains\PhpStorm\Deprecated;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
@@ -107,10 +106,9 @@ public function mediaLink(string $destination, bool $validate = false): string
      * Gets a relative web link to the given image stored in the _site/media folder.
      * If the image is remote (starts with http) it will be returned as is.
      *
-     * If true is passed as the second argument, and a base URL is set,
-     * the image will be returned with a qualified absolute URL.
+     * If a base URL is set, the image will be returned with a qualified absolute URL.
      */
-    public function asset(string $name, #[Deprecated(reason: 'This will be enabled automatically when a site URL is set')] bool $preferQualifiedUrl = false): string
+    public function asset(string $name): string
     {
         if (static::isRemote($name)) {
             return $name;
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 9590fb6133a..9cfb7841a6e 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -37,7 +37,7 @@
  * @method static string formatLink(string $destination)
  * @method static string relativeLink(string $destination)
  * @method static string mediaLink(string $destination, bool $validate = false)
- * @method static string asset(string $name, bool $preferQualifiedUrl = false)
+ * @method static string asset(string $name)
  * @method static string url(string $path = '')
  * @method static Route|null route(string $key)
  * @method static string makeTitle(string $value)
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 54f689619d3..2f7cc48e1b1 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -4,7 +4,6 @@
 
 namespace {
     use Hyde\Foundation\HydeKernel;
-    use JetBrains\PhpStorm\Deprecated;
 
     if (! function_exists('hyde')) {
         /**
@@ -23,9 +22,9 @@ function hyde(): HydeKernel
             /**
              * Get a relative link or URL to an asset in the media directory.
              */
-            function asset(string $name, #[Deprecated(reason: 'This will be enabled automatically when a site URL is set')] bool $preferQualifiedUrl = false): string
+            function asset(string $name): string
             {
-                return hyde()->asset($name, $preferQualifiedUrl);
+                return hyde()->asset($name);
             }
         }
 
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 3234e7cdcee..64f26c4f098 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -54,32 +54,32 @@ public function testAssetHelperResolvesPathsForNestedPages()
         }
     }
 
-    public function testAssetHelperReturnsQualifiedAbsoluteUriWhenRequestedAndSiteHasBaseUrl()
+    public function testAssetHelperReturnsQualifiedAbsoluteUriWhenSiteHasBaseUrl()
     {
         config(['hyde.url' => 'https://example.org']);
-        $this->assertSame('https://example.org/media/test.jpg', $this->class->asset('test.jpg', true));
+        $this->assertSame('https://example.org/media/test.jpg', $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsDefaultRelativePathWhenQualifiedAbsoluteUriIsRequestedButSiteHasNoBaseUrl()
+    public function testAssetHelperReturnsDefaultRelativePathWhenSiteHasNoBaseUrl()
     {
         $this->withoutSiteUrl();
-        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg', true));
+        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsDefaultRelativePathWhenQualifiedAbsoluteUriIsRequestedButSiteBaseUrlIsLocalhost()
+    public function testAssetHelperReturnsDefaultRelativePathWhenSiteBaseUrlIsLocalhost()
     {
-        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg', true));
+        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsInputWhenQualifiedAbsoluteUriIsRequestedButImageIsAlreadyQualified()
+    public function testAssetHelperReturnsInputWhenImageIsAlreadyQualified()
     {
-        $this->assertSame('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'));
     }
 
-    public function testAssetHelperReturnsInputWhenQualifiedAbsoluteUriIsRequestedButImageIsAlreadyQualifiedRegardlessOfMatchingTheConfiguredUrl()
+    public function testAssetHelperReturnsInputWhenImageIsAlreadyQualifiedRegardlessOfMatchingTheConfiguredUrl()
     {
         config(['hyde.url' => 'https://example.org']);
-        $this->assertSame('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'));
     }
 
     public function testAssetHelperUsesConfiguredMediaDirectory()
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 300342e4735..86e49902513 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -77,36 +77,36 @@ public function testAssetFunction()
     /** @covers ::asset */
     public function testAssetFunctionWithQualifiedUrl()
     {
-        $this->assertSame(Hyde::asset('foo', true), asset('foo', true));
-        $this->assertSame('media/foo', asset('foo', true));
+        $this->assertSame(Hyde::asset('foo', true), asset('foo'));
+        $this->assertSame('media/foo', asset('foo'));
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithQualifiedUrlAndSetBaseUrl()
+    public function testAssetFunctionWithSetBaseUrl()
     {
         $this->app['config']->set(['hyde.url' => 'https://example.com']);
-        $this->assertSame('https://example.com/media/foo', asset('foo', true));
+        $this->assertSame('https://example.com/media/foo', asset('foo'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionWithExternalUrl()
     {
         $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
-        $this->assertSame('https://example.com/foo', asset('https://example.com/foo', true));
+        $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithQualifiedUrlAndNoBaseUrl()
+    public function testAssetFunctionWithNoBaseUrl()
     {
         $this->app['config']->set(['hyde.url' => null]);
-        $this->assertSame('media/foo', asset('foo', true));
+        $this->assertSame('media/foo', asset('foo'));
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithQualifiedUrlAndLocalhostBaseUrl()
+    public function testAssetFunctionWithLocalhostBaseUrl()
     {
         $this->app['config']->set(['hyde.url' => 'http://localhost']);
-        $this->assertSame('media/foo', asset('foo', true));
+        $this->assertSame('media/foo', asset('foo'));
     }
 
     /** @covers ::asset */

From 4fa420c8b1527c66b9297b0cb1d4a4bab28a15f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 20:19:39 +0200
Subject: [PATCH 092/328] Reorder to group tests

---
 packages/framework/tests/Feature/HelpersTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 86e49902513..3b70f847262 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -82,17 +82,17 @@ public function testAssetFunctionWithQualifiedUrl()
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithSetBaseUrl()
+    public function testAssetFunctionWithExternalUrl()
     {
-        $this->app['config']->set(['hyde.url' => 'https://example.com']);
-        $this->assertSame('https://example.com/media/foo', asset('foo'));
+        $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
+        $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithExternalUrl()
+    public function testAssetFunctionWithSetBaseUrl()
     {
-        $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
-        $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
+        $this->app['config']->set(['hyde.url' => 'https://example.com']);
+        $this->assertSame('https://example.com/media/foo', asset('foo'));
     }
 
     /** @covers ::asset */

From b26bb18a7f36c49f0d8ee293f4b7ce84dd141e21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 20:31:16 +0200
Subject: [PATCH 093/328] Improve and normalize method documentation

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 6 +++---
 packages/framework/src/helpers.php                      | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index e32b7af793f..6f6c83a486f 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -103,10 +103,10 @@ public function mediaLink(string $destination, bool $validate = false): string
     }
 
     /**
-     * Gets a relative web link to the given image stored in the _site/media folder.
-     * If the image is remote (starts with http) it will be returned as is.
+     * Gets a relative web link to the given file stored in the `_site/media` folder.
+     * If the image is already qualified (starts with `http`) it will be returned as is.
      *
-     * If a base URL is set, the image will be returned with a qualified absolute URL.
+     * If a base URL is configured, the image will be returned with a qualified absolute URL.
      */
     public function asset(string $name): string
     {
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 2f7cc48e1b1..dda130bf3b2 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -20,7 +20,10 @@ function hyde(): HydeKernel
     } else {
         if (! function_exists('asset')) {
             /**
-             * Get a relative link or URL to an asset in the media directory.
+             * Gets a relative web link to the given file stored in the `_site/media` folder.
+             * If the image is already qualified (starts with `http`) it will be returned as is.
+             *
+             * If a base URL is configured, the image will be returned with a qualified absolute URL.
              */
             function asset(string $name): string
             {

From 82c7600bbe3e4941733204f664c2117b68fd7c36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 20:37:34 +0200
Subject: [PATCH 094/328] Add an alias method for asset retrieval to the facade

---
 packages/framework/src/Facades/Asset.php                     | 5 +++++
 .../framework/tests/Unit/Facades/AssetFacadeUnitTest.php     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 45e16a0a881..11090959480 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -18,6 +18,11 @@
  */
 class Asset
 {
+    public static function get(string $file): string
+    {
+        return Hyde::asset($file);
+    }
+
     public static function mediaLink(string $file): string
     {
         return Hyde::mediaLink($file).static::getCacheBustKey($file);
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index a004e805399..5c43956cbcf 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -31,6 +31,11 @@ protected function tearDown(): void
         $this->cleanUpFilesystem();
     }
 
+    public function testGetHelper()
+    {
+        $this->assertSame(Hyde::asset('foo'), Asset::get('foo'));
+    }
+
     public function testHasMediaFileHelper()
     {
         $this->assertFalse(Asset::hasMediaFile('styles.css'));

From d47b220a39239d13bffb1ab8a64814180b4b2978 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 21:19:33 +0200
Subject: [PATCH 095/328] Reword cache busting option documentation to be more
 general

---
 config/hyde.php                    | 10 ++++------
 packages/framework/config/hyde.php | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 87f5481d00e..e601ff0a912 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -355,14 +355,12 @@
     | Cache Busting
     |--------------------------------------------------------------------------
     |
-    | Any assets loaded using the Asset::mediaLink() helper will automatically
-    | have a cache busting query string appended to the URL. This is useful
+    | Any assets loaded using the Hyde Asset helpers will automatically have
+    | a "cache busting" query string appended to the URL. This is useful
     | when you want to force browsers to load a new version of an asset.
+    | All included Blade templates use this feature to load assets.
     |
-    | The mediaLink helper is used in the built-in views to load the
-    | default stylesheets and scripts, and thus use this feature.
-    |
-    | To disable cache busting, set this setting to false.
+    | To disable the cache busting, set this setting to false.
     |
     */
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 87f5481d00e..e601ff0a912 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -355,14 +355,12 @@
     | Cache Busting
     |--------------------------------------------------------------------------
     |
-    | Any assets loaded using the Asset::mediaLink() helper will automatically
-    | have a cache busting query string appended to the URL. This is useful
+    | Any assets loaded using the Hyde Asset helpers will automatically have
+    | a "cache busting" query string appended to the URL. This is useful
     | when you want to force browsers to load a new version of an asset.
+    | All included Blade templates use this feature to load assets.
     |
-    | The mediaLink helper is used in the built-in views to load the
-    | default stylesheets and scripts, and thus use this feature.
-    |
-    | To disable cache busting, set this setting to false.
+    | To disable the cache busting, set this setting to false.
     |
     */
 

From d1d23773469254a81c5b3669c591201739c2c775 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 11:17:02 +0200
Subject: [PATCH 096/328] Copy cache busting key generator to new location

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 3ed834e7562..ec4cf21110f 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -143,4 +143,11 @@ protected static function getMediaGlobPattern(): string
             Config::getArray('hyde.media_extensions', self::EXTENSIONS)
         ));
     }
+
+    protected static function getCacheBustKey(string $file): string
+    {
+        return Config::getBool('hyde.enable_cache_busting', true)
+            ? '?v='.md5_file(MediaFile::sourcePath("$file"))
+            : '';
+    }
 }

From 44e1b1a5b108ddd6414d9852eca9b84e85387689 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 11:19:02 +0200
Subject: [PATCH 097/328] Temporarily make the protected method public internal

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index ec4cf21110f..d52ea12ac95 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -144,7 +144,8 @@ protected static function getMediaGlobPattern(): string
         ));
     }
 
-    protected static function getCacheBustKey(string $file): string
+    /** @internal */
+    public static function getCacheBustKey(string $file): string
     {
         return Config::getBool('hyde.enable_cache_busting', true)
             ? '?v='.md5_file(MediaFile::sourcePath("$file"))

From 97718a587d9a089928bc1009146deaf94ba8d4b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 11:30:20 +0200
Subject: [PATCH 098/328] Use the new logic location

---
 packages/framework/src/Facades/Asset.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 11090959480..e531b84b148 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -7,7 +7,6 @@
 use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
 
-use function md5_file;
 use function file_exists;
 
 /**
@@ -35,8 +34,6 @@ public static function hasMediaFile(string $file): bool
 
     protected static function getCacheBustKey(string $file): string
     {
-        return Config::getBool('hyde.enable_cache_busting', true)
-            ? '?v='.md5_file(MediaFile::sourcePath("$file"))
-            : '';
+        return MediaFile::getCacheBustKey($file);
     }
 }

From 0bd90cbb85c04e92909bba7f17d6eccb3c20ce1f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 11:31:57 +0200
Subject: [PATCH 099/328] Inline simplified helper method

---
 packages/framework/src/Facades/Asset.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index e531b84b148..c823dcea40a 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -24,16 +24,11 @@ public static function get(string $file): string
 
     public static function mediaLink(string $file): string
     {
-        return Hyde::mediaLink($file).static::getCacheBustKey($file);
+        return Hyde::mediaLink($file).MediaFile::getCacheBustKey($file);
     }
 
     public static function hasMediaFile(string $file): bool
     {
         return file_exists(MediaFile::sourcePath($file));
     }
-
-    protected static function getCacheBustKey(string $file): string
-    {
-        return MediaFile::getCacheBustKey($file);
-    }
 }

From 244a22e73677323c2c7fa34e35c681c6f80e7e5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 11:37:36 +0200
Subject: [PATCH 100/328] Call the kernel methods directly

Makes the refactor easier as I can click to get to the code location
---
 packages/framework/src/Facades/Asset.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index c823dcea40a..4e4d7a4ae89 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Facades;
 
-use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
 
+use function hyde;
 use function file_exists;
 
 /**
@@ -19,12 +19,12 @@ class Asset
 {
     public static function get(string $file): string
     {
-        return Hyde::asset($file);
+        return hyde()->asset($file);
     }
 
     public static function mediaLink(string $file): string
     {
-        return Hyde::mediaLink($file).MediaFile::getCacheBustKey($file);
+        return hyde()->mediaLink($file).MediaFile::getCacheBustKey($file);
     }
 
     public static function hasMediaFile(string $file): bool

From e57e9af3deee1c8da8b0d6431d533a6888b9fbd0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 11:41:43 +0200
Subject: [PATCH 101/328] Check that the file exists before trying to hash it

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index d52ea12ac95..fd459995f9f 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -147,7 +147,7 @@ protected static function getMediaGlobPattern(): string
     /** @internal */
     public static function getCacheBustKey(string $file): string
     {
-        return Config::getBool('hyde.enable_cache_busting', true)
+        return Config::getBool('hyde.enable_cache_busting', true) && file_exists(MediaFile::sourcePath("$file"))
             ? '?v='.md5_file(MediaFile::sourcePath("$file"))
             : '';
     }

From 41416b4f7e523f17bec241f4ff871de16dc2ad11 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 11:39:42 +0200
Subject: [PATCH 102/328] Move cache busting to root media link method
 implementation

---
 packages/framework/src/Facades/Asset.php                       | 2 +-
 packages/framework/src/Foundation/Kernel/Hyperlinks.php        | 3 ++-
 packages/framework/tests/Feature/Foundation/HyperlinksTest.php | 2 +-
 .../framework/tests/Feature/Services/RssFeedServiceTest.php    | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 4e4d7a4ae89..d014d1e5ad6 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -24,7 +24,7 @@ public static function get(string $file): string
 
     public static function mediaLink(string $file): string
     {
-        return hyde()->mediaLink($file).MediaFile::getCacheBustKey($file);
+        return hyde()->mediaLink($file);
     }
 
     public static function hasMediaFile(string $file): bool
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 6f6c83a486f..b4e43028049 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -8,6 +8,7 @@
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\HydeKernel;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
@@ -99,7 +100,7 @@ public function mediaLink(string $destination, bool $validate = false): string
             throw new FileNotFoundException($sourcePath);
         }
 
-        return $this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination");
+        return $this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination").MediaFile::getCacheBustKey($destination);
     }
 
     /**
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 64f26c4f098..9a7893a0d6a 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -108,7 +108,7 @@ public function testMediaLinkHelperUsesConfiguredMediaDirectory()
     public function testMediaLinkHelperWithValidationAndExistingFile()
     {
         $this->file('_media/foo');
-        $this->assertSame('media/foo', $this->class->mediaLink('foo', true));
+        $this->assertSame('media/foo?v=d41d8cd98f00b204e9800998ecf8427e', $this->class->mediaLink('foo', true));
     }
 
     public function testMediaLinkHelperWithValidationAndNonExistingFile()
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
index e8ca9f8d518..96b9b9afcf9 100644
--- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
+++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -86,6 +86,8 @@ public function testXmlChannelDataCanBeCustomized()
 
     public function testMarkdownBlogPostsAreAddedToRssFeedThroughAutodiscovery()
     {
+        config(['hyde.enable_cache_busting' => false]);
+
         file_put_contents(Hyde::path('_posts/rss.md'), <<<'MD'
             ---
             title: RSS

From 3b57fe82885d79c4456efea80208a4e27f07e2b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 11:57:21 +0200
Subject: [PATCH 103/328] Apply cache busting to the asset helper

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index b4e43028049..f6a15e7fb1e 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -118,10 +118,10 @@ public function asset(string $name): string
         $name = Str::start($name, "{$this->kernel->getMediaOutputDirectory()}/");
 
         if ($this->hasSiteUrl()) {
-            return $this->url($name);
+            return $this->url($name).MediaFile::getCacheBustKey($name);
         }
 
-        return $this->relativeLink($name);
+        return $this->relativeLink($name).MediaFile::getCacheBustKey($name);
     }
 
     /**

From d8cb4e4a6de831274412b14e3a2952b1f7855d73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 15:25:29 +0200
Subject: [PATCH 104/328] Extract helper method to perform cache busting

---
 .../framework/src/Foundation/Kernel/Hyperlinks.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index f6a15e7fb1e..9fc377a9a9f 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -100,7 +100,7 @@ public function mediaLink(string $destination, bool $validate = false): string
             throw new FileNotFoundException($sourcePath);
         }
 
-        return $this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination").MediaFile::getCacheBustKey($destination);
+        return $this->withCacheBusting($this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination"), $destination);
     }
 
     /**
@@ -118,10 +118,10 @@ public function asset(string $name): string
         $name = Str::start($name, "{$this->kernel->getMediaOutputDirectory()}/");
 
         if ($this->hasSiteUrl()) {
-            return $this->url($name).MediaFile::getCacheBustKey($name);
+            return $this->withCacheBusting($this->url($name), $name);
         }
 
-        return $this->relativeLink($name).MediaFile::getCacheBustKey($name);
+        return $this->withCacheBusting($this->relativeLink($name), $name);
     }
 
     /**
@@ -181,4 +181,12 @@ public static function isRemote(string $url): bool
     {
         return str_starts_with($url, 'http') || str_starts_with($url, '//');
     }
+
+    /**
+     * Apply cache to the URL if enabled in the configuration.
+     */
+    protected function withCacheBusting(string $url, string $file): string
+    {
+        return $url.MediaFile::getCacheBustKey($file);
+    }
 }

From f6b83824259222999d6ab1ff55c413b4677962f8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 13:01:12 +0200
Subject: [PATCH 105/328] Create discovery benchmark

---
 .../tests/Unit/Support/MediaFileTest.php      | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 44ded0474c5..aa6d4124eb9 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -26,6 +26,43 @@ protected function tearDown(): void
         $this->cleanUpFilesystem();
     }
 
+    /** @deprecated */
+    public function testDiscoveryBenchmark()
+    {
+        $this->markTestSkipped('Uncomment this line to run the benchmark.');
+
+        $urls = [
+            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/austria.jpg',
+            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/boat.jpg',
+            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/croatia.jpg',
+            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/fireworks.jpg',
+            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/hallstatt.jpg',
+            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/lemonade.jpg',
+            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/photographer.jpg',
+        ];
+
+        foreach ($urls as $url) {
+            $this->file('_media/'.basename($url), file_get_contents($url));
+        }
+
+        $this->file('_media/foo.css', 'body { color: red; }');
+        $this->file('_media/foo.js', 'console.log("Hello, World!");');
+        $this->file('_media/nested/foo.css', 'foo');
+        $this->file('_media/empty.css', '');
+        $this->file('_media/ignored', 'ignored');
+        $this->directory('_media/empty');
+        $this->file('_media/large.css', str_repeat('a', 1024 * 1024 * 10)); // 10 MB
+
+        // Warm up the classloader / cache
+        echo 'Warmup: '.\Illuminate\Support\Benchmark::measure(function () {
+            MediaFile::all();
+        })."ms\n";
+
+        echo 'Benchmark: '.\Illuminate\Support\Benchmark::measure(function () {
+            MediaFile::all();
+        }, 1000)."ms avg/1000/its\n";
+    }
+
     public function testCanConstruct()
     {
         $file = new MediaFile('foo');

From 1068d767fad87ad6ebe257ea4299416d0c7fb87d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 18:31:50 +0200
Subject: [PATCH 106/328] Create HasMediaFiles.php

---
 .../src/Foundation/Concerns/HasMediaFiles.php     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/src/Foundation/Concerns/HasMediaFiles.php

diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
new file mode 100644
index 00000000000..a0c11c9747c
--- /dev/null
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Foundation\Concerns;
+
+/**
+ * @internal Single-use trait for the Filesystem class.
+ *
+ * @see \Hyde\Foundation\Kernel\Filesystem
+ */
+trait HasMediaFiles
+{
+    //
+}

From 1fc20f23a181474b33646b916393aa37e1c99b02 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 18:32:15 +0200
Subject: [PATCH 107/328] Use HasMediaFiles

---
 packages/framework/src/Foundation/Kernel/Filesystem.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index 8f3bb2fd2aa..345f6caa524 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PharSupport;
+use Hyde\Foundation\Concerns\HasMediaFiles;
 use Illuminate\Support\Collection;
 
 use function collect;
@@ -29,6 +30,8 @@
  */
 class Filesystem
 {
+    use HasMediaFiles;
+
     protected HydeKernel $kernel;
 
     public function __construct(HydeKernel $kernel)

From d30bbde7a756a673b3cebfa42edf3a01feaccd9b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 18:32:32 +0200
Subject: [PATCH 108/328] Test covers HasMediaFiles

---
 packages/framework/tests/Feature/Foundation/FilesystemTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 86bc2c76479..1b8e2c559b1 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -21,6 +21,7 @@
 /**
  * @covers \Hyde\Foundation\HydeKernel
  * @covers \Hyde\Foundation\Kernel\Filesystem
+ * @covers \Hyde\Foundation\Concerns\HasMediaFiles
  */
 class FilesystemTest extends UnitTestCase
 {

From a05cd8314f12d34800fcfc454fff750377a947f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 18:34:52 +0200
Subject: [PATCH 109/328] Annotate upcoming assets method

We'll see if we name this mediaFiles or assets
---
 .../hyde-pages-api/hyde-kernel-filesystem-methods.md   | 10 +++++++++-
 packages/framework/src/Hyde.php                        |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
index eb5983597e6..8da7c32a0e2 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2024-07-26 15:15:12 in 0.09ms -->
+<!-- Generated by HydePHP DocGen script at 2024-07-28 10:41:33 in 0.13ms -->
 
 #### `filesystem()`
 
@@ -51,6 +51,14 @@ No description provided.
 Hyde::pathToRelative(string $path): string
 ```
 
+#### `assets()`
+
+No description provided.
+
+```php
+Hyde::assets(): array
+```
+
 <!-- End generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
 
 </section>
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 9cfb7841a6e..81b788108e9 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -9,6 +9,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Support\V1Compatibility;
 use Illuminate\Support\Collection;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Foundation\Kernel\FileCollection;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Foundation\Kernel\PageCollection;
@@ -37,6 +38,7 @@
  * @method static string formatLink(string $destination)
  * @method static string relativeLink(string $destination)
  * @method static string mediaLink(string $destination, bool $validate = false)
+ * @method static Collection<string, MediaFile> assets()
  * @method static string asset(string $name)
  * @method static string url(string $path = '')
  * @method static Route|null route(string $key)

From 772937eafcc595a61cdba336903f9267b7af5a31 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 20:05:09 +0200
Subject: [PATCH 110/328] Add the assets array

---
 packages/framework/src/Foundation/Concerns/HasMediaFiles.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
index a0c11c9747c..6c3d5a93cdc 100644
--- a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -11,5 +11,6 @@
  */
 trait HasMediaFiles
 {
-    //
+    /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
+    protected array $assets = [];
 }

From e7a7fe0f6377f49307bdb998288e8012ad36cbf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 20:06:55 +0200
Subject: [PATCH 111/328] Add the assets getter

---
 .../src/Foundation/Concerns/HasMediaFiles.php          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
index 6c3d5a93cdc..e5b556290b9 100644
--- a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -13,4 +13,14 @@ trait HasMediaFiles
 {
     /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
     protected array $assets = [];
+
+    /**
+     * Get all media files in the project.
+     *
+     * @return array<string, \Hyde\Support\Filesystem\MediaFile>
+     */
+    public function assets(): array
+    {
+        return $this->assets;
+    }
 }

From 79a495f96c59599888a783379d7909030ce9e02d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 20:07:17 +0200
Subject: [PATCH 112/328] Uninitialize assets

---
 packages/framework/src/Foundation/Concerns/HasMediaFiles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
index e5b556290b9..f854165d52b 100644
--- a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -12,7 +12,7 @@
 trait HasMediaFiles
 {
     /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
-    protected array $assets = [];
+    protected array $assets;
 
     /**
      * Get all media files in the project.

From 8e288f6ab7fc52358ff3a202870845f4672eef1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 21:46:15 +0200
Subject: [PATCH 113/328] Coalesce assign the assets

---
 packages/framework/src/Foundation/Concerns/HasMediaFiles.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
index f854165d52b..b589de6266e 100644
--- a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Foundation\Concerns;
 
+use Hyde\Support\Filesystem\MediaFile;
+
 /**
  * @internal Single-use trait for the Filesystem class.
  *
@@ -21,6 +23,6 @@ trait HasMediaFiles
      */
     public function assets(): array
     {
-        return $this->assets;
+        return $this->assets ??= MediaFile::all();
     }
 }

From b82bfa8ced30df70781db7b8e2e8020d533f109c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 21:47:57 +0200
Subject: [PATCH 114/328] Forward assets

---
 .../framework/src/Foundation/Concerns/ForwardsFilesystem.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index cea06f5bbc2..19a2a835778 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -42,4 +42,9 @@ public function pathToRelative(string $path): string
     {
         return $this->filesystem->pathToRelative($path);
     }
+
+    public function assets(): array
+    {
+        return $this->filesystem->assets();
+    }
 }

From dda76c6bdaf9d3e2819abbb119629f425a2e85b0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 27 Jul 2024 21:48:35 +0200
Subject: [PATCH 115/328] Move asset discovery to kernel filesystem

---
 .../src/Foundation/Concerns/HasMediaFiles.php | 30 ++++++++++++++++++-
 .../src/Support/Filesystem/MediaFile.php      | 27 +----------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
index b589de6266e..5a3d0be4558 100644
--- a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -4,8 +4,15 @@
 
 namespace Hyde\Foundation\Concerns;
 
+use Hyde\Hyde;
+use Hyde\Facades\Config;
 use Hyde\Support\Filesystem\MediaFile;
 
+use function implode;
+use function collect;
+use function sprintf;
+use function glob;
+
 /**
  * @internal Single-use trait for the Filesystem class.
  *
@@ -23,6 +30,27 @@ trait HasMediaFiles
      */
     public function assets(): array
     {
-        return $this->assets ??= MediaFile::all();
+        return $this->assets ??= static::discoverMediaFiles();
+    }
+
+    protected static function discoverMediaFiles(): array
+    {
+        return collect(static::getMediaFiles())->mapWithKeys(function (string $path): array {
+            $file = MediaFile::make($path);
+
+            return [$file->getIdentifier() => $file];
+        })->all();
+    }
+
+    protected static function getMediaFiles(): array
+    {
+        return glob(Hyde::path(static::getMediaGlobPattern()), GLOB_BRACE) ?: [];
+    }
+
+    protected static function getMediaGlobPattern(): string
+    {
+        return sprintf(Hyde::getMediaDirectory().'/{*,**/*,**/*/*}.{%s}', implode(',',
+            Config::getArray('hyde.media_extensions', MediaFile::EXTENSIONS)
+        ));
     }
 }
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index fd459995f9f..6c117d09893 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -16,12 +16,8 @@
 use function array_merge;
 use function array_keys;
 use function filesize;
-use function implode;
 use function pathinfo;
-use function collect;
 use function is_file;
-use function sprintf;
-use function glob;
 
 /**
  * File abstraction for a project media file.
@@ -34,7 +30,7 @@ class MediaFile extends ProjectFile
     /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
     public static function all(): array
     {
-        return static::discoverMediaFiles();
+        return Hyde::assets();
     }
 
     /** @return array<string> Array of filenames relative to the _media/ directory */
@@ -123,27 +119,6 @@ public function getMimeType(): string
         return 'text/plain';
     }
 
-    protected static function discoverMediaFiles(): array
-    {
-        return collect(static::getMediaFiles())->mapWithKeys(function (string $path): array {
-            $file = static::make($path);
-
-            return [$file->getIdentifier() => $file];
-        })->all();
-    }
-
-    protected static function getMediaFiles(): array
-    {
-        return glob(Hyde::path(static::getMediaGlobPattern()), GLOB_BRACE) ?: [];
-    }
-
-    protected static function getMediaGlobPattern(): string
-    {
-        return sprintf(Hyde::getMediaDirectory().'/{*,**/*,**/*/*}.{%s}', implode(',',
-            Config::getArray('hyde.media_extensions', self::EXTENSIONS)
-        ));
-    }
-
     /** @internal */
     public static function getCacheBustKey(string $file): string
     {

From 15d430ebe4fc966f7809c4d0b167648ede02f7bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 12:46:40 +0200
Subject: [PATCH 116/328] Split out test setup from assertions

---
 .../framework/tests/Feature/DiscoveryServiceTest.php   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/DiscoveryServiceTest.php b/packages/framework/tests/Feature/DiscoveryServiceTest.php
index e545cd64b7b..cdc3dc396cb 100644
--- a/packages/framework/tests/Feature/DiscoveryServiceTest.php
+++ b/packages/framework/tests/Feature/DiscoveryServiceTest.php
@@ -88,10 +88,12 @@ public function testGetMediaAssetFilesDiscoversFiles()
     {
         $testFiles = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
-        foreach ($testFiles as $fileType) {
-            $path = 'test.'.$fileType;
-            $this->file('_media/'.$path);
-            $this->assertContains($path, MediaFile::files());
+        foreach ($testFiles as $type) {
+            $this->file("_media/test.$type");
+        }
+
+        foreach ($testFiles as $type) {
+            $this->assertContains("test.$type", MediaFile::files());
         }
     }
 

From 1d12225e211a343f01f934ae11a47cfacaae6fa8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 12:46:43 +0200
Subject: [PATCH 117/328] Reboot to rediscover new files

---
 packages/framework/tests/Feature/DiscoveryServiceTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/DiscoveryServiceTest.php b/packages/framework/tests/Feature/DiscoveryServiceTest.php
index cdc3dc396cb..1cb508ac488 100644
--- a/packages/framework/tests/Feature/DiscoveryServiceTest.php
+++ b/packages/framework/tests/Feature/DiscoveryServiceTest.php
@@ -103,6 +103,8 @@ public function testGetMediaAssetFilesDiscoversCustomFileTypes()
         $this->file("_media/$path");
         $this->assertNotContains($path, MediaFile::files());
         self::mockConfig(['hyde.media_extensions' => ['custom']]);
+
+        $this->resetKernel(); // Reboot to rediscover new files
         $this->assertContains($path, MediaFile::files());
     }
 
@@ -133,6 +135,7 @@ public function testMediaAssetExtensionsCanBeAddedByCommaSeparatedValues()
         $this->assertSame([], MediaFile::files());
 
         self::mockConfig(['hyde.media_extensions' => ['1,2,3']]);
+        $this->resetKernel(); // Reboot to rediscover new files
         $this->assertSame(['test.1', 'test.2', 'test.3'], MediaFile::files());
     }
 
@@ -145,6 +148,7 @@ public function testMediaAssetExtensionsCanBeAddedByArray()
 
         $this->assertSame([], MediaFile::files());
         self::mockConfig(['hyde.media_extensions' => ['1', '2', '3']]);
+        $this->resetKernel(); // Reboot to rediscover new files
         $this->assertSame(['test.1', 'test.2', 'test.3'], MediaFile::files());
     }
 

From b0f3a89013855d1e4fa38a606a3869fc876591da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 13:17:53 +0200
Subject: [PATCH 118/328] Update assets to be stored as a Collection

Better matches other file collections
---
 .../hyde-kernel-filesystem-methods.md               |  4 ++--
 .../src/Foundation/Concerns/ForwardsFilesystem.php  |  3 ++-
 .../src/Foundation/Concerns/HasMediaFiles.php       | 13 +++++++------
 .../framework/src/Support/Filesystem/MediaFile.php  |  8 ++++----
 .../framework/tests/Unit/Support/MediaFileTest.php  |  4 ++--
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
index 8da7c32a0e2..55dfcdafe4b 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2024-07-28 10:41:33 in 0.13ms -->
+<!-- Generated by HydePHP DocGen script at 2024-07-28 11:20:12 in 0.11ms -->
 
 #### `filesystem()`
 
@@ -56,7 +56,7 @@ Hyde::pathToRelative(string $path): string
 No description provided.
 
 ```php
-Hyde::assets(): array
+Hyde::assets(): Illuminate\Support\Collection
 ```
 
 <!-- End generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index 19a2a835778..888f3abf4d0 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -5,6 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Foundation\Kernel\Filesystem;
+use Illuminate\Support\Collection;
 
 /**
  * @internal Single-use trait for the HydeKernel class.
@@ -43,7 +44,7 @@ public function pathToRelative(string $path): string
         return $this->filesystem->pathToRelative($path);
     }
 
-    public function assets(): array
+    public function assets(): Collection
     {
         return $this->filesystem->assets();
     }
diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
index 5a3d0be4558..3dff8db788d 100644
--- a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Support\Filesystem\MediaFile;
+use Illuminate\Support\Collection;
 
 use function implode;
 use function collect;
@@ -20,26 +21,26 @@
  */
 trait HasMediaFiles
 {
-    /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
-    protected array $assets;
+    /** @var Collection<string, \Hyde\Support\Filesystem\MediaFile> The Collection keys are the filenames relative to the _media/ directory */
+    protected Collection $assets;
 
     /**
      * Get all media files in the project.
      *
-     * @return array<string, \Hyde\Support\Filesystem\MediaFile>
+     * @return Collection<string, \Hyde\Support\Filesystem\MediaFile>
      */
-    public function assets(): array
+    public function assets(): Collection
     {
         return $this->assets ??= static::discoverMediaFiles();
     }
 
-    protected static function discoverMediaFiles(): array
+    protected static function discoverMediaFiles(): Collection
     {
         return collect(static::getMediaFiles())->mapWithKeys(function (string $path): array {
             $file = MediaFile::make($path);
 
             return [$file->getIdentifier() => $file];
-        })->all();
+        });
     }
 
     protected static function getMediaFiles(): array
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 6c117d09893..5457e18ba03 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
+use Illuminate\Support\Collection;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
@@ -14,7 +15,6 @@
 use function extension_loaded;
 use function file_exists;
 use function array_merge;
-use function array_keys;
 use function filesize;
 use function pathinfo;
 use function is_file;
@@ -27,8 +27,8 @@ class MediaFile extends ProjectFile
     /** @var array<string> The default extensions for media types */
     final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
-    /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
-    public static function all(): array
+    /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
+    public static function all(): Collection
     {
         return Hyde::assets();
     }
@@ -36,7 +36,7 @@ public static function all(): array
     /** @return array<string> Array of filenames relative to the _media/ directory */
     public static function files(): array
     {
-        return array_keys(static::all());
+        return static::all()->keys()->all();
     }
 
     /**
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index aa6d4124eb9..16f9c1477f3 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -222,7 +222,7 @@ public function testAllHelperReturnsAllMediaFiles()
     {
         $this->assertEquals([
             'app.css' => new MediaFile('_media/app.css'),
-        ], MediaFile::all());
+        ], MediaFile::all()->all());
     }
 
     public function testAllHelperDoesNotIncludeNonMediaFiles()
@@ -231,7 +231,7 @@ public function testAllHelperDoesNotIncludeNonMediaFiles()
 
         $this->assertEquals([
             'app.css' => new MediaFile('_media/app.css'),
-        ], MediaFile::all());
+        ], MediaFile::all()->all());
     }
 
     public function testFilesHelperReturnsAllMediaFiles()

From 575ddbd36a819a0c9e64d4524f2bb5a09251ba25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:19:50 +0200
Subject: [PATCH 119/328] Create kernel asset tests

---
 .../tests/Feature/HydeKernelTest.php          | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index b12a5ea19bb..d9a41c95983 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -204,6 +204,34 @@ public function testImageHelperSupportsCustomMediaDirectories()
         $this->assertSame('assets/foo.jpg', Hyde::asset('foo.jpg'));
     }
 
+    public function testAssetsHelperGetsAllSiteAssets()
+    {
+        $this->assertEquals(new Collection([
+            'app.css' => new MediaFile('_media/app.css'),
+        ]), Hyde::assets());
+    }
+
+    public function testAssetsHelperGetsAllSiteAssetsAsArray()
+    {
+        $assets = Hyde::assets()->toArray();
+
+        $assets['app.css']['length'] = 123;
+
+        $this->assertSame([
+            'app.css' => [
+                'name' => 'app.css',
+                'path' => '_media/app.css',
+                'length' => 123,
+                'mimeType' => 'text/css',
+            ],
+        ], $assets);
+    }
+
+    public function testAssetsHelperReturnsAssetCollectionSingleton()
+    {
+        $this->assertSame(Hyde::assets(), Hyde::assets());
+    }
+
     public function testRouteHelper()
     {
         $this->assertNotNull(Hyde::route('index'));

From c21db94b432f8fd28edf6bcf41f5e7b8541fd7bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:21:58 +0200
Subject: [PATCH 120/328] Move bulk tests to test for implementation

---
 .../Feature/Foundation/FilesystemTest.php     | 30 +++++++++++++++++++
 .../tests/Feature/HydeKernelTest.php          | 16 ----------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 1b8e2c559b1..01f7e83ac11 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature\Foundation;
 
 use Hyde\Foundation\HydeKernel;
+use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Foundation\PharSupport;
 use Hyde\Hyde;
@@ -30,6 +31,7 @@ class FilesystemTest extends UnitTestCase
     protected Filesystem $filesystem;
 
     protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
 
     protected function setUp(): void
     {
@@ -355,4 +357,32 @@ public function testPathToRelativeHelperDoesNotModifyNonProjectPaths()
             $this->assertSame(normalize_slashes($testString), Hyde::pathToRelative($testString));
         }
     }
+
+    public function testAssetsMethodGetsAllSiteAssets()
+    {
+        $this->assertEquals(new Collection([
+            'app.css' => new MediaFile('_media/app.css'),
+        ]), $this->filesystem->assets());
+    }
+
+    public function testAssetsMethodGetsAllSiteAssetsAsArray()
+    {
+        $assets = $this->filesystem->assets()->toArray();
+
+        $assets['app.css']['length'] = 123;
+
+        $this->assertSame([
+            'app.css' => [
+                'name' => 'app.css',
+                'path' => '_media/app.css',
+                'length' => 123,
+                'mimeType' => 'text/css',
+            ],
+        ], $assets);
+    }
+
+    public function testAssetsMethodReturnsAssetCollectionSingleton()
+    {
+        $this->assertSame($this->filesystem->assets(), $this->filesystem->assets());
+    }
 }
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index d9a41c95983..f0dac45e3ba 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -211,22 +211,6 @@ public function testAssetsHelperGetsAllSiteAssets()
         ]), Hyde::assets());
     }
 
-    public function testAssetsHelperGetsAllSiteAssetsAsArray()
-    {
-        $assets = Hyde::assets()->toArray();
-
-        $assets['app.css']['length'] = 123;
-
-        $this->assertSame([
-            'app.css' => [
-                'name' => 'app.css',
-                'path' => '_media/app.css',
-                'length' => 123,
-                'mimeType' => 'text/css',
-            ],
-        ], $assets);
-    }
-
     public function testAssetsHelperReturnsAssetCollectionSingleton()
     {
         $this->assertSame(Hyde::assets(), Hyde::assets());

From 65ed8634ea71d504fa087192df02b71cb4cc7142 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:28:49 +0200
Subject: [PATCH 121/328] Claude: Create FilesystemHasMediaFilesTest.php

---
 .../FilesystemHasMediaFilesTest.php           | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php

diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
new file mode 100644
index 00000000000..0c993cce49e
--- /dev/null
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -0,0 +1,162 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Foundation;
+
+use Hyde\Foundation\Kernel\Filesystem;
+use Hyde\Hyde;
+use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Collection;
+use Mockery;
+
+/**
+ * @covers \Hyde\Foundation\Kernel\Filesystem
+ * @covers \Hyde\Foundation\Concerns\HasMediaFiles
+ */
+class FilesystemHasMediaFilesTest extends UnitTestCase
+{
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
+    protected Filesystem $filesystem;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->filesystem = new Filesystem(Hyde::getInstance());
+    }
+
+    public function testAssetsMethodReturnsSameInstanceOnSubsequentCalls()
+    {
+        $firstCall = $this->filesystem->assets();
+        $secondCall = $this->filesystem->assets();
+
+        $this->assertSame($firstCall, $secondCall);
+    }
+
+    public function testAssetsMethodReturnsEmptyCollectionWhenNoMediaFiles()
+    {
+        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
+            return [];
+        });
+
+        $assets = $this->filesystem->assets();
+
+        $this->assertInstanceOf(Collection::class, $assets);
+        $this->assertTrue($assets->isEmpty());
+    }
+
+    public function testAssetsMethodWithCustomMediaExtensions()
+    {
+        $this->app['config']->set('hyde.media_extensions', ['jpg', 'png']);
+
+        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
+            return [
+                Hyde::path('_media/image1.jpg'),
+                Hyde::path('_media/image2.png'),
+                Hyde::path('_media/document.pdf'), // This should be excluded
+            ];
+        });
+
+        $assets = $this->filesystem->assets();
+
+        $this->assertCount(2, $assets);
+        $this->assertTrue($assets->has('image1.jpg'));
+        $this->assertTrue($assets->has('image2.png'));
+        $this->assertFalse($assets->has('document.pdf'));
+    }
+
+    public function testAssetsMethodWithNestedDirectories()
+    {
+        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
+            return [
+                Hyde::path('_media/images/photo.jpg'),
+                Hyde::path('_media/documents/report.pdf'),
+            ];
+        });
+
+        $assets = $this->filesystem->assets();
+
+        $this->assertCount(2, $assets);
+        $this->assertTrue($assets->has('images/photo.jpg'));
+        $this->assertTrue($assets->has('documents/report.pdf'));
+    }
+
+    public function testAssetsMethodWithInvalidMediaFile()
+    {
+        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
+            return [
+                Hyde::path('_media/valid.jpg'),
+                Hyde::path('_media/invalid'), // File without extension
+            ];
+        });
+
+        $assets = $this->filesystem->assets();
+
+        $this->assertCount(1, $assets);
+        $this->assertTrue($assets->has('valid.jpg'));
+        $this->assertFalse($assets->has('invalid'));
+    }
+
+    public function testGetMediaGlobPatternWithCustomMediaDirectory()
+    {
+        $this->app['config']->set('hyde.media_directory', 'custom_media');
+
+        $pattern = $this->invokeProtectedMethod(Filesystem::class, 'getMediaGlobPattern');
+
+        $this->assertStringContainsString('custom_media/', $pattern);
+    }
+
+    public function testGetMediaGlobPatternWithCustomExtensions()
+    {
+        $this->app['config']->set('hyde.media_extensions', ['gif', 'svg']);
+
+        $pattern = $this->invokeProtectedMethod(Filesystem::class, 'getMediaGlobPattern');
+
+        $this->assertStringContainsString('{gif,svg}', $pattern);
+    }
+
+    public function testDiscoverMediaFilesWithEmptyResult()
+    {
+        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
+            return [];
+        });
+
+        $result = $this->invokeProtectedMethod(Filesystem::class, 'discoverMediaFiles');
+
+        $this->assertInstanceOf(Collection::class, $result);
+        $this->assertTrue($result->isEmpty());
+    }
+
+    public function testDiscoverMediaFilesWithMultipleFiles()
+    {
+        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
+            return [
+                Hyde::path('_media/image.jpg'),
+                Hyde::path('_media/document.pdf'),
+            ];
+        });
+
+        $result = $this->invokeProtectedMethod(Filesystem::class, 'discoverMediaFiles');
+
+        $this->assertCount(2, $result);
+        $this->assertInstanceOf(MediaFile::class, $result->get('image.jpg'));
+        $this->assertInstanceOf(MediaFile::class, $result->get('document.pdf'));
+    }
+
+    protected function mockStaticMethod($class, $method, $return)
+    {
+        $mock = Mockery::mock('alias:' . $class);
+        $mock->shouldReceive($method)->andReturn($return);
+    }
+
+    protected function invokeProtectedMethod($class, $method, array $args = [])
+    {
+        $reflection = new \ReflectionClass($class);
+        $method = $reflection->getMethod($method);
+        $method->setAccessible(true);
+        return $method->invokeArgs(null, $args);
+    }
+}

From ee8e4354bc3207b26535e043c7a498d1ad172c74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:31:12 +0200
Subject: [PATCH 122/328] Static mocks

---
 .../FilesystemHasMediaFilesTest.php           | 99 +++++++++----------
 1 file changed, 48 insertions(+), 51 deletions(-)

diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
index 0c993cce49e..71d37e4bea7 100644
--- a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -9,23 +9,21 @@
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
-use Mockery;
 
 /**
  * @covers \Hyde\Foundation\Kernel\Filesystem
- * @covers \Hyde\Foundation\Concerns\HasMediaFiles
  */
 class FilesystemHasMediaFilesTest extends UnitTestCase
 {
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
-    protected Filesystem $filesystem;
+    protected TestableFilesystem $filesystem;
 
     protected function setUp(): void
     {
         parent::setUp();
-        $this->filesystem = new Filesystem(Hyde::getInstance());
+        $this->filesystem = new TestableFilesystem(Hyde::getInstance());
     }
 
     public function testAssetsMethodReturnsSameInstanceOnSubsequentCalls()
@@ -38,9 +36,7 @@ public function testAssetsMethodReturnsSameInstanceOnSubsequentCalls()
 
     public function testAssetsMethodReturnsEmptyCollectionWhenNoMediaFiles()
     {
-        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
-            return [];
-        });
+        $this->filesystem->setTestMediaFiles([]);
 
         $assets = $this->filesystem->assets();
 
@@ -50,15 +46,13 @@ public function testAssetsMethodReturnsEmptyCollectionWhenNoMediaFiles()
 
     public function testAssetsMethodWithCustomMediaExtensions()
     {
-        $this->app['config']->set('hyde.media_extensions', ['jpg', 'png']);
+        Hyde::getInstance()->config()->set('hyde.media_extensions', ['jpg', 'png']);
 
-        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
-            return [
-                Hyde::path('_media/image1.jpg'),
-                Hyde::path('_media/image2.png'),
-                Hyde::path('_media/document.pdf'), // This should be excluded
-            ];
-        });
+        $this->filesystem->setTestMediaFiles([
+            Hyde::path('_media/image1.jpg'),
+            Hyde::path('_media/image2.png'),
+            Hyde::path('_media/document.pdf'), // This should be excluded
+        ]);
 
         $assets = $this->filesystem->assets();
 
@@ -70,12 +64,10 @@ public function testAssetsMethodWithCustomMediaExtensions()
 
     public function testAssetsMethodWithNestedDirectories()
     {
-        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
-            return [
-                Hyde::path('_media/images/photo.jpg'),
-                Hyde::path('_media/documents/report.pdf'),
-            ];
-        });
+        $this->filesystem->setTestMediaFiles([
+            Hyde::path('_media/images/photo.jpg'),
+            Hyde::path('_media/documents/report.pdf'),
+        ]);
 
         $assets = $this->filesystem->assets();
 
@@ -86,12 +78,10 @@ public function testAssetsMethodWithNestedDirectories()
 
     public function testAssetsMethodWithInvalidMediaFile()
     {
-        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
-            return [
-                Hyde::path('_media/valid.jpg'),
-                Hyde::path('_media/invalid'), // File without extension
-            ];
-        });
+        $this->filesystem->setTestMediaFiles([
+            Hyde::path('_media/valid.jpg'),
+            Hyde::path('_media/invalid'), // File without extension
+        ]);
 
         $assets = $this->filesystem->assets();
 
@@ -102,29 +92,27 @@ public function testAssetsMethodWithInvalidMediaFile()
 
     public function testGetMediaGlobPatternWithCustomMediaDirectory()
     {
-        $this->app['config']->set('hyde.media_directory', 'custom_media');
+        Hyde::getInstance()->config()->set('hyde.media_directory', 'custom_media');
 
-        $pattern = $this->invokeProtectedMethod(Filesystem::class, 'getMediaGlobPattern');
+        $pattern = $this->filesystem->getTestMediaGlobPattern();
 
         $this->assertStringContainsString('custom_media/', $pattern);
     }
 
     public function testGetMediaGlobPatternWithCustomExtensions()
     {
-        $this->app['config']->set('hyde.media_extensions', ['gif', 'svg']);
+        Hyde::getInstance()->config()->set('hyde.media_extensions', ['gif', 'svg']);
 
-        $pattern = $this->invokeProtectedMethod(Filesystem::class, 'getMediaGlobPattern');
+        $pattern = $this->filesystem->getTestMediaGlobPattern();
 
         $this->assertStringContainsString('{gif,svg}', $pattern);
     }
 
     public function testDiscoverMediaFilesWithEmptyResult()
     {
-        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
-            return [];
-        });
+        $this->filesystem->setTestMediaFiles([]);
 
-        $result = $this->invokeProtectedMethod(Filesystem::class, 'discoverMediaFiles');
+        $result = $this->filesystem->getTestDiscoverMediaFiles();
 
         $this->assertInstanceOf(Collection::class, $result);
         $this->assertTrue($result->isEmpty());
@@ -132,31 +120,40 @@ public function testDiscoverMediaFilesWithEmptyResult()
 
     public function testDiscoverMediaFilesWithMultipleFiles()
     {
-        $this->mockStaticMethod(Filesystem::class, 'getMediaFiles', function () {
-            return [
-                Hyde::path('_media/image.jpg'),
-                Hyde::path('_media/document.pdf'),
-            ];
-        });
+        $this->filesystem->setTestMediaFiles([
+            Hyde::path('_media/image.jpg'),
+            Hyde::path('_media/document.pdf'),
+        ]);
 
-        $result = $this->invokeProtectedMethod(Filesystem::class, 'discoverMediaFiles');
+        $result = $this->filesystem->getTestDiscoverMediaFiles();
 
         $this->assertCount(2, $result);
         $this->assertInstanceOf(MediaFile::class, $result->get('image.jpg'));
         $this->assertInstanceOf(MediaFile::class, $result->get('document.pdf'));
     }
+}
+
+class TestableFilesystem extends Filesystem
+{
+    private static array $testMediaFiles = [];
 
-    protected function mockStaticMethod($class, $method, $return)
+    public function setTestMediaFiles(array $files): void
     {
-        $mock = Mockery::mock('alias:' . $class);
-        $mock->shouldReceive($method)->andReturn($return);
+        self::$testMediaFiles = $files;
     }
 
-    protected function invokeProtectedMethod($class, $method, array $args = [])
+    protected static function getMediaFiles(): array
     {
-        $reflection = new \ReflectionClass($class);
-        $method = $reflection->getMethod($method);
-        $method->setAccessible(true);
-        return $method->invokeArgs(null, $args);
+        return self::$testMediaFiles;
     }
-}
+
+    public function getTestMediaGlobPattern(): string
+    {
+        return static::getMediaGlobPattern();
+    }
+
+    public function getTestDiscoverMediaFiles(): Collection
+    {
+        return static::discoverMediaFiles();
+    }
+}
\ No newline at end of file

From 43e72bb6c8b7be912da838977ecbe78cdeee605d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:32:51 +0200
Subject: [PATCH 123/328] Fix config mocks

---
 .../tests/Unit/Foundation/FilesystemHasMediaFilesTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
index 71d37e4bea7..24b5b726586 100644
--- a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -46,7 +46,7 @@ public function testAssetsMethodReturnsEmptyCollectionWhenNoMediaFiles()
 
     public function testAssetsMethodWithCustomMediaExtensions()
     {
-        Hyde::getInstance()->config()->set('hyde.media_extensions', ['jpg', 'png']);
+        self::mockConfig(['hyde.media_extensions' => ['jpg', 'png']]);
 
         $this->filesystem->setTestMediaFiles([
             Hyde::path('_media/image1.jpg'),
@@ -92,7 +92,7 @@ public function testAssetsMethodWithInvalidMediaFile()
 
     public function testGetMediaGlobPatternWithCustomMediaDirectory()
     {
-        Hyde::getInstance()->config()->set('hyde.media_directory', 'custom_media');
+        self::mockConfig(['hyde.media_directory' => 'custom_media']);
 
         $pattern = $this->filesystem->getTestMediaGlobPattern();
 
@@ -101,7 +101,7 @@ public function testGetMediaGlobPatternWithCustomMediaDirectory()
 
     public function testGetMediaGlobPatternWithCustomExtensions()
     {
-        Hyde::getInstance()->config()->set('hyde.media_extensions', ['gif', 'svg']);
+        self::mockConfig(['hyde.media_extensions' => ['gif', 'svg']]);
 
         $pattern = $this->filesystem->getTestMediaGlobPattern();
 
@@ -156,4 +156,4 @@ public function getTestDiscoverMediaFiles(): Collection
     {
         return static::discoverMediaFiles();
     }
-}
\ No newline at end of file
+}

From 19dfea93ea8900dc8a526cab95c7951a3a18c55d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:35:46 +0200
Subject: [PATCH 124/328] Filter static files using the glob pattern

---
 .../FilesystemHasMediaFilesTest.php           | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
index 24b5b726586..7cf5c233857 100644
--- a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -144,7 +144,31 @@ public function setTestMediaFiles(array $files): void
 
     protected static function getMediaFiles(): array
     {
-        return self::$testMediaFiles;
+        $pattern = static::getMediaGlobPattern();
+        $baseDir = Hyde::path('_media');
+        $patternParts = explode('/', $pattern);
+        $globPattern = end($patternParts);
+
+        return array_filter(self::$testMediaFiles, function ($file) use ($baseDir, $globPattern) {
+            $relativePath = str_replace($baseDir . DIRECTORY_SEPARATOR, '', $file);
+            return self::matchesGlobPattern($relativePath, $globPattern);
+        });
+    }
+
+    private static function matchesGlobPattern(string $filename, string $pattern): bool
+    {
+        $regex = self::globToRegex($pattern);
+        return preg_match($regex, $filename) === 1;
+    }
+
+    private static function globToRegex(string $pattern): string
+    {
+        $regex = preg_quote($pattern, '/');
+        $regex = str_replace('\*', '.*', $regex);
+        $regex = str_replace('\{', '(', $regex);
+        $regex = str_replace('\}', ')', $regex);
+        $regex = str_replace(',', '|', $regex);
+        return '/^' . $regex . '$/i';
     }
 
     public function getTestMediaGlobPattern(): string

From eb0cb020f7b70c846891790555b852d79dbfc21f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:35:49 +0200
Subject: [PATCH 125/328] Revert "Filter static files using the glob pattern"

This reverts commit f3a177c385bd72805cb529f75c276472e1939021.
---
 .../FilesystemHasMediaFilesTest.php           | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
index 7cf5c233857..24b5b726586 100644
--- a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -144,31 +144,7 @@ public function setTestMediaFiles(array $files): void
 
     protected static function getMediaFiles(): array
     {
-        $pattern = static::getMediaGlobPattern();
-        $baseDir = Hyde::path('_media');
-        $patternParts = explode('/', $pattern);
-        $globPattern = end($patternParts);
-
-        return array_filter(self::$testMediaFiles, function ($file) use ($baseDir, $globPattern) {
-            $relativePath = str_replace($baseDir . DIRECTORY_SEPARATOR, '', $file);
-            return self::matchesGlobPattern($relativePath, $globPattern);
-        });
-    }
-
-    private static function matchesGlobPattern(string $filename, string $pattern): bool
-    {
-        $regex = self::globToRegex($pattern);
-        return preg_match($regex, $filename) === 1;
-    }
-
-    private static function globToRegex(string $pattern): string
-    {
-        $regex = preg_quote($pattern, '/');
-        $regex = str_replace('\*', '.*', $regex);
-        $regex = str_replace('\{', '(', $regex);
-        $regex = str_replace('\}', ')', $regex);
-        $regex = str_replace(',', '|', $regex);
-        return '/^' . $regex . '$/i';
+        return self::$testMediaFiles;
     }
 
     public function getTestMediaGlobPattern(): string

From 94e3f21b91ed1a151226c71aeb657d1290b666f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:38:04 +0200
Subject: [PATCH 126/328] Clean up and improve the Claude generated unit test

---
 .../FilesystemHasMediaFilesTest.php           | 36 ++-----------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
index 24b5b726586..594e6966bcf 100644
--- a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -44,24 +44,6 @@ public function testAssetsMethodReturnsEmptyCollectionWhenNoMediaFiles()
         $this->assertTrue($assets->isEmpty());
     }
 
-    public function testAssetsMethodWithCustomMediaExtensions()
-    {
-        self::mockConfig(['hyde.media_extensions' => ['jpg', 'png']]);
-
-        $this->filesystem->setTestMediaFiles([
-            Hyde::path('_media/image1.jpg'),
-            Hyde::path('_media/image2.png'),
-            Hyde::path('_media/document.pdf'), // This should be excluded
-        ]);
-
-        $assets = $this->filesystem->assets();
-
-        $this->assertCount(2, $assets);
-        $this->assertTrue($assets->has('image1.jpg'));
-        $this->assertTrue($assets->has('image2.png'));
-        $this->assertFalse($assets->has('document.pdf'));
-    }
-
     public function testAssetsMethodWithNestedDirectories()
     {
         $this->filesystem->setTestMediaFiles([
@@ -76,27 +58,15 @@ public function testAssetsMethodWithNestedDirectories()
         $this->assertTrue($assets->has('documents/report.pdf'));
     }
 
-    public function testAssetsMethodWithInvalidMediaFile()
-    {
-        $this->filesystem->setTestMediaFiles([
-            Hyde::path('_media/valid.jpg'),
-            Hyde::path('_media/invalid'), // File without extension
-        ]);
-
-        $assets = $this->filesystem->assets();
-
-        $this->assertCount(1, $assets);
-        $this->assertTrue($assets->has('valid.jpg'));
-        $this->assertFalse($assets->has('invalid'));
-    }
-
     public function testGetMediaGlobPatternWithCustomMediaDirectory()
     {
-        self::mockConfig(['hyde.media_directory' => 'custom_media']);
+        Hyde::setMediaDirectory('custom_media');
 
         $pattern = $this->filesystem->getTestMediaGlobPattern();
 
         $this->assertStringContainsString('custom_media/', $pattern);
+
+        Hyde::setMediaDirectory('_media');
     }
 
     public function testGetMediaGlobPatternWithCustomExtensions()

From 1bdf4ba3c50c89a2e50afe567b12a5583041d796 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 14:43:11 +0200
Subject: [PATCH 127/328] Annotate the collection generics

---
 .../partials/hyde-pages-api/hyde-kernel-filesystem-methods.md | 4 ++--
 .../framework/src/Foundation/Concerns/ForwardsFilesystem.php  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
index 55dfcdafe4b..9823b18f5f4 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2024-07-28 11:20:12 in 0.11ms -->
+<!-- Generated by HydePHP DocGen script at 2024-07-28 12:43:01 in 0.11ms -->
 
 #### `filesystem()`
 
@@ -56,7 +56,7 @@ Hyde::pathToRelative(string $path): string
 No description provided.
 
 ```php
-Hyde::assets(): Illuminate\Support\Collection
+Hyde::assets(): Collection<string, \Hyde\Support\Filesystem\MediaFile>
 ```
 
 <!-- End generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index 888f3abf4d0..1f45bc30655 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -44,6 +44,7 @@ public function pathToRelative(string $path): string
         return $this->filesystem->pathToRelative($path);
     }
 
+    /** @return Collection<string, \Hyde\Support\Filesystem\MediaFile> */
     public function assets(): Collection
     {
         return $this->filesystem->assets();

From 96781f996026d8782f094ae95cfe465fce1d9bb5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 15:52:08 +0200
Subject: [PATCH 128/328] Normalize implementation syntax

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5457e18ba03..5d362d7aeb4 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -60,9 +60,7 @@ public static function outputPath(string $path = ''): string
             return Hyde::sitePath(Hyde::getMediaOutputDirectory());
         }
 
-        $path = unslash($path);
-
-        return Hyde::sitePath(Hyde::getMediaOutputDirectory()."/$path");
+        return Hyde::sitePath(path_join(Hyde::getMediaOutputDirectory(), unslash($path)));
     }
 
     public function getIdentifier(): string

From 27778927dd2931bed4ef5d224d4674587ff769cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:18:47 +0200
Subject: [PATCH 129/328] Document identifier method

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5d362d7aeb4..d25889dff82 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -63,6 +63,9 @@ public static function outputPath(string $path = ''): string
         return Hyde::sitePath(path_join(Hyde::getMediaOutputDirectory(), unslash($path)));
     }
 
+    /**
+     * Get the path to the media file relative to the media directory.
+     */
     public function getIdentifier(): string
     {
         return Str::after($this->getPath(), Hyde::getMediaDirectory().'/');

From 58cfaf85862be68470c1d0b3554583580c86169c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:18:55 +0200
Subject: [PATCH 130/328] Add more tests for the identifier method

---
 .../framework/tests/Unit/Support/MediaFileTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 16f9c1477f3..0043845a48d 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -249,6 +249,16 @@ public function testGetIdentifierWithSubdirectory()
         $this->assertSame('foo/bar', MediaFile::make('foo/bar')->getIdentifier());
     }
 
+    public function testGetIdentifierReturnsIdentifierWithFileExtension()
+    {
+        $this->assertSame('foo.png', MediaFile::make('foo.png')->getIdentifier());
+    }
+
+    public function testGetIdentifierWithSubdirectoryWithFileExtension()
+    {
+        $this->assertSame('foo/bar.png', MediaFile::make('foo/bar.png')->getIdentifier());
+    }
+
     public function testHelperForMediaPath()
     {
         $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());

From 4e4ef03dbe6f32a73790a2109c1551a08cfb4877 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:10:21 +0200
Subject: [PATCH 131/328] Override parent constructor

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index d25889dff82..4571582d1b7 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -27,6 +27,11 @@ class MediaFile extends ProjectFile
     /** @var array<string> The default extensions for media types */
     final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
+    public function __construct(string $path)
+    {
+        parent::__construct($path);
+    }
+
     /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
     public static function all(): Collection
     {

From c8ca302ada7f561f58d4863799bca9196914b9be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:13:50 +0200
Subject: [PATCH 132/328] Normalize stored internal path

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 4571582d1b7..55f95d6a1a7 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -12,6 +12,7 @@
 
 use function Hyde\unslash;
 use function Hyde\path_join;
+use function Hyde\trim_slashes;
 use function extension_loaded;
 use function file_exists;
 use function array_merge;
@@ -29,6 +30,8 @@ class MediaFile extends ProjectFile
 
     public function __construct(string $path)
     {
+        $path = trim_slashes(Str::after($path, Hyde::getMediaDirectory()));
+
         parent::__construct($path);
     }
 

From c4b7af3c42069e7e9a553b00482f33170c3d0540 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:16:52 +0200
Subject: [PATCH 133/328] Normalize formatter syntax

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 55f95d6a1a7..525cae51fd7 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -30,7 +30,7 @@ class MediaFile extends ProjectFile
 
     public function __construct(string $path)
     {
-        $path = trim_slashes(Str::after($path, Hyde::getMediaDirectory()));
+        $path = Str::after($path, Hyde::getMediaDirectory().'/');
 
         parent::__construct($path);
     }

From b20eab63d01f6c366714ad4f99a1475741094dec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:19:32 +0200
Subject: [PATCH 134/328] Revert "Normalize formatter syntax"

This reverts commit c4b7af3c42069e7e9a553b00482f33170c3d0540.
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 525cae51fd7..55f95d6a1a7 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -30,7 +30,7 @@ class MediaFile extends ProjectFile
 
     public function __construct(string $path)
     {
-        $path = Str::after($path, Hyde::getMediaDirectory().'/');
+        $path = trim_slashes(Str::after($path, Hyde::getMediaDirectory()));
 
         parent::__construct($path);
     }

From 0907bc5c7e38752b1a9887b5e420e77ceb67096c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:20:54 +0200
Subject: [PATCH 135/328] Test normalization

---
 .../framework/tests/Unit/Support/MediaFileTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 0043845a48d..e47e8a290b4 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -86,6 +86,16 @@ public function testAbsolutePathIsNormalizedToRelative()
         $this->assertSame('foo', MediaFile::make(Hyde::path('foo'))->path);
     }
 
+    public function testMediaPathIsNormalizedToRelative()
+    {
+        $this->assertSame('foo', MediaFile::make('_media/foo')->path);
+    }
+
+    public function testAbsoluteMediaPathIsNormalizedToRelative()
+    {
+        $this->assertSame('foo', MediaFile::make(Hyde::path('_media/foo'))->path);
+    }
+
     public function testGetNameReturnsNameOfFile()
     {
         $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getName());

From c3b7ca8c9cd16ad51871a02cc8b9a0d459b353b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:24:31 +0200
Subject: [PATCH 136/328] Add initial normalization

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 55f95d6a1a7..8b375af9026 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -30,7 +30,7 @@ class MediaFile extends ProjectFile
 
     public function __construct(string $path)
     {
-        $path = trim_slashes(Str::after($path, Hyde::getMediaDirectory()));
+        $path = trim_slashes(Str::after(Hyde::pathToRelative($path), Hyde::getMediaDirectory()));
 
         parent::__construct($path);
     }

From e82649c18458d451b9762f6a36b738aa8fafc0f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:43:57 +0200
Subject: [PATCH 137/328] Update MediaFileTest.php

---
 .../framework/tests/Unit/Support/MediaFileTest.php    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index e47e8a290b4..cf5c80dc9d3 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -81,17 +81,22 @@ public function testCanConstructWithNestedPaths()
         $this->assertSame('path/to/file.txt', MediaFile::make('path/to/file.txt')->path);
     }
 
-    public function testAbsolutePathIsNormalizedToRelative()
+    public function testPathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make('foo')->path);
+    }
+
+    public function testAbsolutePathIsNormalizedToRelativeMediaPath()
     {
         $this->assertSame('foo', MediaFile::make(Hyde::path('foo'))->path);
     }
 
-    public function testMediaPathIsNormalizedToRelative()
+    public function testMediaPathIsNormalizedToRelativeMediaPath()
     {
         $this->assertSame('foo', MediaFile::make('_media/foo')->path);
     }
 
-    public function testAbsoluteMediaPathIsNormalizedToRelative()
+    public function testAbsoluteMediaPathIsNormalizedToRelativeMediaPath()
     {
         $this->assertSame('foo', MediaFile::make(Hyde::path('_media/foo'))->path);
     }

From 4e9ea803122424a1dd040435dfea3db455601150 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:28:04 +0200
Subject: [PATCH 138/328] Change normalization to enforce parent documented
 state

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 8b375af9026..e31297c93ba 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -32,7 +32,7 @@ public function __construct(string $path)
     {
         $path = trim_slashes(Str::after(Hyde::pathToRelative($path), Hyde::getMediaDirectory()));
 
-        parent::__construct($path);
+        parent::__construct(static::sourcePath($path));
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */

From 82bbc1c4224f1daed697dfa53a36f73589a32a2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:40:50 +0200
Subject: [PATCH 139/328] Update tests to expect media file paths are
 normalized on construct

---
 .../tests/Unit/Support/MediaFileTest.php      | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index cf5c80dc9d3..ec118f5b700 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -68,7 +68,7 @@ public function testCanConstruct()
         $file = new MediaFile('foo');
 
         $this->assertInstanceOf(MediaFile::class, $file);
-        $this->assertSame('foo', $file->path);
+        $this->assertSame('_media/foo', $file->path);
     }
 
     public function testCanMake()
@@ -78,7 +78,7 @@ public function testCanMake()
 
     public function testCanConstructWithNestedPaths()
     {
-        $this->assertSame('path/to/file.txt', MediaFile::make('path/to/file.txt')->path);
+        $this->assertSame('_media/path/to/file.txt', MediaFile::make('path/to/file.txt')->path);
     }
 
     public function testPathIsNormalizedToRelativeMediaPath()
@@ -88,17 +88,17 @@ public function testPathIsNormalizedToRelativeMediaPath()
 
     public function testAbsolutePathIsNormalizedToRelativeMediaPath()
     {
-        $this->assertSame('foo', MediaFile::make(Hyde::path('foo'))->path);
+        $this->assertSame('_media/foo', MediaFile::make(Hyde::path('foo'))->path);
     }
 
     public function testMediaPathIsNormalizedToRelativeMediaPath()
     {
-        $this->assertSame('foo', MediaFile::make('_media/foo')->path);
+        $this->assertSame('_media/foo', MediaFile::make('_media/foo')->path);
     }
 
     public function testAbsoluteMediaPathIsNormalizedToRelativeMediaPath()
     {
-        $this->assertSame('foo', MediaFile::make(Hyde::path('_media/foo'))->path);
+        $this->assertSame('_media/foo', MediaFile::make(Hyde::path('_media/foo'))->path);
     }
 
     public function testGetNameReturnsNameOfFile()
@@ -109,38 +109,38 @@ public function testGetNameReturnsNameOfFile()
 
     public function testGetPathReturnsPathOfFile()
     {
-        $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getPath());
-        $this->assertSame('foo/bar.txt', MediaFile::make('foo/bar.txt')->getPath());
+        $this->assertSame('_media/foo.txt', MediaFile::make('foo.txt')->getPath());
+        $this->assertSame('_media/foo/bar.txt', MediaFile::make('foo/bar.txt')->getPath());
     }
 
     public function testGetAbsolutePathReturnsAbsolutePathOfFile()
     {
-        $this->assertSame(Hyde::path('foo.txt'), MediaFile::make('foo.txt')->getAbsolutePath());
-        $this->assertSame(Hyde::path('foo/bar.txt'), MediaFile::make('foo/bar.txt')->getAbsolutePath());
+        $this->assertSame(Hyde::path('_media/foo.txt'), MediaFile::make('foo.txt')->getAbsolutePath());
+        $this->assertSame(Hyde::path('_media/foo/bar.txt'), MediaFile::make('foo/bar.txt')->getAbsolutePath());
     }
 
     public function testGetContentsReturnsContentsOfFile()
     {
-        $this->file('foo.txt', 'foo bar');
+        $this->file('_media/foo.txt', 'foo bar');
         $this->assertSame('foo bar', MediaFile::make('foo.txt')->getContents());
     }
 
     public function testGetExtensionReturnsExtensionOfFile()
     {
-        $this->file('foo.txt', 'foo');
+        $this->file('_media/foo.txt', 'foo');
         $this->assertSame('txt', MediaFile::make('foo.txt')->getExtension());
 
-        $this->file('foo.png', 'foo');
+        $this->file('_media/foo.png', 'foo');
         $this->assertSame('png', MediaFile::make('foo.png')->getExtension());
     }
 
     public function testToArrayReturnsArrayOfFileProperties()
     {
-        $this->file('foo.txt', 'foo bar');
+        $this->file('_media/foo.txt', 'foo bar');
 
         $this->assertSame([
             'name' => 'foo.txt',
-            'path' => 'foo.txt',
+            'path' => '_media/foo.txt',
             'length' => 7,
             'mimeType' => 'text/plain',
         ], MediaFile::make('foo.txt')->toArray());
@@ -148,11 +148,11 @@ public function testToArrayReturnsArrayOfFileProperties()
 
     public function testToArrayWithEmptyFileWithNoExtension()
     {
-        $this->file('foo', 'foo bar');
+        $this->file('_media/foo', 'foo bar');
 
         $this->assertSame([
             'name' => 'foo',
-            'path' => 'foo',
+            'path' => '_media/foo',
             'length' => 7,
             'mimeType' => 'text/plain',
         ], MediaFile::make('foo')->toArray());
@@ -160,38 +160,38 @@ public function testToArrayWithEmptyFileWithNoExtension()
 
     public function testToArrayWithFileInSubdirectory()
     {
-        mkdir(Hyde::path('foo'));
-        touch(Hyde::path('foo/bar.txt'));
+        mkdir(Hyde::path('_media/foo'));
+        touch(Hyde::path('_media/foo/bar.txt'));
 
         $this->assertSame([
             'name' => 'bar.txt',
-            'path' => 'foo/bar.txt',
+            'path' => '_media/foo/bar.txt',
             'length' => 0,
             'mimeType' => 'text/plain',
         ], MediaFile::make('foo/bar.txt')->toArray());
 
-        Filesystem::unlink('foo/bar.txt');
-        rmdir(Hyde::path('foo'));
+        Filesystem::unlink('_media/foo/bar.txt');
+        rmdir(Hyde::path('_media/foo'));
     }
 
     public function testGetContentLength()
     {
-        $this->file('foo', 'Hello World!');
+        $this->file('_media/foo', 'Hello World!');
         $this->assertSame(12, MediaFile::make('foo')->getContentLength());
     }
 
     public function testGetContentLengthWithEmptyFile()
     {
-        $this->file('foo', '');
+        $this->file('_media/foo', '');
         $this->assertSame(0, MediaFile::make('foo')->getContentLength());
     }
 
     public function testGetContentLengthWithDirectory()
     {
-        $this->directory('foo');
+        $this->directory('_media/foo');
 
         $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('File [foo] not found.');
+        $this->expectExceptionMessage('File [_media/foo] not found.');
 
         MediaFile::make('foo')->getContentLength();
     }
@@ -199,32 +199,32 @@ public function testGetContentLengthWithDirectory()
     public function testGetContentLengthWithNonExistentFile()
     {
         $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('File [foo] not found.');
+        $this->expectExceptionMessage('File [_media/foo] not found.');
 
         MediaFile::make('foo')->getContentLength();
     }
 
     public function testGetMimeType()
     {
-        $this->file('foo.txt', 'Hello World!');
+        $this->file('_media/foo.txt', 'Hello World!');
         $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType());
     }
 
     public function testGetMimeTypeWithoutExtension()
     {
-        $this->file('foo', 'Hello World!');
+        $this->file('_media/foo', 'Hello World!');
         $this->assertSame('text/plain', MediaFile::make('foo')->getMimeType());
     }
 
     public function testGetMimeTypeWithEmptyFile()
     {
-        $this->file('foo', '');
+        $this->file('_media/foo', '');
         $this->assertSame('application/x-empty', MediaFile::make('foo')->getMimeType());
     }
 
     public function testGetMimeTypeWithDirectory()
     {
-        $this->directory('foo');
+        $this->directory('_media/foo');
         $this->assertSame('directory', MediaFile::make('foo')->getMimeType());
     }
 

From 67f056f39e2d7009e5b28c1d27858b47f1737ff5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 16:45:40 +0200
Subject: [PATCH 140/328] Add more unit tests

---
 .../framework/tests/Unit/Support/MediaFileTest.php    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index ec118f5b700..3feee0d53c2 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -101,6 +101,17 @@ public function testAbsoluteMediaPathIsNormalizedToRelativeMediaPath()
         $this->assertSame('_media/foo', MediaFile::make(Hyde::path('_media/foo'))->path);
     }
 
+    public function testCustomMediaPathsAreNormalizedToRelativeCustomizedMediaPath()
+    {
+        Hyde::setMediaDirectory('bar');
+
+        $this->assertSame('bar/foo', MediaFile::make('foo')->path);
+        $this->assertSame('bar/foo', MediaFile::make('bar/foo')->path);
+        $this->assertSame('bar/foo', MediaFile::make(Hyde::path('foo'))->path);
+
+        Hyde::setMediaDirectory('_media');
+    }
+
     public function testGetNameReturnsNameOfFile()
     {
         $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getName());

From 9f920f71170452fc385a23f337e44a8d6c2feda3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 17:31:35 +0200
Subject: [PATCH 141/328] Fix missing test reset

---
 packages/framework/tests/Unit/Support/MediaFileTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 3feee0d53c2..488d95f324c 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -332,5 +332,8 @@ public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory
         Hyde::setMediaDirectory('bar');
 
         $this->assertSame(Hyde::path('foo/bar'), MediaFile::outputPath());
+
+        Hyde::setOutputDirectory(Hyde::path('_site'));
+        Hyde::setMediaDirectory('_media');
     }
 }

From 4aa11b4b2fd8c8bb0c032074b8271bc494272fcc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 17:06:40 +0200
Subject: [PATCH 142/328] Add hash accessor

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 5 +++++
 packages/framework/tests/Unit/Support/MediaFileTest.php | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index e31297c93ba..c67ab173e2a 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -128,6 +128,11 @@ public function getMimeType(): string
         return 'text/plain';
     }
 
+    public function getHash(): string
+    {
+        return md5_file($this->getAbsolutePath());
+    }
+
     /** @internal */
     public static function getCacheBustKey(string $file): string
     {
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 488d95f324c..85a60d18330 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -336,4 +336,11 @@ public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory
         Hyde::setOutputDirectory(Hyde::path('_site'));
         Hyde::setMediaDirectory('_media');
     }
+
+    public function testGetHash()
+    {
+        $this->file('_media/foo.txt', 'Hello World!');
+
+        $this->assertSame(md5('Hello World!'), MediaFile::make('foo.txt')->getHash());
+    }
 }

From dca20a021d646a11cbd4b79e13c697cd85c67b5f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 20:36:32 +0200
Subject: [PATCH 143/328] Use CRC32 for media asset hashing

See lengthy discussion at https://github.com/hydephp/develop/pull/1918#discussion_r1694288128
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 packages/framework/tests/Unit/Support/MediaFileTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index c67ab173e2a..d7d42ead576 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -130,7 +130,7 @@ public function getMimeType(): string
 
     public function getHash(): string
     {
-        return md5_file($this->getAbsolutePath());
+        return hash_file('crc32', $this->getAbsolutePath());
     }
 
     /** @internal */
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 85a60d18330..e2000a6b370 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -341,6 +341,6 @@ public function testGetHash()
     {
         $this->file('_media/foo.txt', 'Hello World!');
 
-        $this->assertSame(md5('Hello World!'), MediaFile::make('foo.txt')->getHash());
+        $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
     }
 }

From 4cb592f5cf0ec80f47c1b2c20a10355616d85280 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 20:51:18 +0200
Subject: [PATCH 144/328] Use CRC32 for media asset cache busting

See lengthy discussion at https://github.com/hydephp/develop/pull/1918#discussion_r1694288128
---
 packages/framework/src/Support/Filesystem/MediaFile.php       | 2 +-
 .../framework/tests/Feature/Foundation/HyperlinksTest.php     | 4 ++--
 packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php | 4 ++--
 .../framework/tests/Unit/MediaDirectoryCanBeChangedTest.php   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index d7d42ead576..b2a2f76dd6d 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -137,7 +137,7 @@ public function getHash(): string
     public static function getCacheBustKey(string $file): string
     {
         return Config::getBool('hyde.enable_cache_busting', true) && file_exists(MediaFile::sourcePath("$file"))
-            ? '?v='.md5_file(MediaFile::sourcePath("$file"))
+            ? '?v='.hash_file('crc32', MediaFile::sourcePath("$file"))
             : '';
     }
 }
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 9a7893a0d6a..88fa946bf24 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -107,8 +107,8 @@ public function testMediaLinkHelperUsesConfiguredMediaDirectory()
 
     public function testMediaLinkHelperWithValidationAndExistingFile()
     {
-        $this->file('_media/foo');
-        $this->assertSame('media/foo?v=d41d8cd98f00b204e9800998ecf8427e', $this->class->mediaLink('foo', true));
+        $this->file('_media/foo', 'test');
+        $this->assertSame('media/foo?v=accf8b33', $this->class->mediaLink('foo', true));
     }
 
     public function testMediaLinkHelperWithValidationAndNonExistingFile()
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index 5c43956cbcf..f219a8d9318 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -49,7 +49,7 @@ public function testHasMediaFileHelperReturnsTrueForExistingFile()
     public function testMediaLinkReturnsMediaPathWithCacheKey()
     {
         $this->assertIsString($path = Asset::mediaLink('app.css'));
-        $this->assertSame('media/app.css?v='.md5_file(Hyde::path('_media/app.css')), $path);
+        $this->assertSame('media/app.css?v='.hash_file('crc32', Hyde::path('_media/app.css')), $path);
     }
 
     public function testMediaLinkReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled()
@@ -72,6 +72,6 @@ public function testMediaLinkSupportsCustomMediaDirectories()
         $path = Asset::mediaLink('app.css');
 
         $this->assertIsString($path);
-        $this->assertSame('assets/app.css?v='.md5_file(Hyde::path('_assets/app.css')), $path);
+        $this->assertSame('assets/app.css?v='.hash_file('crc32', Hyde::path('_assets/app.css')), $path);
     }
 }
diff --git a/packages/framework/tests/Unit/MediaDirectoryCanBeChangedTest.php b/packages/framework/tests/Unit/MediaDirectoryCanBeChangedTest.php
index f2521fc54f6..741646b4c7e 100644
--- a/packages/framework/tests/Unit/MediaDirectoryCanBeChangedTest.php
+++ b/packages/framework/tests/Unit/MediaDirectoryCanBeChangedTest.php
@@ -67,12 +67,12 @@ public function testCompiledPagesHaveLinksToTheRightMediaFileLocation()
         $this->assertFileExists(Hyde::path('_site/foo.html'));
         $contents = file_get_contents(Hyde::path('_site/foo.html'));
         $this->assertStringContainsString(
-            '<link rel="stylesheet" href="assets/app.css?v='.md5_file(Hyde::path('_assets/app.css')).'">',
+            '<link rel="stylesheet" href="assets/app.css?v='.hash_file('crc32', Hyde::path('_assets/app.css')).'">',
             $contents
         );
 
         $this->assertStringContainsString(
-            '<script defer src="assets/app.js?v='.md5_file(Hyde::path('_assets/app.js')).'"></script>',
+            '<script defer src="assets/app.js?v='.hash_file('crc32', Hyde::path('_assets/app.js')).'"></script>',
             $contents
         );
 

From 9af2d815f8cbfda7758dd0d934992e5ec7e71c5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 21:18:10 +0200
Subject: [PATCH 145/328] Get the hash through creating an instance

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index b2a2f76dd6d..9481be80b72 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -137,7 +137,7 @@ public function getHash(): string
     public static function getCacheBustKey(string $file): string
     {
         return Config::getBool('hyde.enable_cache_busting', true) && file_exists(MediaFile::sourcePath("$file"))
-            ? '?v='.hash_file('crc32', MediaFile::sourcePath("$file"))
+            ? '?v='.MediaFile::make($file)->getHash()
             : '';
     }
 }

From 43e99aed97d4b51af73c33ec1adbad44784188c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 21:18:40 +0200
Subject: [PATCH 146/328] Use static to reference the same class

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 9481be80b72..7e1c540170c 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -136,8 +136,8 @@ public function getHash(): string
     /** @internal */
     public static function getCacheBustKey(string $file): string
     {
-        return Config::getBool('hyde.enable_cache_busting', true) && file_exists(MediaFile::sourcePath("$file"))
-            ? '?v='.MediaFile::make($file)->getHash()
+        return Config::getBool('hyde.enable_cache_busting', true) && file_exists(static::sourcePath("$file"))
+            ? '?v='.static::make($file)->getHash()
             : '';
     }
 }

From 09689fbe83ae7dfccc6508cc255a6bc54f34f7a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 28 Jul 2024 21:30:19 +0200
Subject: [PATCH 147/328] Add the hash to the array representation

---
 packages/framework/src/Support/Filesystem/MediaFile.php        | 1 +
 packages/framework/tests/Feature/Foundation/FilesystemTest.php | 1 +
 packages/framework/tests/Unit/Support/MediaFileTest.php        | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 7e1c540170c..85be0113ea4 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -84,6 +84,7 @@ public function toArray(): array
         return array_merge(parent::toArray(), [
             'length' => $this->getContentLength(),
             'mimeType' => $this->getMimeType(),
+            'hash' => $this->getHash(),
         ]);
     }
 
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 01f7e83ac11..a65c92d8d67 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -377,6 +377,7 @@ public function testAssetsMethodGetsAllSiteAssetsAsArray()
                 'path' => '_media/app.css',
                 'length' => 123,
                 'mimeType' => 'text/css',
+                'hash' => hash_file('crc32', Hyde::path('_media/app.css')),
             ],
         ], $assets);
     }
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index e2000a6b370..a0efbf73091 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -154,6 +154,7 @@ public function testToArrayReturnsArrayOfFileProperties()
             'path' => '_media/foo.txt',
             'length' => 7,
             'mimeType' => 'text/plain',
+            'hash' => hash('crc32', 'foo bar'),
         ], MediaFile::make('foo.txt')->toArray());
     }
 
@@ -166,6 +167,7 @@ public function testToArrayWithEmptyFileWithNoExtension()
             'path' => '_media/foo',
             'length' => 7,
             'mimeType' => 'text/plain',
+            'hash' => hash('crc32', 'foo bar'),
         ], MediaFile::make('foo')->toArray());
     }
 
@@ -179,6 +181,7 @@ public function testToArrayWithFileInSubdirectory()
             'path' => '_media/foo/bar.txt',
             'length' => 0,
             'mimeType' => 'text/plain',
+            'hash' => hash('crc32', ''),
         ], MediaFile::make('foo/bar.txt')->toArray());
 
         Filesystem::unlink('_media/foo/bar.txt');

From b936744062fcf2d1620eb92d9f8471d14df95eea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:30:10 +0200
Subject: [PATCH 148/328] Throw exception if media file does not exist

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 85be0113ea4..63b2bd22f22 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
+use Hyde\Facades\Filesystem;
 use Illuminate\Support\Collection;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
@@ -32,6 +33,10 @@ public function __construct(string $path)
     {
         $path = trim_slashes(Str::after(Hyde::pathToRelative($path), Hyde::getMediaDirectory()));
 
+        if (Filesystem::missing($path)) {
+            throw new FileNotFoundException($path);
+        }
+
         parent::__construct(static::sourcePath($path));
     }
 

From b1d6f30400e24129aa2f114ab754fc97e69ef0a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:32:39 +0200
Subject: [PATCH 149/328] Revert "Throw exception if media file does not exist"

This reverts commit b936744062fcf2d1620eb92d9f8471d14df95eea as it should not be possible for this to happen with normal usage, since we generate these based on discovered files. If a developer does something custom, we can't assume they want files backed by disk. We'll see how we handle construct time data generation though...

It also makes unit testing harder (we could add an internal static property to disable validation)
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 63b2bd22f22..85be0113ea4 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Hyde\Facades\Filesystem;
 use Illuminate\Support\Collection;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
@@ -33,10 +32,6 @@ public function __construct(string $path)
     {
         $path = trim_slashes(Str::after(Hyde::pathToRelative($path), Hyde::getMediaDirectory()));
 
-        if (Filesystem::missing($path)) {
-            throw new FileNotFoundException($path);
-        }
-
         parent::__construct(static::sourcePath($path));
     }
 

From 0b77a4d42d1f57d2cd850eed48b850d52f4ee35d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:33:31 +0200
Subject: [PATCH 150/328] Reapply "Throw exception if media file does not
 exist"

This reverts commit b1d6f30400e24129aa2f114ab754fc97e69ef0a5 as we're going to need this sanity check to reduce complexity with construct time data generation
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 85be0113ea4..63b2bd22f22 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
+use Hyde\Facades\Filesystem;
 use Illuminate\Support\Collection;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
@@ -32,6 +33,10 @@ public function __construct(string $path)
     {
         $path = trim_slashes(Str::after(Hyde::pathToRelative($path), Hyde::getMediaDirectory()));
 
+        if (Filesystem::missing($path)) {
+            throw new FileNotFoundException($path);
+        }
+
         parent::__construct(static::sourcePath($path));
     }
 

From 21340c90529c7e4335bab80c1ba9216ccab8665a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:35:55 +0200
Subject: [PATCH 151/328] Files should receive missing and return false

---
 packages/framework/tests/Unit/Support/MediaFileTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index a0efbf73091..efdbe12b859 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Support;
 
 use Hyde\Facades\Filesystem;
+use Illuminate\Support\Facades\File;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
@@ -21,6 +22,13 @@ class MediaFileTest extends UnitTestCase
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        File::shouldReceive('missing')->andReturn(false);
+    }
+
     protected function tearDown(): void
     {
         $this->cleanUpFilesystem();

From 6e5c26106c300445470e99d0f862d354dfa61f8d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:43:15 +0200
Subject: [PATCH 152/328] Validate the normalized path

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 63b2bd22f22..445748f9f46 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -32,12 +32,13 @@ class MediaFile extends ProjectFile
     public function __construct(string $path)
     {
         $path = trim_slashes(Str::after(Hyde::pathToRelative($path), Hyde::getMediaDirectory()));
+        $path = static::sourcePath($path);
 
         if (Filesystem::missing($path)) {
             throw new FileNotFoundException($path);
         }
 
-        parent::__construct(static::sourcePath($path));
+        parent::__construct($path);
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */

From 070a7ff4d73797cc21b0aa858f1e5a534ffd72dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:47:49 +0200
Subject: [PATCH 153/328] Refactor to use mocks

---
 .../tests/Unit/Support/MediaFileTest.php      | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index efdbe12b859..a4cadc7d4d7 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Support;
 
+use Mockery;
 use Hyde\Facades\Filesystem;
 use Illuminate\Support\Facades\File;
 use Hyde\Framework\Exceptions\FileNotFoundException;
@@ -11,6 +12,7 @@
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Testing\CreatesTemporaryFiles;
+use Illuminate\Filesystem\Filesystem as BaseFilesystem;
 
 /**
  * @covers \Hyde\Support\Filesystem\MediaFile
@@ -26,11 +28,15 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        File::shouldReceive('missing')->andReturn(false);
+        $this->mockFilesystem([
+            'missing' => false,
+        ]);
     }
 
     protected function tearDown(): void
     {
+        $this->withoutMockingFilesystem();
+
         $this->cleanUpFilesystem();
     }
 
@@ -140,21 +146,25 @@ public function testGetAbsolutePathReturnsAbsolutePathOfFile()
 
     public function testGetContentsReturnsContentsOfFile()
     {
-        $this->file('_media/foo.txt', 'foo bar');
+        $this->mockFilesystem([
+            'missing' => false,
+            'get' => 'foo bar',
+        ]);
+
         $this->assertSame('foo bar', MediaFile::make('foo.txt')->getContents());
     }
 
     public function testGetExtensionReturnsExtensionOfFile()
     {
-        $this->file('_media/foo.txt', 'foo');
         $this->assertSame('txt', MediaFile::make('foo.txt')->getExtension());
 
-        $this->file('_media/foo.png', 'foo');
         $this->assertSame('png', MediaFile::make('foo.png')->getExtension());
     }
 
     public function testToArrayReturnsArrayOfFileProperties()
     {
+        $this->withoutMockingFilesystem();
+
         $this->file('_media/foo.txt', 'foo bar');
 
         $this->assertSame([
@@ -168,6 +178,8 @@ public function testToArrayReturnsArrayOfFileProperties()
 
     public function testToArrayWithEmptyFileWithNoExtension()
     {
+        $this->withoutMockingFilesystem();
+
         $this->file('_media/foo', 'foo bar');
 
         $this->assertSame([
@@ -181,6 +193,8 @@ public function testToArrayWithEmptyFileWithNoExtension()
 
     public function testToArrayWithFileInSubdirectory()
     {
+        $this->withoutMockingFilesystem();
+
         mkdir(Hyde::path('_media/foo'));
         touch(Hyde::path('_media/foo/bar.txt'));
 
@@ -198,7 +212,11 @@ public function testToArrayWithFileInSubdirectory()
 
     public function testGetContentLength()
     {
-        $this->file('_media/foo', 'Hello World!');
+        $this->mockFilesystem([
+            'missing' => false,
+            'size' => 12,
+        ]);
+
         $this->assertSame(12, MediaFile::make('foo')->getContentLength());
     }
 
@@ -210,6 +228,8 @@ public function testGetContentLengthWithEmptyFile()
 
     public function testGetContentLengthWithDirectory()
     {
+        $this->withoutMockingFilesystem();
+
         $this->directory('_media/foo');
 
         $this->expectException(FileNotFoundException::class);
@@ -354,4 +374,14 @@ public function testGetHash()
 
         $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
     }
+
+    protected function mockFilesystem(array $methods): void
+    {
+        app()->instance(BaseFilesystem::class, Mockery::mock(BaseFilesystem::class, $methods));
+    }
+
+    protected function withoutMockingFilesystem(): void
+    {
+        app()->forgetInstance(BaseFilesystem::class);
+    }
 }

From f22f8e1854f18949b3d6a3c25a8116d18e1b9364 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:47:52 +0200
Subject: [PATCH 154/328] Revert "Refactor to use mocks"

This reverts commit 070a7ff4d73797cc21b0aa858f1e5a534ffd72dd.
---
 .../tests/Unit/Support/MediaFileTest.php      | 40 +++----------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index a4cadc7d4d7..efdbe12b859 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Unit\Support;
 
-use Mockery;
 use Hyde\Facades\Filesystem;
 use Illuminate\Support\Facades\File;
 use Hyde\Framework\Exceptions\FileNotFoundException;
@@ -12,7 +11,6 @@
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Testing\CreatesTemporaryFiles;
-use Illuminate\Filesystem\Filesystem as BaseFilesystem;
 
 /**
  * @covers \Hyde\Support\Filesystem\MediaFile
@@ -28,15 +26,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->mockFilesystem([
-            'missing' => false,
-        ]);
+        File::shouldReceive('missing')->andReturn(false);
     }
 
     protected function tearDown(): void
     {
-        $this->withoutMockingFilesystem();
-
         $this->cleanUpFilesystem();
     }
 
@@ -146,25 +140,21 @@ public function testGetAbsolutePathReturnsAbsolutePathOfFile()
 
     public function testGetContentsReturnsContentsOfFile()
     {
-        $this->mockFilesystem([
-            'missing' => false,
-            'get' => 'foo bar',
-        ]);
-
+        $this->file('_media/foo.txt', 'foo bar');
         $this->assertSame('foo bar', MediaFile::make('foo.txt')->getContents());
     }
 
     public function testGetExtensionReturnsExtensionOfFile()
     {
+        $this->file('_media/foo.txt', 'foo');
         $this->assertSame('txt', MediaFile::make('foo.txt')->getExtension());
 
+        $this->file('_media/foo.png', 'foo');
         $this->assertSame('png', MediaFile::make('foo.png')->getExtension());
     }
 
     public function testToArrayReturnsArrayOfFileProperties()
     {
-        $this->withoutMockingFilesystem();
-
         $this->file('_media/foo.txt', 'foo bar');
 
         $this->assertSame([
@@ -178,8 +168,6 @@ public function testToArrayReturnsArrayOfFileProperties()
 
     public function testToArrayWithEmptyFileWithNoExtension()
     {
-        $this->withoutMockingFilesystem();
-
         $this->file('_media/foo', 'foo bar');
 
         $this->assertSame([
@@ -193,8 +181,6 @@ public function testToArrayWithEmptyFileWithNoExtension()
 
     public function testToArrayWithFileInSubdirectory()
     {
-        $this->withoutMockingFilesystem();
-
         mkdir(Hyde::path('_media/foo'));
         touch(Hyde::path('_media/foo/bar.txt'));
 
@@ -212,11 +198,7 @@ public function testToArrayWithFileInSubdirectory()
 
     public function testGetContentLength()
     {
-        $this->mockFilesystem([
-            'missing' => false,
-            'size' => 12,
-        ]);
-
+        $this->file('_media/foo', 'Hello World!');
         $this->assertSame(12, MediaFile::make('foo')->getContentLength());
     }
 
@@ -228,8 +210,6 @@ public function testGetContentLengthWithEmptyFile()
 
     public function testGetContentLengthWithDirectory()
     {
-        $this->withoutMockingFilesystem();
-
         $this->directory('_media/foo');
 
         $this->expectException(FileNotFoundException::class);
@@ -374,14 +354,4 @@ public function testGetHash()
 
         $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
     }
-
-    protected function mockFilesystem(array $methods): void
-    {
-        app()->instance(BaseFilesystem::class, Mockery::mock(BaseFilesystem::class, $methods));
-    }
-
-    protected function withoutMockingFilesystem(): void
-    {
-        app()->forgetInstance(BaseFilesystem::class);
-    }
 }

From 2eb56a9cd20aec28108cc931721b1c0603d1bf69 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:50:53 +0200
Subject: [PATCH 155/328] Revert "Files should receive missing and return
 false"

This reverts commit 21340c90529c7e4335bab80c1ba9216ccab8665a.
---
 packages/framework/tests/Unit/Support/MediaFileTest.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index efdbe12b859..a0efbf73091 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Unit\Support;
 
 use Hyde\Facades\Filesystem;
-use Illuminate\Support\Facades\File;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
@@ -22,13 +21,6 @@ class MediaFileTest extends UnitTestCase
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        File::shouldReceive('missing')->andReturn(false);
-    }
-
     protected function tearDown(): void
     {
         $this->cleanUpFilesystem();

From 000f19a1e9fb5ed5e8ed6f8ca6642eb23264ef9c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:54:39 +0200
Subject: [PATCH 156/328] Create public internal static property to control
 validation

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 445748f9f46..94495885257 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -29,12 +29,15 @@ class MediaFile extends ProjectFile
     /** @var array<string> The default extensions for media types */
     final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
+    /** @internal Controls whether to validate the existence of the file. Turning this off may lead to unexpected behavior. */
+    public static bool $validateExistence = true;
+
     public function __construct(string $path)
     {
         $path = trim_slashes(Str::after(Hyde::pathToRelative($path), Hyde::getMediaDirectory()));
         $path = static::sourcePath($path);
 
-        if (Filesystem::missing($path)) {
+        if (static::$validateExistence && Filesystem::missing($path)) {
             throw new FileNotFoundException($path);
         }
 

From 21df2e36039e5596a078c17412d8aeb951fbc524 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:55:30 +0200
Subject: [PATCH 157/328] Disable existence validation during unit tests

---
 .../tests/Unit/Foundation/FilesystemHasMediaFilesTest.php  | 7 +++++++
 packages/framework/tests/Unit/Support/MediaFileTest.php    | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
index 594e6966bcf..f55345c8487 100644
--- a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -24,6 +24,13 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->filesystem = new TestableFilesystem(Hyde::getInstance());
+        MediaFile::$validateExistence = false;
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        MediaFile::$validateExistence = true;
     }
 
     public function testAssetsMethodReturnsSameInstanceOnSubsequentCalls()
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index a0efbf73091..c9efd3452b4 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -21,9 +21,16 @@ class MediaFileTest extends UnitTestCase
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
+    protected function setUp(): void
+    {
+        MediaFile::$validateExistence = false;
+    }
+
     protected function tearDown(): void
     {
         $this->cleanUpFilesystem();
+
+        MediaFile::$validateExistence = true;
     }
 
     /** @deprecated */

From bfda13398798420d1ef22a21c8f357f103c91a63 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 14:31:35 +0200
Subject: [PATCH 158/328] Normalize paths using output directory to have source
 directory prefix

---
 .../src/Support/Filesystem/MediaFile.php       |  9 ++++++++-
 .../tests/Unit/Support/MediaFileTest.php       | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 94495885257..1cf472168cd 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -34,7 +34,14 @@ class MediaFile extends ProjectFile
 
     public function __construct(string $path)
     {
-        $path = trim_slashes(Str::after(Hyde::pathToRelative($path), Hyde::getMediaDirectory()));
+        $path = Hyde::pathToRelative($path);
+
+        // Normalize paths using output directory to have source directory prefix
+        if (str_starts_with($path, Hyde::getMediaOutputDirectory()) && str_starts_with(Hyde::getMediaDirectory(), '_')) {
+            $path = '_'.$path;
+        }
+
+        $path = trim_slashes(Str::after($path, Hyde::getMediaDirectory()));
         $path = static::sourcePath($path);
 
         if (static::$validateExistence && Filesystem::missing($path)) {
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index c9efd3452b4..aa39a7a51a9 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -108,6 +108,16 @@ public function testAbsoluteMediaPathIsNormalizedToRelativeMediaPath()
         $this->assertSame('_media/foo', MediaFile::make(Hyde::path('_media/foo'))->path);
     }
 
+    public function testOutputMediaPathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make('media/foo')->path);
+    }
+
+    public function testAbsoluteOutputMediaPathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make(Hyde::path('media/foo'))->path);
+    }
+
     public function testCustomMediaPathsAreNormalizedToRelativeCustomizedMediaPath()
     {
         Hyde::setMediaDirectory('bar');
@@ -116,6 +126,14 @@ public function testCustomMediaPathsAreNormalizedToRelativeCustomizedMediaPath()
         $this->assertSame('bar/foo', MediaFile::make('bar/foo')->path);
         $this->assertSame('bar/foo', MediaFile::make(Hyde::path('foo'))->path);
 
+        Hyde::setMediaDirectory('_bar');
+
+        $this->assertSame('_bar/foo', MediaFile::make('foo')->path);
+        $this->assertSame('_bar/foo', MediaFile::make('_bar/foo')->path);
+        $this->assertSame('_bar/foo', MediaFile::make(Hyde::path('_bar/foo'))->path);
+        $this->assertSame('_bar/foo', MediaFile::make('bar/foo')->path);
+        $this->assertSame('_bar/foo', MediaFile::make(Hyde::path('foo'))->path);
+
         Hyde::setMediaDirectory('_media');
     }
 

From 13266594d8cd401e4e6d2ec1e8a314014fb4b7a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 13:56:48 +0200
Subject: [PATCH 159/328] Test existence validation

---
 .../tests/Unit/Support/MediaFileTest.php      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index aa39a7a51a9..d774c47e0f4 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -371,4 +371,23 @@ public function testGetHash()
 
         $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
     }
+
+    public function testExceptionIsThrownWhenConstructingFileThatDoesNotExist()
+    {
+        MediaFile::$validateExistence = true;
+
+        $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File [_media/foo] not found.');
+
+        MediaFile::make('foo');
+    }
+
+    public function testExceptionIsNotThrownWhenConstructingFileThatDoesExist()
+    {
+        MediaFile::$validateExistence = true;
+
+        $this->file('_media/foo', 'Hello World!');
+
+        $this->assertInstanceOf(MediaFile::class, MediaFile::make('foo'));
+    }
 }

From 0ccec37131d1d87a468a70616707c1986c1e6797 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 14:42:44 +0200
Subject: [PATCH 160/328] Remove content length validation now performed at
 construct time

---
 .../src/Support/Filesystem/MediaFile.php       |  5 -----
 .../tests/Unit/Support/MediaFileTest.php       | 18 ------------------
 2 files changed, 23 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 1cf472168cd..3d3ff974168 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -19,7 +19,6 @@
 use function array_merge;
 use function filesize;
 use function pathinfo;
-use function is_file;
 
 /**
  * File abstraction for a project media file.
@@ -106,10 +105,6 @@ public function toArray(): array
 
     public function getContentLength(): int
     {
-        if (! is_file($this->getAbsolutePath())) {
-            throw new FileNotFoundException($this->path);
-        }
-
         return filesize($this->getAbsolutePath());
     }
 
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index d774c47e0f4..6d82881a2d0 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -225,24 +225,6 @@ public function testGetContentLengthWithEmptyFile()
         $this->assertSame(0, MediaFile::make('foo')->getContentLength());
     }
 
-    public function testGetContentLengthWithDirectory()
-    {
-        $this->directory('_media/foo');
-
-        $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('File [_media/foo] not found.');
-
-        MediaFile::make('foo')->getContentLength();
-    }
-
-    public function testGetContentLengthWithNonExistentFile()
-    {
-        $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('File [_media/foo] not found.');
-
-        MediaFile::make('foo')->getContentLength();
-    }
-
     public function testGetMimeType()
     {
         $this->file('_media/foo.txt', 'Hello World!');

From 9a7f58b16eb32e13fb123c6895ddb641c375ad0b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 14:51:45 +0200
Subject: [PATCH 161/328] Extract method to normalize path

---
 .../src/Support/Filesystem/MediaFile.php      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 3d3ff974168..e543da54f1a 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -33,15 +33,7 @@ class MediaFile extends ProjectFile
 
     public function __construct(string $path)
     {
-        $path = Hyde::pathToRelative($path);
-
-        // Normalize paths using output directory to have source directory prefix
-        if (str_starts_with($path, Hyde::getMediaOutputDirectory()) && str_starts_with(Hyde::getMediaDirectory(), '_')) {
-            $path = '_'.$path;
-        }
-
-        $path = trim_slashes(Str::after($path, Hyde::getMediaDirectory()));
-        $path = static::sourcePath($path);
+        $path = $this->normalizePath($path);
 
         if (static::$validateExistence && Filesystem::missing($path)) {
             throw new FileNotFoundException($path);
@@ -152,4 +144,16 @@ public static function getCacheBustKey(string $file): string
             ? '?v='.static::make($file)->getHash()
             : '';
     }
+
+    protected function normalizePath(string $path): string
+    {
+        $path = Hyde::pathToRelative($path);
+
+        // Normalize paths using output directory to have source directory prefix
+        if (str_starts_with($path, Hyde::getMediaOutputDirectory()) && str_starts_with(Hyde::getMediaDirectory(), '_')) {
+            $path = '_'.$path;
+        }
+
+        return static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
+    }
 }

From 5f037217327f2d813f88502cca2d484829e9991e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 14:57:20 +0200
Subject: [PATCH 162/328] Set metadata properties at construct time

---
 .../framework/src/Support/Filesystem/MediaFile.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index e543da54f1a..b33a4d6b66e 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -31,6 +31,10 @@ class MediaFile extends ProjectFile
     /** @internal Controls whether to validate the existence of the file. Turning this off may lead to unexpected behavior. */
     public static bool $validateExistence = true;
 
+    protected int $length;
+    protected string $mimeType;
+    protected string $hash;
+
     public function __construct(string $path)
     {
         $path = $this->normalizePath($path);
@@ -40,6 +44,12 @@ public function __construct(string $path)
         }
 
         parent::__construct($path);
+
+        if (is_file($this->getAbsolutePath())) {
+            $this->length = filesize($this->getAbsolutePath());
+            $this->mimeType = $this->getMimeType();
+            $this->hash = $this->getHash();
+        }
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */

From 937917f4dca94bf39e6a823f86c44a2cee916f48 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 15:15:34 +0200
Subject: [PATCH 163/328] Return value when set

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index b33a4d6b66e..2c88ffc74a9 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -107,6 +107,10 @@ public function toArray(): array
 
     public function getContentLength(): int
     {
+        if (isset($this->length)) {
+            return $this->length;
+        }
+
         return filesize($this->getAbsolutePath());
     }
 

From cb37c4e05b335c72d178eb2c756ff80469ccb407 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 15:15:50 +0200
Subject: [PATCH 164/328] Return value when set

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 2c88ffc74a9..0dd583ba96a 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -116,6 +116,10 @@ public function getContentLength(): int
 
     public function getMimeType(): string
     {
+        if (isset($this->mimeType)) {
+            return $this->mimeType;
+        }
+
         $extension = pathinfo($this->getAbsolutePath(), PATHINFO_EXTENSION);
 
         // See if we can find a mime type for the extension instead of

From 523051fa8b026445e37afba6f78eac725425700c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 15:16:04 +0200
Subject: [PATCH 165/328] Return value when set

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 0dd583ba96a..15071dabf63 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -152,6 +152,10 @@ public function getMimeType(): string
 
     public function getHash(): string
     {
+        if (isset($this->hash)) {
+            return $this->hash;
+        }
+
         return hash_file('crc32', $this->getAbsolutePath());
     }
 

From e3104fb087cafa6bdff8f55560da25770abbbc59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 16:03:57 +0200
Subject: [PATCH 166/328] Assume value is set

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 15071dabf63..e5da6935844 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -107,11 +107,7 @@ public function toArray(): array
 
     public function getContentLength(): int
     {
-        if (isset($this->length)) {
-            return $this->length;
-        }
-
-        return filesize($this->getAbsolutePath());
+        return $this->length;
     }
 
     public function getMimeType(): string

From 134d24e8a923af356b671d42d4551fad9138061f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 17:23:40 +0200
Subject: [PATCH 167/328] Revert "Assume value is set"

This reverts commit e3104fb087cafa6bdff8f55560da25770abbbc59.
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index e5da6935844..15071dabf63 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -107,7 +107,11 @@ public function toArray(): array
 
     public function getContentLength(): int
     {
-        return $this->length;
+        if (isset($this->length)) {
+            return $this->length;
+        }
+
+        return filesize($this->getAbsolutePath());
     }
 
     public function getMimeType(): string

From 8b9de19736624406c8c2848d52835356918316e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 17:34:48 +0200
Subject: [PATCH 168/328] Find all media file metadata at construct time

---
 .../src/Support/Filesystem/MediaFile.php      | 73 ++++++++++---------
 .../tests/Unit/Support/MediaFileTest.php      |  2 +
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 15071dabf63..8efd9e2f169 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -46,9 +46,9 @@ public function __construct(string $path)
         parent::__construct($path);
 
         if (is_file($this->getAbsolutePath())) {
-            $this->length = filesize($this->getAbsolutePath());
-            $this->mimeType = $this->getMimeType();
-            $this->hash = $this->getHash();
+            $this->length = $this->findContentLength();
+            $this->mimeType = $this->findMimeType();
+            $this->hash = $this->findHash();
         }
     }
 
@@ -107,19 +107,46 @@ public function toArray(): array
 
     public function getContentLength(): int
     {
-        if (isset($this->length)) {
-            return $this->length;
-        }
-
-        return filesize($this->getAbsolutePath());
+        return $this->length;
     }
 
     public function getMimeType(): string
     {
-        if (isset($this->mimeType)) {
-            return $this->mimeType;
+        return $this->mimeType;
+    }
+
+    public function getHash(): string
+    {
+        return $this->hash;
+    }
+
+    /** @internal */
+    public static function getCacheBustKey(string $file): string
+    {
+        return Config::getBool('hyde.enable_cache_busting', true) && file_exists(static::sourcePath("$file"))
+            ? '?v='.static::make($file)->getHash()
+            : '';
+    }
+
+    protected function normalizePath(string $path): string
+    {
+        $path = Hyde::pathToRelative($path);
+
+        // Normalize paths using output directory to have source directory prefix
+        if (str_starts_with($path, Hyde::getMediaOutputDirectory()) && str_starts_with(Hyde::getMediaDirectory(), '_')) {
+            $path = '_'.$path;
         }
 
+        return static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
+    }
+
+    protected function findContentLength(): int
+    {
+        return filesize($this->getAbsolutePath());
+    }
+
+    protected function findMimeType(): string
+    {
         $extension = pathinfo($this->getAbsolutePath(), PATHINFO_EXTENSION);
 
         // See if we can find a mime type for the extension instead of
@@ -150,32 +177,8 @@ public function getMimeType(): string
         return 'text/plain';
     }
 
-    public function getHash(): string
+    protected function findHash(): string
     {
-        if (isset($this->hash)) {
-            return $this->hash;
-        }
-
         return hash_file('crc32', $this->getAbsolutePath());
     }
-
-    /** @internal */
-    public static function getCacheBustKey(string $file): string
-    {
-        return Config::getBool('hyde.enable_cache_busting', true) && file_exists(static::sourcePath("$file"))
-            ? '?v='.static::make($file)->getHash()
-            : '';
-    }
-
-    protected function normalizePath(string $path): string
-    {
-        $path = Hyde::pathToRelative($path);
-
-        // Normalize paths using output directory to have source directory prefix
-        if (str_starts_with($path, Hyde::getMediaOutputDirectory()) && str_starts_with(Hyde::getMediaDirectory(), '_')) {
-            $path = '_'.$path;
-        }
-
-        return static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
-    }
 }
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 6d82881a2d0..04369d9d514 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -245,12 +245,14 @@ public function testGetMimeTypeWithEmptyFile()
 
     public function testGetMimeTypeWithDirectory()
     {
+        $this->markTestSkipped('Undecided on what should happen here.');
         $this->directory('_media/foo');
         $this->assertSame('directory', MediaFile::make('foo')->getMimeType());
     }
 
     public function testGetMimeTypeWithNonExistentFile()
     {
+        $this->markTestSkipped('Undecided on what should happen here.');
         $this->assertSame('text/plain', MediaFile::make('foo')->getMimeType());
     }
 

From d4a9390f967f63c478a14c40f6a2709b2e05b702 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 17:37:58 +0200
Subject: [PATCH 169/328] Remove tests for weird edge cases with no benefit

---
 .../framework/tests/Unit/Support/MediaFileTest.php  | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileTest.php
index 04369d9d514..6b2a1d10fc8 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileTest.php
@@ -243,19 +243,6 @@ public function testGetMimeTypeWithEmptyFile()
         $this->assertSame('application/x-empty', MediaFile::make('foo')->getMimeType());
     }
 
-    public function testGetMimeTypeWithDirectory()
-    {
-        $this->markTestSkipped('Undecided on what should happen here.');
-        $this->directory('_media/foo');
-        $this->assertSame('directory', MediaFile::make('foo')->getMimeType());
-    }
-
-    public function testGetMimeTypeWithNonExistentFile()
-    {
-        $this->markTestSkipped('Undecided on what should happen here.');
-        $this->assertSame('text/plain', MediaFile::make('foo')->getMimeType());
-    }
-
     public function testAllHelperReturnsAllMediaFiles()
     {
         $this->assertEquals([

From 39d5169da36e26ae608b4c67199240cc518268f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:10:04 +0200
Subject: [PATCH 170/328] Split out unit test and feature test

---
 .../tests/Feature/Support/MediaFileTest.php   | 23 +++++++++++++++++++
 ...ediaFileTest.php => MediaFileUnitTest.php} |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 packages/framework/tests/Feature/Support/MediaFileTest.php
 rename packages/framework/tests/Unit/Support/{MediaFileTest.php => MediaFileUnitTest.php} (99%)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
new file mode 100644
index 00000000000..f1c6a0a74dd
--- /dev/null
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature\Support;
+
+use Hyde\Hyde;
+use Hyde\Testing\TestCase;
+use Hyde\Facades\Filesystem;
+use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Testing\CreatesTemporaryFiles;
+use Hyde\Framework\Exceptions\FileNotFoundException;
+
+/**
+ * @covers \Hyde\Support\Filesystem\MediaFile
+ *
+ * @see \Hyde\Framework\Testing\Unit\Support\MediaFileUnitTest
+ */
+class MediaFileTest extends TestCase
+{
+    //
+}
diff --git a/packages/framework/tests/Unit/Support/MediaFileTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
similarity index 99%
rename from packages/framework/tests/Unit/Support/MediaFileTest.php
rename to packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 6b2a1d10fc8..af0fa5546bd 100644
--- a/packages/framework/tests/Unit/Support/MediaFileTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -13,8 +13,10 @@
 
 /**
  * @covers \Hyde\Support\Filesystem\MediaFile
+ *
+ * @see \Hyde\Framework\Testing\Feature\Support\MediaFileTest
  */
-class MediaFileTest extends UnitTestCase
+class MediaFileUnitTest extends UnitTestCase
 {
     use CreatesTemporaryFiles;
 

From df1bc7c74b918dacc8e9874073f8090a2fcc8393 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:12:39 +0200
Subject: [PATCH 171/328] Generate feature test with Claude

---
 .../tests/Feature/Support/MediaFileTest.php   | 96 ++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index f1c6a0a74dd..d336b54fe2a 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -19,5 +19,99 @@
  */
 class MediaFileTest extends TestCase
 {
-    //
+    public function testMediaFileCreationAndBasicProperties()
+    {
+        $this->file('_media/test.txt', 'Hello, World!');
+
+        $mediaFile = MediaFile::make('test.txt');
+
+        $this->assertInstanceOf(MediaFile::class, $mediaFile);
+        $this->assertEquals('test.txt', $mediaFile->getName());
+        $this->assertEquals('_media/test.txt', $mediaFile->getPath());
+        $this->assertEquals(Hyde::path('_media/test.txt'), $mediaFile->getAbsolutePath());
+        $this->assertEquals('Hello, World!', $mediaFile->getContents());
+        $this->assertEquals('txt', $mediaFile->getExtension());
+    }
+
+    public function testMediaFileDiscovery()
+    {
+        $this->file('_media/image.png', 'PNG content');
+        $this->file('_media/style.css', 'CSS content');
+        $this->file('_media/script.js', 'JS content');
+
+        $allFiles = MediaFile::all();
+
+        $this->assertCount(3, $allFiles);
+        $this->assertArrayHasKey('image.png', $allFiles);
+        $this->assertArrayHasKey('style.css', $allFiles);
+        $this->assertArrayHasKey('script.js', $allFiles);
+
+        $fileNames = MediaFile::files();
+        $this->assertEquals(['image.png', 'style.css', 'script.js'], $fileNames);
+    }
+
+    public function testMediaFileProperties()
+    {
+        $content = str_repeat('a', 1024); // 1KB content
+        $this->file('_media/large_file.txt', $content);
+
+        $mediaFile = MediaFile::make('large_file.txt');
+
+        $this->assertEquals(1024, $mediaFile->getContentLength());
+        $this->assertEquals('text/plain', $mediaFile->getMimeType());
+        $this->assertEquals(hash('crc32', $content), $mediaFile->getHash());
+    }
+
+    public function testMediaFilePathHandling()
+    {
+        $this->file('_media/subfolder/nested_file.txt', 'Nested content');
+
+        $mediaFile = MediaFile::make('subfolder/nested_file.txt');
+
+        $this->assertEquals('subfolder/nested_file.txt', $mediaFile->getIdentifier());
+        $this->assertEquals('_media/subfolder/nested_file.txt', $mediaFile->getPath());
+    }
+
+    public function testMediaFileExceptionHandling()
+    {
+        MediaFile::$validateExistence = true;
+
+        $this->expectException(FileNotFoundException::class);
+        MediaFile::make('non_existent_file.txt');
+    }
+
+    public function testMediaDirectoryCustomization()
+    {
+        Hyde::setMediaDirectory('custom_media');
+
+        $this->file('custom_media/custom_file.txt', 'Custom content');
+
+        $mediaFile = MediaFile::make('custom_file.txt');
+
+        $this->assertEquals('custom_media/custom_file.txt', $mediaFile->getPath());
+        $this->assertEquals(Hyde::path('custom_media/custom_file.txt'), $mediaFile->getAbsolutePath());
+
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testMediaFileOutputPaths()
+    {
+        $this->assertEquals(Hyde::path('_site/media'), MediaFile::outputPath());
+        $this->assertEquals(Hyde::path('_site/media/test.css'), MediaFile::outputPath('test.css'));
+
+        Hyde::setOutputDirectory('custom_output');
+        $this->assertEquals(Hyde::path('custom_output/media'), MediaFile::outputPath());
+
+        Hyde::setOutputDirectory('_site'); // Reset to default
+    }
+
+    public function testMediaFileCacheBusting()
+    {
+        $this->file('_media/cachebust_test.js', 'console.log("Hello");');
+
+        $cacheBustKey = MediaFile::getCacheBustKey('cachebust_test.js');
+
+        $this->assertStringStartsWith('?v=', $cacheBustKey);
+        $this->assertNotEquals('?v=', $cacheBustKey); // Ensure it's not empty
+    }
 }

From 84591e4c517d3ebc9a626ece56765238dba26958 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:12:49 +0200
Subject: [PATCH 172/328] Fix all 'Unused import' problems in file

---
 packages/framework/tests/Feature/Support/MediaFileTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index d336b54fe2a..06caf8059e3 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -6,10 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
-use Hyde\Facades\Filesystem;
-use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Filesystem\MediaFile;
-use Hyde\Testing\CreatesTemporaryFiles;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 
 /**

From ec8099b8b5ec2c48403f6ff3d91a1bf0ad9850d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:13:34 +0200
Subject: [PATCH 173/328] Expect default file

---
 packages/framework/tests/Feature/Support/MediaFileTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index 06caf8059e3..8d05f889096 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -32,19 +32,20 @@ public function testMediaFileCreationAndBasicProperties()
 
     public function testMediaFileDiscovery()
     {
+        // App.css is a default file
         $this->file('_media/image.png', 'PNG content');
         $this->file('_media/style.css', 'CSS content');
         $this->file('_media/script.js', 'JS content');
 
         $allFiles = MediaFile::all();
 
-        $this->assertCount(3, $allFiles);
+        $this->assertCount(4, $allFiles);
         $this->assertArrayHasKey('image.png', $allFiles);
         $this->assertArrayHasKey('style.css', $allFiles);
         $this->assertArrayHasKey('script.js', $allFiles);
 
         $fileNames = MediaFile::files();
-        $this->assertEquals(['image.png', 'style.css', 'script.js'], $fileNames);
+        $this->assertEquals(['image.png', 'app.css', 'style.css', 'script.js'], $fileNames);
     }
 
     public function testMediaFileProperties()

From d819bff24fcfb74159cd19135eef65b8923bd819 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:14:05 +0200
Subject: [PATCH 174/328] Remove setter for already default value

---
 packages/framework/tests/Feature/Support/MediaFileTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index 8d05f889096..db9f789f012 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -72,8 +72,6 @@ public function testMediaFilePathHandling()
 
     public function testMediaFileExceptionHandling()
     {
-        MediaFile::$validateExistence = true;
-
         $this->expectException(FileNotFoundException::class);
         MediaFile::make('non_existent_file.txt');
     }

From c51915e921a02ff75c0e8644bef6960666fcef29 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:14:52 +0200
Subject: [PATCH 175/328] Expect CRC32 hash

---
 packages/framework/tests/Feature/Support/MediaFileTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index db9f789f012..f68cc16dab1 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -108,6 +108,6 @@ public function testMediaFileCacheBusting()
         $cacheBustKey = MediaFile::getCacheBustKey('cachebust_test.js');
 
         $this->assertStringStartsWith('?v=', $cacheBustKey);
-        $this->assertNotEquals('?v=', $cacheBustKey); // Ensure it's not empty
+        $this->assertSame('?v=cd5de5e7', $cacheBustKey); // Expect crc32 hash
     }
 }

From 36f3545ba04895971c1df3ee9f277c3a8bf77ac9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:16:04 +0200
Subject: [PATCH 176/328] Cleanup test code comments

---
 packages/framework/tests/Feature/Support/MediaFileTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index f68cc16dab1..8daf91809ab 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -87,7 +87,7 @@ public function testMediaDirectoryCustomization()
         $this->assertEquals('custom_media/custom_file.txt', $mediaFile->getPath());
         $this->assertEquals(Hyde::path('custom_media/custom_file.txt'), $mediaFile->getAbsolutePath());
 
-        Hyde::setMediaDirectory('_media'); // Reset to default
+        Hyde::setMediaDirectory('_media');
     }
 
     public function testMediaFileOutputPaths()
@@ -98,7 +98,7 @@ public function testMediaFileOutputPaths()
         Hyde::setOutputDirectory('custom_output');
         $this->assertEquals(Hyde::path('custom_output/media'), MediaFile::outputPath());
 
-        Hyde::setOutputDirectory('_site'); // Reset to default
+        Hyde::setOutputDirectory('_site');
     }
 
     public function testMediaFileCacheBusting()
@@ -108,6 +108,6 @@ public function testMediaFileCacheBusting()
         $cacheBustKey = MediaFile::getCacheBustKey('cachebust_test.js');
 
         $this->assertStringStartsWith('?v=', $cacheBustKey);
-        $this->assertSame('?v=cd5de5e7', $cacheBustKey); // Expect crc32 hash
+        $this->assertSame('?v=cd5de5e7', $cacheBustKey); // Expect CRC32 hash
     }
 }

From 3a1c66bbd6a07ae1c4b923007713d4a947d79fc3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:16:08 +0200
Subject: [PATCH 177/328] Use assert same instead of assert equals

---
 .../tests/Feature/Support/MediaFileTest.php   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index 8daf91809ab..a82e6f71456 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -23,11 +23,11 @@ public function testMediaFileCreationAndBasicProperties()
         $mediaFile = MediaFile::make('test.txt');
 
         $this->assertInstanceOf(MediaFile::class, $mediaFile);
-        $this->assertEquals('test.txt', $mediaFile->getName());
-        $this->assertEquals('_media/test.txt', $mediaFile->getPath());
-        $this->assertEquals(Hyde::path('_media/test.txt'), $mediaFile->getAbsolutePath());
-        $this->assertEquals('Hello, World!', $mediaFile->getContents());
-        $this->assertEquals('txt', $mediaFile->getExtension());
+        $this->assertSame('test.txt', $mediaFile->getName());
+        $this->assertSame('_media/test.txt', $mediaFile->getPath());
+        $this->assertSame(Hyde::path('_media/test.txt'), $mediaFile->getAbsolutePath());
+        $this->assertSame('Hello, World!', $mediaFile->getContents());
+        $this->assertSame('txt', $mediaFile->getExtension());
     }
 
     public function testMediaFileDiscovery()
@@ -45,7 +45,7 @@ public function testMediaFileDiscovery()
         $this->assertArrayHasKey('script.js', $allFiles);
 
         $fileNames = MediaFile::files();
-        $this->assertEquals(['image.png', 'app.css', 'style.css', 'script.js'], $fileNames);
+        $this->assertSame(['image.png', 'app.css', 'style.css', 'script.js'], $fileNames);
     }
 
     public function testMediaFileProperties()
@@ -55,9 +55,9 @@ public function testMediaFileProperties()
 
         $mediaFile = MediaFile::make('large_file.txt');
 
-        $this->assertEquals(1024, $mediaFile->getContentLength());
-        $this->assertEquals('text/plain', $mediaFile->getMimeType());
-        $this->assertEquals(hash('crc32', $content), $mediaFile->getHash());
+        $this->assertSame(1024, $mediaFile->getContentLength());
+        $this->assertSame('text/plain', $mediaFile->getMimeType());
+        $this->assertSame(hash('crc32', $content), $mediaFile->getHash());
     }
 
     public function testMediaFilePathHandling()
@@ -66,8 +66,8 @@ public function testMediaFilePathHandling()
 
         $mediaFile = MediaFile::make('subfolder/nested_file.txt');
 
-        $this->assertEquals('subfolder/nested_file.txt', $mediaFile->getIdentifier());
-        $this->assertEquals('_media/subfolder/nested_file.txt', $mediaFile->getPath());
+        $this->assertSame('subfolder/nested_file.txt', $mediaFile->getIdentifier());
+        $this->assertSame('_media/subfolder/nested_file.txt', $mediaFile->getPath());
     }
 
     public function testMediaFileExceptionHandling()
@@ -84,19 +84,19 @@ public function testMediaDirectoryCustomization()
 
         $mediaFile = MediaFile::make('custom_file.txt');
 
-        $this->assertEquals('custom_media/custom_file.txt', $mediaFile->getPath());
-        $this->assertEquals(Hyde::path('custom_media/custom_file.txt'), $mediaFile->getAbsolutePath());
+        $this->assertSame('custom_media/custom_file.txt', $mediaFile->getPath());
+        $this->assertSame(Hyde::path('custom_media/custom_file.txt'), $mediaFile->getAbsolutePath());
 
         Hyde::setMediaDirectory('_media');
     }
 
     public function testMediaFileOutputPaths()
     {
-        $this->assertEquals(Hyde::path('_site/media'), MediaFile::outputPath());
-        $this->assertEquals(Hyde::path('_site/media/test.css'), MediaFile::outputPath('test.css'));
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
+        $this->assertSame(Hyde::path('_site/media/test.css'), MediaFile::outputPath('test.css'));
 
         Hyde::setOutputDirectory('custom_output');
-        $this->assertEquals(Hyde::path('custom_output/media'), MediaFile::outputPath());
+        $this->assertSame(Hyde::path('custom_output/media'), MediaFile::outputPath());
 
         Hyde::setOutputDirectory('_site');
     }

From 521df1ea6cca43274443c48cf4268d4f1a4c3337 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:17:33 +0200
Subject: [PATCH 178/328] Assert on the array

---
 .../framework/tests/Feature/Support/MediaFileTest.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index a82e6f71456..df8756e6551 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -28,6 +28,14 @@ public function testMediaFileCreationAndBasicProperties()
         $this->assertSame(Hyde::path('_media/test.txt'), $mediaFile->getAbsolutePath());
         $this->assertSame('Hello, World!', $mediaFile->getContents());
         $this->assertSame('txt', $mediaFile->getExtension());
+
+        $this->assertSame([
+            'name' => 'test.txt',
+            'path' => '_media/test.txt',
+            'length' => 13,
+            'mimeType' => 'text/plain',
+            'hash' => 'dffed8e6',
+        ], $mediaFile->toArray());
     }
 
     public function testMediaFileDiscovery()

From 77722257a228f911861f778a5dd062f98f64f461 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:39:56 +0200
Subject: [PATCH 179/328] Bypass discovery to isolate unit test

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 6dac17db2f5..74818e459e8 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,12 +9,17 @@
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\HtmlString;
+use Illuminate\Support\Collection;
 use Hyde\Support\Models\RenderData;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
 use Hyde\Testing\MocksKernelFeatures;
+use Hyde\Foundation\Kernel\FileCollection;
+use Hyde\Foundation\Kernel\PageCollection;
+use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -37,6 +42,22 @@ protected function setUp(): void
         $this->setupTestKernel();
         $this->kernel->setRoutes(collect());
         Render::swap(new RenderData());
+
+        HydeKernel::setInstance(new class extends HydeKernel
+        {
+            // Bypass discovery to isolate test
+            public function boot(): void
+            {
+                $this->files = FileCollection::init($this);
+                $this->pages = PageCollection::init($this);
+                $this->routes = RouteCollection::init($this);
+            }
+
+            public function assets(): Collection
+            {
+                return collect();
+            }
+        });
     }
 
     protected function tearDown(): void

From 1f28f2123133f1499b2f783e2eff0a1de343494c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:25:48 +0200
Subject: [PATCH 180/328] Refactor media file class to use the Filesystem
 facade

This makes unit testing easier as it's mockable
---
 .../src/Support/Filesystem/MediaFile.php        | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 8efd9e2f169..aa703d81bdc 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -15,10 +15,7 @@
 use function Hyde\path_join;
 use function Hyde\trim_slashes;
 use function extension_loaded;
-use function file_exists;
 use function array_merge;
-use function filesize;
-use function pathinfo;
 
 /**
  * File abstraction for a project media file.
@@ -45,7 +42,7 @@ public function __construct(string $path)
 
         parent::__construct($path);
 
-        if (is_file($this->getAbsolutePath())) {
+        if (Filesystem::isFile($this->getAbsolutePath())) {
             $this->length = $this->findContentLength();
             $this->mimeType = $this->findMimeType();
             $this->hash = $this->findHash();
@@ -123,7 +120,7 @@ public function getHash(): string
     /** @internal */
     public static function getCacheBustKey(string $file): string
     {
-        return Config::getBool('hyde.enable_cache_busting', true) && file_exists(static::sourcePath("$file"))
+        return Config::getBool('hyde.enable_cache_busting', true) && Filesystem::exists(static::sourcePath("$file"))
             ? '?v='.static::make($file)->getHash()
             : '';
     }
@@ -142,12 +139,12 @@ protected function normalizePath(string $path): string
 
     protected function findContentLength(): int
     {
-        return filesize($this->getAbsolutePath());
+        return Filesystem::size($this->getAbsolutePath());
     }
 
     protected function findMimeType(): string
     {
-        $extension = pathinfo($this->getAbsolutePath(), PATHINFO_EXTENSION);
+        $extension = Filesystem::extension($this->getAbsolutePath());
 
         // See if we can find a mime type for the extension instead of
         // having to rely on a PHP extension and filesystem lookups.
@@ -170,8 +167,8 @@ protected function findMimeType(): string
             return $lookup[$extension];
         }
 
-        if (extension_loaded('fileinfo') && file_exists($this->getAbsolutePath())) {
-            return mime_content_type($this->getAbsolutePath());
+        if (extension_loaded('fileinfo') && Filesystem::exists($this->getAbsolutePath())) {
+            return Filesystem::mimeType($this->getAbsolutePath());
         }
 
         return 'text/plain';
@@ -179,6 +176,6 @@ protected function findMimeType(): string
 
     protected function findHash(): string
     {
-        return hash_file('crc32', $this->getAbsolutePath());
+        return Filesystem::hash($this->getAbsolutePath(), 'crc32');
     }
 }

From bc4c511b5d0657a2fbd4bbea608518d756bfae0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:27:02 +0200
Subject: [PATCH 181/328] No need to qualify path handled by Filesystem facade

---
 .../framework/src/Support/Filesystem/MediaFile.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index aa703d81bdc..24e45f3a5c8 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -42,7 +42,7 @@ public function __construct(string $path)
 
         parent::__construct($path);
 
-        if (Filesystem::isFile($this->getAbsolutePath())) {
+        if (Filesystem::isFile($this->getPath())) {
             $this->length = $this->findContentLength();
             $this->mimeType = $this->findMimeType();
             $this->hash = $this->findHash();
@@ -139,12 +139,12 @@ protected function normalizePath(string $path): string
 
     protected function findContentLength(): int
     {
-        return Filesystem::size($this->getAbsolutePath());
+        return Filesystem::size($this->getPath());
     }
 
     protected function findMimeType(): string
     {
-        $extension = Filesystem::extension($this->getAbsolutePath());
+        $extension = Filesystem::extension($this->getPath());
 
         // See if we can find a mime type for the extension instead of
         // having to rely on a PHP extension and filesystem lookups.
@@ -167,8 +167,8 @@ protected function findMimeType(): string
             return $lookup[$extension];
         }
 
-        if (extension_loaded('fileinfo') && Filesystem::exists($this->getAbsolutePath())) {
-            return Filesystem::mimeType($this->getAbsolutePath());
+        if (extension_loaded('fileinfo') && Filesystem::exists($this->getPath())) {
+            return Filesystem::mimeType($this->getPath());
         }
 
         return 'text/plain';
@@ -176,6 +176,6 @@ protected function findMimeType(): string
 
     protected function findHash(): string
     {
-        return Filesystem::hash($this->getAbsolutePath(), 'crc32');
+        return Filesystem::hash($this->getPath(), 'crc32');
     }
 }

From 5e3e279c80413a46cd0b20ea157a192d74dafdfb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 20:49:01 +0200
Subject: [PATCH 182/328] Prepare unit test for refactor

---
 .../tests/Unit/Support/MediaFileUnitTest.php  | 50 +++++--------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index af0fa5546bd..1d63abcb810 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -4,12 +4,14 @@
 
 namespace Hyde\Framework\Testing\Unit\Support;
 
+use Mockery;
 use Hyde\Facades\Filesystem;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Testing\CreatesTemporaryFiles;
+use Illuminate\Filesystem\Filesystem as BaseFilesystem;
 
 /**
  * @covers \Hyde\Support\Filesystem\MediaFile
@@ -18,6 +20,7 @@
  */
 class MediaFileUnitTest extends UnitTestCase
 {
+    // TODO: Use mocks here instead of filesystem operations
     use CreatesTemporaryFiles;
 
     protected static bool $needsKernel = true;
@@ -26,52 +29,20 @@ class MediaFileUnitTest extends UnitTestCase
     protected function setUp(): void
     {
         MediaFile::$validateExistence = false;
+
+        $this->mockFilesystem([
+            'missing' => false,
+        ]);
     }
 
     protected function tearDown(): void
     {
+        // TODO: Use mocks here instead of filesystem operations
         $this->cleanUpFilesystem();
 
         MediaFile::$validateExistence = true;
     }
 
-    /** @deprecated */
-    public function testDiscoveryBenchmark()
-    {
-        $this->markTestSkipped('Uncomment this line to run the benchmark.');
-
-        $urls = [
-            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/austria.jpg',
-            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/boat.jpg',
-            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/croatia.jpg',
-            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/fireworks.jpg',
-            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/hallstatt.jpg',
-            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/lemonade.jpg',
-            'https://raw.githubusercontent.com/caendesilva/RandomDatasets/master/Media/photographer.jpg',
-        ];
-
-        foreach ($urls as $url) {
-            $this->file('_media/'.basename($url), file_get_contents($url));
-        }
-
-        $this->file('_media/foo.css', 'body { color: red; }');
-        $this->file('_media/foo.js', 'console.log("Hello, World!");');
-        $this->file('_media/nested/foo.css', 'foo');
-        $this->file('_media/empty.css', '');
-        $this->file('_media/ignored', 'ignored');
-        $this->directory('_media/empty');
-        $this->file('_media/large.css', str_repeat('a', 1024 * 1024 * 10)); // 10 MB
-
-        // Warm up the classloader / cache
-        echo 'Warmup: '.\Illuminate\Support\Benchmark::measure(function () {
-            MediaFile::all();
-        })."ms\n";
-
-        echo 'Benchmark: '.\Illuminate\Support\Benchmark::measure(function () {
-            MediaFile::all();
-        }, 1000)."ms avg/1000/its\n";
-    }
-
     public function testCanConstruct()
     {
         $file = new MediaFile('foo');
@@ -363,4 +334,9 @@ public function testExceptionIsNotThrownWhenConstructingFileThatDoesExist()
 
         $this->assertInstanceOf(MediaFile::class, MediaFile::make('foo'));
     }
+
+    protected function mockFilesystem(array $methods): void
+    {
+        app()->instance(BaseFilesystem::class, Mockery::mock(BaseFilesystem::class, $methods));
+    }
 }

From 749e3ead3827e4ff2d7330a80fde407507979631 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 22:42:15 +0200
Subject: [PATCH 183/328] Refactor unit test to use the filesystem mocks

---
 .../tests/Unit/Support/MediaFileUnitTest.php  | 217 +++++-------------
 1 file changed, 63 insertions(+), 154 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 1d63abcb810..cebc5c29fe4 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -5,12 +5,10 @@
 namespace Hyde\Framework\Testing\Unit\Support;
 
 use Mockery;
-use Hyde\Facades\Filesystem;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\UnitTestCase;
-use Hyde\Testing\CreatesTemporaryFiles;
 use Illuminate\Filesystem\Filesystem as BaseFilesystem;
 
 /**
@@ -20,27 +18,40 @@
  */
 class MediaFileUnitTest extends UnitTestCase
 {
-    // TODO: Use mocks here instead of filesystem operations
-    use CreatesTemporaryFiles;
-
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
+    protected $mockFilesystem;
+
     protected function setUp(): void
     {
+        parent::setUp();
+
         MediaFile::$validateExistence = false;
 
-        $this->mockFilesystem([
-            'missing' => false,
-        ]);
+        $this->mockFilesystem = Mockery::mock(BaseFilesystem::class);
+        app()->instance(BaseFilesystem::class, $this->mockFilesystem);
+
+        // Set up default expectations for commonly called methods
+        $this->mockFilesystem->shouldReceive('isFile')->andReturn(true)->byDefault();
+        $this->mockFilesystem->shouldReceive('missing')->andReturn(false)->byDefault();
+        $this->mockFilesystem->shouldReceive('extension')->andReturn('txt')->byDefault();
+        $this->mockFilesystem->shouldReceive('size')->andReturn(12)->byDefault();
+        $this->mockFilesystem->shouldReceive('mimeType')->andReturn('text/plain')->byDefault();
+        $this->mockFilesystem->shouldReceive('hash')->andReturn(hash('crc32', 'Hello World!'))->byDefault();
+        $this->mockFilesystem->shouldReceive('get')->andReturn('Hello World!')->byDefault();
+
+        // Mock Hyde facade
+        $hyde = Mockery::mock(Hyde::kernel())->makePartial();
+        $hyde->shouldReceive('assets')->andReturn(collect(['app.css' => new MediaFile('_media/app.css')]))->byDefault();
     }
 
     protected function tearDown(): void
     {
-        // TODO: Use mocks here instead of filesystem operations
-        $this->cleanUpFilesystem();
+        parent::tearDown();
 
         MediaFile::$validateExistence = true;
+        Mockery::close();
     }
 
     public function testCanConstruct()
@@ -130,22 +141,40 @@ public function testGetAbsolutePathReturnsAbsolutePathOfFile()
 
     public function testGetContentsReturnsContentsOfFile()
     {
-        $this->file('_media/foo.txt', 'foo bar');
+        $this->mockFilesystem->shouldReceive('get')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('foo bar');
+
         $this->assertSame('foo bar', MediaFile::make('foo.txt')->getContents());
     }
 
     public function testGetExtensionReturnsExtensionOfFile()
     {
-        $this->file('_media/foo.txt', 'foo');
-        $this->assertSame('txt', MediaFile::make('foo.txt')->getExtension());
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('txt');
+
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/foo.png'))
+            ->andReturn('png');
 
-        $this->file('_media/foo.png', 'foo');
+        $this->assertSame('txt', MediaFile::make('foo.txt')->getExtension());
         $this->assertSame('png', MediaFile::make('foo.png')->getExtension());
     }
 
     public function testToArrayReturnsArrayOfFileProperties()
     {
-        $this->file('_media/foo.txt', 'foo bar');
+        $this->mockFilesystem->shouldReceive('size')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn(7);
+
+        $this->mockFilesystem->shouldReceive('mimeType')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('text/plain');
+
+        $this->mockFilesystem->shouldReceive('hash')
+            ->with(Hyde::path('_media/foo.txt'), 'crc32')
+            ->andReturn(hash('crc32', 'foo bar'));
 
         $this->assertSame([
             'name' => 'foo.txt',
@@ -156,64 +185,22 @@ public function testToArrayReturnsArrayOfFileProperties()
         ], MediaFile::make('foo.txt')->toArray());
     }
 
-    public function testToArrayWithEmptyFileWithNoExtension()
-    {
-        $this->file('_media/foo', 'foo bar');
-
-        $this->assertSame([
-            'name' => 'foo',
-            'path' => '_media/foo',
-            'length' => 7,
-            'mimeType' => 'text/plain',
-            'hash' => hash('crc32', 'foo bar'),
-        ], MediaFile::make('foo')->toArray());
-    }
-
-    public function testToArrayWithFileInSubdirectory()
-    {
-        mkdir(Hyde::path('_media/foo'));
-        touch(Hyde::path('_media/foo/bar.txt'));
-
-        $this->assertSame([
-            'name' => 'bar.txt',
-            'path' => '_media/foo/bar.txt',
-            'length' => 0,
-            'mimeType' => 'text/plain',
-            'hash' => hash('crc32', ''),
-        ], MediaFile::make('foo/bar.txt')->toArray());
-
-        Filesystem::unlink('_media/foo/bar.txt');
-        rmdir(Hyde::path('_media/foo'));
-    }
-
     public function testGetContentLength()
     {
-        $this->file('_media/foo', 'Hello World!');
-        $this->assertSame(12, MediaFile::make('foo')->getContentLength());
-    }
+        $this->mockFilesystem->shouldReceive('size')
+            ->with(Hyde::path('_media/foo'))
+            ->andReturn(12);
 
-    public function testGetContentLengthWithEmptyFile()
-    {
-        $this->file('_media/foo', '');
-        $this->assertSame(0, MediaFile::make('foo')->getContentLength());
+        $this->assertSame(12, MediaFile::make('foo')->getContentLength());
     }
 
     public function testGetMimeType()
     {
-        $this->file('_media/foo.txt', 'Hello World!');
-        $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType());
-    }
-
-    public function testGetMimeTypeWithoutExtension()
-    {
-        $this->file('_media/foo', 'Hello World!');
-        $this->assertSame('text/plain', MediaFile::make('foo')->getMimeType());
-    }
+        $this->mockFilesystem->shouldReceive('mimeType')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('text/plain');
 
-    public function testGetMimeTypeWithEmptyFile()
-    {
-        $this->file('_media/foo', '');
-        $this->assertSame('application/x-empty', MediaFile::make('foo')->getMimeType());
+        $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType());
     }
 
     public function testAllHelperReturnsAllMediaFiles()
@@ -223,95 +210,16 @@ public function testAllHelperReturnsAllMediaFiles()
         ], MediaFile::all()->all());
     }
 
-    public function testAllHelperDoesNotIncludeNonMediaFiles()
-    {
-        $this->file('_media/foo.blade.php');
-
-        $this->assertEquals([
-            'app.css' => new MediaFile('_media/app.css'),
-        ], MediaFile::all()->all());
-    }
-
     public function testFilesHelperReturnsAllMediaFiles()
     {
         $this->assertSame(['app.css'], MediaFile::files());
     }
 
-    public function testGetIdentifierReturnsIdentifier()
+    public function testGetHashReturnsHash()
     {
-        $this->assertSame('foo', MediaFile::make('foo')->getIdentifier());
-    }
-
-    public function testGetIdentifierWithSubdirectory()
-    {
-        $this->assertSame('foo/bar', MediaFile::make('foo/bar')->getIdentifier());
-    }
-
-    public function testGetIdentifierReturnsIdentifierWithFileExtension()
-    {
-        $this->assertSame('foo.png', MediaFile::make('foo.png')->getIdentifier());
-    }
-
-    public function testGetIdentifierWithSubdirectoryWithFileExtension()
-    {
-        $this->assertSame('foo/bar.png', MediaFile::make('foo/bar.png')->getIdentifier());
-    }
-
-    public function testHelperForMediaPath()
-    {
-        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());
-    }
-
-    public function testHelperForMediaPathReturnsPathToFileWithinTheDirectory()
-    {
-        $this->assertSame(Hyde::path('_media/foo.css'), MediaFile::sourcePath('foo.css'));
-    }
-
-    public function testGetMediaPathReturnsAbsolutePath()
-    {
-        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());
-    }
-
-    public function testHelperForMediaOutputPath()
-    {
-        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
-    }
-
-    public function testHelperForMediaOutputPathReturnsPathToFileWithinTheDirectory()
-    {
-        $this->assertSame(Hyde::path('_site/media/foo.css'), MediaFile::outputPath('foo.css'));
-    }
-
-    public function testGetMediaOutputPathReturnsAbsolutePath()
-    {
-        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
-    }
-
-    public function testCanGetSiteMediaOutputDirectory()
-    {
-        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
-    }
-
-    public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDirectory()
-    {
-        Hyde::setMediaDirectory('_foo');
-        $this->assertSame(Hyde::path('_site/foo'), MediaFile::outputPath());
-    }
-
-    public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory()
-    {
-        Hyde::setOutputDirectory(Hyde::path('foo'));
-        Hyde::setMediaDirectory('bar');
-
-        $this->assertSame(Hyde::path('foo/bar'), MediaFile::outputPath());
-
-        Hyde::setOutputDirectory(Hyde::path('_site'));
-        Hyde::setMediaDirectory('_media');
-    }
-
-    public function testGetHash()
-    {
-        $this->file('_media/foo.txt', 'Hello World!');
+        $this->mockFilesystem->shouldReceive('hash')
+            ->with(Hyde::path('_media/foo.txt'), 'crc32')
+            ->andReturn(hash('crc32', 'Hello World!'));
 
         $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
     }
@@ -320,6 +228,10 @@ public function testExceptionIsThrownWhenConstructingFileThatDoesNotExist()
     {
         MediaFile::$validateExistence = true;
 
+        $this->mockFilesystem->shouldReceive('missing')
+            ->with(Hyde::path('_media/foo'))
+            ->andReturn(true);
+
         $this->expectException(FileNotFoundException::class);
         $this->expectExceptionMessage('File [_media/foo] not found.');
 
@@ -330,13 +242,10 @@ public function testExceptionIsNotThrownWhenConstructingFileThatDoesExist()
     {
         MediaFile::$validateExistence = true;
 
-        $this->file('_media/foo', 'Hello World!');
+        $this->mockFilesystem->shouldReceive('missing')
+            ->with(Hyde::path('_media/foo'))
+            ->andReturn(false);
 
         $this->assertInstanceOf(MediaFile::class, MediaFile::make('foo'));
     }
-
-    protected function mockFilesystem(array $methods): void
-    {
-        app()->instance(BaseFilesystem::class, Mockery::mock(BaseFilesystem::class, $methods));
-    }
 }

From cbdf54069bfc9cb20c7a038cf980285e979ed9c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Jul 2024 22:43:11 +0200
Subject: [PATCH 184/328] Fix failing unit test

---
 packages/framework/tests/Unit/Support/MediaFileUnitTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index cebc5c29fe4..32652ad4537 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -142,8 +142,8 @@ public function testGetAbsolutePathReturnsAbsolutePathOfFile()
     public function testGetContentsReturnsContentsOfFile()
     {
         $this->mockFilesystem->shouldReceive('get')
-            ->with(Hyde::path('_media/foo.txt'))
-            ->andReturn('foo bar');
+            ->andReturn('foo bar')
+            ->once();
 
         $this->assertSame('foo bar', MediaFile::make('foo.txt')->getContents());
     }

From 77574224204021374a11c88d49554fdba51ba5a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 12:39:00 +0200
Subject: [PATCH 185/328] Reset kernel

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 74818e459e8..3a39dc18873 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -63,6 +63,7 @@ public function assets(): Collection
     protected function tearDown(): void
     {
         Mockery::close();
+        self::resetKernel();
 
         parent::tearDown();
     }

From 160e401dfe3c5d6ffd92733badf48fdb044b45ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 12:58:21 +0200
Subject: [PATCH 186/328] Run test without app stylesheet

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 3a39dc18873..ae21891d6e0 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,17 +9,12 @@
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
-use Hyde\Foundation\HydeKernel;
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\HtmlString;
-use Illuminate\Support\Collection;
 use Hyde\Support\Models\RenderData;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
 use Hyde\Testing\MocksKernelFeatures;
-use Hyde\Foundation\Kernel\FileCollection;
-use Hyde\Foundation\Kernel\PageCollection;
-use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -42,22 +37,6 @@ protected function setUp(): void
         $this->setupTestKernel();
         $this->kernel->setRoutes(collect());
         Render::swap(new RenderData());
-
-        HydeKernel::setInstance(new class extends HydeKernel
-        {
-            // Bypass discovery to isolate test
-            public function boot(): void
-            {
-                $this->files = FileCollection::init($this);
-                $this->pages = PageCollection::init($this);
-                $this->routes = RouteCollection::init($this);
-            }
-
-            public function assets(): Collection
-            {
-                return collect();
-            }
-        });
     }
 
     protected function tearDown(): void
@@ -68,6 +47,20 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
+    public static function setUpBeforeClass(): void
+    {
+        rename('_media/app.css', '_media/app.css.bak');
+
+        parent::setUpBeforeClass();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        rename('_media/app.css.bak', '_media/app.css');
+
+        parent::tearDownAfterClass();
+    }
+
     public function testPathReturnsTheIncludesDirectory()
     {
         $this->assertSame(Hyde::path('resources/includes'), Includes::path());

From c585ee330ccc0e0ff9d34a3c464ac5a77e3c484c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 20:20:36 +0200
Subject: [PATCH 187/328] Revert "Reset kernel"

This reverts commit 26aa0b1d3559c597a9e15f7483cb5ba50c075ad7.
---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index ae21891d6e0..4abd3b12054 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -42,7 +42,6 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         Mockery::close();
-        self::resetKernel();
 
         parent::tearDown();
     }

From afc9b012c0362e36e37973126d5764cdcaa10b21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 20:20:39 +0200
Subject: [PATCH 188/328] Revert "Run test without app stylesheet"

This reverts commit 28024ed16bb68d21e77f83a270648e20a665dafa.
---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 4abd3b12054..74818e459e8 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,12 +9,17 @@
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\HtmlString;
+use Illuminate\Support\Collection;
 use Hyde\Support\Models\RenderData;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
 use Hyde\Testing\MocksKernelFeatures;
+use Hyde\Foundation\Kernel\FileCollection;
+use Hyde\Foundation\Kernel\PageCollection;
+use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -37,6 +42,22 @@ protected function setUp(): void
         $this->setupTestKernel();
         $this->kernel->setRoutes(collect());
         Render::swap(new RenderData());
+
+        HydeKernel::setInstance(new class extends HydeKernel
+        {
+            // Bypass discovery to isolate test
+            public function boot(): void
+            {
+                $this->files = FileCollection::init($this);
+                $this->pages = PageCollection::init($this);
+                $this->routes = RouteCollection::init($this);
+            }
+
+            public function assets(): Collection
+            {
+                return collect();
+            }
+        });
     }
 
     protected function tearDown(): void
@@ -46,20 +67,6 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
-    public static function setUpBeforeClass(): void
-    {
-        rename('_media/app.css', '_media/app.css.bak');
-
-        parent::setUpBeforeClass();
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        rename('_media/app.css.bak', '_media/app.css');
-
-        parent::tearDownAfterClass();
-    }
-
     public function testPathReturnsTheIncludesDirectory()
     {
         $this->assertSame(Hyde::path('resources/includes'), Includes::path());

From 025b35e084d85192283b9a4c1e91583e536140ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 12:32:37 +0200
Subject: [PATCH 189/328] Update MediaFileUnitTest.php

---
 .../tests/Unit/Support/MediaFileUnitTest.php  | 98 ++++++++++++++++---
 1 file changed, 86 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 32652ad4537..b7093bddd45 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -21,8 +21,26 @@ class MediaFileUnitTest extends UnitTestCase
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
+    protected static string $originalBasePath;
+
     protected $mockFilesystem;
 
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        static::$originalBasePath = Hyde::getBasePath();
+
+        Hyde::setBasePath('/base/path');
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        Hyde::setBasePath(static::$originalBasePath);
+
+        parent::tearDownAfterClass();
+    }
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -203,18 +221,6 @@ public function testGetMimeType()
         $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType());
     }
 
-    public function testAllHelperReturnsAllMediaFiles()
-    {
-        $this->assertEquals([
-            'app.css' => new MediaFile('_media/app.css'),
-        ], MediaFile::all()->all());
-    }
-
-    public function testFilesHelperReturnsAllMediaFiles()
-    {
-        $this->assertSame(['app.css'], MediaFile::files());
-    }
-
     public function testGetHashReturnsHash()
     {
         $this->mockFilesystem->shouldReceive('hash')
@@ -248,4 +254,72 @@ public function testExceptionIsNotThrownWhenConstructingFileThatDoesExist()
 
         $this->assertInstanceOf(MediaFile::class, MediaFile::make('foo'));
     }
+
+    public function testGetIdentifierWithSubdirectory()
+    {
+        $this->assertSame('foo/bar', MediaFile::make('foo/bar')->getIdentifier());
+    }
+
+    public function testGetIdentifierReturnsIdentifierWithFileExtension()
+    {
+        $this->assertSame('foo.png', MediaFile::make('foo.png')->getIdentifier());
+    }
+
+    public function testGetIdentifierWithSubdirectoryWithFileExtension()
+    {
+        $this->assertSame('foo/bar.png', MediaFile::make('foo/bar.png')->getIdentifier());
+    }
+
+    public function testHelperForMediaPath()
+    {
+        $this->assertSame('/base/path/_media', MediaFile::sourcePath());
+    }
+
+    public function testHelperForMediaPathReturnsPathToFileWithinTheDirectory()
+    {
+        $this->assertSame('/base/path/_media/foo.css', MediaFile::sourcePath('foo.css'));
+    }
+
+    public function testGetMediaPathReturnsAbsolutePath()
+    {
+        $this->assertSame('/base/path/_media', MediaFile::sourcePath());
+    }
+
+    public function testHelperForMediaOutputPath()
+    {
+        $this->assertSame('/base/path/_site/media', MediaFile::outputPath());
+    }
+
+    public function testHelperForMediaOutputPathReturnsPathToFileWithinTheDirectory()
+    {
+        $this->assertSame('/base/path/_site/media/foo.css', MediaFile::outputPath('foo.css'));
+    }
+
+    public function testGetMediaOutputPathReturnsAbsolutePath()
+    {
+        $this->assertSame('/base/path/_site/media', MediaFile::outputPath());
+    }
+
+    public function testCanGetSiteMediaOutputDirectory()
+    {
+        $this->assertSame('/base/path/_site/media', MediaFile::outputPath());
+    }
+
+    public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDirectory()
+    {
+        Hyde::setMediaDirectory('_foo');
+        $this->assertSame('/base/path/_site/foo', MediaFile::outputPath());
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory()
+    {
+        Hyde::setOutputDirectory('/base/path/foo');
+        Hyde::setMediaDirectory('bar');
+
+        $this->assertSame('/base/path/foo/bar', MediaFile::outputPath());
+
+        Hyde::setOutputDirectory('/base/path/_site'); // Reset to default
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
 }

From 9d288782f0dc51345b3b96e641359f11ddded615 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 20:33:19 +0200
Subject: [PATCH 190/328] Swap for a simpler implementation

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 74818e459e8..bcf6d47cebe 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -8,18 +8,15 @@
 use Closure;
 use Hyde\Hyde;
 use Hyde\Support\Includes;
+use Illuminate\Support\Str;
 use Hyde\Testing\UnitTestCase;
-use Hyde\Foundation\HydeKernel;
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\HtmlString;
-use Illuminate\Support\Collection;
 use Hyde\Support\Models\RenderData;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
 use Hyde\Testing\MocksKernelFeatures;
-use Hyde\Foundation\Kernel\FileCollection;
-use Hyde\Foundation\Kernel\PageCollection;
-use Hyde\Foundation\Kernel\RouteCollection;
+use Hyde\Framework\Services\MarkdownService;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -43,21 +40,7 @@ protected function setUp(): void
         $this->kernel->setRoutes(collect());
         Render::swap(new RenderData());
 
-        HydeKernel::setInstance(new class extends HydeKernel
-        {
-            // Bypass discovery to isolate test
-            public function boot(): void
-            {
-                $this->files = FileCollection::init($this);
-                $this->pages = PageCollection::init($this);
-                $this->routes = RouteCollection::init($this);
-            }
-
-            public function assets(): Collection
-            {
-                return collect();
-            }
-        });
+        app()->bind(MarkdownService::class, SimpleMarkdownServiceTestClass::class);
     }
 
     protected function tearDown(): void
@@ -276,3 +259,15 @@ protected function assertHtmlStringIsSame(string|HtmlString $expected, mixed $ac
         $this->assertSame((string) $expected, $actual->toHtml());
     }
 }
+
+class SimpleMarkdownServiceTestClass
+{
+    public function __construct(protected string $markdown = '')
+    {
+    }
+
+    public function parse(): string
+    {
+        return Str::markdown($this->markdown);
+    }
+}

From 3089fbcb41af5f4ff64d246cfa0f67fba62a074f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 12:01:16 +0200
Subject: [PATCH 191/328] Use fully qualified class name in PHPDoc

---
 .../partials/hyde-pages-api/hyde-kernel-filesystem-methods.md | 4 ++--
 .../framework/src/Foundation/Concerns/ForwardsFilesystem.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
index 9823b18f5f4..fa76f9881e7 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2024-07-28 12:43:01 in 0.11ms -->
+<!-- Generated by HydePHP DocGen script at 2024-08-01 10:01:06 in 0.13ms -->
 
 #### `filesystem()`
 
@@ -56,7 +56,7 @@ Hyde::pathToRelative(string $path): string
 No description provided.
 
 ```php
-Hyde::assets(): Collection<string, \Hyde\Support\Filesystem\MediaFile>
+Hyde::assets(): \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
 ```
 
 <!-- End generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index 1f45bc30655..b294170474f 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -44,7 +44,7 @@ public function pathToRelative(string $path): string
         return $this->filesystem->pathToRelative($path);
     }
 
-    /** @return Collection<string, \Hyde\Support\Filesystem\MediaFile> */
+    /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> */
     public function assets(): Collection
     {
         return $this->filesystem->assets();

From e1a39098a1bff028586125525d3ee73bf6dabffe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 12:13:37 +0200
Subject: [PATCH 192/328] Clarify existence of internal property

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 24e45f3a5c8..3e584380b97 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -25,7 +25,7 @@ class MediaFile extends ProjectFile
     /** @var array<string> The default extensions for media types */
     final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
-    /** @internal Controls whether to validate the existence of the file. Turning this off may lead to unexpected behavior. */
+    /** @internal Controls whether to validate the existence of the file, intended for unit testing. Turning this off may lead to unexpected behavior. */
     public static bool $validateExistence = true;
 
     protected int $length;

From cc87ff93e62cfed79a545b695b5885c4de5e3a7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 12:25:06 +0200
Subject: [PATCH 193/328] Mock base filesystem

---
 .../tests/Unit/Foundation/FilesystemHasMediaFilesTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
index f55345c8487..e23e7ad8177 100644
--- a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -4,11 +4,13 @@
 
 namespace Hyde\Framework\Testing\Unit\Foundation;
 
+use Mockery;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
+use Illuminate\Filesystem\Filesystem as BaseFilesystem;
 
 /**
  * @covers \Hyde\Foundation\Kernel\Filesystem
@@ -24,6 +26,12 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->filesystem = new TestableFilesystem(Hyde::getInstance());
+
+        $mock = Mockery::mock(BaseFilesystem::class)->makePartial();
+        $mock->shouldReceive('size')->andReturn(100)->byDefault();
+        $mock->shouldReceive('hash')->andReturn('hash')->byDefault();
+        app()->instance(BaseFilesystem::class, $mock);
+
         MediaFile::$validateExistence = false;
     }
 

From bec2d608e2a3bf1dee22ab75ef44a2540ff3a8c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 12:14:29 +0200
Subject: [PATCH 194/328] Remove file existence check before getting data

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 3e584380b97..e39d2c1c8f8 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -42,11 +42,9 @@ public function __construct(string $path)
 
         parent::__construct($path);
 
-        if (Filesystem::isFile($this->getPath())) {
-            $this->length = $this->findContentLength();
-            $this->mimeType = $this->findMimeType();
-            $this->hash = $this->findHash();
-        }
+        $this->length = $this->findContentLength();
+        $this->mimeType = $this->findMimeType();
+        $this->hash = $this->findHash();
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */

From 818f939bec04b2608d62fd6ad1bbb00d5c1526aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:01:38 +0200
Subject: [PATCH 195/328] Match method declaration order to the base page class

---
 .../framework/src/Support/Filesystem/MediaFile.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index e39d2c1c8f8..8d8cb16c279 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -47,18 +47,18 @@ public function __construct(string $path)
         $this->hash = $this->findHash();
     }
 
-    /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
-    public static function all(): Collection
-    {
-        return Hyde::assets();
-    }
-
     /** @return array<string> Array of filenames relative to the _media/ directory */
     public static function files(): array
     {
         return static::all()->keys()->all();
     }
 
+    /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
+    public static function all(): Collection
+    {
+        return Hyde::assets();
+    }
+
     /**
      * Get the absolute path to the media source directory, or a file within it.
      */

From 2471dfaa82b710ea5fccd45e6eb82556b4b6103a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:04:37 +0200
Subject: [PATCH 196/328] Add an example return value

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 8d8cb16c279..5266da067c1 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -47,7 +47,11 @@ public function __construct(string $path)
         $this->hash = $this->findHash();
     }
 
-    /** @return array<string> Array of filenames relative to the _media/ directory */
+    /**
+     * @return array<string> Array of filenames relative to the _media/ directory
+     *
+     * @example `['app.css', 'images/logo.svg']`
+     */
     public static function files(): array
     {
         return static::all()->keys()->all();

From 1b85baa8b7462d576b5b56d3414e8facd4cf910c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:10:53 +0200
Subject: [PATCH 197/328] Merge example to single line

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5266da067c1..8f4a0cf807a 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -48,9 +48,7 @@ public function __construct(string $path)
     }
 
     /**
-     * @return array<string> Array of filenames relative to the _media/ directory
-     *
-     * @example `['app.css', 'images/logo.svg']`
+     * @return array<string> Array of filenames relative to the _media/ directory {@example `['app.css', 'images/logo.svg']`}
      */
     public static function files(): array
     {

From 8c20420636f37a1df1933aa69e79b1af751929b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:10:56 +0200
Subject: [PATCH 198/328] Revert "Merge example to single line"

This reverts commit 1b85baa8b7462d576b5b56d3414e8facd4cf910c.
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 8f4a0cf807a..5266da067c1 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -48,7 +48,9 @@ public function __construct(string $path)
     }
 
     /**
-     * @return array<string> Array of filenames relative to the _media/ directory {@example `['app.css', 'images/logo.svg']`}
+     * @return array<string> Array of filenames relative to the _media/ directory
+     *
+     * @example `['app.css', 'images/logo.svg']`
      */
     public static function files(): array
     {

From 814b3eb22f8c5878a3e1c6a10df177d4ca3ee863 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:11:36 +0200
Subject: [PATCH 199/328] Add return prefix

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5266da067c1..a913f75c9cf 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -50,7 +50,7 @@ public function __construct(string $path)
     /**
      * @return array<string> Array of filenames relative to the _media/ directory
      *
-     * @example `['app.css', 'images/logo.svg']`
+     * @example `$return = ['app.css', 'images/logo.svg']`
      */
     public static function files(): array
     {

From 2802ae2bf366ae5a9a5a19a05c49ad6a45086a78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:11:39 +0200
Subject: [PATCH 200/328] Revert "Add return prefix"

This reverts commit 814b3eb22f8c5878a3e1c6a10df177d4ca3ee863.
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index a913f75c9cf..5266da067c1 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -50,7 +50,7 @@ public function __construct(string $path)
     /**
      * @return array<string> Array of filenames relative to the _media/ directory
      *
-     * @example `$return = ['app.css', 'images/logo.svg']`
+     * @example `['app.css', 'images/logo.svg']`
      */
     public static function files(): array
     {

From 3441c5339b025bf87c6f0553e9af22ae10dbcd4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:13:56 +0200
Subject: [PATCH 201/328] Improve the method documentation

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5266da067c1..5cb87350239 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -48,9 +48,9 @@ public function __construct(string $path)
     }
 
     /**
-     * @return array<string> Array of filenames relative to the _media/ directory
+     * Get an array of media asset filenames relative to the `_media/` directory.
      *
-     * @example `['app.css', 'images/logo.svg']`
+     * @return array<int, string> {@example `['app.css', 'images/logo.svg']`}
      */
     public static function files(): array
     {

From 067a8058d8778654a1df24827427bce1ca6cb867 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:16:26 +0200
Subject: [PATCH 202/328] Improve the method documentation

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5cb87350239..3ae480b230c 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -57,7 +57,11 @@ public static function files(): array
         return static::all()->keys()->all();
     }
 
-    /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
+    /**
+     * Get a collection of all media files, parsed into MediaFile instances, keyed by the filenames relative to the `_media/` directory.
+     *
+     * @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
+     */
     public static function all(): Collection
     {
         return Hyde::assets();

From 31d8d2ae25f4a23f774a4de66f49df5504235a5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:17:06 +0200
Subject: [PATCH 203/328] Format documented class name

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 3ae480b230c..e5a2d910455 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -58,7 +58,7 @@ public static function files(): array
     }
 
     /**
-     * Get a collection of all media files, parsed into MediaFile instances, keyed by the filenames relative to the `_media/` directory.
+     * Get a collection of all media files, parsed into `MediaFile` instances, keyed by the filenames relative to the `_media/` directory.
      *
      * @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
      */

From c4dc0f7e9a414843f4085e617046118f1681beae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 13:37:52 +0200
Subject: [PATCH 204/328] Generate more unit tests to cover all code paths

---
 .../tests/Unit/Support/MediaFileUnitTest.php  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index b7093bddd45..1af72abfcc2 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -322,4 +322,34 @@ public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory
         Hyde::setOutputDirectory('/base/path/_site'); // Reset to default
         Hyde::setMediaDirectory('_media'); // Reset to default
     }
+
+    public function testSourcePathWithEmptyString()
+    {
+        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath(''));
+    }
+
+    public function testSourcePathWithSubdirectories()
+    {
+        $this->assertSame(Hyde::path('_media/foo/bar'), MediaFile::sourcePath('foo/bar'));
+    }
+
+    public function testSourcePathWithLeadingSlash()
+    {
+        $this->assertSame(Hyde::path('_media/foo'), MediaFile::sourcePath('/foo'));
+    }
+
+    public function testOutputPathWithEmptyString()
+    {
+        $this->assertSame(Hyde::sitePath('media'), MediaFile::outputPath(''));
+    }
+
+    public function testOutputPathWithSubdirectories()
+    {
+        $this->assertSame(Hyde::sitePath('media/foo/bar'), MediaFile::outputPath('foo/bar'));
+    }
+
+    public function testOutputPathWithLeadingSlash()
+    {
+        $this->assertSame(Hyde::sitePath('media/foo'), MediaFile::outputPath('/foo'));
+    }
 }

From e31458451c1a460ee55bff68712ad2f4e6bbbbd8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 15:11:46 +0200
Subject: [PATCH 205/328] Generate more constructor unit tests

---
 .../tests/Unit/Support/MediaFileUnitTest.php  | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 1af72abfcc2..1585bfb6acd 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -139,6 +139,59 @@ public function testCustomMediaPathsAreNormalizedToRelativeCustomizedMediaPath()
         Hyde::setMediaDirectory('_media');
     }
 
+    public function testConstructorWithVariousInputFormats()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('foo.txt')->path);
+        $this->assertSame('_media/foo.txt', MediaFile::make('_media/foo.txt')->path);
+        $this->assertSame('_media/foo.txt', MediaFile::make(Hyde::path('_media/foo.txt'))->path);
+        $this->assertSame('_media/foo.txt', MediaFile::make('media/foo.txt')->path);
+    }
+
+    public function testConstructorWithValidationDisabled()
+    {
+        MediaFile::$validateExistence = false;
+        $this->mockFilesystem->shouldReceive('missing')->never();
+
+        $file = new MediaFile('non_existent_file.txt');
+        $this->assertInstanceOf(MediaFile::class, $file);
+    }
+
+    public function testConstructorSetsProperties()
+    {
+        $file = new MediaFile('foo.txt');
+        $this->assertNotNull($file->length);
+        $this->assertNotNull($file->mimeType);
+        $this->assertNotNull($file->hash);
+    }
+
+    public function testNormalizePathWithAbsolutePath()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make(Hyde::path('_media/foo.txt'))->path);
+    }
+
+    public function testNormalizePathWithRelativePath()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('foo.txt')->path);
+    }
+
+    public function testNormalizePathWithOutputDirectoryPath()
+    {
+        Hyde::setMediaDirectory('_custom_media');
+        $this->assertSame('_custom_media/foo.txt', MediaFile::make('custom_media/foo.txt')->path);
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testNormalizePathWithAlreadyCorrectFormat()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('_media/foo.txt')->path);
+    }
+
+    public function testNormalizePathWithParentDirectoryReferences()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('../_media/foo.txt')->path);
+        $this->assertSame('_media/baz/../bar/foo.txt', MediaFile::make('_media/baz/../bar/foo.txt')->path);
+    }
+
     public function testGetNameReturnsNameOfFile()
     {
         $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getName());

From a6b83a8676efdc75677984ad7e8cdc6e4f899df2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 15:11:58 +0200
Subject: [PATCH 206/328] Annotate context

---
 packages/framework/tests/Unit/Support/MediaFileUnitTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 1585bfb6acd..7311819b2db 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -189,7 +189,7 @@ public function testNormalizePathWithAlreadyCorrectFormat()
     public function testNormalizePathWithParentDirectoryReferences()
     {
         $this->assertSame('_media/foo.txt', MediaFile::make('../_media/foo.txt')->path);
-        $this->assertSame('_media/baz/../bar/foo.txt', MediaFile::make('_media/baz/../bar/foo.txt')->path);
+        $this->assertSame('_media/baz/../bar/foo.txt', MediaFile::make('_media/baz/../bar/foo.txt')->path); // We don't do anything about this
     }
 
     public function testGetNameReturnsNameOfFile()

From 53023b5e9653bf919adc8ea827db54075aff22be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 15:13:14 +0200
Subject: [PATCH 207/328] Change protected properties to public readonly

These are part of the public interface of the class, but the should be immutable since there is no way to change them (in terms of persisting modified states)
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index e5a2d910455..3b8a57a639c 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -28,9 +28,9 @@ class MediaFile extends ProjectFile
     /** @internal Controls whether to validate the existence of the file, intended for unit testing. Turning this off may lead to unexpected behavior. */
     public static bool $validateExistence = true;
 
-    protected int $length;
-    protected string $mimeType;
-    protected string $hash;
+    public readonly int $length;
+    public readonly string $mimeType;
+    public readonly string $hash;
 
     public function __construct(string $path)
     {

From a39ba5be66ec4c06f80c56b0c6d1626860a53f92 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 15:15:03 +0200
Subject: [PATCH 208/328] Normalize extension access between class structure

---
 packages/framework/src/Support/Filesystem/MediaFile.php   | 2 +-
 packages/framework/src/Support/Filesystem/ProjectFile.php | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 3b8a57a639c..5ece5d24400 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -150,7 +150,7 @@ protected function findContentLength(): int
 
     protected function findMimeType(): string
     {
-        $extension = Filesystem::extension($this->getPath());
+        $extension = $this->getExtension();
 
         // See if we can find a mime type for the extension instead of
         // having to rely on a PHP extension and filesystem lookups.
diff --git a/packages/framework/src/Support/Filesystem/ProjectFile.php b/packages/framework/src/Support/Filesystem/ProjectFile.php
index eb29ba893e9..36376fbc14c 100644
--- a/packages/framework/src/Support/Filesystem/ProjectFile.php
+++ b/packages/framework/src/Support/Filesystem/ProjectFile.php
@@ -11,8 +11,6 @@
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
 
-use function pathinfo;
-
 /**
  * Filesystem abstraction for a file stored in the project.
  */
@@ -71,6 +69,6 @@ public function getContents(): string
 
     public function getExtension(): string
     {
-        return pathinfo($this->getAbsolutePath(), PATHINFO_EXTENSION);
+        return Filesystem::extension($this->getPath());
     }
 }

From e077ac615146d125e09640caab4db9f805ecd85c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 1 Aug 2024 21:25:08 +0200
Subject: [PATCH 209/328] Remove internal validate existence flag

---
 .../src/Support/Filesystem/MediaFile.php         |  5 +----
 .../Foundation/FilesystemHasMediaFilesTest.php   |  9 +--------
 .../tests/Unit/Support/MediaFileUnitTest.php     | 16 ----------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5ece5d24400..184ea906821 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -25,9 +25,6 @@ class MediaFile extends ProjectFile
     /** @var array<string> The default extensions for media types */
     final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
-    /** @internal Controls whether to validate the existence of the file, intended for unit testing. Turning this off may lead to unexpected behavior. */
-    public static bool $validateExistence = true;
-
     public readonly int $length;
     public readonly string $mimeType;
     public readonly string $hash;
@@ -36,7 +33,7 @@ public function __construct(string $path)
     {
         $path = $this->normalizePath($path);
 
-        if (static::$validateExistence && Filesystem::missing($path)) {
+        if (Filesystem::missing($path)) {
             throw new FileNotFoundException($path);
         }
 
diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
index e23e7ad8177..d16f987b05a 100644
--- a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -28,17 +28,10 @@ protected function setUp(): void
         $this->filesystem = new TestableFilesystem(Hyde::getInstance());
 
         $mock = Mockery::mock(BaseFilesystem::class)->makePartial();
+        $mock->shouldReceive('missing')->andReturn(false)->byDefault();
         $mock->shouldReceive('size')->andReturn(100)->byDefault();
         $mock->shouldReceive('hash')->andReturn('hash')->byDefault();
         app()->instance(BaseFilesystem::class, $mock);
-
-        MediaFile::$validateExistence = false;
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-        MediaFile::$validateExistence = true;
     }
 
     public function testAssetsMethodReturnsSameInstanceOnSubsequentCalls()
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 7311819b2db..f07bf42cc61 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -45,8 +45,6 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        MediaFile::$validateExistence = false;
-
         $this->mockFilesystem = Mockery::mock(BaseFilesystem::class);
         app()->instance(BaseFilesystem::class, $this->mockFilesystem);
 
@@ -68,7 +66,6 @@ protected function tearDown(): void
     {
         parent::tearDown();
 
-        MediaFile::$validateExistence = true;
         Mockery::close();
     }
 
@@ -147,15 +144,6 @@ public function testConstructorWithVariousInputFormats()
         $this->assertSame('_media/foo.txt', MediaFile::make('media/foo.txt')->path);
     }
 
-    public function testConstructorWithValidationDisabled()
-    {
-        MediaFile::$validateExistence = false;
-        $this->mockFilesystem->shouldReceive('missing')->never();
-
-        $file = new MediaFile('non_existent_file.txt');
-        $this->assertInstanceOf(MediaFile::class, $file);
-    }
-
     public function testConstructorSetsProperties()
     {
         $file = new MediaFile('foo.txt');
@@ -285,8 +273,6 @@ public function testGetHashReturnsHash()
 
     public function testExceptionIsThrownWhenConstructingFileThatDoesNotExist()
     {
-        MediaFile::$validateExistence = true;
-
         $this->mockFilesystem->shouldReceive('missing')
             ->with(Hyde::path('_media/foo'))
             ->andReturn(true);
@@ -299,8 +285,6 @@ public function testExceptionIsThrownWhenConstructingFileThatDoesNotExist()
 
     public function testExceptionIsNotThrownWhenConstructingFileThatDoesExist()
     {
-        MediaFile::$validateExistence = true;
-
         $this->mockFilesystem->shouldReceive('missing')
             ->with(Hyde::path('_media/foo'))
             ->andReturn(false);

From dbbd957aa568d8b769c300f366bc2845ad893b82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 3 Aug 2024 12:36:10 +0200
Subject: [PATCH 210/328] Introduce local variable

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 184ea906821..3f25f8ea2c4 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -137,7 +137,9 @@ protected function normalizePath(string $path): string
             $path = '_'.$path;
         }
 
-        return static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
+        $path = static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
+
+        return $path;
     }
 
     protected function findContentLength(): int

From d3618469c42911a85d6171f53b4b06834ffaab3f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 3 Aug 2024 12:36:31 +0200
Subject: [PATCH 211/328] Rename helper method

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 3f25f8ea2c4..b1728426a89 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -31,7 +31,7 @@ class MediaFile extends ProjectFile
 
     public function __construct(string $path)
     {
-        $path = $this->normalizePath($path);
+        $path = $this->getNormalizedPath($path);
 
         if (Filesystem::missing($path)) {
             throw new FileNotFoundException($path);
@@ -128,7 +128,7 @@ public static function getCacheBustKey(string $file): string
             : '';
     }
 
-    protected function normalizePath(string $path): string
+    protected function getNormalizedPath(string $path): string
     {
         $path = Hyde::pathToRelative($path);
 

From e6ae28dbfc6f1171c280cf92231d09b934e3e05a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 3 Aug 2024 12:37:47 +0200
Subject: [PATCH 212/328] Move file existence check to normalizer method

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index b1728426a89..ac2ee5da846 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -33,10 +33,6 @@ public function __construct(string $path)
     {
         $path = $this->getNormalizedPath($path);
 
-        if (Filesystem::missing($path)) {
-            throw new FileNotFoundException($path);
-        }
-
         parent::__construct($path);
 
         $this->length = $this->findContentLength();
@@ -139,6 +135,10 @@ protected function getNormalizedPath(string $path): string
 
         $path = static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
 
+        if (Filesystem::missing($path)) {
+            throw new FileNotFoundException($path);
+        }
+
         return $path;
     }
 

From 89feb9c768146fc20f5a9587979cba6866b037a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 3 Aug 2024 13:10:30 +0200
Subject: [PATCH 213/328] Document code reasoning

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index ac2ee5da846..67cc69117c2 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -133,6 +133,7 @@ protected function getNormalizedPath(string $path): string
             $path = '_'.$path;
         }
 
+        // Normalize the path to include the media directory
         $path = static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
 
         if (Filesystem::missing($path)) {

From c3bcc78b3d6ae286dc2f40fa14eb8f0eb0d7722d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 3 Aug 2024 13:10:54 +0200
Subject: [PATCH 214/328] Inline local variable

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 67cc69117c2..2c2835880b8 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -31,9 +31,7 @@ class MediaFile extends ProjectFile
 
     public function __construct(string $path)
     {
-        $path = $this->getNormalizedPath($path);
-
-        parent::__construct($path);
+        parent::__construct($this->getNormalizedPath($path));
 
         $this->length = $this->findContentLength();
         $this->mimeType = $this->findMimeType();

From 96b18565b6b0a049479a37c62f3ed44869dd462b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 12:31:13 +0200
Subject: [PATCH 215/328] Add short and concise PHPDoc annotations to the
 public methods

---
 .../src/Support/Filesystem/MediaFile.php      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 2c2835880b8..50226101da4 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -29,6 +29,13 @@ class MediaFile extends ProjectFile
     public readonly string $mimeType;
     public readonly string $hash;
 
+    /**
+     * Create a new MediaFile instance.
+     *
+     * @param  string  $path  The file path relative to the project root or media source directory.
+     *
+     * @throws FileNotFoundException If the file does not exist in the media source directory.
+     */
     public function __construct(string $path)
     {
         parent::__construct($this->getNormalizedPath($path));
@@ -90,6 +97,11 @@ public function getIdentifier(): string
         return Str::after($this->getPath(), Hyde::getMediaDirectory().'/');
     }
 
+    /**
+     * Get the file information as an array.
+     *
+     * @return array<string, mixed> The file information
+     */
     public function toArray(): array
     {
         return array_merge(parent::toArray(), [
@@ -99,16 +111,31 @@ public function toArray(): array
         ]);
     }
 
+    /**
+     * Get the content length of the file.
+     *
+     * @return int The content length in bytes
+     */
     public function getContentLength(): int
     {
         return $this->length;
     }
 
+    /**
+     * Get the MIME type of the file.
+     *
+     * @return string The MIME type
+     */
     public function getMimeType(): string
     {
         return $this->mimeType;
     }
 
+    /**
+     * Get the hash of the file.
+     *
+     * @return string The file hash
+     */
     public function getHash(): string
     {
         return $this->hash;

From ed428cb9a5c5ff26fadb1ff8b2a6876b1c1f2b20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 12:36:05 +0200
Subject: [PATCH 216/328] Narrow down mixed return type

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 50226101da4..0a00f007823 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -100,7 +100,7 @@ public function getIdentifier(): string
     /**
      * Get the file information as an array.
      *
-     * @return array<string, mixed> The file information
+     * @return array<string, int|string> The file information
      */
     public function toArray(): array
     {

From 7f53ba7102c5748c1792c9412835c2d5fca44869 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 13:25:50 +0200
Subject: [PATCH 217/328] Use array shape annotation to match parent

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 0a00f007823..88513d7e5ec 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -100,7 +100,7 @@ public function getIdentifier(): string
     /**
      * Get the file information as an array.
      *
-     * @return array<string, int|string> The file information
+     * @return array{name: string, path: string, length: int, mimeType: string, hash: string}
      */
     public function toArray(): array
     {

From 7c6739fef9d37081f404dbb2e7c241a1caa3a15d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 13:26:25 +0200
Subject: [PATCH 218/328] Specify hash type

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 88513d7e5ec..11761f86ee7 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -132,7 +132,7 @@ public function getMimeType(): string
     }
 
     /**
-     * Get the hash of the file.
+     * Get the CRC32 hash of the file.
      *
      * @return string The file hash
      */

From 687b119c21b686b20097390efd6e30d88577d987 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 13:26:41 +0200
Subject: [PATCH 219/328] Remove redundant PHPDoc comments

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 11761f86ee7..49e48853d25 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -112,9 +112,7 @@ public function toArray(): array
     }
 
     /**
-     * Get the content length of the file.
-     *
-     * @return int The content length in bytes
+     * Get the content length of the file in bytes.
      */
     public function getContentLength(): int
     {
@@ -123,8 +121,6 @@ public function getContentLength(): int
 
     /**
      * Get the MIME type of the file.
-     *
-     * @return string The MIME type
      */
     public function getMimeType(): string
     {
@@ -133,8 +129,6 @@ public function getMimeType(): string
 
     /**
      * Get the CRC32 hash of the file.
-     *
-     * @return string The file hash
      */
     public function getHash(): string
     {

From 5ba193a37164b7ae51f802b7a2aa870ff4005b2e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 13:39:29 +0200
Subject: [PATCH 220/328] Add todo

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 2c2835880b8..e05c8b88e38 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -146,6 +146,7 @@ protected function findContentLength(): int
         return Filesystem::size($this->getPath());
     }
 
+    /** @todo Move to Filesystem::findMimeType($path) */
     protected function findMimeType(): string
     {
         $extension = $this->getExtension();

From 5c77557bf254f8a7607fe13bba8c5299b3d780fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 19:32:23 +0200
Subject: [PATCH 221/328] Add new helper to get a relative web link to the
 media file

---
 .../src/Support/Filesystem/MediaFile.php      |  8 ++
 .../tests/Unit/Support/MediaFileUnitTest.php  | 93 +++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 49e48853d25..090a986f5a9 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -135,6 +135,14 @@ public function getHash(): string
         return $this->hash;
     }
 
+    /**
+     * Get a relative web link to the media file.
+     */
+    public function getLink(): string
+    {
+        return Hyde::asset($this->getIdentifier());
+    }
+
     /** @internal */
     public static function getCacheBustKey(string $file): string
     {
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index f07bf42cc61..1713cfba022 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -5,6 +5,9 @@
 namespace Hyde\Framework\Testing\Unit\Support;
 
 use Mockery;
+use Illuminate\View\Factory;
+use Hyde\Support\Facades\Render;
+use Hyde\Support\Models\RenderData;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Filesystem\MediaFile;
@@ -51,6 +54,7 @@ protected function setUp(): void
         // Set up default expectations for commonly called methods
         $this->mockFilesystem->shouldReceive('isFile')->andReturn(true)->byDefault();
         $this->mockFilesystem->shouldReceive('missing')->andReturn(false)->byDefault();
+        $this->mockFilesystem->shouldReceive('exists')->andReturn(true)->byDefault();
         $this->mockFilesystem->shouldReceive('extension')->andReturn('txt')->byDefault();
         $this->mockFilesystem->shouldReceive('size')->andReturn(12)->byDefault();
         $this->mockFilesystem->shouldReceive('mimeType')->andReturn('text/plain')->byDefault();
@@ -60,6 +64,12 @@ protected function setUp(): void
         // Mock Hyde facade
         $hyde = Mockery::mock(Hyde::kernel())->makePartial();
         $hyde->shouldReceive('assets')->andReturn(collect(['app.css' => new MediaFile('_media/app.css')]))->byDefault();
+
+        // Mock render data
+        \Illuminate\Support\Facades\View::swap(Mockery::mock(Factory::class)->makePartial());
+        Render::swap(new RenderData());
+
+        self::mockConfig(['hyde.enable_cache_busting' => false]);
     }
 
     protected function tearDown(): void
@@ -389,4 +399,87 @@ public function testOutputPathWithLeadingSlash()
     {
         $this->assertSame(Hyde::sitePath('media/foo'), MediaFile::outputPath('/foo'));
     }
+
+    public function testGetLink()
+    {
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('custom_media/foo.txt', $file->getLink());
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testGetLinkWithPrettyUrls()
+    {
+        self::mockConfig(['hyde.enable_cache_busting' => false, 'hyde.pretty_urls' => true]);
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithNestedFile()
+    {
+        $file = MediaFile::make('subdirectory/foo.txt');
+        $this->assertSame('media/subdirectory/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithBaseUrl()
+    {
+        self::mockConfig(['hyde.enable_cache_busting' => false, 'hyde.url' => 'https://example.com']);
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('https://example.com/media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithBaseUrlAndPrettyUrls()
+    {
+        self::mockConfig([
+            'hyde.enable_cache_busting' => false,
+            'hyde.url' => 'https://example.com',
+            'hyde.pretty_urls' => true,
+        ]);
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('https://example.com/media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithCacheBusting()
+    {
+        self::mockConfig(['hyde.enable_cache_busting' => true]);
+        $this->mockFilesystem->shouldReceive('hash')
+            ->andReturn('abc123');
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('media/foo.txt?v=abc123', $file->getLink());
+    }
+
+    public function testGetLinkWithCacheBustingDisabled()
+    {
+        self::mockConfig(['hyde.enable_cache_busting' => false]);
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithCurrentPageContext()
+    {
+        $this->mockCurrentPage('foo/bar');
+        $file = MediaFile::make('baz.txt');
+        $this->assertSame('../media/baz.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithCurrentPageContextAndCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $this->mockCurrentPage('foo/bar');
+        $file = MediaFile::make('baz.txt');
+        $this->assertSame('../custom_media/baz.txt', $file->getLink());
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    // Helper method to mock the current page
+    protected function mockCurrentPage(string $page): void
+    {
+        Render::shouldReceive('getRouteKey')->andReturn($page);
+    }
 }

From 6f5e5379c7d2a15d465675bb3a0cc3a471adc5f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 19:44:56 +0200
Subject: [PATCH 222/328] Make protected method public static internal

---
 .../framework/src/Foundation/Kernel/Hyperlinks.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 9fc377a9a9f..c6e777cafc8 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -100,7 +100,7 @@ public function mediaLink(string $destination, bool $validate = false): string
             throw new FileNotFoundException($sourcePath);
         }
 
-        return $this->withCacheBusting($this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination"), $destination);
+        return static::withCacheBusting($this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination"), $destination);
     }
 
     /**
@@ -118,10 +118,10 @@ public function asset(string $name): string
         $name = Str::start($name, "{$this->kernel->getMediaOutputDirectory()}/");
 
         if ($this->hasSiteUrl()) {
-            return $this->withCacheBusting($this->url($name), $name);
+            return static::withCacheBusting($this->url($name), $name);
         }
 
-        return $this->withCacheBusting($this->relativeLink($name), $name);
+        return static::withCacheBusting($this->relativeLink($name), $name);
     }
 
     /**
@@ -183,9 +183,9 @@ public static function isRemote(string $url): bool
     }
 
     /**
-     * Apply cache to the URL if enabled in the configuration.
+     * @internal Apply cache to the URL if enabled in the configuration.
      */
-    protected function withCacheBusting(string $url, string $file): string
+    public static function withCacheBusting(string $url, string $file): string
     {
         return $url.MediaFile::getCacheBustKey($file);
     }

From 13affcab0f96f6dbc8db270c15b60630671142be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 20:02:41 +0200
Subject: [PATCH 223/328] Convert string interpolation to concatenation

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index c6e777cafc8..b52b944a434 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -96,11 +96,11 @@ public function relativeLink(string $destination): string
      */
     public function mediaLink(string $destination, bool $validate = false): string
     {
-        if ($validate && ! file_exists($sourcePath = "{$this->kernel->getMediaDirectory()}/$destination")) {
+        if ($validate && ! file_exists($sourcePath = $this->kernel->getMediaDirectory().'/'.$destination)) {
             throw new FileNotFoundException($sourcePath);
         }
 
-        return static::withCacheBusting($this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination"), $destination);
+        return static::withCacheBusting($this->relativeLink($this->kernel->getMediaOutputDirectory().'/'.$destination), $destination);
     }
 
     /**

From b588a8851fda06f4f061eb922bd7e27aaba3d387 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 20:03:08 +0200
Subject: [PATCH 224/328] Access kernel using facade

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index b52b944a434..417dac82135 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Foundation\Kernel;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
@@ -96,11 +97,11 @@ public function relativeLink(string $destination): string
      */
     public function mediaLink(string $destination, bool $validate = false): string
     {
-        if ($validate && ! file_exists($sourcePath = $this->kernel->getMediaDirectory().'/'.$destination)) {
+        if ($validate && ! file_exists($sourcePath = Hyde::getMediaDirectory().'/'.$destination)) {
             throw new FileNotFoundException($sourcePath);
         }
 
-        return static::withCacheBusting($this->relativeLink($this->kernel->getMediaOutputDirectory().'/'.$destination), $destination);
+        return static::withCacheBusting($this->relativeLink(Hyde::getMediaOutputDirectory().'/'.$destination), $destination);
     }
 
     /**

From cb98c50e172a6a3b1dffc32365c7617cf4b31bbf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 20:03:32 +0200
Subject: [PATCH 225/328] Revert "Access kernel using facade"

This reverts commit b588a8851fda06f4f061eb922bd7e27aaba3d387.
---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 417dac82135..b52b944a434 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Foundation\Kernel;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
@@ -97,11 +96,11 @@ public function relativeLink(string $destination): string
      */
     public function mediaLink(string $destination, bool $validate = false): string
     {
-        if ($validate && ! file_exists($sourcePath = Hyde::getMediaDirectory().'/'.$destination)) {
+        if ($validate && ! file_exists($sourcePath = $this->kernel->getMediaDirectory().'/'.$destination)) {
             throw new FileNotFoundException($sourcePath);
         }
 
-        return static::withCacheBusting($this->relativeLink(Hyde::getMediaOutputDirectory().'/'.$destination), $destination);
+        return static::withCacheBusting($this->relativeLink($this->kernel->getMediaOutputDirectory().'/'.$destination), $destination);
     }
 
     /**

From 78c02f8ce19d2a9d9e8cec1f420b1ebff9e42327 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 4 Aug 2024 20:03:35 +0200
Subject: [PATCH 226/328] Revert "Convert string interpolation to
 concatenation"

This reverts commit 13affcab0f96f6dbc8db270c15b60630671142be.
---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index b52b944a434..c6e777cafc8 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -96,11 +96,11 @@ public function relativeLink(string $destination): string
      */
     public function mediaLink(string $destination, bool $validate = false): string
     {
-        if ($validate && ! file_exists($sourcePath = $this->kernel->getMediaDirectory().'/'.$destination)) {
+        if ($validate && ! file_exists($sourcePath = "{$this->kernel->getMediaDirectory()}/$destination")) {
             throw new FileNotFoundException($sourcePath);
         }
 
-        return static::withCacheBusting($this->relativeLink($this->kernel->getMediaOutputDirectory().'/'.$destination), $destination);
+        return static::withCacheBusting($this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination"), $destination);
     }
 
     /**

From 7aa2d6a5c5aebc43706b875ac2ccc5395ffded16 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 11:06:38 +0200
Subject: [PATCH 227/328] Deprecate the media link helper

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index c6e777cafc8..4b941358a20 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -91,6 +91,8 @@ public function relativeLink(string $destination): string
     /**
      * Gets a relative web link to the given file stored in the _site/media folder.
      *
+     * @deprecated Use the `asset` method instead.
+     *
      * An exception will be thrown if the file does not exist in the _media directory,
      * and the second argument is set to true.
      */

From ab9e7aac8dac4629de2d110a596ff6b351a26df4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 11:07:23 +0200
Subject: [PATCH 228/328] Convert string interpolation to concatenation

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 4b941358a20..6eac49a45e7 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -117,7 +117,7 @@ public function asset(string $name): string
             return $name;
         }
 
-        $name = Str::start($name, "{$this->kernel->getMediaOutputDirectory()}/");
+        $name = Str::start($name, $this->kernel->getMediaOutputDirectory().'/');
 
         if ($this->hasSiteUrl()) {
             return static::withCacheBusting($this->url($name), $name);

From 1814937abf6bd6a3a41dff63f866aa6fd9deb3c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 11:07:43 +0200
Subject: [PATCH 229/328] Access kernel using facade

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 6eac49a45e7..0f4a669f14a 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Foundation\Kernel;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
@@ -117,7 +118,7 @@ public function asset(string $name): string
             return $name;
         }
 
-        $name = Str::start($name, $this->kernel->getMediaOutputDirectory().'/');
+        $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
 
         if ($this->hasSiteUrl()) {
             return static::withCacheBusting($this->url($name), $name);

From 1deffbd58a10b5b7a7354a1a3f8a4f94930488b9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 11:10:20 +0200
Subject: [PATCH 230/328] Access methods using facade

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 0f4a669f14a..225f93670a9 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -120,11 +120,11 @@ public function asset(string $name): string
 
         $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
 
-        if ($this->hasSiteUrl()) {
-            return static::withCacheBusting($this->url($name), $name);
+        if (Hyde::hasSiteUrl()) {
+            return static::withCacheBusting(Hyde::url($name), $name);
         }
 
-        return static::withCacheBusting($this->relativeLink($name), $name);
+        return static::withCacheBusting(Hyde::relativeLink($name), $name);
     }
 
     /**

From 6c350f032dcd65e960d7c2b53a3fc57dadb6cbd8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 11:11:45 +0200
Subject: [PATCH 231/328] Call class name instead of static

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 225f93670a9..2dd7d07f4e1 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -114,17 +114,17 @@ public function mediaLink(string $destination, bool $validate = false): string
      */
     public function asset(string $name): string
     {
-        if (static::isRemote($name)) {
+        if (Hyperlinks::isRemote($name)) {
             return $name;
         }
 
         $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
 
         if (Hyde::hasSiteUrl()) {
-            return static::withCacheBusting(Hyde::url($name), $name);
+            return Hyperlinks::withCacheBusting(Hyde::url($name), $name);
         }
 
-        return static::withCacheBusting(Hyde::relativeLink($name), $name);
+        return Hyperlinks::withCacheBusting(Hyde::relativeLink($name), $name);
     }
 
     /**

From 20a7f113c1f67fce6d7cde9cc263eb4c0dc286c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 11:18:10 +0200
Subject: [PATCH 232/328] Copy the asset logic to the media file class

---
 .../src/Support/Filesystem/MediaFile.php          | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 090a986f5a9..fb735274def 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -8,6 +8,7 @@
 use Hyde\Facades\Config;
 use Hyde\Facades\Filesystem;
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
@@ -140,7 +141,19 @@ public function getHash(): string
      */
     public function getLink(): string
     {
-        return Hyde::asset($this->getIdentifier());
+        $name = $this->getIdentifier();
+
+        if (Hyperlinks::isRemote($name)) {
+            return $name;
+        }
+
+        $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
+
+        if (Hyde::hasSiteUrl()) {
+            return Hyperlinks::withCacheBusting(Hyde::url($name), $name);
+        }
+
+        return Hyperlinks::withCacheBusting(Hyde::relativeLink($name), $name);
     }
 
     /** @internal */

From eefd67fdc1787371683cb3ab834a55e0487c9cac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 11:18:31 +0200
Subject: [PATCH 233/328] Remove unreachable remote check from method

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index fb735274def..1ec1c26e88f 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -143,10 +143,6 @@ public function getLink(): string
     {
         $name = $this->getIdentifier();
 
-        if (Hyperlinks::isRemote($name)) {
-            return $name;
-        }
-
         $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
 
         if (Hyde::hasSiteUrl()) {

From 5977b8881ed8051cbb3497a737ba4b2a0cf8c51b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 15:46:33 +0200
Subject: [PATCH 234/328] Test against accessors

---
 packages/framework/tests/Unit/Support/MediaFileUnitTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index f07bf42cc61..5a0fa4af492 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -147,9 +147,9 @@ public function testConstructorWithVariousInputFormats()
     public function testConstructorSetsProperties()
     {
         $file = new MediaFile('foo.txt');
-        $this->assertNotNull($file->length);
-        $this->assertNotNull($file->mimeType);
-        $this->assertNotNull($file->hash);
+        $this->assertNotNull($file->getContentLength());
+        $this->assertNotNull($file->getMimeType());
+        $this->assertNotNull($file->getHash());
     }
 
     public function testNormalizePathWithAbsolutePath()

From c2bfffcca92ecd6c7b89b090dd20e30e8f8697e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 15:50:44 +0200
Subject: [PATCH 235/328] Protect the public readonly metadata properties

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index e05c8b88e38..4891cbd6cd2 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -25,9 +25,9 @@ class MediaFile extends ProjectFile
     /** @var array<string> The default extensions for media types */
     final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
-    public readonly int $length;
-    public readonly string $mimeType;
-    public readonly string $hash;
+    protected readonly int $length;
+    protected readonly string $mimeType;
+    protected readonly string $hash;
 
     public function __construct(string $path)
     {

From 24ee8e5c595efdc6bd2223d4f71714027670ac59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 15:54:11 +0200
Subject: [PATCH 236/328] Extracted protected boot function

---
 .../framework/src/Support/Filesystem/MediaFile.php    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 4891cbd6cd2..ddb77378c98 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -33,9 +33,7 @@ public function __construct(string $path)
     {
         parent::__construct($this->getNormalizedPath($path));
 
-        $this->length = $this->findContentLength();
-        $this->mimeType = $this->findMimeType();
-        $this->hash = $this->findHash();
+        $this->boot();
     }
 
     /**
@@ -183,4 +181,11 @@ protected function findHash(): string
     {
         return Filesystem::hash($this->getPath(), 'crc32');
     }
+
+    protected function boot(): void
+    {
+        $this->length = $this->findContentLength();
+        $this->mimeType = $this->findMimeType();
+        $this->hash = $this->findHash();
+    }
 }

From 6403d061b28d7df62108463fcf65357de682aeee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 15:57:43 +0200
Subject: [PATCH 237/328] Boot all metadata properties when is accessed

---
 .../framework/src/Support/Filesystem/MediaFile.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index ddb77378c98..2564a7eb79a 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -32,8 +32,6 @@ class MediaFile extends ProjectFile
     public function __construct(string $path)
     {
         parent::__construct($this->getNormalizedPath($path));
-
-        $this->boot();
     }
 
     /**
@@ -99,16 +97,28 @@ public function toArray(): array
 
     public function getContentLength(): int
     {
+        if (! isset($this->length)) {
+            $this->boot();
+        }
+
         return $this->length;
     }
 
     public function getMimeType(): string
     {
+        if (! isset($this->mimeType)) {
+            $this->boot();
+        }
+
         return $this->mimeType;
     }
 
     public function getHash(): string
     {
+        if (! isset($this->hash)) {
+            $this->boot();
+        }
+
         return $this->hash;
     }
 

From b61d957db7151f99c8572e1fc6256d133bab0d86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 16:02:48 +0200
Subject: [PATCH 238/328] Move file existence validation from constructor to
 boot method

---
 packages/framework/src/Support/Filesystem/MediaFile.php   | 8 ++++----
 .../framework/tests/Feature/Support/MediaFileTest.php     | 2 +-
 .../framework/tests/Unit/Support/MediaFileUnitTest.php    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 2564a7eb79a..211013012b1 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -142,10 +142,6 @@ protected function getNormalizedPath(string $path): string
         // Normalize the path to include the media directory
         $path = static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
 
-        if (Filesystem::missing($path)) {
-            throw new FileNotFoundException($path);
-        }
-
         return $path;
     }
 
@@ -194,6 +190,10 @@ protected function findHash(): string
 
     protected function boot(): void
     {
+        if (Filesystem::missing($this->getPath())) {
+            throw new FileNotFoundException($this->getPath());
+        }
+
         $this->length = $this->findContentLength();
         $this->mimeType = $this->findMimeType();
         $this->hash = $this->findHash();
diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index df8756e6551..3a03d1f4bbb 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -81,7 +81,7 @@ public function testMediaFilePathHandling()
     public function testMediaFileExceptionHandling()
     {
         $this->expectException(FileNotFoundException::class);
-        MediaFile::make('non_existent_file.txt');
+        MediaFile::make('non_existent_file.txt')->getContentLength();
     }
 
     public function testMediaDirectoryCustomization()
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 5a0fa4af492..fc5bf7170b4 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -271,7 +271,7 @@ public function testGetHashReturnsHash()
         $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
     }
 
-    public function testExceptionIsThrownWhenConstructingFileThatDoesNotExist()
+    public function testExceptionIsThrownWhenBootingFileThatDoesNotExist()
     {
         $this->mockFilesystem->shouldReceive('missing')
             ->with(Hyde::path('_media/foo'))
@@ -280,7 +280,7 @@ public function testExceptionIsThrownWhenConstructingFileThatDoesNotExist()
         $this->expectException(FileNotFoundException::class);
         $this->expectExceptionMessage('File [_media/foo] not found.');
 
-        MediaFile::make('foo');
+        MediaFile::make('foo')->getContentLength();
     }
 
     public function testExceptionIsNotThrownWhenConstructingFileThatDoesExist()

From 0fbbf2d8454dfa52aee1c227397a53ec6cc65479 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 16:06:15 +0200
Subject: [PATCH 239/328] Add data provider to test all trigger methods

---
 .../tests/Unit/Support/MediaFileUnitTest.php       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index fc5bf7170b4..5c8588d2c43 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -271,7 +271,8 @@ public function testGetHashReturnsHash()
         $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
     }
 
-    public function testExceptionIsThrownWhenBootingFileThatDoesNotExist()
+    /** @dataProvider bootableMethodsProvider */
+    public function testExceptionIsThrownWhenBootingFileThatDoesNotExist(string $bootableMethod)
     {
         $this->mockFilesystem->shouldReceive('missing')
             ->with(Hyde::path('_media/foo'))
@@ -280,7 +281,7 @@ public function testExceptionIsThrownWhenBootingFileThatDoesNotExist()
         $this->expectException(FileNotFoundException::class);
         $this->expectExceptionMessage('File [_media/foo] not found.');
 
-        MediaFile::make('foo')->getContentLength();
+        MediaFile::make('foo')->$bootableMethod();
     }
 
     public function testExceptionIsNotThrownWhenConstructingFileThatDoesExist()
@@ -389,4 +390,13 @@ public function testOutputPathWithLeadingSlash()
     {
         $this->assertSame(Hyde::sitePath('media/foo'), MediaFile::outputPath('/foo'));
     }
+
+    public static function bootableMethodsProvider(): array
+    {
+        return [
+            ['getContentLength'],
+            ['getMimeType'],
+            ['getHash'],
+        ];
+    }
 }

From dbb679ec96eab1d17595196823b4dba1513b9f4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 19:10:37 +0200
Subject: [PATCH 240/328] Add code comment

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 211013012b1..dc3ea70f4f0 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -132,6 +132,7 @@ public static function getCacheBustKey(string $file): string
 
     protected function getNormalizedPath(string $path): string
     {
+        // Ensure we are working with a relative project path
         $path = Hyde::pathToRelative($path);
 
         // Normalize paths using output directory to have source directory prefix

From aea81c9cd31b3c7c789e20ff0f0fdace96e87f54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 5 Aug 2024 19:12:09 +0200
Subject: [PATCH 241/328] Extract helper method

---
 .../src/Support/Filesystem/MediaFile.php      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index dc3ea70f4f0..8385de73118 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -97,27 +97,21 @@ public function toArray(): array
 
     public function getContentLength(): int
     {
-        if (! isset($this->length)) {
-            $this->boot();
-        }
+        $this->ensureInstanceIsBooted('length');
 
         return $this->length;
     }
 
     public function getMimeType(): string
     {
-        if (! isset($this->mimeType)) {
-            $this->boot();
-        }
+        $this->ensureInstanceIsBooted('mimeType');
 
         return $this->mimeType;
     }
 
     public function getHash(): string
     {
-        if (! isset($this->hash)) {
-            $this->boot();
-        }
+        $this->ensureInstanceIsBooted('hash');
 
         return $this->hash;
     }
@@ -189,6 +183,13 @@ protected function findHash(): string
         return Filesystem::hash($this->getPath(), 'crc32');
     }
 
+    protected function ensureInstanceIsBooted(string $property): void
+    {
+        if (! isset($this->$property)) {
+            $this->boot();
+        }
+    }
+
     protected function boot(): void
     {
         if (Filesystem::missing($this->getPath())) {

From 133a7caf78e974cd21e7b8c770395ca969fb894e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 7 Aug 2024 18:59:56 +0200
Subject: [PATCH 242/328] Add more unit tests

---
 .../tests/Unit/Support/MediaFileUnitTest.php  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 5c8588d2c43..d0f7ec5fa9f 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -271,6 +271,45 @@ public function testGetHashReturnsHash()
         $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
     }
 
+    public function testGetMimeTypeReturnsLookupValueForKnownExtension()
+    {
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('txt');
+
+        $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType());
+    }
+
+    public function testGetMimeTypeUsesFileinfoForUnknownExtension()
+    {
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/foo.xyz'))
+            ->andReturn('xyz');
+
+        $this->mockFilesystem->shouldReceive('exists')
+            ->with(Hyde::path('_media/foo.xyz'))
+            ->andReturn(true);
+
+        $this->mockFilesystem->shouldReceive('mimeType')
+            ->with(Hyde::path('_media/foo.xyz'))
+            ->andReturn('application/octet-stream');
+
+        $this->assertSame('application/octet-stream', MediaFile::make('foo.xyz')->getMimeType());
+    }
+
+    public function testGetMimeTypeReturnsTextPlainForNonExistentFile()
+    {
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/nonexistent.xyz'))
+            ->andReturn('xyz');
+
+        $this->mockFilesystem->shouldReceive('exists')
+            ->with(Hyde::path('_media/nonexistent.xyz'))
+            ->andReturn(false);
+
+        $this->assertSame('text/plain', MediaFile::make('nonexistent.xyz')->getMimeType());
+    }
+
     /** @dataProvider bootableMethodsProvider */
     public function testExceptionIsThrownWhenBootingFileThatDoesNotExist(string $bootableMethod)
     {

From c48a731551c803150c9f84a05d291b40da6bf8d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Aug 2024 12:16:05 +0200
Subject: [PATCH 243/328] Begin adding back support for fileless media file
 instances

---
 .../src/Support/Filesystem/MediaFile.php      | 27 ++++++++++++++-----
 .../tests/Feature/Support/MediaFileTest.php   |  9 ++++---
 .../tests/Unit/Support/MediaFileUnitTest.php  |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 1ec1c26e88f..fdd008d049e 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -41,9 +41,13 @@ public function __construct(string $path)
     {
         parent::__construct($this->getNormalizedPath($path));
 
-        $this->length = $this->findContentLength();
-        $this->mimeType = $this->findMimeType();
-        $this->hash = $this->findHash();
+        if (Filesystem::exists($this->getAbsolutePath())) {
+            [$contentLength, $mimeType, $hash] = $this->getMetadata();
+
+            $this->length = $contentLength;
+            $this->mimeType = $mimeType;
+            $this->hash = $hash;
+        }
     }
 
     /**
@@ -172,10 +176,6 @@ protected function getNormalizedPath(string $path): string
         // Normalize the path to include the media directory
         $path = static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
 
-        if (Filesystem::missing($path)) {
-            throw new FileNotFoundException($path);
-        }
-
         return $path;
     }
 
@@ -220,4 +220,17 @@ protected function findHash(): string
     {
         return Filesystem::hash($this->getPath(), 'crc32');
     }
+
+    protected function getMetadata(): array
+    {
+        if (Filesystem::missing($this->getAbsolutePath())) {
+            throw new FileNotFoundException($this->getPath(), "Cannot get metadata for a file that does not exist on disk. (File [{$this->getPath()}] not found)");
+        }
+
+        $contentLength = $this->findContentLength();
+        $mimeType = $this->findMimeType();
+        $hash = $this->findHash();
+
+        return [$contentLength, $mimeType, $hash];
+    }
 }
diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index df8756e6551..353bec31126 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -78,10 +78,13 @@ public function testMediaFilePathHandling()
         $this->assertSame('_media/subfolder/nested_file.txt', $mediaFile->getPath());
     }
 
-    public function testMediaFileExceptionHandling()
+    public function testCanCreateInMemoryMediaFileInstances()
     {
-        $this->expectException(FileNotFoundException::class);
-        MediaFile::make('non_existent_file.txt');
+        $mediaFile = MediaFile::make('non_existent_file.txt');
+
+        $this->assertInstanceOf(MediaFile::class, $mediaFile);
+
+        $this->assertSame('non_existent_file.txt', $mediaFile->getAbsolutePath());
     }
 
     public function testMediaDirectoryCustomization()
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 1713cfba022..5148fdf5138 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -288,7 +288,7 @@ public function testExceptionIsThrownWhenConstructingFileThatDoesNotExist()
             ->andReturn(true);
 
         $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('File [_media/foo] not found.');
+        $this->expectExceptionMessage('Cannot get metadata for a file that does not exist on disk. (File [_media/foo] not found)');
 
         MediaFile::make('foo');
     }

From d0212c14e7ced90a3d2fd5f4a58faa37b856a622 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Aug 2024 12:16:09 +0200
Subject: [PATCH 244/328] Revert "Begin adding back support for fileless media
 file instances"

This reverts commit c48a731551c803150c9f84a05d291b40da6bf8d4.
---
 .../src/Support/Filesystem/MediaFile.php      | 27 +++++--------------
 .../tests/Feature/Support/MediaFileTest.php   |  9 +++----
 .../tests/Unit/Support/MediaFileUnitTest.php  |  2 +-
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index fdd008d049e..1ec1c26e88f 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -41,13 +41,9 @@ public function __construct(string $path)
     {
         parent::__construct($this->getNormalizedPath($path));
 
-        if (Filesystem::exists($this->getAbsolutePath())) {
-            [$contentLength, $mimeType, $hash] = $this->getMetadata();
-
-            $this->length = $contentLength;
-            $this->mimeType = $mimeType;
-            $this->hash = $hash;
-        }
+        $this->length = $this->findContentLength();
+        $this->mimeType = $this->findMimeType();
+        $this->hash = $this->findHash();
     }
 
     /**
@@ -176,6 +172,10 @@ protected function getNormalizedPath(string $path): string
         // Normalize the path to include the media directory
         $path = static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
 
+        if (Filesystem::missing($path)) {
+            throw new FileNotFoundException($path);
+        }
+
         return $path;
     }
 
@@ -220,17 +220,4 @@ protected function findHash(): string
     {
         return Filesystem::hash($this->getPath(), 'crc32');
     }
-
-    protected function getMetadata(): array
-    {
-        if (Filesystem::missing($this->getAbsolutePath())) {
-            throw new FileNotFoundException($this->getPath(), "Cannot get metadata for a file that does not exist on disk. (File [{$this->getPath()}] not found)");
-        }
-
-        $contentLength = $this->findContentLength();
-        $mimeType = $this->findMimeType();
-        $hash = $this->findHash();
-
-        return [$contentLength, $mimeType, $hash];
-    }
 }
diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index 353bec31126..df8756e6551 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -78,13 +78,10 @@ public function testMediaFilePathHandling()
         $this->assertSame('_media/subfolder/nested_file.txt', $mediaFile->getPath());
     }
 
-    public function testCanCreateInMemoryMediaFileInstances()
+    public function testMediaFileExceptionHandling()
     {
-        $mediaFile = MediaFile::make('non_existent_file.txt');
-
-        $this->assertInstanceOf(MediaFile::class, $mediaFile);
-
-        $this->assertSame('non_existent_file.txt', $mediaFile->getAbsolutePath());
+        $this->expectException(FileNotFoundException::class);
+        MediaFile::make('non_existent_file.txt');
     }
 
     public function testMediaDirectoryCustomization()
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 5148fdf5138..1713cfba022 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -288,7 +288,7 @@ public function testExceptionIsThrownWhenConstructingFileThatDoesNotExist()
             ->andReturn(true);
 
         $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('Cannot get metadata for a file that does not exist on disk. (File [_media/foo] not found)');
+        $this->expectExceptionMessage('File [_media/foo] not found.');
 
         MediaFile::make('foo');
     }

From b7fc928a4d8930309d49f60955b4c3f7b8817ba7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Aug 2024 12:17:32 +0200
Subject: [PATCH 245/328] Document why we must validate file existence

See https://github.com/hydephp/develop/pull/1932#issuecomment-2298498144
---
 packages/framework/src/Support/Filesystem/MediaFile.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 1ec1c26e88f..8623548c582 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -172,6 +172,7 @@ protected function getNormalizedPath(string $path): string
         // Normalize the path to include the media directory
         $path = static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
 
+        // Since assets need to exist on disk in order to be copied to the built site files we validate that the file is real here.
         if (Filesystem::missing($path)) {
             throw new FileNotFoundException($path);
         }

From 9355134bbb2dbbc47fa9edacb99593f349927782 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Aug 2024 15:13:02 +0200
Subject: [PATCH 246/328] Resolve asset links using container to throw when
 they don't exist

---
 .../src/Foundation/Kernel/Hyperlinks.php      | 11 +++--
 .../DynamicMarkdownLinksFeatureTest.php       |  2 +
 .../Feature/Foundation/HyperlinksTest.php     | 47 +++++++++++++++----
 .../framework/tests/Feature/HelpersTest.php   | 24 ++++------
 .../tests/Feature/HydeKernelTest.php          |  7 +++
 .../Markdown/ShortcodeProcessorTest.php       | 13 +++++
 .../Unit/Facades/AssetFacadeUnitTest.php      |  9 +++-
 7 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 2dd7d07f4e1..6b6c7765346 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -11,7 +11,6 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Exceptions\FileNotFoundException;
-use Illuminate\Support\Str;
 
 use function str_ends_with;
 use function str_starts_with;
@@ -111,6 +110,8 @@ public function mediaLink(string $destination, bool $validate = false): string
      * If the image is already qualified (starts with `http`) it will be returned as is.
      *
      * If a base URL is configured, the image will be returned with a qualified absolute URL.
+     *
+     * @throws FileNotFoundException If the file does not exist in the `_media` directory in order to make the issue clear.
      */
     public function asset(string $name): string
     {
@@ -118,13 +119,13 @@ public function asset(string $name): string
             return $name;
         }
 
-        $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
+        $asset = Hyde::assets()->get($name);
 
-        if (Hyde::hasSiteUrl()) {
-            return Hyperlinks::withCacheBusting(Hyde::url($name), $name);
+        if ($asset) {
+            return $asset->getLink();
         }
 
-        return Hyperlinks::withCacheBusting(Hyde::relativeLink($name), $name);
+        throw new FileNotFoundException(MediaFile::sourcePath($name), appendAfterPath: ' when trying to resolve a media asset.');
     }
 
     /**
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 60208243185..9de203144eb 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -39,6 +39,8 @@ public static function tearDownAfterClass(): void
         unlink('_media/logo.png');
         unlink('_media/image.jpg');
 
+        DynamicMarkdownLinkProcessor::resetAssetMapCache();
+
         parent::tearDownAfterClass();
     }
 
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 88fa946bf24..a26b07be4bd 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -29,10 +29,10 @@ public function testAssetHelperGetsRelativeWebLinkToImageStoredInSiteMediaFolder
     {
         $tests = [
             'test.jpg' => 'media/test.jpg',
-            'foo' => 'media/foo',
             'http://example.com/test.jpg' => 'http://example.com/test.jpg',
             'https://example.com/test.jpg' => 'https://example.com/test.jpg',
         ];
+        $this->file('_media/test.jpg');
 
         foreach ($tests as $input => $expected) {
             $this->assertSame($this->class->asset($input), $expected);
@@ -43,11 +43,12 @@ public function testAssetHelperResolvesPathsForNestedPages()
     {
         $tests = [
             'test.jpg' => '../media/test.jpg',
-            'foo' => '../media/foo',
             'http://example.com/test.jpg' => 'http://example.com/test.jpg',
             'https://example.com/test.jpg' => 'https://example.com/test.jpg',
         ];
 
+        $this->file('_media/test.jpg');
+
         foreach ($tests as $input => $expected) {
             $this->mockCurrentPage('foo/bar');
             $this->assertSame($this->class->asset($input), $expected);
@@ -57,35 +58,61 @@ public function testAssetHelperResolvesPathsForNestedPages()
     public function testAssetHelperReturnsQualifiedAbsoluteUriWhenSiteHasBaseUrl()
     {
         config(['hyde.url' => 'https://example.org']);
+        $this->file('_media/test.jpg');
         $this->assertSame('https://example.org/media/test.jpg', $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsDefaultRelativePathWhenSiteHasNoBaseUrl()
     {
         $this->withoutSiteUrl();
+        $this->file('_media/test.jpg');
         $this->assertSame('media/test.jpg', $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsDefaultRelativePathWhenSiteBaseUrlIsLocalhost()
     {
+        $this->file('_media/test.jpg');
         $this->assertSame('media/test.jpg', $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsInputWhenImageIsAlreadyQualified()
+    public function testAssetHelperUsesConfiguredMediaDirectory()
     {
-        $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg'));
+        Hyde::setMediaDirectory('_assets');
+        $this->file('_assets/test.jpg');
+        $this->assertSame('assets/test.jpg', $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsInputWhenImageIsAlreadyQualifiedRegardlessOfMatchingTheConfiguredUrl()
+    public function testAssetHelperThrowsExceptionForNonExistentFile()
     {
-        config(['hyde.url' => 'https://example.org']);
-        $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg'));
+        $this->expectException(FileNotFoundException::class);
+        $this->class->asset('non_existent_file.jpg');
     }
 
-    public function testAssetHelperUsesConfiguredMediaDirectory()
+    public function testAssetHelperThrowsExceptionFileWithNoExtension()
     {
-        Hyde::setMediaDirectory('_assets');
-        $this->assertSame('assets/test.jpg', $this->class->asset('test.jpg'));
+        $this->file('_media/no_extension');
+        $this->expectException(FileNotFoundException::class);
+        $this->class->asset('no_extension');
+    }
+
+    public function testAssetHelperThrowsExceptionForNonExistentFileNonMediaExtension()
+    {
+        $this->file('_media/test.foo');
+        $this->expectException(FileNotFoundException::class);
+        $this->class->asset('test.foo');
+    }
+
+    public function testAssetHelperThrowsExceptionWithHelpfulMessage()
+    {
+        $this->expectExceptionMessage('File [_media/test.png] not found when trying to resolve a media asset.');
+        $this->expectException(FileNotFoundException::class);
+        $this->class->asset('test.png');
+    }
+
+    public function testAssetHelperReturnsInputWhenImageIsAlreadyQualifiedRegardlessOfMatchingTheConfiguredUrl()
+    {
+        config(['hyde.url' => 'https://example.org']);
+        $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg'));
     }
 
     public function testMediaLinkHelper()
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 3b70f847262..045c6958f15 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -70,15 +70,8 @@ public function testUnslashFunctionTrimsTrailingSlashes()
     /** @covers ::asset */
     public function testAssetFunction()
     {
-        $this->assertSame(Hyde::asset('foo'), asset('foo'));
-        $this->assertSame('media/foo', asset('foo'));
-    }
-
-    /** @covers ::asset */
-    public function testAssetFunctionWithQualifiedUrl()
-    {
-        $this->assertSame(Hyde::asset('foo', true), asset('foo'));
-        $this->assertSame('media/foo', asset('foo'));
+        $this->assertSame(Hyde::asset('app.css'), asset('app.css'));
+        $this->assertSame('media/app.css', asset('app.css'));
     }
 
     /** @covers ::asset */
@@ -92,21 +85,21 @@ public function testAssetFunctionWithExternalUrl()
     public function testAssetFunctionWithSetBaseUrl()
     {
         $this->app['config']->set(['hyde.url' => 'https://example.com']);
-        $this->assertSame('https://example.com/media/foo', asset('foo'));
+        $this->assertSame('https://example.com/media/app.css', asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionWithNoBaseUrl()
     {
         $this->app['config']->set(['hyde.url' => null]);
-        $this->assertSame('media/foo', asset('foo'));
+        $this->assertSame('media/app.css', asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionWithLocalhostBaseUrl()
     {
         $this->app['config']->set(['hyde.url' => 'http://localhost']);
-        $this->assertSame('media/foo', asset('foo'));
+        $this->assertSame('media/app.css', asset('app.css'));
     }
 
     /** @covers ::asset */
@@ -114,7 +107,7 @@ public function testAssetFunctionFromNestedPage()
     {
         Render::shouldReceive('getRouteKey')->andReturn('foo/bar');
 
-        $this->assertSame('../media/foo', asset('foo'));
+        $this->assertSame('../media/app.css', asset('app.css'));
     }
 
     /** @covers ::asset */
@@ -122,15 +115,16 @@ public function testAssetFunctionFromDeeplyNestedPage()
     {
         Render::shouldReceive('getRouteKey')->andReturn('foo/bar/baz');
 
-        $this->assertSame('../../media/foo', asset('foo'));
+        $this->assertSame('../../media/app.css', asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionWithCustomMediaDirectory()
     {
+        $this->file('custom/app.css');
         Hyde::setMediaDirectory('custom');
 
-        $this->assertSame('custom/foo', asset('foo'));
+        $this->assertSame('custom/app.css', asset('app.css'));
     }
 
     /** @covers ::route */
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index f0dac45e3ba..fe452d7756f 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -184,6 +184,8 @@ public function testMediaLinkHelperReturnsRelativeLinkToDestination()
 
     public function testImageHelperReturnsImagePathForGivenName()
     {
+        $this->file('_media/foo.jpg');
+
         Render::share('routeKey', 'foo');
         $this->assertSame('media/foo.jpg', Hyde::asset('foo.jpg'));
         $this->assertSame('https://example.com/foo.jpg', Hyde::asset('https://example.com/foo.jpg'));
@@ -195,11 +197,16 @@ public function testImageHelperReturnsImagePathForGivenName()
 
     public function testImageHelperTrimsMediaPrefix()
     {
+        $this->markTestSkipped('needs to reimplement normalization on the get method');
+        $this->file('_media/foo.jpg');
+
         $this->assertSame('media/foo.jpg', Hyde::asset('media/foo.jpg'));
     }
 
     public function testImageHelperSupportsCustomMediaDirectories()
     {
+        $this->file('_assets/foo.jpg');
+
         Hyde::setMediaDirectory('_assets');
         $this->assertSame('assets/foo.jpg', Hyde::asset('foo.jpg'));
     }
diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
index 12660727644..2ba7ecaa6e6 100644
--- a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
+use Hyde\Support\Facades\Render;
+use Hyde\Support\Models\RenderData;
 use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
 use Hyde\Markdown\Processing\ShortcodeProcessor;
 use Hyde\Testing\UnitTestCase;
@@ -13,6 +15,17 @@
  */
 class ShortcodeProcessorTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Todo: Fix coupling so we don't need to use the Render facade at all here.
+        Render::swap(new RenderData());
+    }
+
     public function testConstructorDiscoversDefaultShortcodes()
     {
         $shortcodes = (new ShortcodeProcessor('foo'))->getShortcodes();
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index f219a8d9318..ceb3949017c 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -10,6 +10,7 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
 use Hyde\Testing\CreatesTemporaryFiles;
+use Hyde\Framework\Exceptions\FileNotFoundException;
 
 /**
  * @covers \Hyde\Facades\Asset
@@ -33,7 +34,13 @@ protected function tearDown(): void
 
     public function testGetHelper()
     {
-        $this->assertSame(Hyde::asset('foo'), Asset::get('foo'));
+        $this->assertSame(Hyde::asset('app.css'), Asset::get('app.css'));
+    }
+
+    public function testGetHelperWithNonExistentFile()
+    {
+        $this->expectException(FileNotFoundException::class);
+        Asset::get('styles.css');
     }
 
     public function testHasMediaFileHelper()

From f64bf8437c05b6f9c01f7d454a1cfe52317a935a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Aug 2024 17:37:59 +0200
Subject: [PATCH 247/328] Reorder methods

---
 .../src/Support/Filesystem/MediaFile.php      | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 4d0c52a7ebd..704a9cbf0d1 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -95,17 +95,19 @@ public function getIdentifier(): string
     }
 
     /**
-     * Get the file information as an array.
-     *
-     * @return array{name: string, path: string, length: int, mimeType: string, hash: string}
+     * Get a relative web link to the media file.
      */
-    public function toArray(): array
+    public function getLink(): string
     {
-        return array_merge(parent::toArray(), [
-            'length' => $this->getContentLength(),
-            'mimeType' => $this->getMimeType(),
-            'hash' => $this->getHash(),
-        ]);
+        $name = $this->getIdentifier();
+
+        $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
+
+        if (Hyde::hasSiteUrl()) {
+            return Hyperlinks::withCacheBusting(Hyde::url($name), $name);
+        }
+
+        return Hyperlinks::withCacheBusting(Hyde::relativeLink($name), $name);
     }
 
     /**
@@ -139,19 +141,17 @@ public function getHash(): string
     }
 
     /**
-     * Get a relative web link to the media file.
+     * Get the file information as an array.
+     *
+     * @return array{name: string, path: string, length: int, mimeType: string, hash: string}
      */
-    public function getLink(): string
+    public function toArray(): array
     {
-        $name = $this->getIdentifier();
-
-        $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
-
-        if (Hyde::hasSiteUrl()) {
-            return Hyperlinks::withCacheBusting(Hyde::url($name), $name);
-        }
-
-        return Hyperlinks::withCacheBusting(Hyde::relativeLink($name), $name);
+        return array_merge(parent::toArray(), [
+            'length' => $this->getContentLength(),
+            'mimeType' => $this->getMimeType(),
+            'hash' => $this->getHash(),
+        ]);
     }
 
     /** @internal */

From 23a49e2e4087198c4ce24474e1df54dd0ddb2c82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Aug 2024 18:20:17 +0200
Subject: [PATCH 248/328] Make the media file class stringable

---
 .../src/Support/Filesystem/MediaFile.php      | 11 +++-
 .../tests/Unit/Support/MediaFileUnitTest.php  | 57 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 704a9cbf0d1..d322218215a 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -5,6 +5,7 @@
 namespace Hyde\Support\Filesystem;
 
 use Hyde\Hyde;
+use Stringable;
 use Hyde\Facades\Config;
 use Hyde\Facades\Filesystem;
 use Illuminate\Support\Collection;
@@ -21,7 +22,7 @@
 /**
  * File abstraction for a project media file.
  */
-class MediaFile extends ProjectFile
+class MediaFile extends ProjectFile implements Stringable
 {
     /** @var array<string> The default extensions for media types */
     final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
@@ -42,6 +43,14 @@ public function __construct(string $path)
         parent::__construct($this->getNormalizedPath($path));
     }
 
+    /**
+     * Cast the instance to a string which is the resolved web link to the media file.
+     */
+    public function __toString(): string
+    {
+        return $this->getLink();
+    }
+
     /**
      * Get an array of media asset filenames relative to the `_media/` directory.
      *
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 9b1542bbe3d..eb8c945439b 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -517,6 +517,63 @@ public function testGetLinkWithCurrentPageContextAndCustomMediaDirectory()
         Hyde::setMediaDirectory('_media'); // Reset to default
     }
 
+    public function testCanCastToString()
+    {
+        $file = new MediaFile('foo.txt');
+        $this->assertIsString((string) $file);
+        $this->assertSame('media/foo.txt', (string) $file);
+    }
+
+    public function testStringCastReturnsLink()
+    {
+        $file = new MediaFile('foo.txt');
+        $this->assertSame($file->getLink(), (string) $file);
+    }
+
+    public function testStringCastWithCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $file = new MediaFile('foo.txt');
+        $this->assertSame('custom_media/foo.txt', (string) $file);
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testStringCastWithPrettyUrls()
+    {
+        self::mockConfig(['hyde.enable_cache_busting' => false, 'hyde.pretty_urls' => true]);
+        $file = new MediaFile('foo.txt');
+        $this->assertSame('media/foo.txt', (string) $file);
+    }
+
+    public function testStringCastWithNestedFile()
+    {
+        $file = new MediaFile('subdirectory/foo.txt');
+        $this->assertSame('media/subdirectory/foo.txt', (string) $file);
+    }
+
+    public function testStringCastWithBaseUrl()
+    {
+        self::mockConfig(['hyde.enable_cache_busting' => false, 'hyde.url' => 'https://example.com']);
+        $file = new MediaFile('foo.txt');
+        $this->assertSame('https://example.com/media/foo.txt', (string) $file);
+    }
+
+    public function testStringCastWithCacheBusting()
+    {
+        self::mockConfig(['hyde.enable_cache_busting' => true]);
+        $this->mockFilesystem->shouldReceive('hash')
+            ->andReturn('abc123');
+        $file = new MediaFile('foo.txt');
+        $this->assertSame('media/foo.txt?v=abc123', (string) $file);
+    }
+
+    public function testStringCastWithCurrentPageContext()
+    {
+        $this->mockCurrentPage('foo/bar');
+        $file = new MediaFile('baz.txt');
+        $this->assertSame('../media/baz.txt', (string) $file);
+    }
+
     // Helper method to mock the current page
     protected function mockCurrentPage(string $page): void
     {

From be2e212318cc52a12f83ad9e2ee5c63da85a1e4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 10:58:38 +0200
Subject: [PATCH 249/328] Remove qualified URL normalization from the asset
 helper

See https://github.com/hydephp/develop/pull/1932#discussion_r1740182051
---
 .../src/Foundation/Kernel/Hyperlinks.php      |  5 ----
 .../Feature/Foundation/HyperlinksTest.php     | 24 +++++--------------
 .../framework/tests/Feature/HelpersTest.php   |  4 +++-
 .../tests/Feature/HydeKernelTest.php          |  2 --
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 6b6c7765346..a03e4686f17 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -107,7 +107,6 @@ public function mediaLink(string $destination, bool $validate = false): string
 
     /**
      * Gets a relative web link to the given file stored in the `_site/media` folder.
-     * If the image is already qualified (starts with `http`) it will be returned as is.
      *
      * If a base URL is configured, the image will be returned with a qualified absolute URL.
      *
@@ -115,10 +114,6 @@ public function mediaLink(string $destination, bool $validate = false): string
      */
     public function asset(string $name): string
     {
-        if (Hyperlinks::isRemote($name)) {
-            return $name;
-        }
-
         $asset = Hyde::assets()->get($name);
 
         if ($asset) {
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index a26b07be4bd..9eedeb55782 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -27,32 +27,17 @@ protected function setUp(): void
 
     public function testAssetHelperGetsRelativeWebLinkToImageStoredInSiteMediaFolder()
     {
-        $tests = [
-            'test.jpg' => 'media/test.jpg',
-            'http://example.com/test.jpg' => 'http://example.com/test.jpg',
-            'https://example.com/test.jpg' => 'https://example.com/test.jpg',
-        ];
         $this->file('_media/test.jpg');
 
-        foreach ($tests as $input => $expected) {
-            $this->assertSame($this->class->asset($input), $expected);
-        }
+        $this->assertSame($this->class->asset('test.jpg'), 'media/test.jpg');
     }
 
     public function testAssetHelperResolvesPathsForNestedPages()
     {
-        $tests = [
-            'test.jpg' => '../media/test.jpg',
-            'http://example.com/test.jpg' => 'http://example.com/test.jpg',
-            'https://example.com/test.jpg' => 'https://example.com/test.jpg',
-        ];
-
         $this->file('_media/test.jpg');
 
-        foreach ($tests as $input => $expected) {
-            $this->mockCurrentPage('foo/bar');
-            $this->assertSame($this->class->asset($input), $expected);
-        }
+        $this->mockCurrentPage('foo/bar');
+        $this->assertSame($this->class->asset('test.jpg'), '../media/test.jpg');
     }
 
     public function testAssetHelperReturnsQualifiedAbsoluteUriWhenSiteHasBaseUrl()
@@ -111,6 +96,9 @@ public function testAssetHelperThrowsExceptionWithHelpfulMessage()
 
     public function testAssetHelperReturnsInputWhenImageIsAlreadyQualifiedRegardlessOfMatchingTheConfiguredUrl()
     {
+        $this->expectExceptionMessage('File [_media/http://localhost/media/test.jpg] not found when trying to resolve a media asset.');
+        $this->expectException(FileNotFoundException::class);
+
         config(['hyde.url' => 'https://example.org']);
         $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg'));
     }
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 045c6958f15..4610dc52c9a 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -13,6 +13,7 @@
 use Symfony\Component\Yaml\Yaml;
 use Hyde\Support\Facades\Render;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Framework\Exceptions\FileNotFoundException;
 
 /**
  * Covers the helpers in helpers.php.
@@ -77,7 +78,8 @@ public function testAssetFunction()
     /** @covers ::asset */
     public function testAssetFunctionWithExternalUrl()
     {
-        $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
+        $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File [_media/https://example.com/foo] not found when trying to resolve a media asset.');
         $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
     }
 
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index fe452d7756f..3f0161600f3 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -188,11 +188,9 @@ public function testImageHelperReturnsImagePathForGivenName()
 
         Render::share('routeKey', 'foo');
         $this->assertSame('media/foo.jpg', Hyde::asset('foo.jpg'));
-        $this->assertSame('https://example.com/foo.jpg', Hyde::asset('https://example.com/foo.jpg'));
 
         Render::share('routeKey', 'foo/bar');
         $this->assertSame('../media/foo.jpg', Hyde::asset('foo.jpg'));
-        $this->assertSame('https://example.com/foo.jpg', Hyde::asset('https://example.com/foo.jpg'));
     }
 
     public function testImageHelperTrimsMediaPrefix()

From 0f9cd052f53c25b1eba96d0123ed38fd5519a48e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 12:56:33 +0200
Subject: [PATCH 250/328] Fix wrong order of expected and actual

---
 .../framework/tests/Feature/Foundation/HyperlinksTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 9eedeb55782..8ed622d6a8c 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -29,7 +29,7 @@ public function testAssetHelperGetsRelativeWebLinkToImageStoredInSiteMediaFolder
     {
         $this->file('_media/test.jpg');
 
-        $this->assertSame($this->class->asset('test.jpg'), 'media/test.jpg');
+        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperResolvesPathsForNestedPages()
@@ -37,7 +37,7 @@ public function testAssetHelperResolvesPathsForNestedPages()
         $this->file('_media/test.jpg');
 
         $this->mockCurrentPage('foo/bar');
-        $this->assertSame($this->class->asset('test.jpg'), '../media/test.jpg');
+        $this->assertSame('../media/test.jpg', $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsQualifiedAbsoluteUriWhenSiteHasBaseUrl()

From 32d5dc962e283a5185069c6ee4e5d22ebf975130 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 13:12:56 +0200
Subject: [PATCH 251/328] Update outdated test names

---
 packages/framework/tests/Feature/HydeKernelTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 3f0161600f3..7251c81bac5 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -182,7 +182,7 @@ public function testMediaLinkHelperReturnsRelativeLinkToDestination()
         $this->assertSame('../media/foo', Hyde::mediaLink('foo'));
     }
 
-    public function testImageHelperReturnsImagePathForGivenName()
+    public function testAssetHelperReturnsAssetPathForGivenName()
     {
         $this->file('_media/foo.jpg');
 
@@ -193,7 +193,7 @@ public function testImageHelperReturnsImagePathForGivenName()
         $this->assertSame('../media/foo.jpg', Hyde::asset('foo.jpg'));
     }
 
-    public function testImageHelperTrimsMediaPrefix()
+    public function testAssetHelperTrimsMediaPrefix()
     {
         $this->markTestSkipped('needs to reimplement normalization on the get method');
         $this->file('_media/foo.jpg');
@@ -201,7 +201,7 @@ public function testImageHelperTrimsMediaPrefix()
         $this->assertSame('media/foo.jpg', Hyde::asset('media/foo.jpg'));
     }
 
-    public function testImageHelperSupportsCustomMediaDirectories()
+    public function testAssetHelperSupportsCustomMediaDirectories()
     {
         $this->file('_assets/foo.jpg');
 

From 36a2343ecdeab529b9c5d96d4e962034b2f81b2c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 13:18:57 +0200
Subject: [PATCH 252/328] Major: Change the asset helper to return MediaFile
 instances

If using strict types, this may cause issues, however the instance is castable to the relative link which is the same value as before.
---
 .../hyde-kernel-hyperlink-methods.md          |  4 +--
 packages/framework/src/Facades/Asset.php      |  2 +-
 .../Concerns/ForwardsHyperlinks.php           |  3 +-
 .../src/Foundation/Kernel/Hyperlinks.php      |  8 +++--
 .../DynamicMarkdownLinkProcessor.php          |  2 +-
 packages/framework/src/helpers.php            | 11 ++++--
 .../Feature/Foundation/HyperlinksTest.php     | 14 ++++----
 .../framework/tests/Feature/HelpersTest.php   | 36 +++++++++++++++----
 .../tests/Feature/HydeKernelTest.php          | 23 +++++++++---
 9 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
index bd8d609104b..82c400152b2 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-hyperlink-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsHyperlinks -->
-<!-- Generated by HydePHP DocGen script at 2024-07-26 18:20:22 in 0.13ms -->
+<!-- Generated by HydePHP DocGen script at 2024-09-02 11:18:08 in 0.14ms -->
 
 #### `formatLink()`
 
@@ -32,7 +32,7 @@ Hyde::mediaLink(string $destination, bool $validate): string
 No description provided.
 
 ```php
-Hyde::asset(string $name): string
+Hyde::asset(string $name): Hyde\Support\Filesystem\MediaFile
 ```
 
 #### `url()`
diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index d014d1e5ad6..524607e6ebc 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -17,7 +17,7 @@
  */
 class Asset
 {
-    public static function get(string $file): string
+    public static function get(string $file): MediaFile
     {
         return hyde()->asset($file);
     }
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index d797c3cd983..5eae4cd3e4c 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -5,6 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Support\Models\Route;
+use Hyde\Support\Filesystem\MediaFile;
 
 /**
  * @internal Single-use trait for the HydeKernel class.
@@ -28,7 +29,7 @@ public function mediaLink(string $destination, bool $validate = false): string
         return $this->hyperlinks->mediaLink($destination, $validate);
     }
 
-    public function asset(string $name): string
+    public function asset(string $name): MediaFile
     {
         return $this->hyperlinks->asset($name);
     }
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index a03e4686f17..8465cda8377 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -106,18 +106,20 @@ public function mediaLink(string $destination, bool $validate = false): string
     }
 
     /**
-     * Gets a relative web link to the given file stored in the `_site/media` folder.
+     * Gets a MediaAsset instance for the given file stored in the `_site/media` folder.
+     * The returned value can be cast into a string in Blade views to resole the URL.
      *
      * If a base URL is configured, the image will be returned with a qualified absolute URL.
+     * Otherwise, a relative path will be returned based on the rendered page's location.
      *
      * @throws FileNotFoundException If the file does not exist in the `_media` directory in order to make the issue clear.
      */
-    public function asset(string $name): string
+    public function asset(string $name): MediaFile
     {
         $asset = Hyde::assets()->get($name);
 
         if ($asset) {
-            return $asset->getLink();
+            return $asset;
         }
 
         throw new FileNotFoundException(MediaFile::sourcePath($name), appendAfterPath: ' when trying to resolve a media asset.');
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 7dc220855e0..c14732b2e09 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -66,7 +66,7 @@ protected static function assetMap(): array
 
     protected static function assetPath(MediaFile $mediaFile): string
     {
-        return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'));
+        return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'))->getLink();
     }
 
     /** @internal Testing helper to reset the asset map cache. */
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 784eb083ac2..07bde2f23e0 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -4,6 +4,8 @@
 
 namespace {
     use Hyde\Foundation\HydeKernel;
+    use Hyde\Support\Filesystem\MediaFile;
+    use Hyde\Framework\Exceptions\FileNotFoundException;
 
     if (! function_exists('hyde')) {
         /**
@@ -20,12 +22,15 @@ function hyde(): HydeKernel
     } else {
         if (! function_exists('asset')) {
             /**
-             * Gets a relative web link to the given file stored in the `_site/media` folder.
-             * If the image is already qualified (starts with `http`) it will be returned as is.
+             * Gets a MediaAsset instance for the given file stored in the `_site/media` folder.
+             * The returned value can be cast into a string in Blade views to resole the URL.
              *
              * If a base URL is configured, the image will be returned with a qualified absolute URL.
+             * Otherwise, a relative path will be returned based on the rendered page's location.
+             *
+             * @throws FileNotFoundException If the file does not exist in the `_media` directory in order to make the issue clear.
              */
-            function asset(string $name): string
+            function asset(string $name): MediaFile
             {
                 return hyde()->asset($name);
             }
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 8ed622d6a8c..24ec78755c6 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -29,7 +29,7 @@ public function testAssetHelperGetsRelativeWebLinkToImageStoredInSiteMediaFolder
     {
         $this->file('_media/test.jpg');
 
-        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg'));
+        $this->assertSame('media/test.jpg', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperResolvesPathsForNestedPages()
@@ -37,34 +37,34 @@ public function testAssetHelperResolvesPathsForNestedPages()
         $this->file('_media/test.jpg');
 
         $this->mockCurrentPage('foo/bar');
-        $this->assertSame('../media/test.jpg', $this->class->asset('test.jpg'));
+        $this->assertSame('../media/test.jpg', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsQualifiedAbsoluteUriWhenSiteHasBaseUrl()
     {
         config(['hyde.url' => 'https://example.org']);
         $this->file('_media/test.jpg');
-        $this->assertSame('https://example.org/media/test.jpg', $this->class->asset('test.jpg'));
+        $this->assertSame('https://example.org/media/test.jpg', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsDefaultRelativePathWhenSiteHasNoBaseUrl()
     {
         $this->withoutSiteUrl();
         $this->file('_media/test.jpg');
-        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg'));
+        $this->assertSame('media/test.jpg', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsDefaultRelativePathWhenSiteBaseUrlIsLocalhost()
     {
         $this->file('_media/test.jpg');
-        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg'));
+        $this->assertSame('media/test.jpg', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperUsesConfiguredMediaDirectory()
     {
         Hyde::setMediaDirectory('_assets');
         $this->file('_assets/test.jpg');
-        $this->assertSame('assets/test.jpg', $this->class->asset('test.jpg'));
+        $this->assertSame('assets/test.jpg', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperThrowsExceptionForNonExistentFile()
@@ -100,7 +100,7 @@ public function testAssetHelperReturnsInputWhenImageIsAlreadyQualifiedRegardless
         $this->expectException(FileNotFoundException::class);
 
         config(['hyde.url' => 'https://example.org']);
-        $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg'));
+        $this->assertSame('http://localhost/media/test.jpg', (string) $this->class->asset('http://localhost/media/test.jpg'));
     }
 
     public function testMediaLinkHelper()
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 4610dc52c9a..1cdbabb6c90 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -13,6 +13,7 @@
 use Symfony\Component\Yaml\Yaml;
 use Hyde\Support\Facades\Render;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 
 /**
@@ -71,8 +72,11 @@ public function testUnslashFunctionTrimsTrailingSlashes()
     /** @covers ::asset */
     public function testAssetFunction()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         $this->assertSame(Hyde::asset('app.css'), asset('app.css'));
-        $this->assertSame('media/app.css', asset('app.css'));
+        $this->assertSame('media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
@@ -86,38 +90,53 @@ public function testAssetFunctionWithExternalUrl()
     /** @covers ::asset */
     public function testAssetFunctionWithSetBaseUrl()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         $this->app['config']->set(['hyde.url' => 'https://example.com']);
-        $this->assertSame('https://example.com/media/app.css', asset('app.css'));
+        $this->assertSame('https://example.com/media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionWithNoBaseUrl()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         $this->app['config']->set(['hyde.url' => null]);
-        $this->assertSame('media/app.css', asset('app.css'));
+        $this->assertSame('media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionWithLocalhostBaseUrl()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         $this->app['config']->set(['hyde.url' => 'http://localhost']);
-        $this->assertSame('media/app.css', asset('app.css'));
+        $this->assertSame('media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionFromNestedPage()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         Render::shouldReceive('getRouteKey')->andReturn('foo/bar');
 
-        $this->assertSame('../media/app.css', asset('app.css'));
+        $this->assertSame('../media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionFromDeeplyNestedPage()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         Render::shouldReceive('getRouteKey')->andReturn('foo/bar/baz');
 
-        $this->assertSame('../../media/app.css', asset('app.css'));
+        $this->assertSame('../../media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
@@ -126,7 +145,10 @@ public function testAssetFunctionWithCustomMediaDirectory()
         $this->file('custom/app.css');
         Hyde::setMediaDirectory('custom');
 
-        $this->assertSame('custom/app.css', asset('app.css'));
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('custom/app.css'), asset('app.css'));
+
+        $this->assertSame('custom/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::route */
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 7251c81bac5..518f24db6f1 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -182,15 +182,30 @@ public function testMediaLinkHelperReturnsRelativeLinkToDestination()
         $this->assertSame('../media/foo', Hyde::mediaLink('foo'));
     }
 
+    public function testAssetHelperReturnsMediaFileInstanceForGivenName()
+    {
+        $this->file('_media/foo.jpg');
+
+        $asset = Hyde::asset('foo.jpg');
+
+        $this->assertInstanceOf(MediaFile::class, $asset);
+        $this->assertEquals(new MediaFile('_media/foo.jpg'), $asset);
+
+        $this->assertSame('foo.jpg', $asset->getName());
+        $this->assertSame('_media/foo.jpg', $asset->getPath());
+        $this->assertSame('media/foo.jpg', $asset->getLink());
+        $this->assertSame('media/foo.jpg', (string) $asset);
+    }
+
     public function testAssetHelperReturnsAssetPathForGivenName()
     {
         $this->file('_media/foo.jpg');
 
         Render::share('routeKey', 'foo');
-        $this->assertSame('media/foo.jpg', Hyde::asset('foo.jpg'));
+        $this->assertSame('media/foo.jpg', (string) Hyde::asset('foo.jpg'));
 
         Render::share('routeKey', 'foo/bar');
-        $this->assertSame('../media/foo.jpg', Hyde::asset('foo.jpg'));
+        $this->assertSame('../media/foo.jpg', (string) Hyde::asset('foo.jpg'));
     }
 
     public function testAssetHelperTrimsMediaPrefix()
@@ -198,7 +213,7 @@ public function testAssetHelperTrimsMediaPrefix()
         $this->markTestSkipped('needs to reimplement normalization on the get method');
         $this->file('_media/foo.jpg');
 
-        $this->assertSame('media/foo.jpg', Hyde::asset('media/foo.jpg'));
+        $this->assertSame('media/foo.jpg', (string) Hyde::asset('media/foo.jpg'));
     }
 
     public function testAssetHelperSupportsCustomMediaDirectories()
@@ -206,7 +221,7 @@ public function testAssetHelperSupportsCustomMediaDirectories()
         $this->file('_assets/foo.jpg');
 
         Hyde::setMediaDirectory('_assets');
-        $this->assertSame('assets/foo.jpg', Hyde::asset('foo.jpg'));
+        $this->assertSame('assets/foo.jpg', (string) Hyde::asset('foo.jpg'));
     }
 
     public function testAssetsHelperGetsAllSiteAssets()

From 9bb8e6c2f7075f330a59d1a74b43cd2161b6b2e3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 13:26:41 +0200
Subject: [PATCH 253/328] Create AssetAPIFeatureTest.php

---
 .../framework/tests/Feature/AssetAPIFeatureTest.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 packages/framework/tests/Feature/AssetAPIFeatureTest.php

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
new file mode 100644
index 00000000000..7c39668ffb3
--- /dev/null
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Hyde\Testing\TestCase;
+
+/**
+ * @coversNothing High level test for the Asset API
+ */
+class AssetAPIFeatureTest extends TestCase
+{
+    //
+}

From 001cd3ae42fec6c9278d57a7598f92fcc9be9afb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 13:43:53 +0200
Subject: [PATCH 254/328] Test Asset API usages in Blade views

---
 .../tests/Feature/AssetAPIFeatureTest.php     | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 7c39668ffb3..4422f8bfcf9 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -2,12 +2,44 @@
 
 declare(strict_types=1);
 
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Blade;
 
 /**
  * @coversNothing High level test for the Asset API
  */
 class AssetAPIFeatureTest extends TestCase
 {
-    //
+    public function testAssetAPIUsagesInBladeViews()
+    {
+        $view = <<<'Blade'
+        @if(Asset::hasMediaFile('app.css'))
+            <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
+            <link rel="stylesheet" href="{{ Asset::get('app.css') }}">
+            <link rel="stylesheet" href="{{ Hyde::asset('app.css') }}">
+            <link rel="stylesheet" href="{{ asset('app.css') }}">
+        @endif
+        
+        @if(Asset::hasMediaFile('missing.png'))
+            Found missing.png
+        @else
+            Missing missing.png
+        @endif
+        Blade;
+
+        $html = Blade::render($view);
+
+        $version = Hyde::assets()->get('app.css')->getHash();
+
+        $this->assertSame(<<<HTML
+        <link rel="stylesheet" href="media/app.css?v=$version">
+            <link rel="stylesheet" href="media/app.css">
+            <link rel="stylesheet" href="media/app.css">
+            <link rel="stylesheet" href="media/app.css">
+        
+            Missing missing.png
+
+        HTML, $html);
+    }
 }

From d7bdc495931f37912881b3f4c093d0f12f39e486 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 13:55:03 +0200
Subject: [PATCH 255/328] Swap method declaration order

---
 .../src/Support/Filesystem/MediaFile.php         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index d322218215a..c58127a6008 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -52,23 +52,23 @@ public function __toString(): string
     }
 
     /**
-     * Get an array of media asset filenames relative to the `_media/` directory.
+     * Get a collection of all media files, parsed into `MediaFile` instances, keyed by the filenames relative to the `_media/` directory.
      *
-     * @return array<int, string> {@example `['app.css', 'images/logo.svg']`}
+     * @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
      */
-    public static function files(): array
+    public static function all(): Collection
     {
-        return static::all()->keys()->all();
+        return Hyde::assets();
     }
 
     /**
-     * Get a collection of all media files, parsed into `MediaFile` instances, keyed by the filenames relative to the `_media/` directory.
+     * Get an array of media asset filenames relative to the `_media/` directory.
      *
-     * @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
+     * @return array<int, string> {@example `['app.css', 'images/logo.svg']`}
      */
-    public static function all(): Collection
+    public static function files(): array
     {
-        return Hyde::assets();
+        return static::all()->keys()->all();
     }
 
     /**

From 09243b8d0e87b06dde553a28453823de6e9bbc50 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 14:26:49 +0200
Subject: [PATCH 256/328] Add `MediaFile::get()` method

---
 packages/framework/src/Support/Filesystem/MediaFile.php   | 8 ++++++++
 packages/framework/tests/Feature/AssetAPIFeatureTest.php  | 4 ++--
 packages/framework/tests/Feature/HydeKernelTest.php       | 7 +++++++
 .../framework/tests/Unit/Support/MediaFileUnitTest.php    | 5 +++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index c58127a6008..1dc1478803e 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -51,6 +51,14 @@ public function __toString(): string
         return $this->getLink();
     }
 
+    /**
+     * Get a media file instance from the HydeKernel for the given file.
+     */
+    public static function get(string $file): MediaFile
+    {
+        return Hyde::asset($file);
+    }
+
     /**
      * Get a collection of all media files, parsed into `MediaFile` instances, keyed by the filenames relative to the `_media/` directory.
      *
diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 4422f8bfcf9..e3d3cf1fcf4 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Blade;
+use Hyde\Support\Filesystem\MediaFile;
 
 /**
  * @coversNothing High level test for the Asset API
@@ -30,7 +30,7 @@ public function testAssetAPIUsagesInBladeViews()
 
         $html = Blade::render($view);
 
-        $version = Hyde::assets()->get('app.css')->getHash();
+        $version = MediaFile::get('app.css')->getHash();
 
         $this->assertSame(<<<HTML
         <link rel="stylesheet" href="media/app.css?v=$version">
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 518f24db6f1..f6f5a397817 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -224,6 +224,13 @@ public function testAssetHelperSupportsCustomMediaDirectories()
         $this->assertSame('assets/foo.jpg', (string) Hyde::asset('foo.jpg'));
     }
 
+    public function testAssetsHelperGetsAssetsFromKernel()
+    {
+        $this->assertSame(Hyde::kernel()->assets(), Hyde::assets());
+        $this->assertSame(Hyde::asset('app.css'), Hyde::assets()->get('app.css'));
+        $this->assertSame(MediaFile::get('app.css'), Hyde::asset('app.css'));
+    }
+
     public function testAssetsHelperGetsAllSiteAssets()
     {
         $this->assertEquals(new Collection([
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index eb8c945439b..14da69113e3 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -92,6 +92,11 @@ public function testCanMake()
         $this->assertEquals(new MediaFile('foo'), MediaFile::make('foo'));
     }
 
+    public function testCanGet()
+    {
+        $this->assertEquals(new MediaFile('app.css'), MediaFile::get('app.css'));
+    }
+
     public function testCanConstructWithNestedPaths()
     {
         $this->assertSame('_media/path/to/file.txt', MediaFile::make('path/to/file.txt')->path);

From e89b7d5a139e8091d4ac81dc112280688736e59a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 16:29:33 +0200
Subject: [PATCH 257/328] Fall back to make the instance

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 1dc1478803e..4766cc63806 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -56,7 +56,7 @@ public function __toString(): string
      */
     public static function get(string $file): MediaFile
     {
-        return Hyde::asset($file);
+        return Hyde::assets()->get($file) ?? static::make($file);
     }
 
     /**

From 17edb9b418e1d0fbc50af2adef1a193fd83a40a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 16:34:03 +0200
Subject: [PATCH 258/328] Inject language reference

---
 packages/framework/tests/Feature/AssetAPIFeatureTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index e3d3cf1fcf4..1914ae73820 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -13,7 +13,7 @@ class AssetAPIFeatureTest extends TestCase
 {
     public function testAssetAPIUsagesInBladeViews()
     {
-        $view = <<<'Blade'
+        $view = /** @lang Blade */ <<<'Blade'
         @if(Asset::hasMediaFile('app.css'))
             <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
             <link rel="stylesheet" href="{{ Asset::get('app.css') }}">

From da1941e89c3ce04fd4957edd8b765b4f06accf90 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 16:39:36 +0200
Subject: [PATCH 259/328] Test Asset API examples

---
 .../tests/Feature/AssetAPIFeatureTest.php     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 1914ae73820..92d8a82f713 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -11,6 +11,31 @@
  */
 class AssetAPIFeatureTest extends TestCase
 {
+    public function testAssetAPIExamples()
+    {
+        $conditions = [
+            'hasMediaFileTrue' => Asset::hasMediaFile('app.css'),
+            'hasMediaFileFalse' => Asset::hasMediaFile('missing.png'),
+            'links' => [
+                Asset::mediaLink('app.css'),
+                Asset::get('app.css'),
+                Hyde::asset('app.css'),
+                asset('app.css'),
+            ],
+        ];
+
+        $this->assertSame([
+            'hasMediaFileTrue' => true,
+            'hasMediaFileFalse' => false,
+            'links' => [
+                'media/app.css?v='.MediaFile::get('app.css')->getHash(),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+            ],
+        ], $conditions);
+    }
+
     public function testAssetAPIUsagesInBladeViews()
     {
         $view = /** @lang Blade */ <<<'Blade'

From 7504248536ff02264901ee4b85e39b4e34e16c6c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 16:42:01 +0200
Subject: [PATCH 260/328] Extract helper method

---
 .../framework/tests/Feature/AssetAPIFeatureTest.php   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 92d8a82f713..d7561351f24 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -28,7 +28,7 @@ public function testAssetAPIExamples()
             'hasMediaFileTrue' => true,
             'hasMediaFileFalse' => false,
             'links' => [
-                'media/app.css?v='.MediaFile::get('app.css')->getHash(),
+                "media/app.css?v={$this->getAppStylesVersion()}",
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
@@ -55,10 +55,8 @@ public function testAssetAPIUsagesInBladeViews()
 
         $html = Blade::render($view);
 
-        $version = MediaFile::get('app.css')->getHash();
-
         $this->assertSame(<<<HTML
-        <link rel="stylesheet" href="media/app.css?v=$version">
+        <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
             <link rel="stylesheet" href="media/app.css">
             <link rel="stylesheet" href="media/app.css">
             <link rel="stylesheet" href="media/app.css">
@@ -67,4 +65,9 @@ public function testAssetAPIUsagesInBladeViews()
 
         HTML, $html);
     }
+
+    protected function getAppStylesVersion(): string
+    {
+        return MediaFile::get('app.css')->getHash();
+    }
 }

From 5a4030f11eb46739c0609c02c66f19297bf52a26 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 16:58:02 +0200
Subject: [PATCH 261/328] Test with all Kernel accessors

---
 .../framework/tests/Feature/AssetAPIFeatureTest.php   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index d7561351f24..a2223373571 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\Facades\Blade;
 use Hyde\Support\Filesystem\MediaFile;
 
@@ -19,7 +20,11 @@ public function testAssetAPIExamples()
             'links' => [
                 Asset::mediaLink('app.css'),
                 Asset::get('app.css'),
-                Hyde::asset('app.css'),
+                \Hyde::asset('app.css'),
+                \Hyde\Hyde::asset('app.css'),
+                Hyde::kernel()->asset('app.css'),
+                HydeKernel::getInstance()->asset('app.css'),
+                hyde()->asset('app.css'),
                 asset('app.css'),
             ],
         ];
@@ -32,6 +37,10 @@ public function testAssetAPIExamples()
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
             ],
         ], $conditions);
     }

From 861b25410b8d1a9b5f7170e0954e4f923861fa4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 16:58:43 +0200
Subject: [PATCH 262/328] Provide autocomplete for media file asset getters

---
 ide.json | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/ide.json b/ide.json
index 7fc70f332ac..adc8f317627 100644
--- a/ide.json
+++ b/ide.json
@@ -15,6 +15,29 @@
                 }
             ]
         },
+        {
+            "complete": "directoryFiles",
+            "options": {
+                "directory": "/_media"
+            },
+            "condition": [
+                {
+                    "methodNames": ["get", "mediaLink", "hasMediaFile"],
+                    "place": "parameter",
+                    "classFqn": ["\\Hyde\\Facades\\Asset"],
+                    "parameters": [1]
+                }, {
+                    "methodNames": ["asset"],
+                    "place": "parameter",
+                    "classFqn": ["Hyde\\Foundation\\HydeKernel", "\\Hyde\\Hyde", "Hyde"],
+                    "parameters": [1]
+                }, {
+                    "functionNames": ["asset"],
+                    "place": "parameter",
+                    "parameters": [1]
+                }
+            ]
+        },
         {
             "complete": "configKey",
             "condition": [

From ff439e1d4de693d42832561dce1d299af334d374 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 17:06:22 +0200
Subject: [PATCH 263/328] Provide autocomplete for media file asset accessors

---
 ide.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ide.json b/ide.json
index adc8f317627..dcc1dbb9eb3 100644
--- a/ide.json
+++ b/ide.json
@@ -26,6 +26,12 @@
                     "place": "parameter",
                     "classFqn": ["\\Hyde\\Facades\\Asset"],
                     "parameters": [1]
+                },
+                {
+                    "methodNames": ["__construct", "get", "make", "sourcePath", "outputPath"],
+                    "place": "parameter",
+                    "classFqn": ["Hyde\\Support\\Filesystem\\MediaFile"],
+                    "parameters": [1]
                 }, {
                     "methodNames": ["asset"],
                     "place": "parameter",

From bcacc4d49ab6858d58cdf386244c84cee244cb94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 17:06:33 +0200
Subject: [PATCH 264/328] Update AssetAPIFeatureTest.php

---
 .../tests/Feature/AssetAPIFeatureTest.php     | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index a2223373571..31468ac3504 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -14,10 +14,12 @@ class AssetAPIFeatureTest extends TestCase
 {
     public function testAssetAPIExamples()
     {
+        // Tests for the Asset API, can be used to try out the PhpStorm autocompletion
+
         $conditions = [
             'hasMediaFileTrue' => Asset::hasMediaFile('app.css'),
             'hasMediaFileFalse' => Asset::hasMediaFile('missing.png'),
-            'links' => [
+            'getters' => [
                 Asset::mediaLink('app.css'),
                 Asset::get('app.css'),
                 \Hyde::asset('app.css'),
@@ -27,12 +29,19 @@ public function testAssetAPIExamples()
                 hyde()->asset('app.css'),
                 asset('app.css'),
             ],
+            'accessors' => [
+                new MediaFile('app.css'),
+                MediaFile::make('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::sourcePath('app.css'),
+                MediaFile::outputPath('app.css'),
+            ],
         ];
 
-        $this->assertSame([
+        $this->assertEquals([
             'hasMediaFileTrue' => true,
             'hasMediaFileFalse' => false,
-            'links' => [
+            'getters' => [
                 "media/app.css?v={$this->getAppStylesVersion()}",
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
@@ -42,6 +51,13 @@ public function testAssetAPIExamples()
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
             ],
+            'accessors' => [
+                new MediaFile('app.css'),
+                new MediaFile('app.css'),
+                MediaFile::get('app.css'),
+                Hyde::path('_media/app.css'),
+                Hyde::sitePath('media/app.css'),
+            ],
         ], $conditions);
     }
 

From a6cbbb29fa5073b027f4fc390364bdb5a0a87792 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 17:10:08 +0200
Subject: [PATCH 265/328] Clarify method documentation

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 4766cc63806..5cf59551e38 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -52,7 +52,7 @@ public function __toString(): string
     }
 
     /**
-     * Get a media file instance from the HydeKernel for the given file.
+     * Get or create a media file instance from the HydeKernel for the given file.
      */
     public static function get(string $file): MediaFile
     {

From 14a792fbfb91b9f7067f0e50c132a8b41666969b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 17:10:51 +0200
Subject: [PATCH 266/328] Override parent method to get custom child
 documentation

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5cf59551e38..326dff207fe 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -51,6 +51,14 @@ public function __toString(): string
         return $this->getLink();
     }
 
+    /**
+     * Create a media file instance for the given file.
+     */
+    public static function make(string $path): static
+    {
+        return parent::make($path);
+    }
+
     /**
      * Get or create a media file instance from the HydeKernel for the given file.
      */

From 81c387e970673124517097fe443578120172c54c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 17:14:14 +0200
Subject: [PATCH 267/328] Normalize parameter name

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 326dff207fe..e2f33c27472 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -62,9 +62,9 @@ public static function make(string $path): static
     /**
      * Get or create a media file instance from the HydeKernel for the given file.
      */
-    public static function get(string $file): MediaFile
+    public static function get(string $path): MediaFile
     {
-        return Hyde::assets()->get($file) ?? static::make($file);
+        return Hyde::assets()->get($path) ?? static::make($path);
     }
 
     /**

From e9baf285e0873b4401d149e3da2c850ab02a6431 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 17:14:39 +0200
Subject: [PATCH 268/328] Document base path relation

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index e2f33c27472..2be20c5b457 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -21,6 +21,8 @@
 
 /**
  * File abstraction for a project media file.
+ *
+ * All input paths are relative to the project's media source directory.
  */
 class MediaFile extends ProjectFile implements Stringable
 {

From 48a955151ca785a11240be1a5b425cd03a8a4990 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 20:33:56 +0200
Subject: [PATCH 269/328] Normalize exception message

---
 packages/framework/src/Support/Filesystem/MediaFile.php     | 2 +-
 packages/framework/tests/Unit/Support/MediaFileUnitTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 2be20c5b457..24739695a0e 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -204,7 +204,7 @@ protected function getNormalizedPath(string $path): string
 
         // Since assets need to exist on disk in order to be copied to the built site files we validate that the file is real here.
         if (Filesystem::missing($path)) {
-            throw new FileNotFoundException($path);
+            throw new FileNotFoundException($path, appendAfterPath: ' when trying to resolve a media asset.');
         }
 
         return $path;
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 14da69113e3..df506517fca 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -333,7 +333,7 @@ public function testExceptionIsThrownWhenBootingFileThatDoesNotExist(string $boo
             ->andReturn(true);
 
         $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('File [_media/foo] not found.');
+        $this->expectExceptionMessage('File [_media/foo] not found when trying to resolve a media asset.');
 
         MediaFile::make('foo')->$bootableMethod();
     }

From e80e7f31d96bc6fa1c3d04b9eaf29eec629eb5be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 20:42:05 +0200
Subject: [PATCH 270/328] Update the kernel asset helper to use the media file
 helper

---
 .../framework/src/Foundation/Kernel/Hyperlinks.php    |  9 +--------
 .../tests/Feature/Foundation/HyperlinksTest.php       | 11 +++++------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 8465cda8377..a6edd37ed33 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Foundation\Kernel;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
@@ -116,13 +115,7 @@ public function mediaLink(string $destination, bool $validate = false): string
      */
     public function asset(string $name): MediaFile
     {
-        $asset = Hyde::assets()->get($name);
-
-        if ($asset) {
-            return $asset;
-        }
-
-        throw new FileNotFoundException(MediaFile::sourcePath($name), appendAfterPath: ' when trying to resolve a media asset.');
+        return MediaFile::get($name);
     }
 
     /**
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 24ec78755c6..724ee8716f5 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -7,6 +7,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\Hyperlinks;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -73,18 +74,16 @@ public function testAssetHelperThrowsExceptionForNonExistentFile()
         $this->class->asset('non_existent_file.jpg');
     }
 
-    public function testAssetHelperThrowsExceptionFileWithNoExtension()
+    public function testAssetHelperCanGetFileWithNoExtension()
     {
         $this->file('_media/no_extension');
-        $this->expectException(FileNotFoundException::class);
-        $this->class->asset('no_extension');
+        $this->assertInstanceOf(MediaFile::class, $this->class->asset('no_extension'));
     }
 
-    public function testAssetHelperThrowsExceptionForNonExistentFileNonMediaExtension()
+    public function testAssetHelperCanGetFileWithNonMediaExtension()
     {
         $this->file('_media/test.foo');
-        $this->expectException(FileNotFoundException::class);
-        $this->class->asset('test.foo');
+        $this->assertInstanceOf(MediaFile::class, $this->class->asset('test.foo'));
     }
 
     public function testAssetHelperThrowsExceptionWithHelpfulMessage()

From 85bfcc939d04c05914d1cc49421e1bf229e66001 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 2 Sep 2024 20:30:39 +0200
Subject: [PATCH 271/328] Replace the `mediaLink` helpers with MediaFile getter

Side effects:

Assets included in default views are now qualified if a base URL is set
---
 packages/framework/src/Facades/Asset.php             |  2 +-
 .../framework/tests/Feature/AssetAPIFeatureTest.php  |  6 +++---
 .../tests/Feature/Views/MetadataViewTest.php         | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 524607e6ebc..da8b29138b5 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -24,7 +24,7 @@ public static function get(string $file): MediaFile
 
     public static function mediaLink(string $file): string
     {
-        return hyde()->mediaLink($file);
+        return (string) hyde()->asset($file);
     }
 
     public static function hasMediaFile(string $file): bool
diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 31468ac3504..d1007e8392d 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -42,7 +42,7 @@ public function testAssetAPIExamples()
             'hasMediaFileTrue' => true,
             'hasMediaFileFalse' => false,
             'getters' => [
-                "media/app.css?v={$this->getAppStylesVersion()}",
+                MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
@@ -80,8 +80,8 @@ public function testAssetAPIUsagesInBladeViews()
 
         $html = Blade::render($view);
 
-        $this->assertSame(<<<HTML
-        <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
+        $this->assertSame(<<<'HTML'
+        <link rel="stylesheet" href="media/app.css">
             <link rel="stylesheet" href="media/app.css">
             <link rel="stylesheet" href="media/app.css">
             <link rel="stylesheet" href="media/app.css">
diff --git a/packages/framework/tests/Feature/Views/MetadataViewTest.php b/packages/framework/tests/Feature/Views/MetadataViewTest.php
index b4424aa18c0..68a29eea286 100644
--- a/packages/framework/tests/Feature/Views/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/Views/MetadataViewTest.php
@@ -92,7 +92,7 @@ public function testMetadataTagsInEmptyBladePage()
 
         $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -108,7 +108,7 @@ public function testMetadataTagsInEmptyMarkdownPage()
 
         $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -124,7 +124,7 @@ public function testMetadataTagsInEmptyDocumentationPage()
 
         $assertions = $this->assertSee('docs/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/docs/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -141,7 +141,7 @@ public function testMetadataTagsInEmptyMarkdownPost()
         $assertions = $this->assertSee('posts/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
             '<link rel="alternate" href="https://example.com/feed.xml" type="application/rss+xml" title="HydePHP RSS Feed">',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/posts/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta name="url" content="https://example.com/posts/test.html">',
@@ -178,7 +178,7 @@ public function testMetadataTagsInMarkdownPostWithFlatFrontMatter()
         $assertions = $this->assertSee('posts/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - My title</title>',
             '<link rel="alternate" href="https://example.com/feed.xml" type="application/rss+xml" title="HydePHP RSS Feed">',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/posts/test.html">',
             '<meta name="twitter:title" content="HydePHP - My title">',
             '<meta name="description" content="My description">',
@@ -285,7 +285,7 @@ public function testMetadataTagsInMarkdownPageWithDescription()
 
         $this->assertSee('test-page', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - My Page Title</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<meta name="twitter:title" content="HydePHP - My Page Title">',
             '<meta property="og:title" content="HydePHP - My Page Title">',
             '<meta property="og:description" content="My page description">',

From 29ba2ca2d3d508e861aaef03ecc2704dc8c58fa4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 3 Sep 2024 10:14:26 +0200
Subject: [PATCH 272/328] Revert "Replace the `mediaLink` helpers with
 MediaFile getter"

This reverts commit 85bfcc939d04c05914d1cc49421e1bf229e66001.
---
 packages/framework/src/Facades/Asset.php             |  2 +-
 .../framework/tests/Feature/AssetAPIFeatureTest.php  |  6 +++---
 .../tests/Feature/Views/MetadataViewTest.php         | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index da8b29138b5..524607e6ebc 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -24,7 +24,7 @@ public static function get(string $file): MediaFile
 
     public static function mediaLink(string $file): string
     {
-        return (string) hyde()->asset($file);
+        return hyde()->mediaLink($file);
     }
 
     public static function hasMediaFile(string $file): bool
diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index d1007e8392d..31468ac3504 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -42,7 +42,7 @@ public function testAssetAPIExamples()
             'hasMediaFileTrue' => true,
             'hasMediaFileFalse' => false,
             'getters' => [
-                MediaFile::get('app.css'),
+                "media/app.css?v={$this->getAppStylesVersion()}",
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
                 MediaFile::get('app.css'),
@@ -80,8 +80,8 @@ public function testAssetAPIUsagesInBladeViews()
 
         $html = Blade::render($view);
 
-        $this->assertSame(<<<'HTML'
-        <link rel="stylesheet" href="media/app.css">
+        $this->assertSame(<<<HTML
+        <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
             <link rel="stylesheet" href="media/app.css">
             <link rel="stylesheet" href="media/app.css">
             <link rel="stylesheet" href="media/app.css">
diff --git a/packages/framework/tests/Feature/Views/MetadataViewTest.php b/packages/framework/tests/Feature/Views/MetadataViewTest.php
index 68a29eea286..b4424aa18c0 100644
--- a/packages/framework/tests/Feature/Views/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/Views/MetadataViewTest.php
@@ -92,7 +92,7 @@ public function testMetadataTagsInEmptyBladePage()
 
         $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="https://example.com/media/app.css">',
+            '<link rel="stylesheet" href="media/app.css">',
             '<link rel="canonical" href="https://example.com/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -108,7 +108,7 @@ public function testMetadataTagsInEmptyMarkdownPage()
 
         $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="https://example.com/media/app.css">',
+            '<link rel="stylesheet" href="media/app.css">',
             '<link rel="canonical" href="https://example.com/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -124,7 +124,7 @@ public function testMetadataTagsInEmptyDocumentationPage()
 
         $assertions = $this->assertSee('docs/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="https://example.com/media/app.css">',
+            '<link rel="stylesheet" href="../media/app.css">',
             '<link rel="canonical" href="https://example.com/docs/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -141,7 +141,7 @@ public function testMetadataTagsInEmptyMarkdownPost()
         $assertions = $this->assertSee('posts/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
             '<link rel="alternate" href="https://example.com/feed.xml" type="application/rss+xml" title="HydePHP RSS Feed">',
-            '<link rel="stylesheet" href="https://example.com/media/app.css">',
+            '<link rel="stylesheet" href="../media/app.css">',
             '<link rel="canonical" href="https://example.com/posts/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta name="url" content="https://example.com/posts/test.html">',
@@ -178,7 +178,7 @@ public function testMetadataTagsInMarkdownPostWithFlatFrontMatter()
         $assertions = $this->assertSee('posts/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - My title</title>',
             '<link rel="alternate" href="https://example.com/feed.xml" type="application/rss+xml" title="HydePHP RSS Feed">',
-            '<link rel="stylesheet" href="https://example.com/media/app.css">',
+            '<link rel="stylesheet" href="../media/app.css">',
             '<link rel="canonical" href="https://example.com/posts/test.html">',
             '<meta name="twitter:title" content="HydePHP - My title">',
             '<meta name="description" content="My description">',
@@ -285,7 +285,7 @@ public function testMetadataTagsInMarkdownPageWithDescription()
 
         $this->assertSee('test-page', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - My Page Title</title>',
-            '<link rel="stylesheet" href="https://example.com/media/app.css">',
+            '<link rel="stylesheet" href="media/app.css">',
             '<meta name="twitter:title" content="HydePHP - My Page Title">',
             '<meta property="og:title" content="HydePHP - My Page Title">',
             '<meta property="og:description" content="My page description">',

From 0ffe14fc7bbda426e55e13a4daf63fe87a469c6f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 3 Sep 2024 10:19:46 +0200
Subject: [PATCH 273/328] Move internal method to more suitable location

---
 .../framework/src/Foundation/Kernel/Hyperlinks.php     |  2 +-
 .../framework/src/Support/Filesystem/MediaFile.php     | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index a6edd37ed33..45a777d1c03 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -177,7 +177,7 @@ public static function isRemote(string $url): bool
     }
 
     /**
-     * @internal Apply cache to the URL if enabled in the configuration.
+     * @deprecated Use the `MediaFile::getCacheBustKey` method instead.
      */
     public static function withCacheBusting(string $url, string $file): string
     {
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 24739695a0e..4f8203d6401 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -9,7 +9,6 @@
 use Hyde\Facades\Config;
 use Hyde\Facades\Filesystem;
 use Illuminate\Support\Collection;
-use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
@@ -131,10 +130,10 @@ public function getLink(): string
         $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
 
         if (Hyde::hasSiteUrl()) {
-            return Hyperlinks::withCacheBusting(Hyde::url($name), $name);
+            return static::withCacheBusting(Hyde::url($name), $name);
         }
 
-        return Hyperlinks::withCacheBusting(Hyde::relativeLink($name), $name);
+        return static::withCacheBusting(Hyde::relativeLink($name), $name);
     }
 
     /**
@@ -270,4 +269,9 @@ protected function boot(): void
         $this->mimeType = $this->findMimeType();
         $this->hash = $this->findHash();
     }
+
+    protected static function withCacheBusting(string $url, string $file): string
+    {
+        return $url.MediaFile::getCacheBustKey($file);
+    }
 }

From dd6366c090c39e03aa84dc7e8c917ce1a8b6f6dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 3 Sep 2024 10:21:31 +0200
Subject: [PATCH 274/328] Deprecate internal static method for refactor

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php    | 2 +-
 packages/framework/src/Support/Filesystem/MediaFile.php    | 6 +++---
 packages/framework/tests/Feature/Support/MediaFileTest.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 45a777d1c03..197480122ee 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -181,6 +181,6 @@ public static function isRemote(string $url): bool
      */
     public static function withCacheBusting(string $url, string $file): string
     {
-        return $url.MediaFile::getCacheBustKey($file);
+        return $url.MediaFile::legacy_getCacheBustKey($file);
     }
 }
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 4f8203d6401..1380140ba1a 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -180,8 +180,8 @@ public function toArray(): array
         ]);
     }
 
-    /** @internal */
-    public static function getCacheBustKey(string $file): string
+    /** @deprecated Use instance helper */
+    public static function legacy_getCacheBustKey(string $file): string
     {
         return Config::getBool('hyde.enable_cache_busting', true) && Filesystem::exists(static::sourcePath("$file"))
             ? '?v='.static::make($file)->getHash()
@@ -272,6 +272,6 @@ protected function boot(): void
 
     protected static function withCacheBusting(string $url, string $file): string
     {
-        return $url.MediaFile::getCacheBustKey($file);
+        return $url.MediaFile::legacy_getCacheBustKey($file);
     }
 }
diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index 3a03d1f4bbb..e1b12bb484f 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -113,7 +113,7 @@ public function testMediaFileCacheBusting()
     {
         $this->file('_media/cachebust_test.js', 'console.log("Hello");');
 
-        $cacheBustKey = MediaFile::getCacheBustKey('cachebust_test.js');
+        $cacheBustKey = MediaFile::legacy_getCacheBustKey('cachebust_test.js');
 
         $this->assertStringStartsWith('?v=', $cacheBustKey);
         $this->assertSame('?v=cd5de5e7', $cacheBustKey); // Expect CRC32 hash

From 2c24add6afdd4dda0e8011641d921454d4dbe686 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 3 Sep 2024 10:28:02 +0200
Subject: [PATCH 275/328] Create new instance helper to consistently add cache
 busting keys

---
 .../src/Support/Filesystem/MediaFile.php      | 16 +++---
 .../tests/Feature/AssetAPIFeatureTest.php     |  6 +--
 .../DynamicMarkdownLinksFeatureTest.php       |  7 +++
 .../Feature/Foundation/HyperlinksTest.php     | 14 ++---
 .../framework/tests/Feature/HelpersTest.php   | 22 ++++++++
 .../tests/Feature/HydeKernelTest.php          | 53 ++++++++++++++++---
 .../DynamicMarkdownLinkProcessorTest.php      |  2 +
 7 files changed, 97 insertions(+), 23 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 1380140ba1a..3126c34a129 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -130,10 +130,10 @@ public function getLink(): string
         $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
 
         if (Hyde::hasSiteUrl()) {
-            return static::withCacheBusting(Hyde::url($name), $name);
+            return Hyde::url($name).$this->getCacheBustKey();
         }
 
-        return static::withCacheBusting(Hyde::relativeLink($name), $name);
+        return Hyde::relativeLink($name).$this->getCacheBustKey();
     }
 
     /**
@@ -188,6 +188,13 @@ public static function legacy_getCacheBustKey(string $file): string
             : '';
     }
 
+    protected function getCacheBustKey(): string
+    {
+        return Config::getBool('hyde.enable_cache_busting', true)
+            ? '?v='.$this->getHash()
+            : '';
+    }
+
     protected function getNormalizedPath(string $path): string
     {
         // Ensure we are working with a relative project path
@@ -269,9 +276,4 @@ protected function boot(): void
         $this->mimeType = $this->findMimeType();
         $this->hash = $this->findHash();
     }
-
-    protected static function withCacheBusting(string $url, string $file): string
-    {
-        return $url.MediaFile::legacy_getCacheBustKey($file);
-    }
 }
diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 31468ac3504..1f09a7ba721 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -82,9 +82,9 @@ public function testAssetAPIUsagesInBladeViews()
 
         $this->assertSame(<<<HTML
         <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
-            <link rel="stylesheet" href="media/app.css">
-            <link rel="stylesheet" href="media/app.css">
-            <link rel="stylesheet" href="media/app.css">
+            <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
+            <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
+            <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
         
             Missing missing.png
 
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 9de203144eb..97df3a668af 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -44,6 +44,13 @@ public static function tearDownAfterClass(): void
         parent::tearDownAfterClass();
     }
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['hyde.enable_cache_busting' => false]);
+    }
+
     public function testBasicDynamicMarkdownLinks()
     {
         $input = <<<'MARKDOWN'
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 724ee8716f5..00b2cb84681 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -30,7 +30,7 @@ public function testAssetHelperGetsRelativeWebLinkToImageStoredInSiteMediaFolder
     {
         $this->file('_media/test.jpg');
 
-        $this->assertSame('media/test.jpg', (string) $this->class->asset('test.jpg'));
+        $this->assertSame('media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperResolvesPathsForNestedPages()
@@ -38,34 +38,34 @@ public function testAssetHelperResolvesPathsForNestedPages()
         $this->file('_media/test.jpg');
 
         $this->mockCurrentPage('foo/bar');
-        $this->assertSame('../media/test.jpg', (string) $this->class->asset('test.jpg'));
+        $this->assertSame('../media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsQualifiedAbsoluteUriWhenSiteHasBaseUrl()
     {
         config(['hyde.url' => 'https://example.org']);
         $this->file('_media/test.jpg');
-        $this->assertSame('https://example.org/media/test.jpg', (string) $this->class->asset('test.jpg'));
+        $this->assertSame('https://example.org/media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsDefaultRelativePathWhenSiteHasNoBaseUrl()
     {
         $this->withoutSiteUrl();
         $this->file('_media/test.jpg');
-        $this->assertSame('media/test.jpg', (string) $this->class->asset('test.jpg'));
+        $this->assertSame('media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperReturnsDefaultRelativePathWhenSiteBaseUrlIsLocalhost()
     {
         $this->file('_media/test.jpg');
-        $this->assertSame('media/test.jpg', (string) $this->class->asset('test.jpg'));
+        $this->assertSame('media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperUsesConfiguredMediaDirectory()
     {
         Hyde::setMediaDirectory('_assets');
         $this->file('_assets/test.jpg');
-        $this->assertSame('assets/test.jpg', (string) $this->class->asset('test.jpg'));
+        $this->assertSame('assets/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperThrowsExceptionForNonExistentFile()
@@ -99,7 +99,7 @@ public function testAssetHelperReturnsInputWhenImageIsAlreadyQualifiedRegardless
         $this->expectException(FileNotFoundException::class);
 
         config(['hyde.url' => 'https://example.org']);
-        $this->assertSame('http://localhost/media/test.jpg', (string) $this->class->asset('http://localhost/media/test.jpg'));
+        $this->assertSame('http://localhost/media/test.jpg?v=00000000', (string) $this->class->asset('http://localhost/media/test.jpg'));
     }
 
     public function testMediaLinkHelper()
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 1cdbabb6c90..aefa3b160a4 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -23,6 +23,13 @@
  */
 class HelpersTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['hyde.enable_cache_busting' => false]);
+    }
+
     /** @covers ::hyde */
     public function testHydeFunctionExists()
     {
@@ -79,6 +86,21 @@ public function testAssetFunction()
         $this->assertSame('media/app.css', (string) asset('app.css'));
     }
 
+    /** @covers ::asset */
+    public function testAssetFunctionWithCacheBusting()
+    {
+        config(['hyde.enable_cache_busting' => true]);
+
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
+        $this->assertSame(Hyde::asset('app.css'), asset('app.css'));
+        $this->assertSame(
+            'media/app.css?v='.hash_file('crc32', Hyde::path('_media/app.css')),
+            (string) asset('app.css')
+        );
+    }
+
     /** @covers ::asset */
     public function testAssetFunctionWithExternalUrl()
     {
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index f6f5a397817..423c6c33c44 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -193,8 +193,8 @@ public function testAssetHelperReturnsMediaFileInstanceForGivenName()
 
         $this->assertSame('foo.jpg', $asset->getName());
         $this->assertSame('_media/foo.jpg', $asset->getPath());
-        $this->assertSame('media/foo.jpg', $asset->getLink());
-        $this->assertSame('media/foo.jpg', (string) $asset);
+        $this->assertSame('media/foo.jpg?v=00000000', $asset->getLink());
+        $this->assertSame('media/foo.jpg?v=00000000', (string) $asset);
     }
 
     public function testAssetHelperReturnsAssetPathForGivenName()
@@ -202,10 +202,10 @@ public function testAssetHelperReturnsAssetPathForGivenName()
         $this->file('_media/foo.jpg');
 
         Render::share('routeKey', 'foo');
-        $this->assertSame('media/foo.jpg', (string) Hyde::asset('foo.jpg'));
+        $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
 
         Render::share('routeKey', 'foo/bar');
-        $this->assertSame('../media/foo.jpg', (string) Hyde::asset('foo.jpg'));
+        $this->assertSame('../media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
     }
 
     public function testAssetHelperTrimsMediaPrefix()
@@ -213,7 +213,7 @@ public function testAssetHelperTrimsMediaPrefix()
         $this->markTestSkipped('needs to reimplement normalization on the get method');
         $this->file('_media/foo.jpg');
 
-        $this->assertSame('media/foo.jpg', (string) Hyde::asset('media/foo.jpg'));
+        $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('media/foo.jpg'));
     }
 
     public function testAssetHelperSupportsCustomMediaDirectories()
@@ -221,7 +221,48 @@ public function testAssetHelperSupportsCustomMediaDirectories()
         $this->file('_assets/foo.jpg');
 
         Hyde::setMediaDirectory('_assets');
-        $this->assertSame('assets/foo.jpg', (string) Hyde::asset('foo.jpg'));
+        $this->assertSame('assets/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
+    }
+
+    public function testAssetHelperWithoutCacheBusting()
+    {
+        $this->file('_media/foo.jpg');
+
+        Config::set('hyde.enable_cache_busting', false);
+
+        $this->assertSame('media/foo.jpg', (string) Hyde::asset('foo.jpg'));
+    }
+
+    public function testAssetHelperWithoutCacheBustingWithChangedSettingInTheSameLifecycle()
+    {
+        $this->file('_media/foo.jpg');
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
+
+        Config::set('hyde.enable_cache_busting', false);
+
+        $this->assertSame('media/foo.jpg', (string) Hyde::asset('foo.jpg'));
+
+        Config::set('hyde.enable_cache_busting', true);
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
+    }
+
+    public function testAssetHelperWithoutCacheBustingWithChangedSettingInTheSameLifecycleForSameInstance()
+    {
+        $this->file('_media/foo.jpg');
+
+        $instance = Hyde::asset('foo.jpg');
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) $instance);
+
+        Config::set('hyde.enable_cache_busting', false);
+
+        $this->assertSame('media/foo.jpg', (string) $instance);
+
+        Config::set('hyde.enable_cache_busting', true);
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) $instance);
     }
 
     public function testAssetsHelperGetsAssetsFromKernel()
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 67acd7ffe39..656cd48ca46 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -35,6 +35,8 @@ protected function setUp(): void
         Routes::addRoute(new Route(new MarkdownPost('post')));
 
         // Todo: No way to mock media files, so we are using app.css as a test asset for now.
+
+        self::mockConfig(['hyde.enable_cache_busting' => false]);
     }
 
     public function testRouteReplacement()

From 34d16d9c4a27712fc92f7b67b1281308e35362f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 26 Jul 2024 20:56:28 +0200
Subject: [PATCH 276/328] Remove the `validate` parameter from the `mediaLink`
 method

---
 .../framework/src/Foundation/Concerns/ForwardsHyperlinks.php  | 4 ++--
 packages/framework/src/Foundation/Kernel/Hyperlinks.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index 5eae4cd3e4c..56d567169bf 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -24,9 +24,9 @@ public function relativeLink(string $destination): string
         return $this->hyperlinks->relativeLink($destination);
     }
 
-    public function mediaLink(string $destination, bool $validate = false): string
+    public function mediaLink(string $destination): string
     {
-        return $this->hyperlinks->mediaLink($destination, $validate);
+        return $this->hyperlinks->mediaLink($destination);
     }
 
     public function asset(string $name): MediaFile
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 197480122ee..552ad334881 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -95,9 +95,9 @@ public function relativeLink(string $destination): string
      * An exception will be thrown if the file does not exist in the _media directory,
      * and the second argument is set to true.
      */
-    public function mediaLink(string $destination, bool $validate = false): string
+    public function mediaLink(string $destination): string
     {
-        if ($validate && ! file_exists($sourcePath = "{$this->kernel->getMediaDirectory()}/$destination")) {
+        if (false && ! file_exists($sourcePath = "{$this->kernel->getMediaDirectory()}/$destination")) {
             throw new FileNotFoundException($sourcePath);
         }
 

From d789fda64a01e17cd6d4cd34b3879d8206b74504 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 4 Sep 2024 21:31:43 +0200
Subject: [PATCH 277/328] Revert "Remove the `validate` parameter from the
 `mediaLink` method"

This reverts commit 34d16d9c4a27712fc92f7b67b1281308e35362f6.
---
 .../framework/src/Foundation/Concerns/ForwardsHyperlinks.php  | 4 ++--
 packages/framework/src/Foundation/Kernel/Hyperlinks.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index 56d567169bf..5eae4cd3e4c 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -24,9 +24,9 @@ public function relativeLink(string $destination): string
         return $this->hyperlinks->relativeLink($destination);
     }
 
-    public function mediaLink(string $destination): string
+    public function mediaLink(string $destination, bool $validate = false): string
     {
-        return $this->hyperlinks->mediaLink($destination);
+        return $this->hyperlinks->mediaLink($destination, $validate);
     }
 
     public function asset(string $name): MediaFile
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 552ad334881..197480122ee 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -95,9 +95,9 @@ public function relativeLink(string $destination): string
      * An exception will be thrown if the file does not exist in the _media directory,
      * and the second argument is set to true.
      */
-    public function mediaLink(string $destination): string
+    public function mediaLink(string $destination, bool $validate = false): string
     {
-        if (false && ! file_exists($sourcePath = "{$this->kernel->getMediaDirectory()}/$destination")) {
+        if ($validate && ! file_exists($sourcePath = "{$this->kernel->getMediaDirectory()}/$destination")) {
             throw new FileNotFoundException($sourcePath);
         }
 

From 824ccfb29b3894b92789f1d96c1be4cc032f671c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 10:28:40 +0200
Subject: [PATCH 278/328] Add new method to the Filesystem facade to get mime
 types

---
 packages/framework/src/Facades/Filesystem.php | 35 +++++++++++++++++++
 .../tests/Feature/FilesystemFacadeTest.php    | 12 +++++++
 2 files changed, 47 insertions(+)

diff --git a/packages/framework/src/Facades/Filesystem.php b/packages/framework/src/Facades/Filesystem.php
index 3229bc584c3..98f4bfe1dfe 100644
--- a/packages/framework/src/Facades/Filesystem.php
+++ b/packages/framework/src/Facades/Filesystem.php
@@ -129,6 +129,41 @@ public static function putContents(string $path, string $contents, bool $lock =
         return self::put($path, $contents, $lock);
     }
 
+    /**
+     *  Find the MIME type of a file.
+     *
+     * @param  string  $path  The path to the file, relative to the project root or a remote URL.
+     */
+    public static function findMimeType(string $path): string
+    {
+        $extension = self::extension($path);
+
+        $lookup = [
+            'txt' => 'text/plain',
+            'md' => 'text/markdown',
+            'html' => 'text/html',
+            'css' => 'text/css',
+            'svg' => 'image/svg+xml',
+            'png' => 'image/png',
+            'jpg' => 'image/jpeg',
+            'jpeg' => 'image/jpeg',
+            'gif' => 'image/gif',
+            'json' => 'application/json',
+            'js' => 'application/javascript',
+            'xml' => 'application/xml',
+        ];
+
+        if (isset($lookup[$extension])) {
+            return $lookup[$extension];
+        }
+
+        if (extension_loaded('fileinfo') && self::exists($path)) {
+            return self::mimeType($path);
+        }
+
+        return 'text/plain';
+    }
+
     protected static function filesystem(): \Illuminate\Filesystem\Filesystem
     {
         return app(\Illuminate\Filesystem\Filesystem::class);
diff --git a/packages/framework/tests/Feature/FilesystemFacadeTest.php b/packages/framework/tests/Feature/FilesystemFacadeTest.php
index db00aefc30c..19f22724f9e 100644
--- a/packages/framework/tests/Feature/FilesystemFacadeTest.php
+++ b/packages/framework/tests/Feature/FilesystemFacadeTest.php
@@ -447,6 +447,18 @@ public function testMethodWithMixedSequentialAndNamedArgumentsSkippingMiddleOne(
         rmdir(Hyde::path('foo'));
     }
 
+    public function testFindMimeType()
+    {
+        $this->file('test.txt', 'content');
+        $this->assertSame('text/plain', Filesystem::findMimeType('test.txt'));
+
+        $this->file('test.png', 'content');
+        $this->assertSame('image/png', Filesystem::findMimeType('test.png'));
+
+        $this->file('test.unknown', 'content');
+        $this->assertSame('text/plain', Filesystem::findMimeType('test.unknown'));
+    }
+
     protected function createExpectation(string $method, mixed $returns, ...$args): void
     {
         File::shouldReceive($method)->withArgs($args)->once()->andReturn($returns);

From 78fb6d2df3ea1f21e4ee1668978c39a015a078a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 10:33:43 +0200
Subject: [PATCH 279/328] Use the new Filesystem helper for mime type detection

---
 .../src/Support/Filesystem/MediaFile.php      | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 3126c34a129..1c18444a2da 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -15,7 +15,6 @@
 use function Hyde\unslash;
 use function Hyde\path_join;
 use function Hyde\trim_slashes;
-use function extension_loaded;
 use function array_merge;
 
 /**
@@ -221,37 +220,9 @@ protected function findContentLength(): int
         return Filesystem::size($this->getPath());
     }
 
-    /** @todo Move to Filesystem::findMimeType($path) */
     protected function findMimeType(): string
     {
-        $extension = $this->getExtension();
-
-        // See if we can find a mime type for the extension instead of
-        // having to rely on a PHP extension and filesystem lookups.
-        $lookup = [
-            'txt' => 'text/plain',
-            'md' => 'text/markdown',
-            'html' => 'text/html',
-            'css' => 'text/css',
-            'svg' => 'image/svg+xml',
-            'png' => 'image/png',
-            'jpg' => 'image/jpeg',
-            'jpeg' => 'image/jpeg',
-            'gif' => 'image/gif',
-            'json' => 'application/json',
-            'js' => 'application/javascript',
-            'xml' => 'application/xml',
-        ];
-
-        if (isset($lookup[$extension])) {
-            return $lookup[$extension];
-        }
-
-        if (extension_loaded('fileinfo') && Filesystem::exists($this->getPath())) {
-            return Filesystem::mimeType($this->getPath());
-        }
-
-        return 'text/plain';
+        return Filesystem::findMimeType($this->getPath());
     }
 
     protected function findHash(): string

From 2284cfaa547ca5504f2c6286f9f495787094464e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 10:50:59 +0200
Subject: [PATCH 280/328] Improve method documentation

---
 packages/framework/src/Facades/Filesystem.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Filesystem.php b/packages/framework/src/Facades/Filesystem.php
index 98f4bfe1dfe..514a48dfc32 100644
--- a/packages/framework/src/Facades/Filesystem.php
+++ b/packages/framework/src/Facades/Filesystem.php
@@ -130,7 +130,8 @@ public static function putContents(string $path, string $contents, bool $lock =
     }
 
     /**
-     *  Find the MIME type of a file.
+     * Improved mime type detection for the given path that can be relative to the project root,
+     * or a remote URL where this will try to guess the mime type based on the file extension.
      *
      * @param  string  $path  The path to the file, relative to the project root or a remote URL.
      */

From 1da49a29357e5fb493f3ec6c8b2f5b44d9221b15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 10:51:22 +0200
Subject: [PATCH 281/328] Test all cases of the mime type detection method

This is quite important so I want it properly tested
---
 .../tests/Feature/FilesystemFacadeTest.php    | 99 +++++++++++++++++--
 1 file changed, 93 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/FilesystemFacadeTest.php b/packages/framework/tests/Feature/FilesystemFacadeTest.php
index 19f22724f9e..7b2aec812bb 100644
--- a/packages/framework/tests/Feature/FilesystemFacadeTest.php
+++ b/packages/framework/tests/Feature/FilesystemFacadeTest.php
@@ -449,14 +449,101 @@ public function testMethodWithMixedSequentialAndNamedArgumentsSkippingMiddleOne(
 
     public function testFindMimeType()
     {
-        $this->file('test.txt', 'content');
-        $this->assertSame('text/plain', Filesystem::findMimeType('test.txt'));
+        // Test known extensions
+        $this->assertSame('text/plain', Filesystem::findMimeType('file.txt'));
+        $this->assertSame('text/markdown', Filesystem::findMimeType('file.md'));
+        $this->assertSame('text/html', Filesystem::findMimeType('file.html'));
+        $this->assertSame('text/css', Filesystem::findMimeType('file.css'));
+        $this->assertSame('image/svg+xml', Filesystem::findMimeType('file.svg'));
+        $this->assertSame('image/png', Filesystem::findMimeType('file.png'));
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('file.jpg'));
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('file.jpeg'));
+        $this->assertSame('image/gif', Filesystem::findMimeType('file.gif'));
+        $this->assertSame('application/json', Filesystem::findMimeType('file.json'));
+        $this->assertSame('application/javascript', Filesystem::findMimeType('file.js'));
+        $this->assertSame('application/xml', Filesystem::findMimeType('file.xml'));
 
-        $this->file('test.png', 'content');
-        $this->assertSame('image/png', Filesystem::findMimeType('test.png'));
+        // Test with remote URLs
+        $this->assertSame('text/plain', Filesystem::findMimeType('https://example.com/file.txt'));
+        $this->assertSame('text/markdown', Filesystem::findMimeType('https://example.com/file.md'));
+        $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/file.html'));
+        $this->assertSame('text/css', Filesystem::findMimeType('https://example.com/file.css'));
+        $this->assertSame('image/svg+xml', Filesystem::findMimeType('https://example.com/file.svg'));
+        $this->assertSame('image/png', Filesystem::findMimeType('https://example.com/file.png'));
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('https://example.com/file.jpg'));
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('https://example.com/file.jpeg'));
+        $this->assertSame('image/gif', Filesystem::findMimeType('https://example.com/file.gif'));
+        $this->assertSame('application/json', Filesystem::findMimeType('https://example.com/file.json'));
+        $this->assertSame('application/javascript', Filesystem::findMimeType('https://example.com/file.js'));
+        $this->assertSame('application/xml', Filesystem::findMimeType('https://example.com/file.xml'));
 
-        $this->file('test.unknown', 'content');
-        $this->assertSame('text/plain', Filesystem::findMimeType('test.unknown'));
+        // Test unknown extension
+        $this->assertSame('text/plain', Filesystem::findMimeType('file.unknown'));
+
+        // Test file without extension
+        $this->assertSame('text/plain', Filesystem::findMimeType('file'));
+
+        // Test relative path
+        $this->assertSame('text/plain', Filesystem::findMimeType('path/to/file.txt'));
+
+        // Test absolute path
+        $this->assertSame('text/plain', Filesystem::findMimeType('/absolute/path/to/file.txt'));
+
+        // Test URL
+        $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/page.html'));
+
+        // Test case sensitivity
+        $this->assertSame('text/plain', Filesystem::findMimeType('file.TXT'));
+
+        // Test fileinfo fallback for existing files where the extension is not in the lookup table
+        $this->file('text.unknown', 'text');
+        $this->assertSame('text/plain', Filesystem::findMimeType('text.unknown'));
+
+        $this->file('blank.unknown', '');
+        $this->assertSame('application/x-empty', Filesystem::findMimeType('blank.unknown'));
+
+        $this->file('empty.unknown');
+        $this->assertSame('application/x-empty', Filesystem::findMimeType('empty.unknown'));
+
+        $this->file('json.unknown', '{"key": "value"}');
+        $this->assertSame('application/json', Filesystem::findMimeType('json.unknown'));
+
+        $this->file('xml.unknown', '<?xml version="1.0" encoding="UTF-8"?><root></root>');
+        $this->assertSame('text/xml', Filesystem::findMimeType('xml.unknown'));
+
+        $this->file('html.unknown', '<!DOCTYPE html><html><head><title>Test</title></head><body></body></html>');
+        $this->assertSame('text/html', Filesystem::findMimeType('html.unknown'));
+
+        $this->file('yaml.unknown', 'key: value');
+        $this->assertSame('text/plain', Filesystem::findMimeType('yaml.unknown')); // YAML is not detected by fileinfo
+
+        $this->file('css.unknown', 'body { color: red; }');
+        $this->assertSame('text/plain', Filesystem::findMimeType('css.unknown')); // CSS is not detected by fileinfo
+
+        $this->file('js.unknown', 'console.log("Hello, World!");');
+        $this->assertSame('text/plain', Filesystem::findMimeType('js.unknown')); // JavaScript is not detected by fileinfo
+
+        $this->file('binary.unknown', "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"); // 16 bytes of binary data
+        $this->assertSame('application/octet-stream', Filesystem::findMimeType('binary.unknown'));
+
+        $this->file('png.unknown', base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkAAIAAAoAAvM1P4AAAAASUVORK5CYII=')); // 1x1 transparent PNG
+        $this->assertSame('image/png', Filesystem::findMimeType('png.unknown'));
+
+        $this->file('jpeg.unknown', base64_decode('/9j/4AAQSkZJRgABAQEAYABgAAD/4QA6RXhpZgAATU0AKgAAAAgAA1IBAAABAAAAngIBAAABAAAAnwICAAABAAAAnQ==')); // 1x1 JPEG
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('jpeg.unknown'));
+
+        $this->file('gif.unknown', base64_decode('R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs=')); // 1x1 GIF
+        $this->assertSame('image/gif', Filesystem::findMimeType('gif.unknown'));
+
+        // Test non-existing file
+        $this->assertSame('text/plain', Filesystem::findMimeType('non_existing_file.txt'));
+
+        // Test it uses lookup before fileinfo (so lookup overrides fileinfo)
+        $this->file('file.png', 'Not PNG content');
+        $this->assertSame('image/png', Filesystem::findMimeType('file.png'));
+
+        $this->file('png.txt', base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkAAIAAAoAAvM1P4AAAAASUVORK5CYII=')); // 1x1 transparent PNG
+        $this->assertSame('text/plain', Filesystem::findMimeType('png.txt'));
     }
 
     protected function createExpectation(string $method, mixed $returns, ...$args): void

From 2d4c2d9925d0bafaf779428b1265c60d9249344f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 11:04:37 +0200
Subject: [PATCH 282/328] Extract unit test

---
 .../tests/Feature/FilesystemFacadeTest.php    | 30 +-----------
 ...FilesystemFacadeMimeTypeHelperUnitTest.php | 47 +++++++++++++++++++
 2 files changed, 49 insertions(+), 28 deletions(-)
 create mode 100644 packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php

diff --git a/packages/framework/tests/Feature/FilesystemFacadeTest.php b/packages/framework/tests/Feature/FilesystemFacadeTest.php
index 7b2aec812bb..0d65c2b4f26 100644
--- a/packages/framework/tests/Feature/FilesystemFacadeTest.php
+++ b/packages/framework/tests/Feature/FilesystemFacadeTest.php
@@ -15,6 +15,8 @@
  * @covers \Hyde\Facades\Filesystem
  * @covers \Hyde\Foundation\Kernel\Filesystem
  * @covers \Hyde\Framework\Concerns\Internal\ForwardsIlluminateFilesystem
+ *
+ * @see \FilesystemFacadeMimeTypeHelperUnitTest
  */
 class FilesystemFacadeTest extends TestCase
 {
@@ -449,34 +451,6 @@ public function testMethodWithMixedSequentialAndNamedArgumentsSkippingMiddleOne(
 
     public function testFindMimeType()
     {
-        // Test known extensions
-        $this->assertSame('text/plain', Filesystem::findMimeType('file.txt'));
-        $this->assertSame('text/markdown', Filesystem::findMimeType('file.md'));
-        $this->assertSame('text/html', Filesystem::findMimeType('file.html'));
-        $this->assertSame('text/css', Filesystem::findMimeType('file.css'));
-        $this->assertSame('image/svg+xml', Filesystem::findMimeType('file.svg'));
-        $this->assertSame('image/png', Filesystem::findMimeType('file.png'));
-        $this->assertSame('image/jpeg', Filesystem::findMimeType('file.jpg'));
-        $this->assertSame('image/jpeg', Filesystem::findMimeType('file.jpeg'));
-        $this->assertSame('image/gif', Filesystem::findMimeType('file.gif'));
-        $this->assertSame('application/json', Filesystem::findMimeType('file.json'));
-        $this->assertSame('application/javascript', Filesystem::findMimeType('file.js'));
-        $this->assertSame('application/xml', Filesystem::findMimeType('file.xml'));
-
-        // Test with remote URLs
-        $this->assertSame('text/plain', Filesystem::findMimeType('https://example.com/file.txt'));
-        $this->assertSame('text/markdown', Filesystem::findMimeType('https://example.com/file.md'));
-        $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/file.html'));
-        $this->assertSame('text/css', Filesystem::findMimeType('https://example.com/file.css'));
-        $this->assertSame('image/svg+xml', Filesystem::findMimeType('https://example.com/file.svg'));
-        $this->assertSame('image/png', Filesystem::findMimeType('https://example.com/file.png'));
-        $this->assertSame('image/jpeg', Filesystem::findMimeType('https://example.com/file.jpg'));
-        $this->assertSame('image/jpeg', Filesystem::findMimeType('https://example.com/file.jpeg'));
-        $this->assertSame('image/gif', Filesystem::findMimeType('https://example.com/file.gif'));
-        $this->assertSame('application/json', Filesystem::findMimeType('https://example.com/file.json'));
-        $this->assertSame('application/javascript', Filesystem::findMimeType('https://example.com/file.js'));
-        $this->assertSame('application/xml', Filesystem::findMimeType('https://example.com/file.xml'));
-
         // Test unknown extension
         $this->assertSame('text/plain', Filesystem::findMimeType('file.unknown'));
 
diff --git a/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
new file mode 100644
index 00000000000..0db2bd6a516
--- /dev/null
+++ b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+use Hyde\Facades\Filesystem;
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Facades\Filesystem
+ *
+ * @see \Hyde\Framework\Testing\Feature\FilesystemFacadeTest
+ */
+class FilesystemFacadeMimeTypeHelperUnitTest extends UnitTestCase
+{
+    protected static bool $needsKernel = true;
+
+    public function testFindMimeType()
+    {
+        // Test known extensions
+        $this->assertSame('text/plain', Filesystem::findMimeType('file.txt'));
+        $this->assertSame('text/markdown', Filesystem::findMimeType('file.md'));
+        $this->assertSame('text/html', Filesystem::findMimeType('file.html'));
+        $this->assertSame('text/css', Filesystem::findMimeType('file.css'));
+        $this->assertSame('image/svg+xml', Filesystem::findMimeType('file.svg'));
+        $this->assertSame('image/png', Filesystem::findMimeType('file.png'));
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('file.jpg'));
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('file.jpeg'));
+        $this->assertSame('image/gif', Filesystem::findMimeType('file.gif'));
+        $this->assertSame('application/json', Filesystem::findMimeType('file.json'));
+        $this->assertSame('application/javascript', Filesystem::findMimeType('file.js'));
+        $this->assertSame('application/xml', Filesystem::findMimeType('file.xml'));
+
+        // Test with remote URLs
+        $this->assertSame('text/plain', Filesystem::findMimeType('https://example.com/file.txt'));
+        $this->assertSame('text/markdown', Filesystem::findMimeType('https://example.com/file.md'));
+        $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/file.html'));
+        $this->assertSame('text/css', Filesystem::findMimeType('https://example.com/file.css'));
+        $this->assertSame('image/svg+xml', Filesystem::findMimeType('https://example.com/file.svg'));
+        $this->assertSame('image/png', Filesystem::findMimeType('https://example.com/file.png'));
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('https://example.com/file.jpg'));
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('https://example.com/file.jpeg'));
+        $this->assertSame('image/gif', Filesystem::findMimeType('https://example.com/file.gif'));
+        $this->assertSame('application/json', Filesystem::findMimeType('https://example.com/file.json'));
+        $this->assertSame('application/javascript', Filesystem::findMimeType('https://example.com/file.js'));
+        $this->assertSame('application/xml', Filesystem::findMimeType('https://example.com/file.xml'));
+    }
+}

From 6ef5d18612e31a7feb177472ee2d12adfe163f8e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 11:05:47 +0200
Subject: [PATCH 283/328] Split out to two test methods

---
 .../tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
index 0db2bd6a516..7f6c27658ec 100644
--- a/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
+++ b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
@@ -14,9 +14,8 @@ class FilesystemFacadeMimeTypeHelperUnitTest extends UnitTestCase
 {
     protected static bool $needsKernel = true;
 
-    public function testFindMimeType()
+    public function testFindMimeTypeWithKnownExtensions()
     {
-        // Test known extensions
         $this->assertSame('text/plain', Filesystem::findMimeType('file.txt'));
         $this->assertSame('text/markdown', Filesystem::findMimeType('file.md'));
         $this->assertSame('text/html', Filesystem::findMimeType('file.html'));
@@ -29,8 +28,10 @@ public function testFindMimeType()
         $this->assertSame('application/json', Filesystem::findMimeType('file.json'));
         $this->assertSame('application/javascript', Filesystem::findMimeType('file.js'));
         $this->assertSame('application/xml', Filesystem::findMimeType('file.xml'));
+    }
 
-        // Test with remote URLs
+    public function testFindMimeTypeWithRemoteUrls()
+    {
         $this->assertSame('text/plain', Filesystem::findMimeType('https://example.com/file.txt'));
         $this->assertSame('text/markdown', Filesystem::findMimeType('https://example.com/file.md'));
         $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/file.html'));

From 935a718d3caf31ef9b8ab08ce1e63d164de946f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 11:12:50 +0200
Subject: [PATCH 284/328] Use dataproviders for the extensions to test

---
 ...FilesystemFacadeMimeTypeHelperUnitTest.php | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
index 7f6c27658ec..89078673ef9 100644
--- a/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
+++ b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
@@ -14,35 +14,37 @@ class FilesystemFacadeMimeTypeHelperUnitTest extends UnitTestCase
 {
     protected static bool $needsKernel = true;
 
-    public function testFindMimeTypeWithKnownExtensions()
+    /**
+     * @dataProvider mimeTypeProvider
+     */
+    public function testFindMimeTypeWithKnownExtensions(string $extension, string $expectedMimeType)
     {
-        $this->assertSame('text/plain', Filesystem::findMimeType('file.txt'));
-        $this->assertSame('text/markdown', Filesystem::findMimeType('file.md'));
-        $this->assertSame('text/html', Filesystem::findMimeType('file.html'));
-        $this->assertSame('text/css', Filesystem::findMimeType('file.css'));
-        $this->assertSame('image/svg+xml', Filesystem::findMimeType('file.svg'));
-        $this->assertSame('image/png', Filesystem::findMimeType('file.png'));
-        $this->assertSame('image/jpeg', Filesystem::findMimeType('file.jpg'));
-        $this->assertSame('image/jpeg', Filesystem::findMimeType('file.jpeg'));
-        $this->assertSame('image/gif', Filesystem::findMimeType('file.gif'));
-        $this->assertSame('application/json', Filesystem::findMimeType('file.json'));
-        $this->assertSame('application/javascript', Filesystem::findMimeType('file.js'));
-        $this->assertSame('application/xml', Filesystem::findMimeType('file.xml'));
+        $this->assertSame($expectedMimeType, Filesystem::findMimeType("file.$extension"));
     }
 
-    public function testFindMimeTypeWithRemoteUrls()
+    /**
+     * @dataProvider mimeTypeProvider
+     */
+    public function testFindMimeTypeWithRemoteUrls(string $extension, string $expectedMimeType)
     {
-        $this->assertSame('text/plain', Filesystem::findMimeType('https://example.com/file.txt'));
-        $this->assertSame('text/markdown', Filesystem::findMimeType('https://example.com/file.md'));
-        $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/file.html'));
-        $this->assertSame('text/css', Filesystem::findMimeType('https://example.com/file.css'));
-        $this->assertSame('image/svg+xml', Filesystem::findMimeType('https://example.com/file.svg'));
-        $this->assertSame('image/png', Filesystem::findMimeType('https://example.com/file.png'));
-        $this->assertSame('image/jpeg', Filesystem::findMimeType('https://example.com/file.jpg'));
-        $this->assertSame('image/jpeg', Filesystem::findMimeType('https://example.com/file.jpeg'));
-        $this->assertSame('image/gif', Filesystem::findMimeType('https://example.com/file.gif'));
-        $this->assertSame('application/json', Filesystem::findMimeType('https://example.com/file.json'));
-        $this->assertSame('application/javascript', Filesystem::findMimeType('https://example.com/file.js'));
-        $this->assertSame('application/xml', Filesystem::findMimeType('https://example.com/file.xml'));
+        $this->assertSame($expectedMimeType, Filesystem::findMimeType("https://example.com/file.$extension"));
+    }
+
+    public static function mimeTypeProvider(): array
+    {
+        return [
+            ['txt', 'text/plain'],
+            ['md', 'text/markdown'],
+            ['html', 'text/html'],
+            ['css', 'text/css'],
+            ['svg', 'image/svg+xml'],
+            ['png', 'image/png'],
+            ['jpg', 'image/jpeg'],
+            ['jpeg', 'image/jpeg'],
+            ['gif', 'image/gif'],
+            ['json', 'application/json'],
+            ['js', 'application/javascript'],
+            ['xml', 'application/xml'],
+        ];
     }
 }

From ebd7be60b1a8d0b933c710eba30fda9b184f5326 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 11:15:59 +0200
Subject: [PATCH 285/328] Move more assertions to the unit test

---
 .../tests/Feature/FilesystemFacadeTest.php    | 18 -----------
 ...FilesystemFacadeMimeTypeHelperUnitTest.php | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/packages/framework/tests/Feature/FilesystemFacadeTest.php b/packages/framework/tests/Feature/FilesystemFacadeTest.php
index 0d65c2b4f26..2470b217abf 100644
--- a/packages/framework/tests/Feature/FilesystemFacadeTest.php
+++ b/packages/framework/tests/Feature/FilesystemFacadeTest.php
@@ -451,24 +451,6 @@ public function testMethodWithMixedSequentialAndNamedArgumentsSkippingMiddleOne(
 
     public function testFindMimeType()
     {
-        // Test unknown extension
-        $this->assertSame('text/plain', Filesystem::findMimeType('file.unknown'));
-
-        // Test file without extension
-        $this->assertSame('text/plain', Filesystem::findMimeType('file'));
-
-        // Test relative path
-        $this->assertSame('text/plain', Filesystem::findMimeType('path/to/file.txt'));
-
-        // Test absolute path
-        $this->assertSame('text/plain', Filesystem::findMimeType('/absolute/path/to/file.txt'));
-
-        // Test URL
-        $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/page.html'));
-
-        // Test case sensitivity
-        $this->assertSame('text/plain', Filesystem::findMimeType('file.TXT'));
-
         // Test fileinfo fallback for existing files where the extension is not in the lookup table
         $this->file('text.unknown', 'text');
         $this->assertSame('text/plain', Filesystem::findMimeType('text.unknown'));
diff --git a/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
index 89078673ef9..d6dbf8d4364 100644
--- a/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
+++ b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
@@ -30,6 +30,36 @@ public function testFindMimeTypeWithRemoteUrls(string $extension, string $expect
         $this->assertSame($expectedMimeType, Filesystem::findMimeType("https://example.com/file.$extension"));
     }
 
+    public function testFindMimeTypeWithUnknownExtension()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('file.unknown'));
+    }
+
+    public function testFindMimeTypeWithFileWithoutExtension()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('file'));
+    }
+
+    public function testFindMimeTypeWithRelativePath()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('path/to/file.txt'));
+    }
+
+    public function testFindMimeTypeWithAbsolutePath()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('/absolute/path/to/file.txt'));
+    }
+
+    public function testFindMimeTypeWithUrl()
+    {
+        $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/page.html'));
+    }
+
+    public function testFindMimeTypeWithCaseSensitivity()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('file.TXT'));
+    }
+
     public static function mimeTypeProvider(): array
     {
         return [

From d7a3a28016c73fdf6bd10eed5eea7b9f6f1dd760 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 11:17:30 +0200
Subject: [PATCH 286/328] Split out each assertion group to its own test method

---
 .../tests/Feature/FilesystemFacadeTest.php    | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/FilesystemFacadeTest.php b/packages/framework/tests/Feature/FilesystemFacadeTest.php
index 2470b217abf..f46a8694b56 100644
--- a/packages/framework/tests/Feature/FilesystemFacadeTest.php
+++ b/packages/framework/tests/Feature/FilesystemFacadeTest.php
@@ -449,52 +449,91 @@ public function testMethodWithMixedSequentialAndNamedArgumentsSkippingMiddleOne(
         rmdir(Hyde::path('foo'));
     }
 
-    public function testFindMimeType()
+    public function testFindMimeTypeWithUnknownExtension()
     {
-        // Test fileinfo fallback for existing files where the extension is not in the lookup table
         $this->file('text.unknown', 'text');
         $this->assertSame('text/plain', Filesystem::findMimeType('text.unknown'));
+    }
 
+    public function testFindMimeTypeWithBlankFile()
+    {
         $this->file('blank.unknown', '');
         $this->assertSame('application/x-empty', Filesystem::findMimeType('blank.unknown'));
+    }
 
+    public function testFindMimeTypeWithEmptyFile()
+    {
         $this->file('empty.unknown');
         $this->assertSame('application/x-empty', Filesystem::findMimeType('empty.unknown'));
+    }
 
+    public function testFindMimeTypeWithJsonFile()
+    {
         $this->file('json.unknown', '{"key": "value"}');
         $this->assertSame('application/json', Filesystem::findMimeType('json.unknown'));
+    }
 
+    public function testFindMimeTypeWithXmlFile()
+    {
         $this->file('xml.unknown', '<?xml version="1.0" encoding="UTF-8"?><root></root>');
         $this->assertSame('text/xml', Filesystem::findMimeType('xml.unknown'));
+    }
 
+    public function testFindMimeTypeWithHtmlFile()
+    {
         $this->file('html.unknown', '<!DOCTYPE html><html><head><title>Test</title></head><body></body></html>');
         $this->assertSame('text/html', Filesystem::findMimeType('html.unknown'));
+    }
 
+    public function testFindMimeTypeWithYamlFile()
+    {
         $this->file('yaml.unknown', 'key: value');
         $this->assertSame('text/plain', Filesystem::findMimeType('yaml.unknown')); // YAML is not detected by fileinfo
+    }
 
+    public function testFindMimeTypeWithCssFile()
+    {
         $this->file('css.unknown', 'body { color: red; }');
         $this->assertSame('text/plain', Filesystem::findMimeType('css.unknown')); // CSS is not detected by fileinfo
+    }
 
+    public function testFindMimeTypeWithJsFile()
+    {
         $this->file('js.unknown', 'console.log("Hello, World!");');
         $this->assertSame('text/plain', Filesystem::findMimeType('js.unknown')); // JavaScript is not detected by fileinfo
+    }
 
+    public function testFindMimeTypeWithBinaryFile()
+    {
         $this->file('binary.unknown', "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"); // 16 bytes of binary data
         $this->assertSame('application/octet-stream', Filesystem::findMimeType('binary.unknown'));
+    }
 
+    public function testFindMimeTypeWithPngFile()
+    {
         $this->file('png.unknown', base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkAAIAAAoAAvM1P4AAAAASUVORK5CYII=')); // 1x1 transparent PNG
         $this->assertSame('image/png', Filesystem::findMimeType('png.unknown'));
+    }
 
+    public function testFindMimeTypeWithJpegFile()
+    {
         $this->file('jpeg.unknown', base64_decode('/9j/4AAQSkZJRgABAQEAYABgAAD/4QA6RXhpZgAATU0AKgAAAAgAA1IBAAABAAAAngIBAAABAAAAnwICAAABAAAAnQ==')); // 1x1 JPEG
         $this->assertSame('image/jpeg', Filesystem::findMimeType('jpeg.unknown'));
+    }
 
+    public function testFindMimeTypeWithGifFile()
+    {
         $this->file('gif.unknown', base64_decode('R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs=')); // 1x1 GIF
         $this->assertSame('image/gif', Filesystem::findMimeType('gif.unknown'));
+    }
 
-        // Test non-existing file
+    public function testFindMimeTypeWithNonExistingFile()
+    {
         $this->assertSame('text/plain', Filesystem::findMimeType('non_existing_file.txt'));
+    }
 
-        // Test it uses lookup before fileinfo (so lookup overrides fileinfo)
+    public function testFindMimeTypeUsesLookupBeforeFileinfo()
+    {
         $this->file('file.png', 'Not PNG content');
         $this->assertSame('image/png', Filesystem::findMimeType('file.png'));
 

From 1a5ed00f300b2eb92e2afb8bd1c7f0e0c68d3e23 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 11:18:48 +0200
Subject: [PATCH 287/328] Add two initial high level tests

---
 .../framework/tests/Feature/FilesystemFacadeTest.php  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/FilesystemFacadeTest.php b/packages/framework/tests/Feature/FilesystemFacadeTest.php
index f46a8694b56..94f91d787c2 100644
--- a/packages/framework/tests/Feature/FilesystemFacadeTest.php
+++ b/packages/framework/tests/Feature/FilesystemFacadeTest.php
@@ -449,6 +449,17 @@ public function testMethodWithMixedSequentialAndNamedArgumentsSkippingMiddleOne(
         rmdir(Hyde::path('foo'));
     }
 
+    public function testFindMimeTypeLookup()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('test.txt'));
+    }
+
+    public function testFindMimeTypeWithKnownFile()
+    {
+        $this->file('test.txt', 'This is a test file.');
+        $this->assertSame('text/plain', Filesystem::findMimeType('test.txt'));
+    }
+
     public function testFindMimeTypeWithUnknownExtension()
     {
         $this->file('text.unknown', 'text');

From a3296523fe6b6faa6662d8bfe25f75eaac349a2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 13:47:45 +0200
Subject: [PATCH 288/328] Update the RSS feed generator to use the new
 Filesystem facade

---
 .../src/Framework/Features/XmlGenerators/RssFeedGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
index b3abfab48d2..c8d6a3340c9 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
@@ -12,7 +12,7 @@
 use Hyde\Facades\Site;
 use Hyde\Facades\Config;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Facades\Filesystem;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 
 use function date;
@@ -108,7 +108,7 @@ protected function addAtomLinkItem(): void
 
     protected function getImageType(FeaturedImage $image): string
     {
-        return (new MediaFile($image->getSource()))->getMimeType();
+        return Filesystem::findMimeType($image->getSource());
     }
 
     /** @return numeric-string */

From fdf434143da3144be36ff53dc2d5ecea4b668721 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 14:48:00 +0200
Subject: [PATCH 289/328] Get Assets via the Asset API instead of using
 deprecated media links

---
 .../resources/views/layouts/scripts.blade.php |  2 +-
 .../resources/views/layouts/styles.blade.php  |  2 +-
 .../Blogging/Models/FeaturedImage.php         |  2 +-
 .../Feature/FeaturedImageFactoryTest.php      | 26 ++++++++
 .../tests/Feature/FeaturedImageTest.php       | 24 ++++++-
 .../tests/Feature/MarkdownPostTest.php        | 40 ++++++++++++
 .../framework/tests/Feature/MetadataTest.php  | 62 ++++++++++++++-----
 .../StaticSiteBuilderPostModuleTest.php       |  8 ++-
 .../tests/Feature/Views/MetadataViewTest.php  | 20 +++---
 .../Unit/Views/ArticleExcerptViewTest.php     | 27 ++++++--
 .../Unit/Views/FeaturedImageViewTest.php      | 31 +++++++++-
 11 files changed, 201 insertions(+), 43 deletions(-)

diff --git a/packages/framework/resources/views/layouts/scripts.blade.php b/packages/framework/resources/views/layouts/scripts.blade.php
index bdb527f59bb..a5c85b7be1c 100644
--- a/packages/framework/resources/views/layouts/scripts.blade.php
+++ b/packages/framework/resources/views/layouts/scripts.blade.php
@@ -1,6 +1,6 @@
 {{-- The compiled Laravel Mix scripts --}}
 @if(Asset::hasMediaFile('app.js'))
-    <script defer src="{{ Asset::mediaLink('app.js') }}"></script>
+    <script defer src="{{ Asset::get('app.js') }}"></script>
 @endif
 
 {{-- Alpine.js --}}
diff --git a/packages/framework/resources/views/layouts/styles.blade.php b/packages/framework/resources/views/layouts/styles.blade.php
index d1b374d73cf..02ace05e8ef 100644
--- a/packages/framework/resources/views/layouts/styles.blade.php
+++ b/packages/framework/resources/views/layouts/styles.blade.php
@@ -5,7 +5,7 @@
 @if(config('hyde.load_app_styles_from_cdn', false))
     <link rel="stylesheet" href="{{ HydeFront::cdnLink('app.css') }}">
 @elseif(Asset::hasMediaFile('app.css'))
-    <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
+    <link rel="stylesheet" href="{{ Asset::get('app.css') }}">
 @endif
 
 {{-- Dynamic TailwindCSS Play CDN --}}
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 5c4acef1996..71376cb651f 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -83,7 +83,7 @@ public function getSource(): string
     {
         if ($this->type === self::TYPE_LOCAL) {
             // Return value is always resolvable from a compiled page in the _site directory.
-            return Hyde::mediaLink($this->source);
+            return (string) Hyde::asset($this->source);
         }
 
         return $this->source;
diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 7774e713ed1..2e6ea781049 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -16,6 +16,15 @@
  */
 class FeaturedImageFactoryTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['hyde.enable_cache_busting' => false]);
+
+        $this->file('_media/foo');
+    }
+
     public function testWithDataFromSchema()
     {
         $array = [
@@ -98,6 +107,8 @@ public function testImagePathsAreNormalizedForCustomizedMediaDirectory()
     {
         Hyde::setMediaDirectory('_assets');
 
+        $this->file('_assets/foo');
+
         $this->assertSourceIsSame('assets/foo', ['image' => 'foo']);
         $this->assertSourceIsSame('assets/foo', ['image' => 'assets/foo']);
         $this->assertSourceIsSame('assets/foo', ['image' => '_assets/foo']);
@@ -111,6 +122,8 @@ public function testImagePathsAreNormalizedForCustomizedMediaDirectoryWithoutUnd
     {
         Hyde::setMediaDirectory('assets');
 
+        $this->file('assets/foo');
+
         $this->assertSourceIsSame('assets/foo', ['image' => 'foo']);
         $this->assertSourceIsSame('assets/foo', ['image' => 'assets/foo']);
         $this->assertSourceIsSame('assets/foo', ['image' => 'assets/foo']);
@@ -120,6 +133,19 @@ public function testImagePathsAreNormalizedForCustomizedMediaDirectoryWithoutUnd
         $this->assertSourceIsSame('assets/foo', ['image' => ['source' => 'assets/foo']]);
     }
 
+    public function testImagePathsWithCacheBusting()
+    {
+        config(['hyde.enable_cache_busting' => true]);
+
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => 'foo']);
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => 'media/foo']);
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => '_media/foo']);
+
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => ['source' => 'foo']]);
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => ['source' => 'media/foo']]);
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => ['source' => '_media/foo']]);
+    }
+
     protected function makeFromArray(array $matter): FeaturedImage
     {
         return FeaturedImageFactory::make(new FrontMatter($matter));
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index ca252cd7852..47819102cc4 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -17,6 +17,16 @@
  */
 class FeaturedImageTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['hyde.enable_cache_busting' => false]);
+
+        $this->file('_media/foo', 'test');
+        $this->file('_media/source');
+    }
+
     public function testGetMetadataArray()
     {
         $this->assertSame([
@@ -52,10 +62,8 @@ public function testCanConstructFeaturedImage()
 
     public function testFeaturedImageGetContentLength()
     {
-        $this->file('_media/foo', 'image');
-
         $image = new FeaturedImage('_media/foo', ...$this->defaultArguments());
-        $this->assertSame(5, $image->getContentLength());
+        $this->assertSame(4, $image->getContentLength());
     }
 
     public function testFeaturedImageGetContentLengthWithRemoteSource()
@@ -108,6 +116,16 @@ public function testGetSourceMethod()
         $this->assertSame('http', FeaturedImageFactory::make(new FrontMatter(['image' => 'http']))->getSource());
     }
 
+    public function testImagePathsWithCacheBusting()
+    {
+        config(['hyde.enable_cache_busting' => true]);
+
+        $this->assertSame('media/foo?v=accf8b33', (new FeaturedImage('_media/foo', ...$this->defaultArguments()))->getSource());
+        $this->assertSame('media/foo?v=accf8b33', FeaturedImageFactory::make(new FrontMatter(['image.source' => 'foo']))->getSource());
+        $this->assertSame('media/foo?v=accf8b33', FeaturedImageFactory::make(new FrontMatter(['image.source' => 'media/foo']))->getSource());
+        $this->assertSame('media/foo?v=accf8b33', FeaturedImageFactory::make(new FrontMatter(['image.source' => '_media/foo']))->getSource());
+    }
+
     protected function defaultArguments(): array
     {
         return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 9716c9c78bf..c266762f1d5 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
+use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Models\FrontMatter;
@@ -102,14 +104,28 @@ public function testFeaturedImageCanBeConstructedReturnsNullWhenNoImageIsSetInTh
 
     public function testFeaturedImageCanBeConstructedReturnsImageObjectWithLocalPathWhenMatterIsString()
     {
+        $this->setupMediaFileAndCacheBusting();
+
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertSame('media/foo.png', $image->getSource());
     }
 
+    public function testFeaturedImageCanBeConstructedReturnsImageObjectWithLocalPathAndCacheBusting()
+    {
+        $this->setupMediaFileAndCacheBusting(true);
+
+        $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
+        $image = $page->image;
+        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $this->assertSame('media/foo.png?v=98b41d87', $image->getSource());
+    }
+
     public function testFeaturedImageCanBeConstructedReturnsImageObjectWithRemotePathWhenMatterIsString()
     {
+        $this->setupMediaFileAndCacheBusting(true);
+
         $page = MarkdownPost::make(matter: ['image' => 'https://example.com/foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
@@ -118,10 +134,34 @@ public function testFeaturedImageCanBeConstructedReturnsImageObjectWithRemotePat
 
     public function testFeaturedImageCanBeConstructedReturnsImageObjectWithSuppliedDataWhenMatterIsArray()
     {
+        $this->setupMediaFileAndCacheBusting();
         $page = MarkdownPost::make(matter: ['image' => ['source' => 'foo.png', 'titleText' => 'bar']]);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertSame('media/foo.png', $image->getSource());
         $this->assertSame('bar', $image->getTitleText());
     }
+
+    public function testFeaturedImageThrowsExceptionWhenFileDoesNotExist()
+    {
+        $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File [_media/nonexistent.png] not found when trying to resolve a media asset.');
+
+        MarkdownPost::make(matter: ['image' => 'nonexistent.png']);
+    }
+
+    public function testFeaturedImageNormalizesPathForDifferentMediaDirectoryConfigurations()
+    {
+        Hyde::setMediaDirectory('assets');
+        $this->file('assets/foo.png', 'test content');
+
+        $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
+        $this->assertSame('assets/foo.png?v=98b41d87', $page->image->getSource());
+    }
+
+    protected function setupMediaFileAndCacheBusting(bool $enableCacheBusting = false): void
+    {
+        $this->file('_media/foo.png', 'test content');
+        config(['hyde.enable_cache_busting' => $enableCacheBusting]);
+    }
 }
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index fe6d93b724e..f6c6ce3446d 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -411,101 +411,129 @@ public function testDoesNotAddPublishedTimePropertyWhenDateIsNotSetInPost()
         $this->assertPageDoesNotHaveMetadata($page, '<meta property="og:article:published_time"');
     }
 
-    public function testAddsImagePropertyWhenImageIsSetInPost()
+    public function testAddsTypePropertyAutomatically()
     {
-        $page = new MarkdownPost(matter: ['image' => 'image.jpg']);
+        $page = new MarkdownPost();
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/image.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:type" content="article">');
     }
 
-    public function testDoesNotAddImagePropertyWhenImageIsNotSetInPost()
+    public function testDynamicPostMetaPropertiesReturnsBaseArrayWhenInitializedWithEmptyFrontMatter()
     {
         $page = new MarkdownPost();
-        $this->assertPageDoesNotHaveMetadata($page, '<meta property="og:image"');
+
+        $this->assertSame('<meta property="og:type" content="article">', $page->metadata->render());
     }
 
-    public function testAddsTypePropertyAutomatically()
+    public function testDoesNotAddImagePropertyWhenImageIsNotSetInPost()
     {
         $page = new MarkdownPost();
-
-        $this->assertPageHasMetadata($page, '<meta property="og:type" content="article">');
+        $this->assertPageDoesNotHaveMetadata($page, '<meta property="og:image"');
     }
 
-    public function testDynamicPostMetaPropertiesReturnsBaseArrayWhenInitializedWithEmptyFrontMatter()
+    public function testAddsImagePropertyWhenImageIsSetInPost()
     {
-        $page = new MarkdownPost();
+        $this->file('_media/image.jpg');
+        $page = new MarkdownPost(matter: ['image' => 'image.jpg']);
 
-        $this->assertSame('<meta property="og:type" content="article">', $page->metadata->render());
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/image.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageMetadataWhenFeaturedImageSetToString()
     {
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatIsAlwaysRelative()
     {
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatIsAlwaysRelativeForNestedPosts()
     {
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost('foo/bar', matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatIsAlwaysRelativeForNestedOutputDirectories()
     {
         MarkdownPost::setOutputDirectory('_posts/foo');
 
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatIsAlwaysRelativeForNestedPostsAndNestedOutputDirectories()
     {
         MarkdownPost::setOutputDirectory('_posts/foo');
 
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost('bar/baz', matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatUsesTheConfiguredMediaDirectory()
     {
         Hyde::setMediaDirectory('assets');
 
+        $this->file('assets/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../assets/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../assets/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageMetadataWhenFeaturedImageSetToArrayWithPath()
     {
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => [
                 'source' => 'foo.jpg',
             ],
         ]);
 
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg?v=00000000">');
+    }
+
+    public function testDynamicPostMetaPropertiesContainsImageLinkWithoutCacheBusting()
+    {
+        config(['hyde.enable_cache_busting' => false]);
+
+        $this->file('_media/foo.jpg');
+
+        $page = new MarkdownPost(matter: [
+            'image' => 'foo.jpg',
+        ]);
+
         $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg">');
     }
 
diff --git a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
index 18f4743ecdb..8269e519dc1 100644
--- a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
@@ -23,6 +23,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->file('_media/image.png');
+
         $this->post = MarkdownPost::make('test-post', [
             'title' => 'Adventures in Wonderland',
             'description' => 'All in the golden afternoon, full leisurely we glide.',
@@ -119,9 +121,9 @@ public function testPostContainsExpectedAriaSupport()
     public function testPostImageIsResolvedRelatively()
     {
         $this->inspectHtml([
-            '<meta property="og:image" content="../media/image.png">',
-            '<meta itemprop="url" content="../media/image.png">',
-            '<meta itemprop="contentUrl" content="../media/image.png">',
+            '<meta property="og:image" content="../media/image.png?v=00000000">',
+            '<meta itemprop="url" content="../media/image.png?v=00000000">',
+            '<meta itemprop="contentUrl" content="../media/image.png?v=00000000">',
         ]);
     }
 
diff --git a/packages/framework/tests/Feature/Views/MetadataViewTest.php b/packages/framework/tests/Feature/Views/MetadataViewTest.php
index b4424aa18c0..33e0108c7d8 100644
--- a/packages/framework/tests/Feature/Views/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/Views/MetadataViewTest.php
@@ -92,7 +92,7 @@ public function testMetadataTagsInEmptyBladePage()
 
         $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -108,7 +108,7 @@ public function testMetadataTagsInEmptyMarkdownPage()
 
         $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -124,7 +124,7 @@ public function testMetadataTagsInEmptyDocumentationPage()
 
         $assertions = $this->assertSee('docs/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/docs/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -141,7 +141,7 @@ public function testMetadataTagsInEmptyMarkdownPost()
         $assertions = $this->assertSee('posts/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
             '<link rel="alternate" href="https://example.com/feed.xml" type="application/rss+xml" title="HydePHP RSS Feed">',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/posts/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta name="url" content="https://example.com/posts/test.html">',
@@ -173,12 +173,13 @@ public function testMetadataTagsInMarkdownPostWithFlatFrontMatter()
             Lorem Ipsum Dolor Amet.
             MARKDOWN
         );
+        $this->file('_media/image.jpg');
         $this->build('_posts/test.md');
 
         $assertions = $this->assertSee('posts/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - My title</title>',
             '<link rel="alternate" href="https://example.com/feed.xml" type="application/rss+xml" title="HydePHP RSS Feed">',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/posts/test.html">',
             '<meta name="twitter:title" content="HydePHP - My title">',
             '<meta name="description" content="My description">',
@@ -190,11 +191,11 @@ public function testMetadataTagsInMarkdownPostWithFlatFrontMatter()
             '<meta property="og:url" content="https://example.com/posts/test.html">',
             '<meta property="og:type" content="article">',
             '<meta property="og:article:published_time" content="2022-01-01T00:00:00+00:00">',
-            '<meta property="og:image" content="../media/image.jpg">',
+            '<meta property="og:image" content="https://example.com/media/image.jpg">',
             '<meta itemprop="identifier" content="test">',
             '<meta itemprop="url" content="https://example.com/posts/test.html">',
-            '<meta itemprop="url" content="../media/image.jpg">',
-            '<meta itemprop="contentUrl" content="../media/image.jpg">',
+            '<meta itemprop="url" content="https://example.com/media/image.jpg">',
+            '<meta itemprop="contentUrl" content="https://example.com/media/image.jpg">',
         ]));
 
         $this->assertAllTagsWereCovered('posts/test', $assertions);
@@ -219,6 +220,7 @@ public function testCanonicalUrlTagsAreNotAddedWhenCanonicalUrlIsNotSet()
             Lorem Ipsum Dolor Amet.
             MARKDOWN
         );
+        $this->file('_media/image.jpg');
         $this->build('_posts/test.md');
 
         $assertions = $this->assertSee('posts/test', [
@@ -285,7 +287,7 @@ public function testMetadataTagsInMarkdownPageWithDescription()
 
         $this->assertSee('test-page', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - My Page Title</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<meta name="twitter:title" content="HydePHP - My Page Title">',
             '<meta property="og:title" content="HydePHP - My Page Title">',
             '<meta property="og:description" content="My page description">',
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index ea83bdc457a..6b7d49e9ffc 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -96,17 +96,34 @@ public function testItempropImageIsNotAddedWhenThereIsNoImage()
         $this->assertStringNotContainsString('itemprop="image"', $view);
     }
 
-    public function testItempropImageIsAddedWhenThereIsAnImage()
+    public function testItempropImageIsAddedWhenThereIsAnImageWithLocalPath()
     {
-        // Test with local path
+        $this->file('_media/image.jpg');
+
         $viewLocal = $this->renderTestView(MarkdownPost::make(matter: [
-            'image' => 'path/to/local/image.jpg',
+            'image' => 'image.jpg',
         ]));
 
         $this->assertStringContainsString('itemprop="image"', $viewLocal);
-        $this->assertStringContainsString('content="media/path/to/local/image.jpg"', $viewLocal);
+        $this->assertStringContainsString('content="media/image.jpg?v=00000000"', $viewLocal);
+    }
+
+    public function testItempropImageIsAddedWhenThereIsAnImageWithLocalPathNoCache()
+    {
+        $this->file('_media/image.jpg');
+
+        config(['hyde.enable_cache_busting' => false]);
 
-        // Test with remote URL
+        $viewLocalNoCache = $this->renderTestView(MarkdownPost::make(matter: [
+            'image' => 'image.jpg',
+        ]));
+
+        $this->assertStringContainsString('itemprop="image"', $viewLocalNoCache);
+        $this->assertStringContainsString('content="media/image.jpg"', $viewLocalNoCache);
+    }
+
+    public function testItempropImageIsAddedWhenThereIsAnImageWithRemoteUrl()
+    {
         $viewRemote = $this->renderTestView(MarkdownPost::make(matter: [
             'image' => 'https://example.com/image.jpg',
         ]));
diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 3e6fa630c6c..188f489dc38 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Hyde;
 use Hyde\Framework\Factories\FeaturedImageFactory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Models\FrontMatter;
@@ -15,6 +16,13 @@
  */
 class FeaturedImageViewTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->file('_media/foo.jpg', 'test content');
+        config(['hyde.enable_cache_busting' => false]);
+    }
+
     public function testTheView()
     {
         $component = $this->renderComponent([
@@ -249,6 +257,22 @@ public function testFluentAttributionLogicCreatesFluentMessages7()
         );
     }
 
+    public function testCacheBusting()
+    {
+        config(['hyde.enable_cache_busting' => true]);
+        $component = $this->renderComponent();
+        $this->assertStringContainsString('src="media/foo.jpg?v=98b41d87"', $component);
+    }
+
+    public function testImagePathNormalization()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $this->file('custom_media/bar.png', 'test content');
+
+        $component = $this->renderComponent(['image.source' => 'bar.png']);
+        $this->assertStringContainsString('src="custom_media/bar.png"', $component);
+    }
+
     protected function stripHtml(string $string): string
     {
         return trim($this->stripWhitespace(strip_tags($string)), "\t ");
@@ -259,7 +283,7 @@ protected function stripWhitespace(string $string): string
         return str_replace([' ', "\r", "\n"], '', $string);
     }
 
-    protected function renderComponent(FeaturedImage|array $data = ['image.source' => 'foo']): string
+    protected function renderComponent(FeaturedImage|array $data = ['image.source' => 'foo.jpg']): string
     {
         $image = $data instanceof FeaturedImage ? $data : $this->make($data);
 
@@ -270,9 +294,10 @@ protected function renderComponent(FeaturedImage|array $data = ['image.source' =
         return view('hyde::components.post.image')->render();
     }
 
-    protected function make(array $data = [], string $path = 'foo.png'): FeaturedImage
+    protected function make(array $data = [], string $path = 'foo.jpg'): FeaturedImage
     {
-        $this->file("_media/$path");
+        $mediaDir = config('hyde.media_directory', '_media');
+        $this->file("$mediaDir/$path", 'test content');
 
         return FeaturedImageFactory::make(FrontMatter::fromArray(array_merge(
             ['image.source' => $path],

From 86715b0ca71f03b1b484e2d6aaa25f5b3b19db2e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 15:02:18 +0200
Subject: [PATCH 290/328] Migrate tests using deprecated media link helper to
 use new Asset API

---
 .../tests/Feature/AssetAPIFeatureTest.php     | 10 +++----
 .../Feature/Foundation/HyperlinksTest.php     | 28 +++++++++----------
 .../tests/Feature/HydeKernelTest.php          |  8 ++++--
 .../Unit/Facades/AssetFacadeUnitTest.php      | 18 ++++++------
 4 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 1f09a7ba721..fd78911fc02 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -17,11 +17,11 @@ public function testAssetAPIExamples()
         // Tests for the Asset API, can be used to try out the PhpStorm autocompletion
 
         $conditions = [
-            'hasMediaFileTrue' => Asset::hasMediaFile('app.css'),
-            'hasMediaFileFalse' => Asset::hasMediaFile('missing.png'),
+            'hasMediaFileTrue' => \Hyde\Facades\Asset::hasMediaFile('app.css'),
+            'hasMediaFileFalse' => \Hyde\Facades\Asset::hasMediaFile('missing.png'),
             'getters' => [
-                Asset::mediaLink('app.css'),
-                Asset::get('app.css'),
+                (string) \Hyde\Facades\Asset::get('app.css'),
+                \Hyde\Facades\Asset::get('app.css'),
                 \Hyde::asset('app.css'),
                 \Hyde\Hyde::asset('app.css'),
                 Hyde::kernel()->asset('app.css'),
@@ -65,7 +65,6 @@ public function testAssetAPIUsagesInBladeViews()
     {
         $view = /** @lang Blade */ <<<'Blade'
         @if(Asset::hasMediaFile('app.css'))
-            <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
             <link rel="stylesheet" href="{{ Asset::get('app.css') }}">
             <link rel="stylesheet" href="{{ Hyde::asset('app.css') }}">
             <link rel="stylesheet" href="{{ asset('app.css') }}">
@@ -84,7 +83,6 @@ public function testAssetAPIUsagesInBladeViews()
         <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
             <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
             <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
-            <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
         
             Missing missing.png
 
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 00b2cb84681..2b72bf203cb 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -102,33 +102,33 @@ public function testAssetHelperReturnsInputWhenImageIsAlreadyQualifiedRegardless
         $this->assertSame('http://localhost/media/test.jpg?v=00000000', (string) $this->class->asset('http://localhost/media/test.jpg'));
     }
 
-    public function testMediaLinkHelper()
+    public function testAssetHelper()
     {
-        $this->assertSame('media/foo', $this->class->mediaLink('foo'));
+        $this->file('_media/foo', 'test');
+        $class = $this->class;
+        $this->assertSame('media/foo?v=accf8b33', (string) $class->asset('foo'));
     }
 
-    public function testMediaLinkHelperWithRelativePath()
+    public function testAssetHelperWithRelativePath()
     {
         $this->mockCurrentPage('foo/bar');
-        $this->assertSame('../media/foo', $this->class->mediaLink('foo'));
-    }
-
-    public function testMediaLinkHelperUsesConfiguredMediaDirectory()
-    {
-        Hyde::setMediaDirectory('_assets');
-        $this->assertSame('assets/foo', $this->class->mediaLink('foo'));
+        $this->file('_media/foo', 'test');
+        $class = $this->class;
+        $this->assertSame('../media/foo?v=accf8b33', (string) $class->asset('foo'));
     }
 
-    public function testMediaLinkHelperWithValidationAndExistingFile()
+    public function testAssetHelperWithExistingFile()
     {
         $this->file('_media/foo', 'test');
-        $this->assertSame('media/foo?v=accf8b33', $this->class->mediaLink('foo', true));
+        $class = $this->class;
+        $this->assertSame('media/foo?v=accf8b33', (string) $class->asset('foo'));
     }
 
-    public function testMediaLinkHelperWithValidationAndNonExistingFile()
+    public function testAssetHelperWithNonExistingFile()
     {
         $this->expectException(FileNotFoundException::class);
-        $this->class->mediaLink('foo', true);
+        $class = $this->class;
+        (string) $class->asset('foo');
     }
 
     public function testRouteHelper()
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 423c6c33c44..7579df9ae2a 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -173,13 +173,15 @@ public function testRelativeLinkHelperReturnsRelativeLinkToDestination()
         $this->assertSame('../foo', Hyde::relativeLink('foo'));
     }
 
-    public function testMediaLinkHelperReturnsRelativeLinkToDestination()
+    public function testAssetHelperReturnsRelativeLinkToDestination()
     {
+        $this->file('_media/foo');
+
         Render::share('routeKey', 'bar');
-        $this->assertSame('media/foo', Hyde::mediaLink('foo'));
+        $this->assertSame('media/foo?v=00000000', (string) Hyde::asset('foo'));
 
         Render::share('routeKey', 'foo/bar');
-        $this->assertSame('../media/foo', Hyde::mediaLink('foo'));
+        $this->assertSame('../media/foo?v=00000000', (string) Hyde::asset('foo'));
     }
 
     public function testAssetHelperReturnsMediaFileInstanceForGivenName()
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index ceb3949017c..5a6345fd55e 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -53,30 +53,32 @@ public function testHasMediaFileHelperReturnsTrueForExistingFile()
         $this->assertTrue(Asset::hasMediaFile('app.css'));
     }
 
-    public function testMediaLinkReturnsMediaPathWithCacheKey()
+    public function testAssetReturnsMediaPathWithCacheKey()
     {
-        $this->assertIsString($path = Asset::mediaLink('app.css'));
+        $this->assertIsString($path = (string) Asset::get('app.css'));
         $this->assertSame('media/app.css?v='.hash_file('crc32', Hyde::path('_media/app.css')), $path);
     }
 
-    public function testMediaLinkReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled()
+    public function testAssetReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled()
     {
         self::mockConfig(['hyde.enable_cache_busting' => false]);
 
-        $path = Asset::mediaLink('app.css');
+        $path = (string) Asset::get('app.css');
 
         $this->assertIsString($path);
         $this->assertSame('media/app.css', $path);
     }
 
-    public function testMediaLinkSupportsCustomMediaDirectories()
+    public function testAssetSupportsCustomMediaDirectories()
     {
-        $this->directory('_assets');
-        $this->file('_assets/app.css');
+        self::resetKernel();
 
         Hyde::setMediaDirectory('_assets');
 
-        $path = Asset::mediaLink('app.css');
+        $this->directory('_assets');
+        $this->file('_assets/app.css');
+
+        $path = (string) Asset::get('app.css');
 
         $this->assertIsString($path);
         $this->assertSame('assets/app.css?v='.hash_file('crc32', Hyde::path('_assets/app.css')), $path);

From 5ff2550c1d6b35e006f693597badd46b806098bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 15:06:25 +0200
Subject: [PATCH 291/328] Breaking: Remove the `mediaLink` helper replaced by
 the Asset API

---
 .../hyde-kernel-hyperlink-methods.md           | 10 +---------
 docs/architecture-concepts/the-hydekernel.md   |  8 --------
 ide.json                                       |  2 +-
 packages/framework/src/Facades/Asset.php       |  5 -----
 .../Foundation/Concerns/ForwardsHyperlinks.php |  5 -----
 .../src/Foundation/Kernel/Hyperlinks.php       | 18 ------------------
 6 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
index 82c400152b2..102c68dfb7b 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-hyperlink-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsHyperlinks -->
-<!-- Generated by HydePHP DocGen script at 2024-09-02 11:18:08 in 0.14ms -->
+<!-- Generated by HydePHP DocGen script at 2024-09-04 19:44:45 in 0.10ms -->
 
 #### `formatLink()`
 
@@ -19,14 +19,6 @@ No description provided.
 Hyde::relativeLink(string $destination): string
 ```
 
-#### `mediaLink()`
-
-No description provided.
-
-```php
-Hyde::mediaLink(string $destination, bool $validate): string
-```
-
 #### `asset()`
 
 No description provided.
diff --git a/docs/architecture-concepts/the-hydekernel.md b/docs/architecture-concepts/the-hydekernel.md
index b4c3dab6dbf..633bb8db889 100644
--- a/docs/architecture-concepts/the-hydekernel.md
+++ b/docs/architecture-concepts/the-hydekernel.md
@@ -205,14 +205,6 @@ No description provided.
 Hyde::relativeLink(string $destination): string
 ```
 
-#### `mediaLink()`
-
-No description provided.
-
-```php
-Hyde::mediaLink(string $destination, bool $validate): string
-```
-
 #### `asset()`
 
 No description provided.
diff --git a/ide.json b/ide.json
index dcc1dbb9eb3..d6b36b6b45e 100644
--- a/ide.json
+++ b/ide.json
@@ -22,7 +22,7 @@
             },
             "condition": [
                 {
-                    "methodNames": ["get", "mediaLink", "hasMediaFile"],
+                    "methodNames": ["get", "hasMediaFile"],
                     "place": "parameter",
                     "classFqn": ["\\Hyde\\Facades\\Asset"],
                     "parameters": [1]
diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 524607e6ebc..4194c27dc66 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -22,11 +22,6 @@ public static function get(string $file): MediaFile
         return hyde()->asset($file);
     }
 
-    public static function mediaLink(string $file): string
-    {
-        return hyde()->mediaLink($file);
-    }
-
     public static function hasMediaFile(string $file): bool
     {
         return file_exists(MediaFile::sourcePath($file));
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index 5eae4cd3e4c..6b28b7ea3d4 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -24,11 +24,6 @@ public function relativeLink(string $destination): string
         return $this->hyperlinks->relativeLink($destination);
     }
 
-    public function mediaLink(string $destination, bool $validate = false): string
-    {
-        return $this->hyperlinks->mediaLink($destination, $validate);
-    }
-
     public function asset(string $name): MediaFile
     {
         return $this->hyperlinks->asset($name);
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 197480122ee..28cb7580abd 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -14,7 +14,6 @@
 use function str_ends_with;
 use function str_starts_with;
 use function substr_count;
-use function file_exists;
 use function str_replace;
 use function str_repeat;
 use function substr;
@@ -87,23 +86,6 @@ public function relativeLink(string $destination): string
         return str_replace('//', '/', $route);
     }
 
-    /**
-     * Gets a relative web link to the given file stored in the _site/media folder.
-     *
-     * @deprecated Use the `asset` method instead.
-     *
-     * An exception will be thrown if the file does not exist in the _media directory,
-     * and the second argument is set to true.
-     */
-    public function mediaLink(string $destination, bool $validate = false): string
-    {
-        if ($validate && ! file_exists($sourcePath = "{$this->kernel->getMediaDirectory()}/$destination")) {
-            throw new FileNotFoundException($sourcePath);
-        }
-
-        return static::withCacheBusting($this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination"), $destination);
-    }
-
     /**
      * Gets a MediaAsset instance for the given file stored in the `_site/media` folder.
      * The returned value can be cast into a string in Blade views to resole the URL.

From ff183486d136bc9a8dfc6af5228a2b30ab1f99be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 7 Sep 2024 15:13:16 +0200
Subject: [PATCH 292/328] Remove deprecated withCacheBusting method

---
 packages/framework/src/Foundation/Kernel/Hyperlinks.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 28cb7580abd..fffae96b0d6 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -157,12 +157,4 @@ public static function isRemote(string $url): bool
     {
         return str_starts_with($url, 'http') || str_starts_with($url, '//');
     }
-
-    /**
-     * @deprecated Use the `MediaFile::getCacheBustKey` method instead.
-     */
-    public static function withCacheBusting(string $url, string $file): string
-    {
-        return $url.MediaFile::legacy_getCacheBustKey($file);
-    }
 }

From d8a97fd0295bd5bc94960206136666855dd27331 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 10:58:29 +0200
Subject: [PATCH 293/328] Remove already evaluated condition

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 1c18444a2da..eb1004576f6 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -239,10 +239,6 @@ protected function ensureInstanceIsBooted(string $property): void
 
     protected function boot(): void
     {
-        if (Filesystem::missing($this->getPath())) {
-            throw new FileNotFoundException($this->getPath());
-        }
-
         $this->length = $this->findContentLength();
         $this->mimeType = $this->findMimeType();
         $this->hash = $this->findHash();

From c2cf04e4ceff8c7d467ee989ef9f795655c6ff33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 11:00:46 +0200
Subject: [PATCH 294/328] Remove deprecated legacy helper

---
 packages/framework/src/Support/Filesystem/MediaFile.php   | 8 --------
 .../framework/tests/Feature/Support/MediaFileTest.php     | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index eb1004576f6..6c095bcc07e 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -179,14 +179,6 @@ public function toArray(): array
         ]);
     }
 
-    /** @deprecated Use instance helper */
-    public static function legacy_getCacheBustKey(string $file): string
-    {
-        return Config::getBool('hyde.enable_cache_busting', true) && Filesystem::exists(static::sourcePath("$file"))
-            ? '?v='.static::make($file)->getHash()
-            : '';
-    }
-
     protected function getCacheBustKey(): string
     {
         return Config::getBool('hyde.enable_cache_busting', true)
diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index e1b12bb484f..2752c362f4a 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 
@@ -113,7 +114,7 @@ public function testMediaFileCacheBusting()
     {
         $this->file('_media/cachebust_test.js', 'console.log("Hello");');
 
-        $cacheBustKey = MediaFile::legacy_getCacheBustKey('cachebust_test.js');
+        $cacheBustKey = Str::after(MediaFile::make('cachebust_test.js')->getLink(), '.js');
 
         $this->assertStringStartsWith('?v=', $cacheBustKey);
         $this->assertSame('?v=cd5de5e7', $cacheBustKey); // Expect CRC32 hash

From 32b5b6fda1b15e46ae12609971da7718624e414d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 11:03:58 +0200
Subject: [PATCH 295/328] Use fully qualified class names in docblocks

---
 packages/framework/src/Support/Filesystem/MediaFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 6c095bcc07e..de4b7867630 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -36,7 +36,7 @@ class MediaFile extends ProjectFile implements Stringable
      *
      * @param  string  $path  The file path relative to the project root or media source directory.
      *
-     * @throws FileNotFoundException If the file does not exist in the media source directory.
+     * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the media source directory.
      */
     public function __construct(string $path)
     {

From 8dfb5ce2f3fa760b9a30b34c135aff9308467664 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 11:10:36 +0200
Subject: [PATCH 296/328] Test it throws exceptions for non existent media
 files

---
 .../tests/Feature/AssetAPIFeatureTest.php     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 5de775575b5..4380f63d097 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -6,6 +6,7 @@
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\Facades\Blade;
 use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Framework\Exceptions\FileNotFoundException;
 
 /**
  * High level test for the Asset API.
@@ -93,6 +94,36 @@ public function testAssetAPIUsagesInBladeViews()
         HTML, $html);
     }
 
+    public function testThrowsExceptionForNonExistentMediaFile()
+    {
+        $nonExistentFile = 'non_existent_file.txt';
+
+        $accessors = [
+            fn () => \Hyde\Facades\Asset::get($nonExistentFile),
+            fn () => \Hyde::asset($nonExistentFile),
+            fn () => \Hyde\Hyde::asset($nonExistentFile),
+            fn () => Hyde::kernel()->asset($nonExistentFile),
+            fn () => HydeKernel::getInstance()->asset($nonExistentFile),
+            fn () => hyde()->asset($nonExistentFile),
+            fn () => asset($nonExistentFile),
+            fn () => new MediaFile($nonExistentFile),
+            fn () => MediaFile::make($nonExistentFile),
+            fn () => MediaFile::get($nonExistentFile),
+        ];
+
+        foreach ($accessors as $test => $accessor) {
+            try {
+                $accessor();
+                $this->fail('Expected exception to be thrown for syntax test #'.$test);
+            } catch (FileNotFoundException $exception) {
+                $this->assertSame('File [_media/non_existent_file.txt] not found when trying to resolve a media asset.', $exception->getMessage());
+            }
+        }
+
+        $this->assertSame(Hyde::path('_media/non_existent_file.txt'), MediaFile::sourcePath($nonExistentFile));
+        $this->assertSame(Hyde::path('_site/media/non_existent_file.txt'), MediaFile::outputPath($nonExistentFile));
+    }
+
     protected function getAppStylesVersion(): string
     {
         return MediaFile::get('app.css')->getHash();

From a897d0dd07f583782a687c1f7f7370021286d339 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 11:17:08 +0200
Subject: [PATCH 297/328] Breaking: Rename `Asset::hasMediaFile` to
 `Asset::exists`

Also considered `has`, but exists is generally better for clarity, as it directly indicates that you're checking for the presence of a file. has can be more ambiguous, as it might imply ownership or possession rather than existence. Therefore, exists is often preferred for methods that check for the presence of an item. It's also what the Laravel Filesystem facade uses
---
 ide.json                                             |  2 +-
 .../resources/views/layouts/scripts.blade.php        |  2 +-
 .../resources/views/layouts/styles.blade.php         |  2 +-
 packages/framework/src/Facades/Asset.php             |  2 +-
 .../framework/tests/Feature/AssetAPIFeatureTest.php  | 12 ++++++------
 .../tests/Unit/Facades/AssetFacadeUnitTest.php       |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ide.json b/ide.json
index d6b36b6b45e..08e825f6361 100644
--- a/ide.json
+++ b/ide.json
@@ -22,7 +22,7 @@
             },
             "condition": [
                 {
-                    "methodNames": ["get", "hasMediaFile"],
+                    "methodNames": ["get", "exists"],
                     "place": "parameter",
                     "classFqn": ["\\Hyde\\Facades\\Asset"],
                     "parameters": [1]
diff --git a/packages/framework/resources/views/layouts/scripts.blade.php b/packages/framework/resources/views/layouts/scripts.blade.php
index a5c85b7be1c..abc3a7030b5 100644
--- a/packages/framework/resources/views/layouts/scripts.blade.php
+++ b/packages/framework/resources/views/layouts/scripts.blade.php
@@ -1,5 +1,5 @@
 {{-- The compiled Laravel Mix scripts --}}
-@if(Asset::hasMediaFile('app.js'))
+@if(Asset::exists('app.js'))
     <script defer src="{{ Asset::get('app.js') }}"></script>
 @endif
 
diff --git a/packages/framework/resources/views/layouts/styles.blade.php b/packages/framework/resources/views/layouts/styles.blade.php
index 02ace05e8ef..8bf4d5bcc55 100644
--- a/packages/framework/resources/views/layouts/styles.blade.php
+++ b/packages/framework/resources/views/layouts/styles.blade.php
@@ -4,7 +4,7 @@
 {{-- The compiled Tailwind/App styles --}}
 @if(config('hyde.load_app_styles_from_cdn', false))
     <link rel="stylesheet" href="{{ HydeFront::cdnLink('app.css') }}">
-@elseif(Asset::hasMediaFile('app.css'))
+@elseif(Asset::exists('app.css'))
     <link rel="stylesheet" href="{{ Asset::get('app.css') }}">
 @endif
 
diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 4194c27dc66..92b2ee30097 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -22,7 +22,7 @@ public static function get(string $file): MediaFile
         return hyde()->asset($file);
     }
 
-    public static function hasMediaFile(string $file): bool
+    public static function exists(string $file): bool
     {
         return file_exists(MediaFile::sourcePath($file));
     }
diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 4380f63d097..8961c16cd5f 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -22,8 +22,8 @@ public function testAssetAPIExamples()
         // Tests for the Asset API, can be used to try out the PhpStorm autocompletion
 
         $conditions = [
-            'hasMediaFileTrue' => \Hyde\Facades\Asset::hasMediaFile('app.css'),
-            'hasMediaFileFalse' => \Hyde\Facades\Asset::hasMediaFile('missing.png'),
+            'existsTrue' => \Hyde\Facades\Asset::exists('app.css'),
+            'existsFalse' => \Hyde\Facades\Asset::exists('missing.png'),
             'getters' => [
                 (string) \Hyde\Facades\Asset::get('app.css'),
                 \Hyde\Facades\Asset::get('app.css'),
@@ -44,8 +44,8 @@ public function testAssetAPIExamples()
         ];
 
         $this->assertEquals([
-            'hasMediaFileTrue' => true,
-            'hasMediaFileFalse' => false,
+            'existsTrue' => true,
+            'existsFalse' => false,
             'getters' => [
                 "media/app.css?v={$this->getAppStylesVersion()}",
                 MediaFile::get('app.css'),
@@ -69,13 +69,13 @@ public function testAssetAPIExamples()
     public function testAssetAPIUsagesInBladeViews()
     {
         $view = /** @lang Blade */ <<<'Blade'
-        @if(Asset::hasMediaFile('app.css'))
+        @if(Asset::exists('app.css'))
             <link rel="stylesheet" href="{{ Asset::get('app.css') }}">
             <link rel="stylesheet" href="{{ Hyde::asset('app.css') }}">
             <link rel="stylesheet" href="{{ asset('app.css') }}">
         @endif
         
-        @if(Asset::hasMediaFile('missing.png'))
+        @if(Asset::exists('missing.png'))
             Found missing.png
         @else
             Missing missing.png
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index 5a6345fd55e..2befc96d34b 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -45,12 +45,12 @@ public function testGetHelperWithNonExistentFile()
 
     public function testHasMediaFileHelper()
     {
-        $this->assertFalse(Asset::hasMediaFile('styles.css'));
+        $this->assertFalse(Asset::exists('styles.css'));
     }
 
     public function testHasMediaFileHelperReturnsTrueForExistingFile()
     {
-        $this->assertTrue(Asset::hasMediaFile('app.css'));
+        $this->assertTrue(Asset::exists('app.css'));
     }
 
     public function testAssetReturnsMediaPathWithCacheKey()

From b99f1d214f851baeee160326592a81c83e28985f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 11:31:55 +0200
Subject: [PATCH 298/328] Refactor featured image helper to use the Asset API

---
 .../Features/Blogging/Models/FeaturedImage.php       | 12 +-----------
 .../framework/tests/Unit/FeaturedImageUnitTest.php   | 12 +++++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 71376cb651f..bb789f8d637 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -12,14 +12,10 @@
 use Illuminate\Support\Facades\Http;
 use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Support\Filesystem\MediaFile;
-use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 
 use function array_key_exists;
 use function array_flip;
-use function file_exists;
-use function filesize;
-use function sprintf;
 use function key;
 
 /**
@@ -214,13 +210,7 @@ protected function has(string $property): bool
 
     protected function getContentLengthForLocalImage(): int
     {
-        $storagePath = MediaFile::sourcePath($this->source);
-
-        if (! file_exists($storagePath)) {
-            throw new FileNotFoundException(customMessage: sprintf('Featured image [%s] not found.', Hyde::pathToRelative($storagePath)));
-        }
-
-        return filesize($storagePath);
+        return MediaFile::get($this->source)->getContentLength();
     }
 
     protected function getContentLengthForRemoteImage(): int
diff --git a/packages/framework/tests/Unit/FeaturedImageUnitTest.php b/packages/framework/tests/Unit/FeaturedImageUnitTest.php
index 5ea286739a7..26ab3ffca70 100644
--- a/packages/framework/tests/Unit/FeaturedImageUnitTest.php
+++ b/packages/framework/tests/Unit/FeaturedImageUnitTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Foundation\HydeKernel;
+use Illuminate\Support\Collection;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Testing\UnitTestCase;
@@ -182,8 +184,16 @@ public function testGetContentLength()
 
     public function testFeaturedImageGetContentLengthWithNoSource()
     {
+        HydeKernel::setInstance(new class extends HydeKernel
+        {
+            public function assets(): Collection
+            {
+                return new Collection();
+            }
+        });
+
         $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('Featured image [_media/foo] not found.');
+        $this->expectExceptionMessage('File [_media/foo] not found when trying to resolve a media asset.');
 
         $image = new FeaturedImage('_media/foo', ...self::ARGUMENTS);
         $this->assertSame(0, $image->getContentLength());

From 541e62a80654abd9af4dcbc6a4786b2da0010a14 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 11:50:45 +0200
Subject: [PATCH 299/328] Rename `MediaFile` method `getContentLength` to
 `getLength`

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php  | 2 +-
 packages/framework/src/Support/Filesystem/MediaFile.php   | 8 ++++----
 .../framework/tests/Feature/Support/MediaFileTest.php     | 4 ++--
 .../framework/tests/Unit/Support/MediaFileUnitTest.php    | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index bb789f8d637..e1cb2d34ea6 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -210,7 +210,7 @@ protected function has(string $property): bool
 
     protected function getContentLengthForLocalImage(): int
     {
-        return MediaFile::get($this->source)->getContentLength();
+        return MediaFile::get($this->source)->getLength();
     }
 
     protected function getContentLengthForRemoteImage(): int
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index de4b7867630..258bbbbadd0 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -138,7 +138,7 @@ public function getLink(): string
     /**
      * Get the content length of the file in bytes.
      */
-    public function getContentLength(): int
+    public function getLength(): int
     {
         $this->ensureInstanceIsBooted('length');
 
@@ -173,7 +173,7 @@ public function getHash(): string
     public function toArray(): array
     {
         return array_merge(parent::toArray(), [
-            'length' => $this->getContentLength(),
+            'length' => $this->getLength(),
             'mimeType' => $this->getMimeType(),
             'hash' => $this->getHash(),
         ]);
@@ -207,7 +207,7 @@ protected function getNormalizedPath(string $path): string
         return $path;
     }
 
-    protected function findContentLength(): int
+    protected function findLength(): int
     {
         return Filesystem::size($this->getPath());
     }
@@ -231,7 +231,7 @@ protected function ensureInstanceIsBooted(string $property): void
 
     protected function boot(): void
     {
-        $this->length = $this->findContentLength();
+        $this->length = $this->findLength();
         $this->mimeType = $this->findMimeType();
         $this->hash = $this->findHash();
     }
diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index 2752c362f4a..c088dac91d8 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -64,7 +64,7 @@ public function testMediaFileProperties()
 
         $mediaFile = MediaFile::make('large_file.txt');
 
-        $this->assertSame(1024, $mediaFile->getContentLength());
+        $this->assertSame(1024, $mediaFile->getLength());
         $this->assertSame('text/plain', $mediaFile->getMimeType());
         $this->assertSame(hash('crc32', $content), $mediaFile->getHash());
     }
@@ -82,7 +82,7 @@ public function testMediaFilePathHandling()
     public function testMediaFileExceptionHandling()
     {
         $this->expectException(FileNotFoundException::class);
-        MediaFile::make('non_existent_file.txt')->getContentLength();
+        MediaFile::make('non_existent_file.txt')->getLength();
     }
 
     public function testMediaDirectoryCustomization()
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index df506517fca..a7176e0e464 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -162,7 +162,7 @@ public function testConstructorWithVariousInputFormats()
     public function testConstructorSetsProperties()
     {
         $file = new MediaFile('foo.txt');
-        $this->assertNotNull($file->getContentLength());
+        $this->assertNotNull($file->getLength());
         $this->assertNotNull($file->getMimeType());
         $this->assertNotNull($file->getHash());
     }
@@ -259,13 +259,13 @@ public function testToArrayReturnsArrayOfFileProperties()
         ], MediaFile::make('foo.txt')->toArray());
     }
 
-    public function testGetContentLength()
+    public function testGetLength()
     {
         $this->mockFilesystem->shouldReceive('size')
             ->with(Hyde::path('_media/foo'))
             ->andReturn(12);
 
-        $this->assertSame(12, MediaFile::make('foo')->getContentLength());
+        $this->assertSame(12, MediaFile::make('foo')->getLength());
     }
 
     public function testGetMimeType()
@@ -588,7 +588,7 @@ protected function mockCurrentPage(string $page): void
     public static function bootableMethodsProvider(): array
     {
         return [
-            ['getContentLength'],
+            ['getLength'],
             ['getMimeType'],
             ['getHash'],
         ];

From 96263b5da47818d755be285a42ba34648c10a6ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 12:06:33 +0200
Subject: [PATCH 300/328] Fix mock setup

---
 .../tests/Unit/Support/MediaFileUnitTest.php       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index a7176e0e464..d10db2e3916 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -6,6 +6,7 @@
 
 use Mockery;
 use Illuminate\View\Factory;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
 use Hyde\Framework\Exceptions\FileNotFoundException;
@@ -61,10 +62,6 @@ protected function setUp(): void
         $this->mockFilesystem->shouldReceive('hash')->andReturn(hash('crc32', 'Hello World!'))->byDefault();
         $this->mockFilesystem->shouldReceive('get')->andReturn('Hello World!')->byDefault();
 
-        // Mock Hyde facade
-        $hyde = Mockery::mock(Hyde::kernel())->makePartial();
-        $hyde->shouldReceive('assets')->andReturn(collect(['app.css' => new MediaFile('_media/app.css')]))->byDefault();
-
         // Mock render data
         \Illuminate\Support\Facades\View::swap(Mockery::mock(Factory::class)->makePartial());
         Render::swap(new RenderData());
@@ -94,7 +91,16 @@ public function testCanMake()
 
     public function testCanGet()
     {
+        $kernel = HydeKernel::getInstance();
+
+        $hyde = Mockery::mock(Hyde::kernel())->makePartial();
+        $hyde->shouldReceive('assets')->andReturn(collect(['app.css' => new MediaFile('_media/app.css')]));
+
+        HydeKernel::setInstance($hyde);
+
         $this->assertEquals(new MediaFile('app.css'), MediaFile::get('app.css'));
+
+        HydeKernel::setInstance($kernel);
     }
 
     public function testCanConstructWithNestedPaths()

From 126f4440eec3787f41cff47f755103d1d995eb57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 11:59:52 +0200
Subject: [PATCH 301/328] Use the filesystem glob helper

---
 packages/framework/src/Foundation/Concerns/HasMediaFiles.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
index 3dff8db788d..5fb387be696 100644
--- a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -6,13 +6,13 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
+use Hyde\Facades\Filesystem;
 use Hyde\Support\Filesystem\MediaFile;
 use Illuminate\Support\Collection;
 
 use function implode;
 use function collect;
 use function sprintf;
-use function glob;
 
 /**
  * @internal Single-use trait for the Filesystem class.
@@ -45,7 +45,7 @@ protected static function discoverMediaFiles(): Collection
 
     protected static function getMediaFiles(): array
     {
-        return glob(Hyde::path(static::getMediaGlobPattern()), GLOB_BRACE) ?: [];
+        return Filesystem::glob(static::getMediaGlobPattern(), GLOB_BRACE) ?: [];
     }
 
     protected static function getMediaGlobPattern(): string

From 9aa9a8bccf176884c16521236f3904e194104761 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 12:09:51 +0200
Subject: [PATCH 302/328] Move test to more suitable location

---
 .../tests/Feature/AssetAPIFeatureTest.php     | 15 ++++++++++++
 .../Unit/Facades/AssetFacadeUnitTest.php      | 23 -------------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
index 8961c16cd5f..c80f9a75814 100644
--- a/packages/framework/tests/Feature/AssetAPIFeatureTest.php
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use Hyde\Hyde;
+use Hyde\Facades\Asset;
 use Hyde\Testing\TestCase;
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\Facades\Blade;
@@ -124,6 +126,19 @@ public function testThrowsExceptionForNonExistentMediaFile()
         $this->assertSame(Hyde::path('_site/media/non_existent_file.txt'), MediaFile::outputPath($nonExistentFile));
     }
 
+    public function testAssetSupportsCustomMediaDirectories()
+    {
+        Hyde::setMediaDirectory('_assets');
+
+        $this->directory('_assets');
+        $this->file('_assets/app.css');
+
+        $path = (string) Asset::get('app.css');
+
+        $this->assertIsString($path);
+        $this->assertSame('assets/app.css?v='.hash_file('crc32', Hyde::path('_assets/app.css')), $path);
+    }
+
     protected function getAppStylesVersion(): string
     {
         return MediaFile::get('app.css')->getHash();
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index 2befc96d34b..bcbe1f5f171 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -9,7 +9,6 @@
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
-use Hyde\Testing\CreatesTemporaryFiles;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 
 /**
@@ -17,8 +16,6 @@
  */
 class AssetFacadeUnitTest extends UnitTestCase
 {
-    use CreatesTemporaryFiles;
-
     protected function setUp(): void
     {
         self::needsKernel();
@@ -27,11 +24,6 @@ protected function setUp(): void
         Render::swap(new RenderData());
     }
 
-    protected function tearDown(): void
-    {
-        $this->cleanUpFilesystem();
-    }
-
     public function testGetHelper()
     {
         $this->assertSame(Hyde::asset('app.css'), Asset::get('app.css'));
@@ -68,19 +60,4 @@ public function testAssetReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled
         $this->assertIsString($path);
         $this->assertSame('media/app.css', $path);
     }
-
-    public function testAssetSupportsCustomMediaDirectories()
-    {
-        self::resetKernel();
-
-        Hyde::setMediaDirectory('_assets');
-
-        $this->directory('_assets');
-        $this->file('_assets/app.css');
-
-        $path = (string) Asset::get('app.css');
-
-        $this->assertIsString($path);
-        $this->assertSame('assets/app.css?v='.hash_file('crc32', Hyde::path('_assets/app.css')), $path);
-    }
 }

From bdbf7dcc06058bdd80eb637b76d1b28f11483747 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 12:13:26 +0200
Subject: [PATCH 303/328] Unwrap method redirection chain to call destination
 method directly

---
 packages/framework/src/Facades/Asset.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 92b2ee30097..504a28a62e0 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -6,7 +6,6 @@
 
 use Hyde\Support\Filesystem\MediaFile;
 
-use function hyde;
 use function file_exists;
 
 /**
@@ -19,7 +18,7 @@ class Asset
 {
     public static function get(string $file): MediaFile
     {
-        return hyde()->asset($file);
+        return MediaFile::get($file);
     }
 
     public static function exists(string $file): bool

From 7342f72fd81c377174d00265b468b224c9d95cc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 12:15:42 +0200
Subject: [PATCH 304/328] Use the filesystem facade

---
 packages/framework/src/Facades/Asset.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 504a28a62e0..24fdc1fad89 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -6,8 +6,6 @@
 
 use Hyde\Support\Filesystem\MediaFile;
 
-use function file_exists;
-
 /**
  * Handles the retrieval of core asset files, either from the HydeFront CDN or from the local media folder.
  *
@@ -23,6 +21,6 @@ public static function get(string $file): MediaFile
 
     public static function exists(string $file): bool
     {
-        return file_exists(MediaFile::sourcePath($file));
+        return Filesystem::exists(MediaFile::sourcePath($file));
     }
 }

From aaa928066c095e55a72094484f87acc01f6c0b2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 12:18:59 +0200
Subject: [PATCH 305/328] Update outdated facade documentation

---
 packages/framework/src/Facades/Asset.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index 24fdc1fad89..c6392fc0fc3 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -7,18 +7,23 @@
 use Hyde\Support\Filesystem\MediaFile;
 
 /**
- * Handles the retrieval of core asset files, either from the HydeFront CDN or from the local media folder.
+ * Simplified facade to interact with media files.
  *
- * This class provides static methods for interacting with versioned files,
- * as well as the HydeFront CDN service and the media directories.
+ * @see \Hyde\Support\Filesystem\MediaFile
  */
 class Asset
 {
+    /**
+     * Get a MediaFile instance for the given filename in the media source directory.
+     */
     public static function get(string $file): MediaFile
     {
         return MediaFile::get($file);
     }
 
+    /**
+     * Check if a media file exists in the source directory.
+     */
     public static function exists(string $file): bool
     {
         return Filesystem::exists(MediaFile::sourcePath($file));

From 7a77de6c96abe566fe1980d8ca31d2fa084e890f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 12:22:20 +0200
Subject: [PATCH 306/328] Normalize throws tags

---
 .../partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md  | 4 +++-
 packages/framework/src/Facades/Asset.php                      | 2 ++
 .../framework/src/Foundation/Concerns/ForwardsHyperlinks.php  | 1 +
 packages/framework/src/Foundation/Kernel/Hyperlinks.php       | 3 +--
 packages/framework/src/Support/Filesystem/MediaFile.php       | 2 ++
 packages/framework/src/helpers.php                            | 3 +--
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
index 102c68dfb7b..d3d7e31ab61 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-hyperlink-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsHyperlinks -->
-<!-- Generated by HydePHP DocGen script at 2024-09-04 19:44:45 in 0.10ms -->
+<!-- Generated by HydePHP DocGen script at 2024-09-08 10:25:34 in 0.11ms -->
 
 #### `formatLink()`
 
@@ -27,6 +27,8 @@ No description provided.
 Hyde::asset(string $name): Hyde\Support\Filesystem\MediaFile
 ```
 
+- **Throws:** \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
+
 #### `url()`
 
 No description provided.
diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index c6392fc0fc3..3bc01acfa1c 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -15,6 +15,8 @@ class Asset
 {
     /**
      * Get a MediaFile instance for the given filename in the media source directory.
+     *
+     * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
      */
     public static function get(string $file): MediaFile
     {
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index 6b28b7ea3d4..9c7cd2aded7 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -24,6 +24,7 @@ public function relativeLink(string $destination): string
         return $this->hyperlinks->relativeLink($destination);
     }
 
+    /** @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory. */
     public function asset(string $name): MediaFile
     {
         return $this->hyperlinks->asset($name);
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index fffae96b0d6..c23498ebae3 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -9,7 +9,6 @@
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Support\Filesystem\MediaFile;
-use Hyde\Framework\Exceptions\FileNotFoundException;
 
 use function str_ends_with;
 use function str_starts_with;
@@ -93,7 +92,7 @@ public function relativeLink(string $destination): string
      * If a base URL is configured, the image will be returned with a qualified absolute URL.
      * Otherwise, a relative path will be returned based on the rendered page's location.
      *
-     * @throws FileNotFoundException If the file does not exist in the `_media` directory in order to make the issue clear.
+     * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
      */
     public function asset(string $name): MediaFile
     {
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 258bbbbadd0..07827626abe 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -61,6 +61,8 @@ public static function make(string $path): static
 
     /**
      * Get or create a media file instance from the HydeKernel for the given file.
+     *
+     * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
      */
     public static function get(string $path): MediaFile
     {
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 07bde2f23e0..ddc0bf27f48 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -5,7 +5,6 @@
 namespace {
     use Hyde\Foundation\HydeKernel;
     use Hyde\Support\Filesystem\MediaFile;
-    use Hyde\Framework\Exceptions\FileNotFoundException;
 
     if (! function_exists('hyde')) {
         /**
@@ -28,7 +27,7 @@ function hyde(): HydeKernel
              * If a base URL is configured, the image will be returned with a qualified absolute URL.
              * Otherwise, a relative path will be returned based on the rendered page's location.
              *
-             * @throws FileNotFoundException If the file does not exist in the `_media` directory in order to make the issue clear.
+             * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
              */
             function asset(string $name): MediaFile
             {

From 5ea05006d32f07ed7ede68014ac8f867ec62a35c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 13:17:43 +0200
Subject: [PATCH 307/328] Fix coupling so we don't need to use the Render
 facade in test

---
 .../Feature/Services/Markdown/ShortcodeProcessorTest.php     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
index 2ba7ecaa6e6..b8b1f3ab48f 100644
--- a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
-use Hyde\Support\Facades\Render;
-use Hyde\Support\Models\RenderData;
 use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
 use Hyde\Markdown\Processing\ShortcodeProcessor;
 use Hyde\Testing\UnitTestCase;
@@ -22,8 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        // Todo: Fix coupling so we don't need to use the Render facade at all here.
-        Render::swap(new RenderData());
+        self::mockCurrentRouteKey('foo');
     }
 
     public function testConstructorDiscoversDefaultShortcodes()

From 3bbd7efabd7bf0312f5085769264b6886a82d0ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 4 Oct 2024 14:14:12 +0200
Subject: [PATCH 308/328] Delete spec.md

This is pretty outdated now
---
 spec.md | 895 --------------------------------------------------------
 1 file changed, 895 deletions(-)
 delete mode 100644 spec.md

diff --git a/spec.md b/spec.md
deleted file mode 100644
index cb78e76674c..00000000000
--- a/spec.md
+++ /dev/null
@@ -1,895 +0,0 @@
-# Asset API Overview
-
-## Abstract
-
-In order to rework the Asset API, we need to analyze the current state of the API, to find what can be improved.
-
-### Background
-
-Remember the original problem: The current system is confusing and unintuitive with multiple and inconsistent ways to access assets.
-
-Additionally, keep in mind that most ways users will commonly use this API is to link to assets in the `_media` directory, and to check if they exist.
-
-For example: Consider these Blade snippets from the default views, showing common usages that actual end users may use:
-
-```blade
-{{-- The compiled Tailwind/App styles --}}
-@if(config('hyde.load_app_styles_from_cdn', false))
-    <link rel="stylesheet" href="{{ HydeFront::cdnLink('app.css') }}">
-@elseif(Asset::hasMediaFile('app.css'))
-    <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
-@endif
-
-{{-- The compiled Laravel Mix scripts --}}
-@if(Asset::hasMediaFile('app.js'))
-    <script defer src="{{ Asset::mediaLink('app.js') }}"></script>
-@endif
-
-@if (file_exists(Hyde::mediaPath('favicon.ico')))
-    <link rel="shortcut icon" href="{{ Hyde::relativeLink('media/favicon.ico') }}" type="image/x-icon">
-@endif
-```
-
-Some other example usages could be things like:
-
-```blade
-<img src="{{ asset('images/logo.png') }}" alt="Logo">
-```
-
-We also use the Asset API helpers in the internal codebase that actually powers the static site generator. These kinds of usages would usually only be used by us, package developers, and serious power users. They have an important, but secondary role in the API design. Here are some examples from our codebase:
-
-```php
-// Code that transfers media assets from the source directory to the site output directory
-$this->createDirectoryifItDoesNotExist(Hyde::siteMediaPath());
-$this->mapWithProgressBar(MediaFile::files(), function (string $identifier): void {
-   copy(Hyde::mediaPath($identifier), Hyde::siteMediaPath($identifier));
-});
-
-// Helpers in the featured image class
-public function getSource(): string {
-    return Hyde::mediaLink($this->source);
-}
-
-protected function setSource(string $source): string {
-   // Normalize away any leading media path prefixes.
-   return Str::after($source, Hyde::getMediaDirectory().'/');
-}
-```
-
-## Current State
-
-### Asset Facade
-
-```php
-HydeFront::cdnLink(string $file) // Gets remote URL to any file in /dist/ in the HydeFront version
-Asset::mediaLink(string $file) // Returns Hyde::mediaLink but with a cache buster
-Asset::hasMediaFile(string $file) // Returns file_exists(Hyde::mediaPath($file))
-
-/**
- * Real implementations of the facade methods:
- * 
- * @see \Hyde\Framework\Services\AssetService::cdnLink
- * @see \Hyde\Framework\Services\AssetService::mediaLink
- * @see \Hyde\Framework\Services\AssetService::hasMediaFile
- */
-```
-
-### Hyde Facade
-
-```php
-Hyde::mediaPath() // Get the absolute path to the media source directory, or a file within it. (Intended as a sibling to Hyde::path and Hyde::sitePath helpers, and the HydePage::path methods)
-Hyde::siteMediaPath() //  Get the absolute path to the compiled site's media directory, or a file within it. (Intended as a sibling to Hyde::sitePath)
-Hyde::mediaLink() // Gets a relative web link to the given file stored in the _site/media folder. (Intended as a sibling to Hyde::relativeLink, which is called by this) (A second $validate parameter will return throw an exception if the file does not exist)
-Hyde::asset() // Gets a relative web link to the given image stored in the _site/media folder. (But leaves remote URLs alone) (A second $preferQualifiedUrl parameter will return a fully qualified URL if a site URL is set)
-
-/**
- * Real implementations of the facade methods:
- * 
- * @see \Hyde\Foundation\HydeKernel::mediaPath {@see \Hyde\Foundation\Kernel\Filesystem::mediaPath}
- * @see \Hyde\Foundation\HydeKernel::siteMediaPath {@see \Hyde\Foundation\Kernel\Filesystem::siteMediaPath}
- * @see \Hyde\Foundation\HydeKernel::mediaLink {@see \Hyde\Foundation\Kernel\Hyperlinks::mediaLink}
- * @see \Hyde\Foundation\HydeKernel::asset {@see \Hyde\Foundation\Kernel\Hyperlinks::asset}
- */
-```
-
-### Helper Functions
-
-```php
-asset() // Calls Hyde::asset 
-```
-
-## AI Context
-
-Please provide feedback on how we for HydePHP v2 can improve the Asset API, designed to make it easy to interact with Asset files stored in the `_media` directory.
-
-For context: This is for static site generator HydePHP, based on Laravel.
-
-Motto: "Simplicity first. Power when you need it. Quality always."
-Tagline: Create static websites with the tools you already know and love with HydePHP.
-
-The Hyde Philosophy:
-> Developing Hyde sites, and contributing to the framework should be a joy. Great Developer Experience (DX) is our top priority.
-> Code should make sense and be intuitive, especially user-facing APIs. Convention over configuration, but not at the expense of flexibility.
-> Making sites should not be boring and repetitive - Hyde is all about taking focus away from boilerplate, and letting users focus on the content.
-
-Considerations: While HydePHP targets developers, not all users necessarily are familiar with Laravel, or PHP. So while we want to provide a familiar interface for Laravel/PHP users, we also want to make sure that the API is intuitive and easy to use for all users.
-
-For additional context on the naming conventions, here is the entire Hyde facade methods:
-
-```php
- * @method static string path(string $path = '')
- * @method static string vendorPath(string $path = '', string $package = 'framework')
- * @method static string pathToAbsolute(string $path)
- * @method static string pathToRelative(string $path)
- * @method static string sitePath(string $path = '')
- * @method static string mediaPath(string $path = '')
- * @method static string siteMediaPath(string $path = '')
- * @method static string formatLink(string $destination)
- * @method static string relativeLink(string $destination)
- * @method static string mediaLink(string $destination, bool $validate = false)
- * @method static string asset(string $name, bool $preferQualifiedUrl = false)
- * @method static string url(string $path = '')
- * @method static Route|null route(string $key)
- * @method static string makeTitle(string $value)
- * @method static string normalizeNewlines(string $string)
- * @method static string stripNewlines(string $string)
- * @method static string trimSlashes(string $string)
- * @method static HtmlString markdown(string $text, bool $stripIndentation = false)
- * @method static string currentPage()
- * @method static string currentRouteKey()
- * @method static string getBasePath()
- * @method static string getSourceRoot()
- * @method static string getOutputDirectory()
- * @method static string getMediaDirectory()
- * @method static string getMediaOutputDirectory()
- * @method static Features features()
- * @method static Collection<string, PostAuthor> authors()
- * @method static FileCollection files()
- * @method static PageCollection pages()
- * @method static RouteCollection routes()
- * @method static Route|null currentRoute()
- * @method static HydeKernel getInstance()
- * @method static Filesystem filesystem()
- * @method static array getRegisteredExtensions()
- * @method static bool hasFeature(Feature $feature)
- * @method static bool hasSiteUrl()
- * @method static void setInstance(HydeKernel $instance)
- * @method static void setBasePath(string $basePath)
- * @method static void setOutputDirectory(string $outputDirectory)
- * @method static void setMediaDirectory(string $mediaDirectory)
- * @method static void setSourceRoot(string $sourceRoot)
- * @method static void shareViewData(HydePage $page)
- * @method static array toArray()
- * @method static bool isBooted()
- * @method static void boot()
-```
-
-We also have a MediaFile class that looks like this, maybe we can unify this as well:
-
-```php
-/**
- * File abstraction for a project media file.
- */
-class MediaFile extends ProjectFile
-{
-    /** @var array<string> The default extensions for media types */
-    final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
-
-    /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
-    public static function all(): array
-    {
-        return static::discoverMediaAssetFiles();
-    }
-
-    /** @return array<string> Array of filenames relative to the _media/ directory */
-    public static function files(): array
-    {
-        return array_keys(static::all());
-    }
-
-    public function getIdentifier(): string
-    {
-        return Str::after($this->getPath(), Hyde::getMediaDirectory().'/');
-    }
-
-    public function toArray(): array
-    {
-        return array_merge(parent::toArray(), [
-            'length' => $this->getContentLength(),
-            'mimeType' => $this->getMimeType(),
-        ]);
-    }
-
-    public function getContentLength(): int
-    {
-        if (! is_file($this->getAbsolutePath())) {
-            throw new FileNotFoundException($this->path);
-        }
-
-        return filesize($this->getAbsolutePath());
-    }
-
-    public function getMimeType(): string
-    {
-        return mime_content_type($this->getAbsolutePath());
-    }
-
-    protected static function discoverMediaAssetFiles(): array
-    {
-        return collect(static::getMediaAssetFiles())->mapWithKeys(function (string $path): array {
-            $file = static::make($path);
-
-            return [$file->getIdentifier() => $file];
-        })->all();
-    }
-
-    protected static function getMediaAssetFiles(): array
-    {
-        return glob(Hyde::path(static::getMediaGlobPattern()), GLOB_BRACE) ?: [];
-    }
-
-    protected static function getMediaGlobPattern(): string
-    {
-        return sprintf(Hyde::getMediaDirectory().'/{*,**/*,**/*/*}.{%s}', implode(',',
-            Config::getArray('hyde.media_extensions', self::EXTENSIONS)
-        ));
-    }
-}
-```
-
-### AI Example Prompt
-
-```markdown
-Task: Split out the HydeFront related parts of the AssetService to a new facade class.
-Motivation: We are simplifying the Asset API in https://github.com/hydephp/develop/pull/1904, and most users won't need the HydeFront related parts of the AssetService. Later, we will be able to merge the simplified AssetService into the other Asset helpers.
-Implementation: Make the necessary changes to the code and tests. Also update the release notes to detail all breaking changes and the upgrade path. Make sure the release notes contains all necessary information, but is not too verbose and should not contain any fluff. Also write a brief pull request description detailing the changes made and why they were made.
-Context: This is for v2 of static site generator HydePHP. Remember to match the code style of the existing codebase.
-```
-
-## Proposals
-
-### Fluent Asset API
-
-Author: Claude 3.5 Sonnet
-Link: https://claude.ai/chat/3b4529e1-79f5-48b9-ac8f-d35fa705a377
-
-Based on the provided information and the goals of HydePHP, here are some suggestions to improve the Asset API for version 2:
-
-1. Consolidate and simplify the API:
-   The current API is spread across multiple facades (Asset, Hyde) and helper functions. To improve clarity and ease of use, consider consolidating these into a single, intuitive API.
-
-
-
-```php
-class Asset
-{
-    // Get the absolute path to a media file
-    public static function path(string $file = ''): string
-    {
-        // Implementation
-    }
-
-    // Get a relative web link to a media file
-    public static function link(string $file, bool $validate = false): string
-    {
-        // Implementation
-    }
-
-    // Get a CDN link for a file
-    public static function cdnLink(string $file): string
-    {
-        // Implementation
-    }
-
-    // Check if a media file exists
-    public static function exists(string $file): bool
-    {
-        // Implementation
-    }
-
-    // Get all media files
-    public static function all(): array
-    {
-        // Implementation using MediaFile::all()
-    }
-
-    // Get a MediaFile instance
-    public static function file(string $file): MediaFile
-    {
-        // Implementation
-    }
-}
-
-```
-
-This consolidated API provides a cleaner, more intuitive interface for working with assets. It combines functionality from the current Asset and Hyde facades, making it easier for developers to find and use the methods they need.
-
-2. Improve method naming:
-   Some current method names like `cdnLink` and `mediaLink` might be confusing. Consider using more descriptive names that clearly indicate their purpose.
-
-3. Consistent return types:
-   Ensure that all methods have consistent return types. For example, always return strings for paths and links, and use type hinting to make the API more predictable.
-
-4. Fluent interface:
-   Consider implementing a fluent interface for chaining operations on assets. This can make the API more flexible and expressive.
-
-
-
-```php
-class AssetFile
-{
-    protected $file;
-
-    public function __construct(string $file)
-    {
-        $this->file = $file;
-    }
-
-    public function path(): string
-    {
-        // Implementation
-    }
-
-    public function link(bool $validate = false): string
-    {
-        // Implementation
-    }
-
-    public function cdnLink(): string
-    {
-        // Implementation
-    }
-
-    public function exists(): bool
-    {
-        // Implementation
-    }
-
-    public function content(): string
-    {
-        // Implementation
-    }
-}
-
-class Asset
-{
-    public static function file(string $file): AssetFile
-    {
-        return new AssetFile($file);
-    }
-
-    // Other static methods...
-}
-
-// Usage example
-$assetUrl = Asset::file('image.jpg')->cdnLink();
-$assetContent = Asset::file('styles.css')->content();
-
-```
-
-5. Better integration with MediaFile:
-   Leverage the existing MediaFile class more prominently in the API. This can provide a richer set of operations on individual files.
-
-6. Consistent error handling:
-   Implement a consistent approach to error handling. Consider using custom exceptions that provide clear, actionable error messages.
-
-7. Caching:
-   Implement intelligent caching for asset operations to improve performance, especially for repeated operations.
-
-8. Configuration:
-   Provide a clear way to configure asset-related settings, such as CDN URLs or custom media directories, through a dedicated configuration file or section.
-
-These improvements aim to create a more intuitive, powerful, and flexible Asset API that aligns with HydePHP's philosophy and goals. The consolidated and fluent interfaces should make it easier for both Laravel-familiar and new users to work with assets effectively.
-
-### Fluent Asset API (Refined)
-
-Author: Claude 3.5 Sonnet
-Link: https://claude.ai/chat/3b4529e1-79f5-48b9-ac8f-d35fa705a377
-
-Thank you for providing those additional considerations and the detailed API reference. Let's refine the proposal based on this new information. We'll focus on merging with MediaFiles, adjusting for the limited CDN use case, and aligning with the existing Hyde page classes API structure.
-
-
-
-```php
-abstract class Asset
-{
-    protected string $identifier;
-    protected string $sourceDirectory = '_media';
-    protected string $outputDirectory = 'media';
-    protected string $fileExtension;
-
-    public function __construct(string $identifier)
-    {
-        $this->identifier = $identifier;
-        $this->fileExtension = pathinfo($identifier, PATHINFO_EXTENSION);
-    }
-
-    public static function make(string $identifier): static
-    {
-        return new static($identifier);
-    }
-
-    public static function isDiscoverable(): bool
-    {
-        return true;
-    }
-
-    public static function get(string $identifier): static
-    {
-        if (!static::exists($identifier)) {
-            throw new FileNotFoundException("Asset not found: {$identifier}");
-        }
-        return new static($identifier);
-    }
-
-    public static function parse(string $identifier): static
-    {
-        return static::get($identifier);
-    }
-
-    public static function files(): array
-    {
-        // Implementation to get all asset file identifiers
-    }
-
-    public static function all(): AssetCollection
-    {
-        // Implementation to get all assets as a collection
-    }
-
-    public static function sourceDirectory(): string
-    {
-        return (new static(''))->sourceDirectory;
-    }
-
-    public static function outputDirectory(): string
-    {
-        return (new static(''))->outputDirectory;
-    }
-
-    public static function setSourceDirectory(string $sourceDirectory): void
-    {
-        (new static(''))->sourceDirectory = $sourceDirectory;
-    }
-
-    public static function setOutputDirectory(string $outputDirectory): void
-    {
-        (new static(''))->outputDirectory = $outputDirectory;
-    }
-
-    public function sourcePath(): string
-    {
-        return Hyde::path($this->sourceDirectory . '/' . $this->identifier);
-    }
-
-    public function outputPath(): string
-    {
-        return Hyde::sitePath($this->outputDirectory . '/' . $this->identifier);
-    }
-
-    public static function exists(string $identifier): bool
-    {
-        return file_exists((new static($identifier))->sourcePath());
-    }
-
-    public function getIdentifier(): string
-    {
-        return $this->identifier;
-    }
-
-    public function getLink(): string
-    {
-        return '/' . $this->outputDirectory . '/' . $this->identifier;
-    }
-
-    public function getContents(): string
-    {
-        return file_get_contents($this->sourcePath());
-    }
-
-    public function getMimeType(): string
-    {
-        return mime_content_type($this->sourcePath());
-    }
-
-    public function getSize(): int
-    {
-        return filesize($this->sourcePath());
-    }
-
-    public function copy(): bool
-    {
-        return copy($this->sourcePath(), $this->outputPath());
-    }
-
-    // HydeFront specific method
-    public static function cdnLink(string $file): string
-    {
-        // Implementation for HydeFront CDN links
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'identifier' => $this->getIdentifier(),
-            'sourcePath' => $this->sourcePath(),
-            'outputPath' => $this->outputPath(),
-            'link' => $this->getLink(),
-            'mimeType' => $this->getMimeType(),
-            'size' => $this->getSize(),
-        ];
-    }
-}
-
-class AssetCollection extends Collection
-{
-    // Implement any asset-specific collection methods here
-}
-
-```
-
-This refined Asset API proposal addresses the considerations you mentioned:
-
-1. Merging with MediaFiles:
-   The new `Asset` class incorporates functionality from both the current Asset facade and the MediaFile class. It provides methods for working with individual assets as well as collections of assets.
-
-2. CDN links:
-   The `cdnLink` method is retained but as a static method, reflecting its specific use for HydeFront files. This keeps the functionality available without overemphasizing its importance for general asset handling.
-
-3. Alignment with Hyde page classes:
-   The API structure closely follows the pattern established by the Hyde page classes. It includes similar static methods for file discovery and management, as well as instance methods for working with individual assets.
-
-Key improvements and features:
-
-1. Consistent API:
-   The new API provides a consistent interface for working with assets, following patterns familiar to users of other Hyde classes.
-
-2. Flexible file handling:
-   Methods like `sourcePath()`, `outputPath()`, `getLink()`, and `copy()` provide flexible ways to work with asset files throughout the build process.
-
-3. Asset information:
-   Methods like `getMimeType()`, `getSize()`, and `getContents()` provide easy access to important asset information.
-
-4. Collection support:
-   The `AssetCollection` class allows for easy management and manipulation of multiple assets.
-
-5. Extensibility:
-   As an abstract class, `Asset` can be extended for specific asset types if needed in the future.
-
-Usage examples:
-
-```php
-// Get all assets
-$assets = Asset::all();
-
-// Get a specific asset
-$logo = Asset::get('images/logo.png');
-
-// Get the web-accessible link to an asset
-$logoUrl = $logo->getLink();
-
-// Copy an asset to the output directory
-$logo->copy();
-
-// Get asset information
-$size = $logo->getSize();
-$mimeType = $logo->getMimeType();
-
-// HydeFront CDN link (for app.js or app.css)
-$appJsUrl = HydeFront::cdnLink('app.js');
-```
-
-This API maintains the simplicity-first approach of Hyde while providing power when needed. It should be intuitive for both Laravel-familiar developers and those new to the framework, aligning well with Hyde's philosophy and goals.
-
-### Unified Asset API
-
-Author: Claude 3.5 Sonnet
-Link: https://claude.ai/chat/9c1c98cc-db92-41cc-9a8e-1f51fd9a04d5
-
-Certainly, I'd be happy to help you improve the Asset API for HydePHP v2. Based on your requirements and the HydePHP philosophy, I've come up with a proposal for a new, more unified Asset API. Here's the proposed new API and implementation plan:
-
-```php
-<?php
-
-namespace Hyde\Framework\Facades;
-
-use Hyde\Framework\Contracts\AssetContract;
-use Hyde\Framework\Services\AssetService;
-
-/**
- * @method static string get(string $path, bool $absolute = false)
- * @method static string url(string $path)
- * @method static bool exists(string $path)
- * @method static int size(string $path)
- * @method static string mime(string $path)
- * @method static string|null hash(string $path)
- * @method static AssetContract instance(string $path)
- */
-class Asset extends Facade
-{
-    protected static function getFacadeAccessor()
-    {
-        return AssetService::class;
-    }
-}
-
-// AssetService.php
-class AssetService implements AssetContract
-{
-    protected $validateExistence;
-
-    public function __construct(bool $validateExistence = false)
-    {
-        $this->validateExistence = $validateExistence;
-    }
-
-    public function get(string $path, bool $absolute = false): string
-    {
-        if ($this->validateExistence && !$this->exists($path)) {
-            throw new AssetNotFoundException("Asset not found: {$path}");
-        }
-
-        return $absolute ? $this->getAbsolutePath($path) : $this->getRelativePath($path);
-    }
-
-    public function url(string $path): string
-    {
-        if (filter_var($path, FILTER_VALIDATE_URL)) {
-            return $path;
-        }
-
-        return Hyde::url($this->get($path));
-    }
-
-    public function exists(string $path): bool
-    {
-        return file_exists($this->getAbsolutePath($path));
-    }
-
-    public function size(string $path): int
-    {
-        return filesize($this->getAbsolutePath($path));
-    }
-
-    public function mime(string $path): string
-    {
-        return mime_content_type($this->getAbsolutePath($path));
-    }
-
-    public function hash(string $path): ?string
-    {
-        $file = $this->getAbsolutePath($path);
-        return file_exists($file) ? md5_file($file) : null;
-    }
-
-    public function instance(string $path): AssetContract
-    {
-        return new Asset($path);
-    }
-
-    protected function getAbsolutePath(string $path): string
-    {
-        return Hyde::mediaPath($path);
-    }
-
-    protected function getRelativePath(string $path): string
-    {
-        return Hyde::mediaLink($path);
-    }
-}
-
-// Asset.php (implements AssetContract)
-class Asset implements AssetContract
-{
-    protected $path;
-
-    public function __construct(string $path)
-    {
-        $this->path = $path;
-    }
-
-    public function get(bool $absolute = false): string
-    {
-        return app(AssetService::class)->get($this->path, $absolute);
-    }
-
-    public function url(): string
-    {
-        return app(AssetService::class)->url($this->path);
-    }
-
-    public function exists(): bool
-    {
-        return app(AssetService::class)->exists($this->path);
-    }
-
-    public function size(): int
-    {
-        return app(AssetService::class)->size($this->path);
-    }
-
-    public function mime(): string
-    {
-        return app(AssetService::class)->mime($this->path);
-    }
-
-    public function hash(): ?string
-    {
-        return app(AssetService::class)->hash($this->path);
-    }
-}
-
-// Helper function
-function asset(string $path, bool $absolute = false): string
-{
-    return Asset::get($path, $absolute);
-}
-
-```
-
-This new API proposal aims to simplify and unify the asset-related functions while maintaining flexibility and adhering to the HydePHP philosophy. Here's a breakdown of the changes and the implementation plan:
-
-1. Unified API:
-   - All asset-related functions are now under the `Asset` facade.
-   - The `get()` method replaces both `mediaLink()` and `asset()`, with an optional parameter for absolute paths.
-   - Added `url()` method to handle both local and remote URLs.
-   - Included utility methods like `exists()`, `size()`, `mime()`, and `hash()` for common operations.
-
-2. Validation:
-   - Instead of a parameter to validate, we've added a constructor parameter in the `AssetService` that can be set via configuration or environment variable.
-
-3. Flexibility:
-   - The `instance()` method allows for object-oriented usage when needed.
-
-Implementation Plan:
-
-1. Deprecation process in v1:
-   - Add deprecation notices to the existing methods in the `Asset` and `Hyde` facades.
-   - Introduce the new `Asset` facade with the proposed methods, marking them as `@since 1.x`.
-   - Update the documentation to recommend using the new `Asset` facade.
-
-2. Implementation in v2:
-   - Remove the deprecated methods from the `Asset` and `Hyde` facades.
-   - Fully implement the new `AssetService` and `Asset` classes.
-   - Update all internal usage to use the new API.
-
-3. Configuration:
-   - Add a new configuration option in `config/hyde.php`:
-     ```php
-     'assets' => [
-         'validate_existence' => env('HYDE_VALIDATE_ASSETS', false),
-     ],
-     ```
-
-4. Release Notes:
-   ```markdown
-   # HydePHP v2.0 Release Notes
-
-   ## Asset API Overhaul
-
-   We've completely revamped the Asset API to provide a more intuitive and unified interface for handling media files. Key changes include:
-
-   - New `Asset` facade with streamlined methods
-   - Simplified asset retrieval with `Asset::get()`
-   - Built-in URL handling with `Asset::url()`
-   - Additional utility methods: `exists()`, `size()`, `mime()`, `hash()`
-   - Object-oriented usage available through `Asset::instance()`
-   - Global `asset()` helper function updated
-
-   These changes aim to improve developer experience and make asset handling more straightforward and consistent.
-   ```
-
-5. Upgrade Guide:
-   ```markdown
-   # Upgrading to HydePHP v2.0
-
-   ## Asset API Changes
-
-   1. Replace all usage of `Hyde::mediaLink()`, `Hyde::asset()`, and `Asset::mediaLink()` with `Asset::get()`:
-
-      ```php
-      // Old
-      $path = Hyde::mediaLink('image.jpg');
-      $path = Hyde::asset('image.jpg');
-      $path = Asset::mediaLink('image.jpg');
-
-      // New
-      $path = Asset::get('image.jpg');
-      ```
-
-   2. For absolute paths, use the second parameter of `Asset::get()`:
-
-      ```php
-      $absolutePath = Asset::get('image.jpg', true);
-      ```
-
-   3. Use `Asset::url()` for handling both local and remote URLs:
-
-      ```php
-      $url = Asset::url('image.jpg');
-      $url = Asset::url('https://example.com/image.jpg');
-      ```
-
-   4. Take advantage of new utility methods:
-
-      ```php
-      if (Asset::exists('image.jpg')) {
-          $size = Asset::size('image.jpg');
-          $mime = Asset::mime('image.jpg');
-          $hash = Asset::hash('image.jpg');
-      }
-      ```
-
-   5. For object-oriented usage, use `Asset::instance()`:
-
-      ```php
-      $asset = Asset::instance('image.jpg');
-      $path = $asset->get();
-      $exists = $asset->exists();
-      ```
-
-   6. Update your configuration file to include the new asset validation option:
-
-      ```php
-      // config/hyde.php
-      'assets' => [
-          'validate_existence' => env('HYDE_VALIDATE_ASSETS', false),
-      ],
-      ```
-
-   These changes will ensure your project is compatible with HydePHP v2.0 and takes full advantage of the new Asset API.
-
-This proposal aims to simplify the Asset API while maintaining flexibility and power. It adheres to the HydePHP philosophy by providing an intuitive interface that should be easy to use for both Laravel developers and those less familiar with the framework. The implementation plan ensures a smooth transition from v1 to v2, with clear deprecation notices and comprehensive upgrade instructions.
-
-### Proposal Summary and Analysis
-
-Independent Claude 3.5 Sonnet executive summary of the three proposals for improving the Asset API in HydePHP v2:
-
-1. Fluent Asset API
-
-This proposal introduces a consolidated `Asset` class with both static and instance methods, integrating functionality from the current Asset and Hyde facades. It offers a fluent interface for chaining operations on assets.
-
-Benefits:
-- Simplified, intuitive API
-- Fluent interface for expressive chaining
-- Consistent with Laravel patterns
-
-Drawbacks:
-- Significant departure from current API, potentially high upgrade friction
-- Increased complexity with new classes (AssetFile, AssetCollection)
-
-2. Fluent Asset API (Refined)
-
-This refined proposal merges functionality from the Asset facade and MediaFile class into an abstract `Asset` class. It aligns more closely with existing Hyde page classes and retains some current naming conventions.
-
-Benefits:
-- Better alignment with existing Hyde patterns
-- Comprehensive asset handling (discovery, manipulation, information)
-- Extensibility through abstract class
-
-Drawbacks:
-- Still represents a major change from current API
-- Potential learning curve for users unfamiliar with Hyde patterns
-
-3. Unified Asset API
-
-This proposal focuses on unifying asset-related functions under a single `Asset` facade, with a backing `AssetService`. It aims for a balance between simplification and maintaining familiarity.
-
-Benefits:
-- Maintains facade pattern, reducing upgrade friction
-- Simplifies API while retaining familiar method names
-- Includes a clear deprecation and upgrade path
-
-Drawbacks:
-- Less dramatic improvement in DX compared to fluent proposals
-- Retains some potential for confusion with multiple ways to access assets
-
-#### Final Recommendation:
-
-Based on the analysis, the Unified Asset API (Proposal 3) appears to be the most balanced approach. It offers significant improvements in developer experience and API consistency while minimizing upgrade friction and implementation complexity. The clear deprecation process and upgrade path will ease the transition for existing users.
-
-This proposal aligns well with HydePHP's philosophy of "Simplicity first. Power when you need it." It provides a more intuitive API without a complete overhaul, allowing for gradual adoption of new features. The retained facade pattern and familiar method names will help maintain accessibility for developers of varying experience levels.
-
-While the fluent API proposals offer more dramatic improvements in expressiveness, the associated increase in complexity and potential for confusion may outweigh these benefits. The Unified Asset API strikes a good balance between enhancing DX and maintaining continuity with the current system.
-
-Recommendation: Proceed with implementing the Unified Asset API (Proposal 3), ensuring thorough documentation and clear upgrade guides to support users through the transition.

From 50327f8baa9a6cef16bb530f86d04e60ea8957e3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 12:00:50 +0200
Subject: [PATCH 309/328] Update release notes for the new Asset API

---
 RELEASE_NOTES.md | 111 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0970fc75495..154a87f9eee 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -23,6 +23,11 @@ This serves two purposes:
 - You can now add custom posts to the blog post feed component when including it directly in https://github.com/hydephp/develop/pull/1893
 - Added a `Feature::fromName()` enum helper in https://github.com/hydephp/develop/pull/1895
 - Added support for specifying features in the YAML configuration in https://github.com/hydephp/develop/pull/1896
+- **Added a new consolidated Asset API to better handle media files.**
+  - Added several new methods to the `MediaFile` class with methods like `getLink()`, `getLength()`, `getMimeType()`, etc.
+  - Added new `HydeFront` facade to handle CDN links and Tailwind config injection.
+  - Added method `Asset::exists()` has to check if a media file exists.
+
 
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
@@ -60,6 +65,19 @@ This serves two purposes:
 - The build command now groups together all `InMemoryPage` instances under one progress bar group in https://github.com/hydephp/develop/pull/1897
 - The `Markdown::render()` method will now always render Markdown using the custom HydePHP Markdown service (thus getting smart features like our Markdown processors) in https://github.com/hydephp/develop/pull/1900
 - Improved how the `MarkdownService` class is accessed, by binding it into the service container, in https://github.com/hydephp/develop/pull/1922
+- **Many MediaFile related helpers has been changed or completely rewritten** to provide a simplified API for interacting with media files.
+  - **Note:** For most end users, the changes will have minimal direct impact, but if you have custom code that interacts with media files, you may need to update it.
+  - The `Asset` facade has been e restructured to be more scoped and easier to use, splitting out a separate `HydeFront` facade and inlining the `AssetService` class.
+  - All asset retrieval methods now return a `MediaFile` instance, which can be fluently interacted with, or cast to a string to get the link (which was the previous behavior).
+  - Renamed method `Asset::hasMediaFile` to `Asset::exists` in https://github.com/hydephp/develop/pull/1957
+  - Renamed method `MediaFile::getContentLength` to `MediaFile::getLength` in https://github.com/hydephp/develop/pull/1904
+  - Replaced method `Hyde::mediaPath` with `MediaFile::sourcePath` in https://github.com/hydephp/develop/pull/1911
+  - Replaced method `Hyde::siteMediaPath` with `MediaFile::outputPath` in https://github.com/hydephp/develop/pull/1911
+  - We will now throw an exception if you try to get a media file that does not exist in order to prevent missing assets from going unnoticed in https://github.com/hydephp/develop/pull/1932
+- **MediaFile performance improvements:**
+  - Media assets are now cached in the HydeKernel, giving a massive performance boost and making it easier to access the instances in https://github.com/hydephp/develop/pull/1917
+  - Media file metadata is now lazy loaded and then cached in memory, providing performance improvements for files that may not be used in a build in https://github.com/hydephp/develop/pull/1933
+  - We now use the much faster `CRC32` hashing algoritm instead of `MD5` for cache busting keys in https://github.com/hydephp/develop/pull/1918
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -72,6 +90,11 @@ This serves two purposes:
 - Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`) in https://github.com/hydephp/develop/pull/1782
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 - Removed the deprecated `FeaturedImage::isRemote()` method in https://github.com/hydephp/develop/pull/1883. Use `Hyperlinks::isRemote()` instead.
+- **With the new Asset API, a few features had to be moved/removed:**
+  - `AssetService` class has been removed (was merged into the `Asset` facade) in https://github.com/hydephp/develop/pull/1908
+  - Removed HydeFront methods from the `Asset` facade (moved to the new HydeFront facade) in https://github.com/hydephp/develop/pull/1907
+  - The config options `hyde.hydefront_version` and `hyde.hydefront_cdn_url` have been removed in https://github.com/hydephp/develop/pull/1909 (as changing these could lead to incompatible asset versions, defeating the feature's purpose)
+  - Removed `Hyde::mediaLink()` method replaced by `Hyde::asset()` in https://github.com/hydephp/develop/pull/1932
 
 ### Fixed
 - Added missing collection key types in Hyde facade method annotations in https://github.com/hydephp/develop/pull/1784
@@ -240,6 +263,94 @@ The following methods in the `Features` class have been renamed to follow a more
 
 Note that this class was previously marked as internal in v1, but the change is logged here in case it was used in configuration files or custom code.
 
+### Asset API Changes
+
+#### Overview
+For most end users, the changes to the Asset API in HydePHP 2.x will have minimal direct impact. However, if you have custom code that interacts with media files, you may need to update it.
+
+The most important thing to note is that all asset retrieval methods now return a `MediaFile` instance, which can be fluently interacted with, or cast to a string to get the link (which was the previous behavior).
+
+#### Side effects to consider
+
+Regardless of if you need to make changes to your code, there are a few side effects to consider:
+
+- All cache busting keys will have changed since we changed the hashing algorithm from `MD5` to `CRC32`.
+- Media file getters now return MediaFile instances instead of strings. But these can still be used the same way in Blade `{{ }}` tags, as they can be cast to strings.
+- Due to the internal normalizations, we will consistently use cache busting keys and use qualified paths when site URLs are set.
+- An exception will be thrown if you try to get a media file that does not exist in order to prevent missing assets from going unnoticed.
+
+These side effects should not have any negative impact on your site, but may cause the generated HTML to look slightly different.
+
+#### Impact on Your Code
+
+If you are using strict type declarations, you may need to update your code to expect a `MediaFile` instance instead of a string path; or you should cast the `MediaFile` instance to a string when needed.
+
+Most changes were made in https://github.com/hydephp/develop/pull/1904 which contains extra information and the reasoning behind the changes.
+
+#### Updating Your Code
+
+Once you have determined that you need to update your code, here are the steps you should take:
+
+1. Replace usages of `Asset::mediaLink()` with `Asset::get()`:
+
+   ```php
+   // Before (returns a string)
+   Asset::mediaLink('image.jpg');
+   
+   // After (returns a MediaFile instance that can be cast to a string)
+   Asset::get('image.jpg');
+   ```
+
+2. Replace `Hyde::mediaLink()` with `Hyde::asset()`:
+
+   ```php
+   // Before
+   $link = Hyde::mediaLink('image.jpg');
+   
+   // After
+   $link = Hyde::asset('image.jpg');
+   ```
+
+3. Update CDN link generation:
+
+   ```php
+   // Before
+   $cdnLink = Asset::cdnLink('app.css');
+   
+   // After
+   $cdnLink = HydeFront::cdnLink('app.css');
+   ```
+
+4. Replace `Asset::hasMediaFile()` with `Asset::exists()`:
+
+   ```php
+   // Before
+   if (Asset::hasMediaFile('image.jpg')) {
+       // ...
+   }
+   
+   // After
+   if (Asset::exists('image.jpg')) {
+       // ...
+   }
+   ```
+
+5. Update Tailwind config injection:
+
+   ```php
+   // Before
+   $config = Asset::injectTailwindConfig();
+   
+   // After
+   $config = HydeFront::injectTailwindConfig();
+   ```
+
+6. Remove any references to `hyde.hydefront_version` and `hyde.hydefront_cdn_url` in your config files as these options have been removed.
+
+7. If you were using `AssetService` directly, refactor your code to use the new `Asset` facade, `MediaFile` class, or `HydeFront` facade as appropriate.
+
+These changes simplify the Asset API and provide more robust handling of media files. The new `MediaFile` class offers additional functionality for working with assets.
+
 ## Low impact
 
 ### Navigation internal changes

From 79f309171abd7c4d2a57ec4e7561a7509d0f919f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 12:08:51 +0200
Subject: [PATCH 310/328] Delete V1Compatibility.php

---
 .../framework/src/Support/V1Compatibility.php | 38 -------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 packages/framework/src/Support/V1Compatibility.php

diff --git a/packages/framework/src/Support/V1Compatibility.php b/packages/framework/src/Support/V1Compatibility.php
deleted file mode 100644
index 3d8f5b5cd0c..00000000000
--- a/packages/framework/src/Support/V1Compatibility.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Support;
-
-use JetBrains\PhpStorm\Deprecated;
-use Hyde\Support\Filesystem\MediaFile;
-
-/**
- * @internal Hyde Facade support to aid in the v1 to v2 transition.
- *
- * @deprecated All code here is deprecated, and exists to help you transition.
- *
- * @codeCoverageIgnore This class is ignored from code coverage.
- */
-trait V1Compatibility
-{
-    /**
-     * @deprecated Use MediaFile::sourcePath() instead.
-     * @see \Hyde\Support\Filesystem\MediaFile::sourcePath()
-     */
-    #[Deprecated(reason: 'Use MediaFile::sourcePath() instead', replacement: '\Hyde\Support\Filesystem\MediaFile::sourcePath(%parametersList%)')]
-    public static function mediaPath(string $path = ''): string
-    {
-        return MediaFile::sourcePath($path);
-    }
-
-    /**
-     * @deprecated Use MediaFile::outputPath() instead.
-     * @see \Hyde\Support\Filesystem\MediaFile::outputPath()
-     */
-    #[Deprecated(reason: 'Use MediaFile::outputPath() instead', replacement: '\Hyde\Support\Filesystem\MediaFile::outputPath(%parametersList%)')]
-    public static function siteMediaPath(string $path = ''): string
-    {
-        return MediaFile::outputPath($path);
-    }
-}

From 10256c78e77156a880bb6afb33463a205e1f6dfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 12:44:10 +0200
Subject: [PATCH 311/328] Update wording in comments

---
 packages/framework/src/Facades/HydeFront.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index ed2def95db9..7a49771936c 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -16,10 +16,10 @@
  */
 class HydeFront
 {
-    /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
+    /** @var string The HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
     protected const HYDEFRONT_VERSION = 'v3.4';
 
-    /** @var string The default HydeFront CDN path pattern used to assemble CDN links. */
+    /** @var string The HydeFront CDN path pattern used to assemble CDN links. */
     protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@%s/dist/%s';
 
     /**

From 95bd78cb88b34ba571b85c550af5706b7dd6d467 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 12:45:57 +0200
Subject: [PATCH 312/328] Improve facade documentation

---
 packages/framework/src/Facades/HydeFront.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
index 7a49771936c..9f3c4135ff6 100644
--- a/packages/framework/src/Facades/HydeFront.php
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -36,13 +36,15 @@ public static function version(): string
      * Get the CDN link for a specific file.
      *
      * @param  'app.css'|'hyde.css'|'hyde.css.map'  $file
+     *
+     * @link https://cdn.jsdelivr.net/npm/hydefront@latest/dist/ for the available files.
      */
     public static function cdnLink(string $file): string
     {
         return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);
     }
 
-    /** This method is used to inject the Tailwind CSS configuration into the Play CDN integration. */
+    /** This method is used to inject the project's Tailwind CSS configuration into the Play CDN integration so it can match the styles. */
     public static function injectTailwindConfig(): string
     {
         if (! file_exists(Hyde::path('tailwind.config.js'))) {
@@ -51,7 +53,7 @@ public static function injectTailwindConfig(): string
 
         $config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');
 
-        // Remove the plugins array, as it is not used in the frontend.
+        // Remove the plugins array, as it is not used in the frontend build.
         if (str_contains($config, 'plugins: [')) {
             $tokens = explode('plugins: [', $config, 2);
             $tokens[1] = Str::after($tokens[1], ']');

From 319a2fc9a386f6b83dafa74908897fd0a14ce5bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 13:14:31 +0200
Subject: [PATCH 313/328] Rebuild documentation

---
 docs/architecture-concepts/the-hydekernel.md | 28 ++++++++------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/docs/architecture-concepts/the-hydekernel.md b/docs/architecture-concepts/the-hydekernel.md
index af2f6f97d21..2c266bbecd3 100644
--- a/docs/architecture-concepts/the-hydekernel.md
+++ b/docs/architecture-concepts/the-hydekernel.md
@@ -189,7 +189,7 @@ Hyde::markdown(string $text, bool $normalizeIndentation): Illuminate\Support\Htm
 <section id="hyde-kernel-hyperlink-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsHyperlinks -->
-<!-- Generated by HydePHP DocGen script at 2024-02-25 19:02:29 in 0.09ms -->
+<!-- Generated by HydePHP DocGen script at 2024-09-08 10:25:34 in 0.11ms -->
 
 #### `formatLink()`
 
@@ -212,9 +212,11 @@ Hyde::relativeLink(string $destination): string
 No description provided.
 
 ```php
-Hyde::asset(string $name): string
+Hyde::asset(string $name): Hyde\Support\Filesystem\MediaFile
 ```
 
+- **Throws:** \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
+
 #### `url()`
 
 No description provided.
@@ -246,7 +248,7 @@ Hyde::hasSiteUrl(): bool
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2023-03-11 11:17:34 in 0.10ms -->
+<!-- Generated by HydePHP DocGen script at 2024-08-01 10:01:06 in 0.13ms -->
 
 #### `filesystem()`
 
@@ -272,14 +274,6 @@ No description provided.
 Hyde::vendorPath(string $path, string $package): string
 ```
 
-#### `mediaPath()`
-
-No description provided.
-
-```php
-Hyde::mediaPath(string $path): string
-```
-
 #### `sitePath()`
 
 No description provided.
@@ -288,28 +282,28 @@ No description provided.
 Hyde::sitePath(string $path): string
 ```
 
-#### `siteMediaPath()`
+#### `pathToAbsolute()`
 
 No description provided.
 
 ```php
-Hyde::siteMediaPath(string $path): string
+Hyde::pathToAbsolute(array|string $path): array|string
 ```
 
-#### `pathToAbsolute()`
+#### `pathToRelative()`
 
 No description provided.
 
 ```php
-Hyde::pathToAbsolute(array|string $path): array|string
+Hyde::pathToRelative(string $path): string
 ```
 
-#### `pathToRelative()`
+#### `assets()`
 
 No description provided.
 
 ```php
-Hyde::pathToRelative(string $path): string
+Hyde::assets(): \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
 ```
 
 <!-- End generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->

From eda2c12298d179f74708cbd177d93f9a2a02ff19 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 13:47:17 +0200
Subject: [PATCH 314/328] Test version returns correct HydeFront version

---
 .../tests/Unit/Facades/HydeFrontFacadeTest.php      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
index 3bcdf3a096d..2ac04884afe 100644
--- a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
@@ -15,7 +15,18 @@ class HydeFrontFacadeTest extends UnitTestCase
 {
     protected static bool $needsKernel = true;
 
-    // Todo: Check the version is correct? (When running in monorepo)
+    public function testVersionReturnsCorrectHydeFrontVersion()
+    {
+        if (file_exists(Hyde::path('README.md')) && ! str_contains(file_get_contents(Hyde::path('README.md')), 'HydePHP - Source Code Monorepo')) {
+            $this->markTestSkipped('Test skipped when not running in the monorepo.');
+        }
+
+        $package = json_decode(file_get_contents(Hyde::path('packages/hydefront/package.json')), true);
+
+        [$major, $minor] = explode('.', $package['version']);
+
+        $this->assertSame("v$major.$minor", HydeFront::version());
+    }
 
     public function testVersionReturnsString()
     {

From 532e35fbcffc2336648c3ab72292881d5c889a5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 14:11:49 +0200
Subject: [PATCH 315/328] Update head layout to use the Asset API

---
 .../resources/views/layouts/head.blade.php    |  4 ++--
 .../Unit/Views/HeadComponentViewTest.php      | 22 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/layouts/head.blade.php b/packages/framework/resources/views/layouts/head.blade.php
index 111aced665b..861eadfc8ff 100644
--- a/packages/framework/resources/views/layouts/head.blade.php
+++ b/packages/framework/resources/views/layouts/head.blade.php
@@ -2,8 +2,8 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>{{ $page->title() }}</title>
 
-@if (file_exists(MediaFile::sourcePath('favicon.ico')))
-    <link rel="shortcut icon" href="{{ Hyde::relativeLink('media/favicon.ico') }}" type="image/x-icon">
+@if (Asset::exists('favicon.ico'))
+    <link rel="shortcut icon" href="{{ Asset::get('media/favicon.ico') }}" type="image/x-icon">
 @endif
 
 {{-- App Meta Tags --}}
diff --git a/packages/framework/tests/Unit/Views/HeadComponentViewTest.php b/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
index 3678fd3a04f..a43865ad60a 100644
--- a/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
@@ -51,7 +51,7 @@ public function testLinkToFaviconIsAddedWhenFileExists()
         $this->mockPage();
         $this->file('_media/favicon.ico');
 
-        $this->assertStringContainsString('<link rel="shortcut icon" href="media/favicon.ico" type="image/x-icon">', $this->renderTestView());
+        $this->assertStringContainsString('<link rel="shortcut icon" href="media/favicon.ico?v=00000000" type="image/x-icon">', $this->renderTestView());
     }
 
     public function testLinkToFaviconUsesRelativeUrl()
@@ -59,6 +59,26 @@ public function testLinkToFaviconUsesRelativeUrl()
         $this->file('_media/favicon.ico');
         $this->mockPage(currentPage: 'foo/bar');
 
+        $this->assertStringContainsString('<link rel="shortcut icon" href="../media/favicon.ico?v=00000000" type="image/x-icon">', $this->renderTestView());
+    }
+
+    public function testLinkToFaviconUsesAbsoluteBaseUrl()
+    {
+        $this->file('_media/favicon.ico');
+        $this->mockPage(currentPage: 'foo/bar');
+
+        config(['hyde.url' => 'https://example.com']);
+
+        $this->assertStringContainsString('<link rel="shortcut icon" href="https://example.com/media/favicon.ico?v=00000000" type="image/x-icon">', $this->renderTestView());
+    }
+
+    public function testLinkToFaviconDoesNotUseCacheBustingWhenDisabled()
+    {
+        $this->file('_media/favicon.ico');
+        $this->mockPage(currentPage: 'foo/bar');
+
+        config(['hyde.enable_cache_busting' => false]);
+
         $this->assertStringContainsString('<link rel="shortcut icon" href="../media/favicon.ico" type="image/x-icon">', $this->renderTestView());
     }
 

From d4d8af37cb6309d65b07dde742857ba3982ba9f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 14:17:50 +0200
Subject: [PATCH 316/328] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 154a87f9eee..a2d1ef726a7 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -24,9 +24,10 @@ This serves two purposes:
 - Added a `Feature::fromName()` enum helper in https://github.com/hydephp/develop/pull/1895
 - Added support for specifying features in the YAML configuration in https://github.com/hydephp/develop/pull/1896
 - **Added a new consolidated Asset API to better handle media files.**
-  - Added several new methods to the `MediaFile` class with methods like `getLink()`, `getLength()`, `getMimeType()`, etc.
+  - Added several new fluent methods to the `MediaFile` class, like `getLink()`, `getLength()`, `getMimeType()`, etc.
   - Added new `HydeFront` facade to handle CDN links and Tailwind config injection.
   - Added method `Asset::exists()` has to check if a media file exists.
+  - Added a `Hyde::assets()` method to get all media file instancess in the site.
 
 
 ### Changed
@@ -69,6 +70,7 @@ This serves two purposes:
   - **Note:** For most end users, the changes will have minimal direct impact, but if you have custom code that interacts with media files, you may need to update it.
   - The `Asset` facade has been e restructured to be more scoped and easier to use, splitting out a separate `HydeFront` facade and inlining the `AssetService` class.
   - All asset retrieval methods now return a `MediaFile` instance, which can be fluently interacted with, or cast to a string to get the link (which was the previous behavior).
+  - The `Hyde::asset()` method and `asset()` function now return `MediaFile` instances instead of strings, and will throw an exception if the asset does not exist.
   - Renamed method `Asset::hasMediaFile` to `Asset::exists` in https://github.com/hydephp/develop/pull/1957
   - Renamed method `MediaFile::getContentLength` to `MediaFile::getLength` in https://github.com/hydephp/develop/pull/1904
   - Replaced method `Hyde::mediaPath` with `MediaFile::sourcePath` in https://github.com/hydephp/develop/pull/1911
@@ -95,6 +97,8 @@ This serves two purposes:
   - Removed HydeFront methods from the `Asset` facade (moved to the new HydeFront facade) in https://github.com/hydephp/develop/pull/1907
   - The config options `hyde.hydefront_version` and `hyde.hydefront_cdn_url` have been removed in https://github.com/hydephp/develop/pull/1909 (as changing these could lead to incompatible asset versions, defeating the feature's purpose)
   - Removed `Hyde::mediaLink()` method replaced by `Hyde::asset()` in https://github.com/hydephp/develop/pull/1932
+  - Removed `Hyde::mediaPath()` method replaced by `MediaFile::sourcePath()` in https://github.com/hydephp/develop/pull/1911
+  - Removed `Hyde::siteMediaPath()` method replaced by `MediaFile::outputPath()` in https://github.com/hydephp/develop/pull/1911
 
 ### Fixed
 - Added missing collection key types in Hyde facade method annotations in https://github.com/hydephp/develop/pull/1784

From 1affcbb10c77d23395a7d989e61f881e05fe0ebe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 14:26:36 +0200
Subject: [PATCH 317/328] Breaking: Rename config option `enable_cache_busting`
 to `cache_busting`

This option is best because it:

1.  Maintains consistency with the rest of the configuration file.
2.  Aligns with the explanatory comment.
3.  Is clear and concise.

It is part of the HydePHP v2 Asset API refactors https://github.com/hydephp/develop/pull/1904
---
 config/hyde.php                                |  2 +-
 packages/framework/config/hyde.php             |  2 +-
 .../src/Support/Filesystem/MediaFile.php       |  2 +-
 .../DynamicMarkdownLinksFeatureTest.php        |  2 +-
 .../tests/Feature/FeaturedImageFactoryTest.php |  4 ++--
 .../tests/Feature/FeaturedImageTest.php        |  4 ++--
 .../framework/tests/Feature/HelpersTest.php    |  4 ++--
 .../framework/tests/Feature/HydeKernelTest.php | 10 +++++-----
 .../tests/Feature/MarkdownPostTest.php         |  2 +-
 .../framework/tests/Feature/MetadataTest.php   |  2 +-
 .../DynamicMarkdownLinkProcessorTest.php       |  2 +-
 .../Feature/Services/RssFeedServiceTest.php    |  2 +-
 .../tests/Feature/Views/MetadataViewTest.php   |  2 +-
 .../tests/Unit/Facades/AssetFacadeUnitTest.php |  2 +-
 ...iveLinksAcrossPagesRetainsIntegrityTest.php |  2 +-
 .../tests/Unit/Support/MediaFileUnitTest.php   | 18 +++++++++---------
 .../Unit/Views/ArticleExcerptViewTest.php      |  2 +-
 .../tests/Unit/Views/FeaturedImageViewTest.php |  4 ++--
 .../tests/Unit/Views/HeadComponentViewTest.php |  2 +-
 .../Unit/Views/ScriptsComponentViewTest.php    |  2 +-
 .../Unit/Views/StylesComponentViewTest.php     |  2 +-
 21 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index e601ff0a912..92163827958 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -364,7 +364,7 @@
     |
     */
 
-    'enable_cache_busting' => true,
+    'cache_busting' => true,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index e601ff0a912..92163827958 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -364,7 +364,7 @@
     |
     */
 
-    'enable_cache_busting' => true,
+    'cache_busting' => true,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 07827626abe..5afdf429797 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -183,7 +183,7 @@ public function toArray(): array
 
     protected function getCacheBustKey(): string
     {
-        return Config::getBool('hyde.enable_cache_busting', true)
+        return Config::getBool('hyde.cache_busting', true)
             ? '?v='.$this->getHash()
             : '';
     }
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 97df3a668af..e0981f7cabb 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -48,7 +48,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
     }
 
     public function testBasicDynamicMarkdownLinks()
diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 2e6ea781049..b38f0b77bd3 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
 
         $this->file('_media/foo');
     }
@@ -135,7 +135,7 @@ public function testImagePathsAreNormalizedForCustomizedMediaDirectoryWithoutUnd
 
     public function testImagePathsWithCacheBusting()
     {
-        config(['hyde.enable_cache_busting' => true]);
+        config(['hyde.cache_busting' => true]);
 
         $this->assertSourceIsSame('media/foo?v=00000000', ['image' => 'foo']);
         $this->assertSourceIsSame('media/foo?v=00000000', ['image' => 'media/foo']);
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 47819102cc4..031018a0d22 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
 
         $this->file('_media/foo', 'test');
         $this->file('_media/source');
@@ -118,7 +118,7 @@ public function testGetSourceMethod()
 
     public function testImagePathsWithCacheBusting()
     {
-        config(['hyde.enable_cache_busting' => true]);
+        config(['hyde.cache_busting' => true]);
 
         $this->assertSame('media/foo?v=accf8b33', (new FeaturedImage('_media/foo', ...$this->defaultArguments()))->getSource());
         $this->assertSame('media/foo?v=accf8b33', FeaturedImageFactory::make(new FrontMatter(['image.source' => 'foo']))->getSource());
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index aefa3b160a4..9efbfb6532b 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
     }
 
     /** @covers ::hyde */
@@ -89,7 +89,7 @@ public function testAssetFunction()
     /** @covers ::asset */
     public function testAssetFunctionWithCacheBusting()
     {
-        config(['hyde.enable_cache_busting' => true]);
+        config(['hyde.cache_busting' => true]);
 
         $this->assertInstanceOf(MediaFile::class, asset('app.css'));
         $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index c34cbc792f2..bc4591539dc 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -230,7 +230,7 @@ public function testAssetHelperWithoutCacheBusting()
     {
         $this->file('_media/foo.jpg');
 
-        Config::set('hyde.enable_cache_busting', false);
+        Config::set('hyde.cache_busting', false);
 
         $this->assertSame('media/foo.jpg', (string) Hyde::asset('foo.jpg'));
     }
@@ -241,11 +241,11 @@ public function testAssetHelperWithoutCacheBustingWithChangedSettingInTheSameLif
 
         $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
 
-        Config::set('hyde.enable_cache_busting', false);
+        Config::set('hyde.cache_busting', false);
 
         $this->assertSame('media/foo.jpg', (string) Hyde::asset('foo.jpg'));
 
-        Config::set('hyde.enable_cache_busting', true);
+        Config::set('hyde.cache_busting', true);
 
         $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
     }
@@ -258,11 +258,11 @@ public function testAssetHelperWithoutCacheBustingWithChangedSettingInTheSameLif
 
         $this->assertSame('media/foo.jpg?v=00000000', (string) $instance);
 
-        Config::set('hyde.enable_cache_busting', false);
+        Config::set('hyde.cache_busting', false);
 
         $this->assertSame('media/foo.jpg', (string) $instance);
 
-        Config::set('hyde.enable_cache_busting', true);
+        Config::set('hyde.cache_busting', true);
 
         $this->assertSame('media/foo.jpg?v=00000000', (string) $instance);
     }
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 1166f2162be..cc4109d85fa 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -195,6 +195,6 @@ public function testBlogPostFeedCanBeRenderedWhenPostHasNoFrontMatter()
     protected function setupMediaFileAndCacheBusting(bool $enableCacheBusting = false): void
     {
         $this->file('_media/foo.png', 'test content');
-        config(['hyde.enable_cache_busting' => $enableCacheBusting]);
+        config(['hyde.cache_busting' => $enableCacheBusting]);
     }
 }
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index f6c6ce3446d..e1220f8fbe2 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -526,7 +526,7 @@ public function testDynamicPostMetaPropertiesContainsImageMetadataWhenFeaturedIm
 
     public function testDynamicPostMetaPropertiesContainsImageLinkWithoutCacheBusting()
     {
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
 
         $this->file('_media/foo.jpg');
 
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 86cd30871ac..a0736900cb2 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -34,7 +34,7 @@ protected function setUp(): void
 
         // Todo: No way to mock media files, so we are using app.css as a test asset for now.
 
-        self::mockConfig(['hyde.enable_cache_busting' => false]);
+        self::mockConfig(['hyde.cache_busting' => false]);
     }
 
     public function testRouteReplacement()
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
index 96b9b9afcf9..72f291eaaa4 100644
--- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
+++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -86,7 +86,7 @@ public function testXmlChannelDataCanBeCustomized()
 
     public function testMarkdownBlogPostsAreAddedToRssFeedThroughAutodiscovery()
     {
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
 
         file_put_contents(Hyde::path('_posts/rss.md'), <<<'MD'
             ---
diff --git a/packages/framework/tests/Feature/Views/MetadataViewTest.php b/packages/framework/tests/Feature/Views/MetadataViewTest.php
index 33e0108c7d8..1e517e8e0e1 100644
--- a/packages/framework/tests/Feature/Views/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/Views/MetadataViewTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         parent::setUp();
 
         $this->withSiteUrl();
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
     }
 
     protected function build(?string $page = null): void
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
index 807aee54226..da5b1573138 100644
--- a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -53,7 +53,7 @@ public function testAssetReturnsMediaPathWithCacheKey()
 
     public function testAssetReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled()
     {
-        self::mockConfig(['hyde.enable_cache_busting' => false]);
+        self::mockConfig(['hyde.cache_busting' => false]);
 
         $path = (string) Asset::get('app.css');
 
diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index e8f9f8c1f66..d15f0d9cbcc 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
         config(['hyde.navigation.subdirectory_display' => 'flat']);
 
         $this->needsDirectory('_pages/nested');
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index c5a5761a3bd..10d0818b411 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -64,7 +64,7 @@ protected function setUp(): void
         \Illuminate\Support\Facades\View::swap(Mockery::mock(Factory::class)->makePartial());
         Render::swap(new RenderData());
 
-        self::mockConfig(['hyde.enable_cache_busting' => false]);
+        self::mockConfig(['hyde.cache_busting' => false]);
     }
 
     protected function tearDown(): void
@@ -463,7 +463,7 @@ public function testGetLinkWithCustomMediaDirectory()
 
     public function testGetLinkWithPrettyUrls()
     {
-        self::mockConfig(['hyde.enable_cache_busting' => false, 'hyde.pretty_urls' => true]);
+        self::mockConfig(['hyde.cache_busting' => false, 'hyde.pretty_urls' => true]);
         $file = MediaFile::make('foo.txt');
         $this->assertSame('media/foo.txt', $file->getLink());
     }
@@ -476,7 +476,7 @@ public function testGetLinkWithNestedFile()
 
     public function testGetLinkWithBaseUrl()
     {
-        self::mockConfig(['hyde.enable_cache_busting' => false, 'hyde.url' => 'https://example.com']);
+        self::mockConfig(['hyde.cache_busting' => false, 'hyde.url' => 'https://example.com']);
         $file = MediaFile::make('foo.txt');
         $this->assertSame('https://example.com/media/foo.txt', $file->getLink());
     }
@@ -484,7 +484,7 @@ public function testGetLinkWithBaseUrl()
     public function testGetLinkWithBaseUrlAndPrettyUrls()
     {
         self::mockConfig([
-            'hyde.enable_cache_busting' => false,
+            'hyde.cache_busting' => false,
             'hyde.url' => 'https://example.com',
             'hyde.pretty_urls' => true,
         ]);
@@ -494,7 +494,7 @@ public function testGetLinkWithBaseUrlAndPrettyUrls()
 
     public function testGetLinkWithCacheBusting()
     {
-        self::mockConfig(['hyde.enable_cache_busting' => true]);
+        self::mockConfig(['hyde.cache_busting' => true]);
         $this->mockFilesystem->shouldReceive('hash')
             ->andReturn('abc123');
         $file = MediaFile::make('foo.txt');
@@ -503,7 +503,7 @@ public function testGetLinkWithCacheBusting()
 
     public function testGetLinkWithCacheBustingDisabled()
     {
-        self::mockConfig(['hyde.enable_cache_busting' => false]);
+        self::mockConfig(['hyde.cache_busting' => false]);
         $file = MediaFile::make('foo.txt');
         $this->assertSame('media/foo.txt', $file->getLink());
     }
@@ -547,7 +547,7 @@ public function testStringCastWithCustomMediaDirectory()
 
     public function testStringCastWithPrettyUrls()
     {
-        self::mockConfig(['hyde.enable_cache_busting' => false, 'hyde.pretty_urls' => true]);
+        self::mockConfig(['hyde.cache_busting' => false, 'hyde.pretty_urls' => true]);
         $file = new MediaFile('foo.txt');
         $this->assertSame('media/foo.txt', (string) $file);
     }
@@ -560,14 +560,14 @@ public function testStringCastWithNestedFile()
 
     public function testStringCastWithBaseUrl()
     {
-        self::mockConfig(['hyde.enable_cache_busting' => false, 'hyde.url' => 'https://example.com']);
+        self::mockConfig(['hyde.cache_busting' => false, 'hyde.url' => 'https://example.com']);
         $file = new MediaFile('foo.txt');
         $this->assertSame('https://example.com/media/foo.txt', (string) $file);
     }
 
     public function testStringCastWithCacheBusting()
     {
-        self::mockConfig(['hyde.enable_cache_busting' => true]);
+        self::mockConfig(['hyde.cache_busting' => true]);
         $this->mockFilesystem->shouldReceive('hash')
             ->andReturn('abc123');
         $file = new MediaFile('foo.txt');
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index 6b7d49e9ffc..062bd3f4b2d 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -112,7 +112,7 @@ public function testItempropImageIsAddedWhenThereIsAnImageWithLocalPathNoCache()
     {
         $this->file('_media/image.jpg');
 
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
 
         $viewLocalNoCache = $this->renderTestView(MarkdownPost::make(matter: [
             'image' => 'image.jpg',
diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 188f489dc38..a15ade44528 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->file('_media/foo.jpg', 'test content');
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
     }
 
     public function testTheView()
@@ -259,7 +259,7 @@ public function testFluentAttributionLogicCreatesFluentMessages7()
 
     public function testCacheBusting()
     {
-        config(['hyde.enable_cache_busting' => true]);
+        config(['hyde.cache_busting' => true]);
         $component = $this->renderComponent();
         $this->assertStringContainsString('src="media/foo.jpg?v=98b41d87"', $component);
     }
diff --git a/packages/framework/tests/Unit/Views/HeadComponentViewTest.php b/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
index a43865ad60a..d16df103f5f 100644
--- a/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
@@ -77,7 +77,7 @@ public function testLinkToFaviconDoesNotUseCacheBustingWhenDisabled()
         $this->file('_media/favicon.ico');
         $this->mockPage(currentPage: 'foo/bar');
 
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
 
         $this->assertStringContainsString('<link rel="shortcut icon" href="../media/favicon.ico" type="image/x-icon">', $this->renderTestView());
     }
diff --git a/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php b/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
index 63abb92a8a9..d16027a70b0 100644
--- a/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
@@ -18,7 +18,7 @@ class ScriptsComponentViewTest extends TestCase
 
     protected function renderTestView(): string
     {
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
         $this->mockCurrentPage($this->mockCurrentPage ?? '');
 
         return Blade::render(file_get_contents(
diff --git a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
index bb5358f9e08..95fb7a2ee09 100644
--- a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
@@ -20,7 +20,7 @@ class StylesComponentViewTest extends TestCase
 
     protected function renderTestView(): string
     {
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
         $this->mockCurrentPage($this->mockCurrentPage ?? '');
 
         return Blade::render(file_get_contents(

From 9c3f9f8b1a6513e131622ddbc74066d99d0fe7d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 14:29:22 +0200
Subject: [PATCH 318/328] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a2d1ef726a7..22092c8c085 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -39,6 +39,7 @@ This serves two purposes:
 - **Breaking:** The `Author::get()` method now returns `null` if an author is not found, rather than creating a new instance. For more information, see below.
 - **Breaking:** The custom navigation item configuration now uses array inputs instead of the previous format. For more information, see the upgrade guide below.
 - **Breaking:** Renamed the `hyde.navigation.subdirectories` configuration option to `hyde.navigation.subdirectory_display`.
+- **Breaking:** Renamed the `hyde.enable_cache_busting` configuration option to `hyde.cache_busting` in https://github.com/hydephp/develop/pull/1980
 - Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
@@ -349,9 +350,11 @@ Once you have determined that you need to update your code, here are the steps y
    $config = HydeFront::injectTailwindConfig();
    ```
 
-6. Remove any references to `hyde.hydefront_version` and `hyde.hydefront_cdn_url` in your config files as these options have been removed.
+6. Rename the option `hyde.enable_cache_busting` to `hyde.cache_busting` in your configuration file.
 
-7. If you were using `AssetService` directly, refactor your code to use the new `Asset` facade, `MediaFile` class, or `HydeFront` facade as appropriate.
+7. Remove any references to `hyde.hydefront_version` and `hyde.hydefront_cdn_url` in your config files as these options have been removed.
+
+8. If you were using `AssetService` directly, refactor your code to use the new `Asset` facade, `MediaFile` class, or `HydeFront` facade as appropriate.
 
 These changes simplify the Asset API and provide more robust handling of media files. The new `MediaFile` class offers additional functionality for working with assets.
 

From 269f0fbbdb93030f7076aa43bb253f6856859949 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 14:36:28 +0200
Subject: [PATCH 319/328] Merge update steps for renamed methos

---
 RELEASE_NOTES.md | 65 ++++++++----------------------------------------
 1 file changed, 11 insertions(+), 54 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 22092c8c085..f9e545109eb 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -296,65 +296,22 @@ Most changes were made in https://github.com/hydephp/develop/pull/1904 which con
 
 Once you have determined that you need to update your code, here are the steps you should take:
 
-1. Replace usages of `Asset::mediaLink()` with `Asset::get()`:
-
-   ```php
-   // Before (returns a string)
-   Asset::mediaLink('image.jpg');
-   
-   // After (returns a MediaFile instance that can be cast to a string)
-   Asset::get('image.jpg');
-   ```
-
-2. Replace `Hyde::mediaLink()` with `Hyde::asset()`:
-
-   ```php
-   // Before
-   $link = Hyde::mediaLink('image.jpg');
-   
-   // After
-   $link = Hyde::asset('image.jpg');
-   ```
-
-3. Update CDN link generation:
-
-   ```php
-   // Before
-   $cdnLink = Asset::cdnLink('app.css');
-   
-   // After
-   $cdnLink = HydeFront::cdnLink('app.css');
-   ```
-
-4. Replace `Asset::hasMediaFile()` with `Asset::exists()`:
-
-   ```php
-   // Before
-   if (Asset::hasMediaFile('image.jpg')) {
-       // ...
-   }
-   
-   // After
-   if (Asset::exists('image.jpg')) {
-       // ...
-   }
-   ```
-
-5. Update Tailwind config injection:
-
+1. Update calls to renamed methods:
    ```php
-   // Before
-   $config = Asset::injectTailwindConfig();
-   
-   // After
-   $config = HydeFront::injectTailwindConfig();
+   // Replace this:                      With this:
+   Hyde::mediaLink('image.png')      =>  Hyde::asset('image.png');
+   Asset::mediaLink('image.png')     =>  Asset::get('image.png');
+   Asset::hasMediaFile('image.png')  =>  Asset::exists('image.png');
+   Asset::cdnLink('app.css')         =>  HydeFront::cdnLink('app.css');
+   Asset::injectTailwindConfig()     =>  HydeFront::injectTailwindConfig();
+   FeaturedImage::isRemote($source)  =>  Hyperlinks::isRemote($source);
    ```
 
-6. Rename the option `hyde.enable_cache_busting` to `hyde.cache_busting` in your configuration file.
+2. Rename the option `hyde.enable_cache_busting` to `hyde.cache_busting` in your configuration file.
 
-7. Remove any references to `hyde.hydefront_version` and `hyde.hydefront_cdn_url` in your config files as these options have been removed.
+3. Remove any references to `hyde.hydefront_version` and `hyde.hydefront_cdn_url` in your config files as these options have been removed.
 
-8. If you were using `AssetService` directly, refactor your code to use the new `Asset` facade, `MediaFile` class, or `HydeFront` facade as appropriate.
+4. If you were using `AssetService` directly, refactor your code to use the new `Asset` facade, `MediaFile` class, or `HydeFront` facade as appropriate.
 
 These changes simplify the Asset API and provide more robust handling of media files. The new `MediaFile` class offers additional functionality for working with assets.
 

From c936cbea4daf00c0cb6e48c9cba0634c4b91eddc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:06:05 +0200
Subject: [PATCH 320/328] Clean up and improve test

---
 .../tests/Feature/StaticSiteServiceTest.php   | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 8c740d851c5..6127b9c23a5 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -59,10 +59,12 @@ public function testBuildCommandCreatesHtmlFiles()
 
     public function testBuildCommandTransfersMediaAssetFiles()
     {
-        file_put_contents(Hyde::path('_media/test-image.png'), 'foo');
-        $this->artisan('build');
+        $this->file('_media/test-image.png', 'foo');
+        $this->artisan('build')
+            ->expectsOutputToContain('Transferring Media Assets...');
+
         $this->assertFileEquals(Hyde::path('_media/test-image.png'), Hyde::path('_site/media/test-image.png'));
-        Filesystem::unlink('_media/test-image.png');
+
         Filesystem::unlink('_site/media/test-image.png');
     }
 
@@ -70,11 +72,28 @@ public function testBuildCommandTransfersMediaAssetFilesRecursively()
     {
         $this->directory('_media/foo');
 
-        file_put_contents(Hyde::path('_media/foo/img.png'), 'foo');
+        $this->file('_media/foo/img.png', 'foo');
         $this->artisan('build')->assertSuccessful();
         $this->assertFileEquals(Hyde::path('_media/foo/img.png'), Hyde::path('_site/media/foo/img.png'));
     }
 
+    public function testBuildCommandCreatesNeededDirectoriesRecursively()
+    {
+        $this->directory('_media/foo/bar');
+        $this->file('_media/1.png');
+        $this->file('_media/foo/2.png');
+        $this->file('_media/foo/bar/3.png');
+
+        Filesystem::deleteDirectory('_site');
+
+        $this->artisan('build')
+            ->assertExitCode(0);
+
+        $this->assertFileExists(Hyde::path('_site/media/1.png'));
+        $this->assertFileExists(Hyde::path('_site/media/foo/2.png'));
+        $this->assertFileExists(Hyde::path('_site/media/foo/bar/3.png'));
+    }
+
     public function testAllPageTypesCanBeCompiled()
     {
         $this->file('_pages/html.html');
@@ -96,12 +115,6 @@ public function testAllPageTypesCanBeCompiled()
         $this->assertFileExists(Hyde::path('_site/markdown.html'));
         $this->assertFileExists(Hyde::path('_site/posts/post.html'));
         $this->assertFileExists(Hyde::path('_site/docs/docs.html'));
-
-        Filesystem::unlink('_site/html.html');
-        Filesystem::unlink('_site/blade.html');
-        Filesystem::unlink('_site/markdown.html');
-        Filesystem::unlink('_site/posts/post.html');
-        Filesystem::unlink('_site/docs/docs.html');
     }
 
     public function testOnlyProgressBarsForTypesWithPagesAreShown()
@@ -120,8 +133,6 @@ public function testOnlyProgressBarsForTypesWithPagesAreShown()
 
         $this->assertFileExists(Hyde::path('_site/blade.html'));
         $this->assertFileExists(Hyde::path('_site/markdown.html'));
-        Filesystem::unlink('_site/blade.html');
-        Filesystem::unlink('_site/markdown.html');
     }
 
     public function testPrintInitialInformationAllowsApiToBeDisabled()

From 84672f1507d9cc9385fcfab273311fee190108cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:22:35 +0200
Subject: [PATCH 321/328] Add instance helper to get media file output path

---
 .../src/Support/Filesystem/MediaFile.php      |  8 ++++
 .../tests/Feature/Support/MediaFileTest.php   | 44 ++++++++++++++++++-
 .../tests/Unit/Support/MediaFileUnitTest.php  | 28 ++++++++++++
 3 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 5afdf429797..82eadc79b9b 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -137,6 +137,14 @@ public function getLink(): string
         return Hyde::relativeLink($name).$this->getCacheBustKey();
     }
 
+    /**
+     * Get the absolute path to the media file in the compiled site.
+     */
+    public function getOutputPath(): string
+    {
+        return static::outputPath($this->getIdentifier());
+    }
+
     /**
      * Get the content length of the file in bytes.
      */
diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index c088dac91d8..9ed44ccd8e8 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -54,7 +54,7 @@ public function testMediaFileDiscovery()
         $this->assertArrayHasKey('script.js', $allFiles);
 
         $fileNames = MediaFile::files();
-        $this->assertSame(['image.png', 'app.css', 'style.css', 'script.js'], $fileNames);
+        $this->assertEqualsCanonicalizing(['image.png', 'app.css', 'style.css', 'script.js'], $fileNames);
     }
 
     public function testMediaFileProperties()
@@ -119,4 +119,46 @@ public function testMediaFileCacheBusting()
         $this->assertStringStartsWith('?v=', $cacheBustKey);
         $this->assertSame('?v=cd5de5e7', $cacheBustKey); // Expect CRC32 hash
     }
+
+    public function testGetOutputPath()
+    {
+        $this->file('_media/test.txt', 'Hello, World!');
+        $mediaFile = MediaFile::make('test.txt');
+
+        $expectedPath = Hyde::path('_site/media/test.txt');
+        $this->assertSame($expectedPath, $mediaFile->getOutputPath());
+    }
+
+    public function testGetOutputPathWithNestedFile()
+    {
+        $this->file('_media/subfolder/nested_file.txt', 'Nested content');
+        $mediaFile = MediaFile::make('subfolder/nested_file.txt');
+
+        $expectedPath = Hyde::path('_site/media/subfolder/nested_file.txt');
+        $this->assertSame($expectedPath, $mediaFile->getOutputPath());
+    }
+
+    public function testGetOutputPathWithCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $this->file('custom_media/custom_file.txt', 'Custom content');
+        $mediaFile = MediaFile::make('custom_file.txt');
+
+        $expectedPath = Hyde::path('_site/custom_media/custom_file.txt');
+        $this->assertSame($expectedPath, $mediaFile->getOutputPath());
+
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testGetOutputPathWithCustomOutputDirectory()
+    {
+        Hyde::setOutputDirectory('custom_output');
+        $this->file('_media/test.txt', 'Hello, World!');
+        $mediaFile = MediaFile::make('test.txt');
+
+        $expectedPath = Hyde::path('custom_output/media/test.txt');
+        $this->assertSame($expectedPath, $mediaFile->getOutputPath());
+
+        Hyde::setOutputDirectory('_site'); // Reset to default
+    }
 }
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
index 10d0818b411..1be4b464f59 100644
--- a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -581,6 +581,34 @@ public function testStringCastWithCurrentPageContext()
         $this->assertSame('../media/baz.txt', (string) $file);
     }
 
+    public function testGetOutputPath()
+    {
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('/base/path/_site/media/foo.txt', $file->getOutputPath());
+    }
+
+    public function testGetOutputPathWithNestedFile()
+    {
+        $file = MediaFile::make('subdirectory/foo.txt');
+        $this->assertSame('/base/path/_site/media/subdirectory/foo.txt', $file->getOutputPath());
+    }
+
+    public function testGetOutputPathWithCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('/base/path/_site/custom_media/foo.txt', $file->getOutputPath());
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testGetOutputPathWithCustomOutputDirectory()
+    {
+        Hyde::setOutputDirectory('/base/path/custom_output');
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('/base/path/custom_output/media/foo.txt', $file->getOutputPath());
+        Hyde::setOutputDirectory('/base/path/_site'); // Reset to default
+    }
+
     // Helper method to mock the current page
     protected function mockCurrentPage(string $page): void
     {

From bdf0cc1fb1927f71e5a72de0eada06781e17e7db Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:25:44 +0200
Subject: [PATCH 322/328] Update media asset transfer task to use the Asset API

---
 .../Framework/Actions/PreBuildTasks/TransferMediaAssets.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index 3acb112ea9d..86fe084a470 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -20,10 +20,10 @@ public function handle(): void
 
         $this->newLine();
 
-        $this->withProgressBar(MediaFile::files(), function (string $identifier): void {
-            $sitePath = MediaFile::outputPath($identifier);
+        $this->withProgressBar(MediaFile::all(), function (MediaFile $file): void {
+            $sitePath = $file->getOutputPath();
             $this->needsParentDirectory($sitePath);
-            copy(MediaFile::sourcePath($identifier), $sitePath);
+            copy($file->getAbsolutePath(), $sitePath);
         });
 
         $this->newLine();

From 6b3d54cb1a71aeebcff7eec7fec26a5935f2d870 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:28:56 +0200
Subject: [PATCH 323/328] Remove unnecessary method call

---
 .../src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index 86fe084a470..e7a3e7bc160 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -16,8 +16,6 @@ class TransferMediaAssets extends PreBuildTask
 
     public function handle(): void
     {
-        $this->needsDirectory(MediaFile::outputPath());
-
         $this->newLine();
 
         $this->withProgressBar(MediaFile::all(), function (MediaFile $file): void {

From 704bc273ebc9f4741c1970cb24d1ddee05dad5d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:39:53 +0200
Subject: [PATCH 324/328] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f9e545109eb..85b9078ec4e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -67,6 +67,7 @@ This serves two purposes:
 - The build command now groups together all `InMemoryPage` instances under one progress bar group in https://github.com/hydephp/develop/pull/1897
 - The `Markdown::render()` method will now always render Markdown using the custom HydePHP Markdown service (thus getting smart features like our Markdown processors) in https://github.com/hydephp/develop/pull/1900
 - Improved how the `MarkdownService` class is accessed, by binding it into the service container, in https://github.com/hydephp/develop/pull/1922
+- Improved the media asset transfer build task to have better output in https://github.com/hydephp/develop/pull/1904
 - **Many MediaFile related helpers has been changed or completely rewritten** to provide a simplified API for interacting with media files.
   - **Note:** For most end users, the changes will have minimal direct impact, but if you have custom code that interacts with media files, you may need to update it.
   - The `Asset` facade has been e restructured to be more scoped and easier to use, splitting out a separate `HydeFront` facade and inlining the `AssetService` class.

From 5de7fce5ce5b64575ca9eee68012999078bba700 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:39:59 +0200
Subject: [PATCH 325/328] Cover the task

---
 packages/framework/tests/Feature/StaticSiteServiceTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 6127b9c23a5..a3d0780c609 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -18,6 +18,7 @@
  * @covers \Hyde\Console\Commands\BuildSiteCommand
  * @covers \Hyde\Framework\Services\BuildService
  * @covers \Hyde\Framework\Actions\PreBuildTasks\CleanSiteDirectory
+ * @covers \Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets
  */
 class StaticSiteServiceTest extends TestCase
 {

From 2e49a6c337b8322ccba7294c555c4e5e13327e4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:42:05 +0200
Subject: [PATCH 326/328] Clarify test name

---
 packages/framework/tests/Feature/StaticSiteServiceTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index a3d0780c609..9172495f20b 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -78,7 +78,7 @@ public function testBuildCommandTransfersMediaAssetFilesRecursively()
         $this->assertFileEquals(Hyde::path('_media/foo/img.png'), Hyde::path('_site/media/foo/img.png'));
     }
 
-    public function testBuildCommandCreatesNeededDirectoriesRecursively()
+    public function testBuildCommandCreatesNeededMediaDirectoriesRecursively()
     {
         $this->directory('_media/foo/bar');
         $this->file('_media/1.png');

From 0909f304fe8da491164cd92d93262b107c6dd6a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:46:18 +0200
Subject: [PATCH 327/328] Skip when there are no media files to transfer

---
 .../Actions/PreBuildTasks/TransferMediaAssets.php   |  4 ++++
 .../tests/Feature/StaticSiteServiceTest.php         | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index e7a3e7bc160..d694e93999a 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -18,6 +18,10 @@ public function handle(): void
     {
         $this->newLine();
 
+        if (MediaFile::all()->isEmpty()) {
+            $this->skip("No media files to transfer.\n");
+        }
+
         $this->withProgressBar(MediaFile::all(), function (MediaFile $file): void {
             $sitePath = $file->getOutputPath();
             $this->needsParentDirectory($sitePath);
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 9172495f20b..580139033ba 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -95,6 +95,19 @@ public function testBuildCommandCreatesNeededMediaDirectoriesRecursively()
         $this->assertFileExists(Hyde::path('_site/media/foo/bar/3.png'));
     }
 
+    public function testBuildCommandSkipsMediaTransferWhenThereAreNoAssets()
+    {
+        rename(Hyde::path('_media/app.css'), Hyde::path('_media/app.css.bak'));
+
+        $this->artisan('build')
+            ->expectsOutputToContain('Transferring Media Assets... ')
+            ->expectsOutputToContain('Skipped')
+            ->expectsOutputToContain('> No media files to transfer.')
+            ->assertExitCode(0);
+
+        rename(Hyde::path('_media/app.css.bak'), Hyde::path('_media/app.css'));
+    }
+
     public function testAllPageTypesCanBeCompiled()
     {
         $this->file('_pages/html.html');

From 1a7785439f1e1e5f5c8eab6627602bacba2023b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 6 Oct 2024 21:53:43 +0200
Subject: [PATCH 328/328] Add experimental way to customize the written asset
 contents

See https://github.com/hydephp/develop/pull/1904#issuecomment-2394582406
---
 .../Framework/Actions/PreBuildTasks/TransferMediaAssets.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index d694e93999a..05dda5e7c00 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Actions\PreBuildTasks;
 
+use Hyde\Facades\Filesystem;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Features\BuildTasks\PreBuildTask;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
@@ -25,7 +26,7 @@ public function handle(): void
         $this->withProgressBar(MediaFile::all(), function (MediaFile $file): void {
             $sitePath = $file->getOutputPath();
             $this->needsParentDirectory($sitePath);
-            copy($file->getAbsolutePath(), $sitePath);
+            Filesystem::putContents($sitePath, $file->getContents());
         });
 
         $this->newLine();