#4

and psr-2

Author: bnomei

README.md

@@ -57,6 +57,9 @@ return [
 
 ## Settings
 
+**mime**
+- default: `null` to autodetect json or rss-xml otherwise enforce output with a certain [mime type](https://github.com/k-next/kirby/blob/master/src/Toolkit/Mime.php)
+
 **expires**
 - default: `60*24*7` in minutes
 

classes/feed.php

@@ -18,11 +18,13 @@ private static function cache(): \Kirby\Cache\Cache
         return static::$cache;
     }
 
-    public static function flush() {
+    public static function flush()
+    {
         return static::cache()->flush();
     }
 
-    public static function isJson($string) {
+    public static function isJson($string)
+    {
         json_decode($string);
         return (json_last_error() == JSON_ERROR_NONE);
     }
@@ -43,17 +45,18 @@ public static function isXml($content)
         return empty($errors);
     }
 
-    public static function feed($pages, $options = [], $force = null) {
-        if($force == null && option('debug') && option('bnomei.feed.debugforce')) {
+    public static function feed($pages, $options = [], $force = null)
+    {
+        if ($force == null && option('debug') && option('bnomei.feed.debugforce')) {
             $force = true;
         }
         $key = [];
-        foreach($pages as $p) {
+        foreach ($pages as $p) {
             $key[] = $p->modified();
         }
         $key = md5(\implode(',', $key));
         $response = $force ? null : static::cache()->get($key);
-        if(!$response) {
+        if (!$response) {
             $snippet = \Kirby\Toolkit\A::get($options, 'snippet', 'feed/rss');
             $response = snippet($snippet, static::data($pages, $options), true);
             static::cache()->set(
@@ -65,8 +68,8 @@ public static function feed($pages, $options = [], $force = null) {
         return $response;
     }
 
-    public static function data($pages, $options = []) {
-
+    public static function data($pages, $options = [])
+    {
         $defaults = array(
             'url'         => site()->url(),
             'title'       => 'Feed',

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby3-feed",
     "type": "plugin",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "Generate a RSS/JSON-Feed from a Pages-Collection",
     "license": "MIT",
     "autoload": {

config.php

@@ -5,6 +5,7 @@
         'cache' => true,
         'debugforce' => true,
         'expires' => (60*24*7), // minutes
+        'mime' => null,
     ],
     'snippets' => [
         'feed/rss' => __DIR__ . '/snippets/feed/rss.php',
@@ -13,12 +14,15 @@
     'pagesMethods' => [ // PAGES not PAGE
         'feed' => function ($options = [], $force = null) {
             $string = \Bnomei\Feed::feed($this, $options, $force);
+            $mime = option('bnomei.feed.mime');
+            $snippet = \Kirby\Toolkit\A::get($options, 'snippet');
 
-            if(\Bnomei\Feed::isJson($string)) {
+            if ($mime) {
+                return new Response($string, $mime);
+            } elseif ($snippet == 'feed/json' || \Bnomei\Feed::isJson($string)) {
                 return new Response($string, 'application/json');
-
-            } else if (\Bnomei\Feed::isXml($string)) {
-                return new Response($string, 'text/xml');
+            } elseif ($snippet == 'feed/rss' || \Bnomei\Feed::isXml($string)) {
+                return new Response($string, 'application/rss+xml');
             }
             return $return;
         },

snippets/feed/json.php

@@ -1,7 +1,5 @@
 <?php
 
-    header('Content-Type:application/json; charset=utf-8');
-
     $pages = $items;
     $items = [];
     foreach ($pages as $item) {

snippets/feed/rss.php

@@ -1,11 +1,4 @@
-<?php
-
-use \Kirby\Toolkit\XML;
-
-header('Content-Type:text/xml; charset=utf-8');
-
-?>
-<?xml version="1.0" encoding="utf-8"?>
+<?php use \Kirby\Toolkit\XML; ?><?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
 
   <channel>