FilesystemMapper: returns only existing files

src/Assets/Asset.php

@@ -20,9 +20,4 @@ public function getUrl(): string;
 	 * Shortcut for getUrl()
 	 */
 	public function __toString(): string;
-
-	/**
-	 * Checks if the asset file exists in the filesystem.
-	 */
-	public function exists(): bool;
 }

src/Assets/FilesystemMapper.php

@@ -27,14 +27,17 @@ public function __construct(string $baseUrl, string $basePath, array $extensions
 	/**
 	 * Returns asset instance for given reference.
 	 */
-	public function getAsset(string $reference, array $options = []): FileAsset
+	public function getAsset(string $reference, array $options = []): ?FileAsset
 	{
 		Helpers::checkOptions($options);
 		$path = $this->resolvePath($reference);
-		$ext = $this->extensions && !is_file($path)
+		$path .= $ext = $this->extensions && !is_file($path)
 			? $this->findExtension($path)
 			: '';
-		return new FileAsset($this->buildUrl($reference . $ext, $options), $path . $ext);
+
+		return is_file($path)
+			? new FileAsset($this->buildUrl($reference . $ext, $options), $path)
+			: null;
 	}
 
 

src/Assets/Mapper.php

@@ -14,5 +14,5 @@ interface Mapper
 	/**
 	 * Returns asset instance for given reference.
 	 */
-	public function getAsset(string $reference, array $options = []): Asset;
+	public function getAsset(string $reference, array $options = []): ?Asset;
 }

src/Assets/Registry.php

@@ -48,10 +48,10 @@ public function getMapper(string $id = ''): Mapper
 	/**
 	 * Returns asset instance for given mapper-qualified reference.
 	 */
-	public function getAsset(string $qualifiedRef, array $options = []): Asset
+	public function getAsset(string $qualifiedRef, array $options = []): ?Asset
 	{
 		$cacheKey = $qualifiedRef . ($options ? '?' . http_build_query($options) : '');
-		if (isset($this->cache[$cacheKey])) {
+		if (array_key_exists($cacheKey, $this->cache)) {
 			return $this->cache[$cacheKey];
 		}
 

tests/Assets/FilesystemMapper.phpt

@@ -16,7 +16,6 @@ test('Basic mapper functionality', function () {
 
 	Assert::same('http://example.com/assets/test.txt?v=2700000000', $asset->getUrl());
 	Assert::same(__DIR__ . '/fixtures/test.txt', $asset->getPath());
-	Assert::true($asset->exists());
 });
 
 test('URL without trailing slash', function () {
@@ -28,10 +27,7 @@ test('URL without trailing slash', function () {
 
 test('Non-existent file version handling', function () {
 	$mapper = new FilesystemMapper('http://example.com/assets', __DIR__ . '/fixtures');
-	$asset = $mapper->getAsset('missing.txt');
-
-	Assert::same('http://example.com/assets/missing.txt', $asset->getUrl());
-	Assert::false($asset->exists());
+	Assert::null($mapper->getAsset('missing.txt'));
 });
 
 test('Mandatory extension autodetection', function () {
@@ -43,19 +39,12 @@ test('Mandatory extension autodetection', function () {
 
 	$exact = $mapper->getAsset('image.gif');
 	Assert::match('http://example.com/assets/image.gif?v=%d%', $exact->getUrl());
-	Assert::true($exact->exists());
 
 	$gif = $mapper->getAsset('image');
 	Assert::match('http://example.com/assets/image.gif?v=%d%', $gif->getUrl());
-	Assert::true($gif->exists());
-
-	$notFound = $mapper->getAsset('missing');
-	Assert::same('http://example.com/assets/missing.gif', $notFound->getUrl());
-	Assert::false($notFound->exists());
 
-	$subdir = $mapper->getAsset('subdir');
-	Assert::same('http://example.com/assets/subdir.gif', $subdir->getUrl());
-	Assert::false($subdir->exists());
+	Assert::null($mapper->getAsset('missing'));
+	Assert::null($mapper->getAsset('subdir'));
 });
 
 test('Optional extension autodetection', function () {
@@ -67,11 +56,8 @@ test('Optional extension autodetection', function () {
 
 	$gif = $mapper->getAsset('image');
 	Assert::match('http://example.com/assets/image.gif?v=%d%', $gif->getUrl());
-	Assert::true($gif->exists());
 
-	$notFound = $mapper->getAsset('missing');
-	Assert::same('http://example.com/assets/missing', $notFound->getUrl());
-	Assert::false($notFound->exists());
+	Assert::null($mapper->getAsset('missing'));
 });
 
 test('Option validation', function () {