Skip to content

Commit ad0adaf

Browse files
committed
Fix duplicate extension being added.
1 parent 8f006f2 commit ad0adaf

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/Server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private function handle(string $method, string $path, $contents, $request): Resp
247247
}
248248
}
249249

250-
if (isset($extensions[$contentType])) {
250+
if (isset($extensions[$contentType]) && ! str_ends_with($filename, $extensions[$contentType])) {
251251
$filename .= $extensions[$contentType];
252252
}
253253

tests/unit/ServerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ public static function provideSlugs()
179179
{
180180
return [
181181
// '' => [$slug, $mimetype, $expectedFilename],
182-
'Slug with json extension, with ld+json MIME' => ['Mock Slug.json', 'application/ld+json', 'Mock Slug.json.json'],
182+
'Slug with json extension, with ld+json MIME' => ['Mock Slug.json', 'application/ld+json', 'Mock Slug.json'],
183183
'Slug with jsonld extension, with ld+json MIME)' => ['Mock Slug.jsonld', 'application/ld+json', 'Mock Slug.jsonld.json'],
184-
'Slug with PNG extension, with PNG MIME' => ['Mock Slug.png', 'image/png', 'Mock Slug.png.png'],
184+
'Slug with PNG extension, with PNG MIME' => ['Mock Slug.png', 'image/png', 'Mock Slug.png'],
185185
'Slug with some other, extension) with Turtle MIME' => ['Mock Slug.other', 'text/turtle', 'Mock Slug.other.ttl'],
186186
'Slug with Turtle extension, with other MIME' => ['Mock Slug.ttl', 'some/other', 'Mock Slug.ttl'],
187-
'Slug with Turtle extension, with Turtle MIME' => ['Mock Slug.ttl', 'text/turtle', 'Mock Slug.ttl.ttl'],
187+
'Slug with Turtle extension, with Turtle MIME' => ['Mock Slug.ttl', 'text/turtle', 'Mock Slug.ttl'],
188188
'Slug without extension), with some other MIME' => ['Mock Slug', 'some/other', 'Mock Slug'],
189189
'Slug without extension), with turtle MIME' => ['Mock Slug', 'text/turtle', 'Mock Slug.ttl'],
190190
];

0 commit comments

Comments
 (0)