enforced mimetype

Signed-off-by: Bruno Meilick <b@bnomei.com>
bnomei · Aug 19, 2019 · 0ffbeb8 · 0ffbeb8
1 parent 86e6f3c
commit 0ffbeb8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/classes/Feed.php b/classes/Feed.php
@@ -140,12 +140,14 @@ public function response(): \Kirby\Http\Response
         $mime = \Kirby\Toolkit\A::get($this->options, 'mime');
         $snippet = \Kirby\Toolkit\A::get($this->options, 'snippet');
 
-        if ($mime && in_array($mime, array_values(\Kirby\Toolkit\Mime::types()))) {
+        $allMimeTypes = \Kirby\Toolkit\Mime::types();
+        $mime = array_search($mime, $allMimeTypes);
+        if ($mime !== false) {
             return new \Kirby\Http\Response($this->string, $mime);
         } elseif ($snippet === 'feed/json' || \Bnomei\Feed::isJson($this->string)) {
-            return new \Kirby\Http\Response($this->string, 'application/json');
+            return new \Kirby\Http\Response($this->string, 'json');
         } elseif ($snippet === 'feed/rss' || \Bnomei\Feed::isXml($this->string)) {
-            return new \Kirby\Http\Response($this->string, 'application/rss+xml');
+            return new \Kirby\Http\Response($this->string, 'rss');
         }
         return new \Kirby\Http\Response('Error: Feed Response', null, 500);
     }

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "bnomei/kirby3-feed",
   "type": "kirby-plugin",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Generate a RSS/JSON-Feed from a Pages-Collection",
   "license": "MIT",
   "authors": [

diff --git a/index.php b/index.php
@@ -14,7 +14,9 @@
     ],
     'pagesMethods' => [ // PAGES not PAGE
         'feed' => function ($options = [], $force = null) {
-            return \Bnomei\Feed::feed($this, $options, $force);
+            $response = \Bnomei\Feed::feed($this, $options, $force);
+            kirby()->response()->type($response->type());
+            return $response;
         },
     ],
 ]);
diff --git a/tests/FeedTest.php b/tests/FeedTest.php
@@ -97,7 +97,7 @@ public function testForcedMime()
             [
                 'feedurl' => '/feed-yaml',
                 'snippet' => 'feed/yaml',
-                'mime' => 'text/plain', // TODO: application/yaml is missing in kirby
+                'mime' => 'text/html',
             ]
         );
         $yamlString = $feed->stringFromSnippet(true)->getString();
@@ -108,7 +108,7 @@ public function testForcedMime()
         $this->assertCount(11, $yaml['items']);
 
         $response = $feed->response();
-        $this->assertTrue($response->type() === 'text/plain');
+        $this->assertTrue($response->type() === 'text/html');
     }
 
     public function testInvalidOptions()

diff --git a/tests/IndexTest.php b/tests/IndexTest.php
@@ -36,8 +36,5 @@ public function testFindsFeedRouteYAML()
         $response = kirby()->render('/feed-yaml');
         $this->assertIsInt($response->code(), 200);
         $this->assertTrue('text/html' === $response->type());
-
-        // TODO: kirby render sends text/html and not type set by plugin
-        $this->assertFalse('text/plain' === $response->type());
     }
 }