From 56b2ed6c7db60405292c532b1d10ee81749cf897 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 29 Feb 2016 19:50:35 +0100
Subject: [PATCH 001/188] Allow manual plugin loading

---
 lib/Pico.php | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 4ad1c3b..b49c7c5 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -383,6 +383,7 @@ class Pico
      * - 60 to 79: Plugins hooking into template or markdown parsing
      * - 80 to 99: Plugins using the `onPageRendered` event
      *
+     * @see    Pico::loadPlugin()
      * @see    Pico::getPlugin()
      * @see    Pico::getPlugins()
      * @return void
@@ -404,11 +405,52 @@ class Pico
                 $this->plugins[$className] = $plugin;
             } else {
                 // TODO: breaks backward compatibility
-                //throw new RuntimeException("Unable to load plugin '".$className."'");
+                //throw new RuntimeException("Unable to load plugin '" . $className . "'");
             }
         }
     }
 
+    /**
+     * Manually loads a plugin
+     *
+     * Manually loaded plugins must implement {@see PicoPluginInterface}.
+     *
+     * @see    Pico::loadPlugins()
+     * @see    Pico::getPlugin()
+     * @see    Pico::getPlugins()
+     * @param  PicoPluginInterface|string $plugin either the class name of a
+     *     plugin to instantiate or a plugin instance
+     * @return PicoPluginInterface                instance of the loaded plugin
+     * @throws RuntimeException                   thrown when a plugin couldn't
+     *     be loaded
+     */
+    public function loadPlugin($plugin)
+    {
+        if (!is_object($plugin)) {
+            $className = (string) $plugin;
+            if (class_exists($className)) {
+                $plugin = new $className($this);
+            } else {
+                throw new RuntimeException("Unable to load plugin '" . $className . "'");
+            }
+        }
+
+        $className = get_class($plugin);
+        if (!is_a($plugin, 'PicoPluginInterface')) {
+            throw new RuntimeException(
+                "Manually loaded plugins must implement 'PicoPluginInterface', "
+                . "'" . $className . "' given"
+            );
+        }
+
+        if ($this->plugins === null) {
+            $this->plugins = array();
+        }
+        $this->plugins[$className] = $plugin;
+
+        return $plugin;
+    }
+
     /**
      * Returns the instance of a named plugin
      *

From 5a9c02f7bf6466c02458311eb16545c17ebc945e Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 29 Feb 2016 19:51:06 +0100
Subject: [PATCH 002/188] Allow plugins to trigger events

You MUST NOT trigger events of Pico's core through a plugin!
---
 lib/Pico.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index b49c7c5..a0cb75f 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1382,6 +1382,7 @@ class Pico
      *
      * Deprecated events (as used by plugins not implementing
      * {@link PicoPluginInterface}) are triggered by {@link PicoDeprecated}.
+     * You MUST NOT trigger events of Pico's core through a plugin!
      *
      * @see    PicoPluginInterface
      * @see    AbstractPicoPlugin
@@ -1390,7 +1391,7 @@ class Pico
      * @param  array  $params    optional parameters to pass
      * @return void
      */
-    protected function triggerEvent($eventName, array $params = array())
+    public function triggerEvent($eventName, array $params = array())
     {
         if (!empty($this->plugins)) {
             foreach ($this->plugins as $plugin) {

From 86614a3ab40b4ececa3dadba22de16184a44750b Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 2 Mar 2016 21:40:58 +0100
Subject: [PATCH 003/188] Default theme: Use flexbox to grow content div

---
 themes/default/style.css | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/themes/default/style.css b/themes/default/style.css
index a8c0030..9073349 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -211,6 +211,17 @@ blockquote {
 
 /* Structure Styles
 /*---------------------------------------------*/
+body {
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+    height: 100%;
+}
+body > * {
+    flex: none;
+    width: 100%;
+}
+
 .inner {
     width: 850px;
     margin: 0 auto;
@@ -262,6 +273,9 @@ blockquote {
     display: inline-block;
     float: left;
 }
+#content {
+    flex: 1 0 auto;
+}
 #footer {
     background: #707070;
     padding: 60px 0;

From a3fa373119c12cae834bcfab758a11b036234c76 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 2 Mar 2016 21:44:38 +0100
Subject: [PATCH 004/188] Default theme: Move elements into Twig blocks

Allows plugins to extend the default template
---
 themes/default/index.twig | 90 +++++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/themes/default/index.twig b/themes/default/index.twig
index 37f8f16..1b9f2ce 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -1,51 +1,67 @@
 <!DOCTYPE html>
-<html lang="en" class="no-js">
+<html class="no-js">
 <head>
     <meta charset="utf-8" />
 
-    <title>{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}</title>
-    {% if meta.description %}
-        <meta name="description" content="{{ meta.description|striptags }}">
-    {% endif %}{% if meta.robots %}
-        <meta name="robots" content="{{ meta.robots }}">
-    {% endif %}
+    {% block documentHeader %}
+        <title>{% block title %}{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}{% endblock %}</title>
+        {% if meta.description %}
+            <meta name="description" content="{{ meta.description|striptags }}">
+        {% endif %}{% if meta.robots %}
+            <meta name="robots" content="{{ meta.robots }}">
+        {% endif %}
+    {% endblock %}
 
-    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" type="text/css" />
-    <link rel="stylesheet" href="{{ theme_url }}/style.css" type="text/css" />
+    {% block stylesheets %}
+        <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" type="text/css" />
+        <link rel="stylesheet" href="{{ theme_url }}/style.css" type="text/css" />
+    {% endblock %}
 
-    <script src="{{ theme_url }}/scripts/modernizr-2.6.1.min.js"></script>
+    {% block javascript %}
+        <script src="{{ theme_url }}/scripts/modernizr-2.6.1.min.js"></script>
+    {% endblock %}
 </head>
 <body>
 
-    <header id="header">
-        <div class="inner clearfix">
-            <h1><a href="{{ "index"|link }}" id="logo">{{ site_title }}</a></h1>
-            <nav>
-                <a href="#" class="menu-icon"></a>
-                <ul>
-                    {% for page in pages if page.title %}
-                        <li{% if page.id == current_page.id %} class="active"{% endif %}>
-                            <a href="{{ page.url }}">{{ page.title }}</a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </nav>
-        </div>
-    </header>
+    {% block pageHeader %}
+        <header id="header">
+            <div class="inner clearfix">
+                <h1><a href="{{ "index"|link }}" id="logo">{{ site_title }}</a></h1>
+                {% block header %}
+                    <nav>
+                        <a href="#" class="menu-icon"></a>
+                        <ul>
+                            {% for page in pages if page.title %}
+                                <li{% if page.id == current_page.id %} class="active"{% endif %}>
+                                    <a href="{{ page.url }}">{{ page.title }}</a>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </nav>
+                {% endblock %}
+            </div>
+        </header>
+    {% endblock %}
 
-    <section id="content">
-        <div class="inner">
-            {{ content }}
-        </div>
-    </section>
+    {% block pageContent %}
+        <section id="content">
+            <div class="inner">
+                {% block content content %}
+            </div>
+        </section>
+    {% endblock %}
 
-    <footer id="footer">
-        <div class="inner">
-            <a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
-            and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
-            Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
-        </div>
-    </footer>
+    {% block pageFooter %}
+        <footer id="footer">
+            <div class="inner">
+                {% block footer %}
+                    <a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
+                    and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
+                    Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
+                {% endblock %}
+            </div>
+        </footer>
+    {% endblock %}
 
 </body>
 </html>

From 1709b920d17ba685e200405dcc8b9cb221a35e61 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 2 Mar 2016 21:46:35 +0100
Subject: [PATCH 005/188] Add AbstractPicoPlugin::getPluginConfig() method

---
 lib/AbstractPicoPlugin.php | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 4ee337e..68587f0 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -74,9 +74,9 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
             if ($pluginEnabled !== null) {
                 $this->setEnabled($pluginEnabled);
             } else {
-                $pluginConfig = $this->getConfig(get_called_class());
-                if (is_array($pluginConfig) && isset($pluginConfig['enabled'])) {
-                    $this->setEnabled($pluginConfig['enabled']);
+                $pluginEnabled = $this->getPluginConfig('enabled');
+                if ($pluginEnabled !== null) {
+                    $this->setEnabled($pluginEnabled);
                 } elseif ($this->enabled) {
                     // make sure dependencies are already fulfilled,
                     // otherwise the plugin needs to be enabled manually
@@ -135,6 +135,29 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
         return $this->pico;
     }
 
+    /**
+     * Returns either the value of the specified plugin config variable or
+     * the config array
+     *
+     * @param  string $configName optional name of a config variable
+     * @return mixed              returns either the value of the named plugin
+     *     config variable, null if the config variable doesn't exist or the
+     *     plugin's config array if no config name was supplied
+     */
+    protected function getPluginConfig($configName = null)
+    {
+        $pluginConfig = $this->getConfig(get_called_class());
+        if ($pluginConfig) {
+            if ($configName === null) {
+                return $pluginConfig;
+            } elseif (isset($pluginConfig[$configName])) {
+                return $pluginConfig[$configName];
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Passes all not satisfiable method calls to Pico
      *

From 2a3e2fa5769cd901ff9057433924836be83b3586 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 2 Mar 2016 22:10:49 +0100
Subject: [PATCH 006/188] Fix typos in class docs/exception messages

---
 lib/Pico.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index a0cb75f..00f9e9e 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -405,7 +405,13 @@ class Pico
                 $this->plugins[$className] = $plugin;
             } else {
                 // TODO: breaks backward compatibility
-                //throw new RuntimeException("Unable to load plugin '" . $className . "'");
+                /*
+                $pluginFileName = substr($pluginFile, strlen($this->getPluginsDir()));
+                throw new RuntimeException(
+                    "Unable to load plugin '" . $className . "' "
+                    . "from '" . $pluginFileName . "'"
+                );
+                */
             }
         }
     }
@@ -431,15 +437,15 @@ class Pico
             if (class_exists($className)) {
                 $plugin = new $className($this);
             } else {
-                throw new RuntimeException("Unable to load plugin '" . $className . "'");
+                throw new RuntimeException("Unable to load plugin '" . $className . "':  Class not found");
             }
         }
 
         $className = get_class($plugin);
         if (!is_a($plugin, 'PicoPluginInterface')) {
             throw new RuntimeException(
-                "Manually loaded plugins must implement 'PicoPluginInterface', "
-                . "'" . $className . "' given"
+                "Unable to load plugin '" . $className . "': "
+                . "Manually loaded plugins must implement 'PicoPluginInterface'"
             );
         }
 
@@ -1382,7 +1388,7 @@ class Pico
      *
      * Deprecated events (as used by plugins not implementing
      * {@link PicoPluginInterface}) are triggered by {@link PicoDeprecated}.
-     * You MUST NOT trigger events of Pico's core through a plugin!
+     * You MUST NOT trigger events of Pico's core with a plugin!
      *
      * @see    PicoPluginInterface
      * @see    AbstractPicoPlugin

From 43705d0f76eb87cb91072a527983f0ce28b39da6 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2016 00:29:40 +0100
Subject: [PATCH 007/188] Minor code refactoring

---
 lib/Pico.php | 54 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index ea4c157..025b537 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -657,8 +657,11 @@ class Pico
      */
     protected function discoverRequestFile()
     {
+        $contentDir = $this->getConfig('content_dir');
+        $contentExt = $this->getConfig('content_ext');
+
         if (empty($this->requestUrl)) {
-            $this->requestFile = $this->getConfig('content_dir') . 'index' . $this->getConfig('content_ext');
+            $this->requestFile = $contentDir . 'index' . $contentExt;
         } else {
             // prevent content_dir breakouts using malicious request URLs
             // we don't use realpath() here because we neither want to check for file existance
@@ -680,24 +683,24 @@ class Pico
             }
 
             if (empty($requestFileParts)) {
-                $this->requestFile = $this->getConfig('content_dir') . 'index' . $this->getConfig('content_ext');
+                $this->requestFile = $contentDir . 'index' . $contentExt;
                 return;
             }
 
             // discover the content file to serve
             // Note: $requestFileParts neither contains a trailing nor a leading slash
-            $this->requestFile = $this->getConfig('content_dir') . implode('/', $requestFileParts);
+            $this->requestFile = $contentDir . implode('/', $requestFileParts);
             if (is_dir($this->requestFile)) {
                 // if no index file is found, try a accordingly named file in the previous dir
                 // if this file doesn't exist either, show the 404 page, but assume the index
                 // file as being requested (maintains backward compatibility to Pico < 1.0)
-                $indexFile = $this->requestFile . '/index' . $this->getConfig('content_ext');
-                if (file_exists($indexFile) || !file_exists($this->requestFile . $this->getConfig('content_ext'))) {
+                $indexFile = $this->requestFile . '/index' . $contentExt;
+                if (file_exists($indexFile) || !file_exists($this->requestFile . $contentExt)) {
                     $this->requestFile = $indexFile;
                     return;
                 }
             }
-            $this->requestFile .= $this->getConfig('content_ext');
+            $this->requestFile .= $contentExt;
         }
     }
 
@@ -737,25 +740,26 @@ class Pico
     {
         $contentDir = $this->getConfig('content_dir');
         $contentDirLength = strlen($contentDir);
+        $contentExt = $this->getConfig('content_ext');
 
         if (substr($file, 0, $contentDirLength) === $contentDir) {
             $errorFileDir = substr($file, $contentDirLength);
 
             while ($errorFileDir !== '.') {
                 $errorFileDir = dirname($errorFileDir);
-                $errorFile = $errorFileDir . '/404' . $this->getConfig('content_ext');
+                $errorFile = $errorFileDir . '/404' . $contentExt;
 
-                if (file_exists($this->getConfig('content_dir') . $errorFile)) {
-                    return $this->loadFileContent($this->getConfig('content_dir') . $errorFile);
+                if (file_exists($contentDir . $errorFile)) {
+                    return $this->loadFileContent($contentDir . $errorFile);
                 }
             }
-        } elseif (file_exists($this->getConfig('content_dir') . '404' . $this->getConfig('content_ext'))) {
+        } elseif (file_exists($contentDir . '404' . $contentExt)) {
             // provided that the requested file is not in the regular
             // content directory, fallback to Pico's global `404.md`
-            return $this->loadFileContent($this->getConfig('content_dir') . '404' . $this->getConfig('content_ext'));
+            return $this->loadFileContent($contentDir . '404' . $contentExt);
         }
 
-        $errorFile = $this->getConfig('content_dir') . '404' . $this->getConfig('content_ext');
+        $errorFile = $contentDir . '404' . $contentExt;
         throw new RuntimeException('Required "' . $errorFile . '" not found');
     }
 
@@ -989,25 +993,30 @@ class Pico
      */
     protected function readPages()
     {
+        $contentDir = $this->getConfig('content_dir');
+        $contentDirLength = strlen($contentDir);
+        $contentExt = $this->getConfig('content_ext');
+        $contentExtLength = strlen($contentExt);
+
         $this->pages = array();
-        $files = $this->getFiles($this->getConfig('content_dir'), $this->getConfig('content_ext'), Pico::SORT_NONE);
+        $files = $this->getFiles($contentDir, $contentExt, Pico::SORT_NONE);
         foreach ($files as $i => $file) {
             // skip 404 page
-            if (basename($file) === '404' . $this->getConfig('content_ext')) {
+            if (basename($file) === '404' . $contentExt) {
                 unset($files[$i]);
                 continue;
             }
 
-            $id = substr($file, strlen($this->getConfig('content_dir')), -strlen($this->getConfig('content_ext')));
+            $id = substr($file, $contentDirLength, -$contentExtLength);
 
             // drop inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists)
-            $conflictFile = $this->getConfig('content_dir') . $id . '/index' . $this->getConfig('content_ext');
+            $conflictFile = $contentDir . $id . '/index' . $contentExt;
             if (in_array($conflictFile, $files, true)) {
                 continue;
             }
 
             $url = $this->getPageUrl($id);
-            if ($file != $this->requestFile) {
+            if ($file !== $this->requestFile) {
                 $rawContent = file_get_contents($file);
 
                 $headers = $this->getMetaHeaders();
@@ -1126,8 +1135,7 @@ class Pico
             return;
         }
 
-        $contentExt = $this->getConfig('content_ext');
-        $currentPageId = substr($this->requestFile, $contentDirLength, -strlen($contentExt));
+        $currentPageId = substr($this->requestFile, $contentDirLength, -strlen($this->getConfig('content_ext')));
         $currentPageIndex = array_search($currentPageId, $pageIds);
         if ($currentPageIndex !== false) {
             $this->currentPage = &$this->pages[$currentPageId];
@@ -1287,7 +1295,7 @@ class Pico
             $protocol . "://" . $_SERVER['HTTP_HOST']
             . rtrim(dirname($_SERVER['SCRIPT_NAME']), '/\\') . '/';
 
-        return $this->getConfig('base_url');
+        return $this->config['base_url'];
     }
 
     /**
@@ -1303,7 +1311,7 @@ class Pico
         }
 
         $this->config['rewrite_url'] = (isset($_SERVER['PICO_URL_REWRITING']) && $_SERVER['PICO_URL_REWRITING']);
-        return $this->getConfig('rewrite_url');
+        return $this->config['rewrite_url'];
     }
 
     /**
@@ -1363,7 +1371,7 @@ class Pico
             foreach ($files as $file) {
                 // exclude hidden files/dirs starting with a .; this also excludes the special dirs . and ..
                 // exclude files ending with a ~ (vim/nano backup) or # (emacs backup)
-                if ((substr($file, 0, 1) === '.') || in_array(substr($file, -1), array('~', '#'))) {
+                if (($file[0] === '.') || in_array(substr($file, -1), array('~', '#'))) {
                     continue;
                 }
 
@@ -1394,7 +1402,7 @@ class Pico
                 $path = $this->getRootDir() . $path;
             }
         } else {
-            if (substr($path, 0, 1) !== '/') {
+            if ($path[0] !== '/') {
                 $path = $this->getRootDir() . $path;
             }
         }

From 479926eeb46bb6eedc0f908d05456e6557400b90 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2016 00:38:51 +0100
Subject: [PATCH 008/188] Add Pico::VERSION constant

---
 content-sample/index.md |  4 ++--
 lib/Pico.php            | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/content-sample/index.md b/content-sample/index.md
index 209369b..b1c8529 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -5,8 +5,8 @@ Description: Pico is a stupidly simple, blazing fast, flat file CMS.
 
 ## Welcome to Pico
 
-Congratulations, you have successfully installed [Pico](http://picocms.org/).
-%meta.description% <!-- replaced by the above Description meta header -->
+Congratulations, you have successfully installed [Pico](http://picocms.org/)
+%version%. %meta.description% <!-- replaced by the above Description header -->
 
 ## Creating Content
 
diff --git a/lib/Pico.php b/lib/Pico.php
index 025b537..df494d4 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -26,6 +26,13 @@
  */
 class Pico
 {
+    /**
+     * Pico version
+     *
+     * @var string
+     */
+    const VERSION = '1.1.0-dev';
+
     /**
      * Sort files in alphabetical ascending order
      *
@@ -907,6 +914,9 @@ class Pico
             . "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s";
         $content = preg_replace($metaHeaderPattern, '', $rawContent, 1);
 
+        // replace %version%
+        $content = str_replace('%version%', static::VERSION, $content);
+
         // replace %site_title%
         $content = str_replace('%site_title%', $this->getConfig('site_title'), $content);
 
@@ -1267,6 +1277,7 @@ class Pico
             'current_page' => $this->currentPage,
             'next_page' => $this->nextPage,
             'is_front_page' => ($this->requestFile === $frontPage),
+            'version' => static::VERSION
         );
     }
 

From 245cd15770fc678c3b1990741ba93d01e9beb0f3 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2016 00:49:45 +0100
Subject: [PATCH 009/188] Refactor Pico::prepareFileContent() for better
 performance

---
 lib/Pico.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index df494d4..1f4d0eb 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -915,38 +915,36 @@ class Pico
         $content = preg_replace($metaHeaderPattern, '', $rawContent, 1);
 
         // replace %version%
-        $content = str_replace('%version%', static::VERSION, $content);
+        $variables['%version%'] = static::VERSION;
 
         // replace %site_title%
-        $content = str_replace('%site_title%', $this->getConfig('site_title'), $content);
+        $variables['%site_title%'] = $this->getConfig('site_title');
 
         // replace %base_url%
         if ($this->isUrlRewritingEnabled()) {
             // always use `%base_url%?sub/page` syntax for internal links
             // we'll replace the links accordingly, depending on enabled rewriting
-            $content = str_replace('%base_url%?', $this->getBaseUrl(), $content);
+            $variables['%base_url%?'] = $this->getBaseUrl();
         } else {
             // actually not necessary, but makes the URL look a little nicer
-            $content = str_replace('%base_url%?', $this->getBaseUrl() . '?', $content);
+            $variables['%base_url%?'] = $this->getBaseUrl() . '?';
         }
-        $content = str_replace('%base_url%', rtrim($this->getBaseUrl(), '/'), $content);
+        $variables['%base_url%'] = rtrim($this->getBaseUrl(), '/');
 
         // replace %theme_url%
         $themeUrl = $this->getBaseUrl() . basename($this->getThemesDir()) . '/' . $this->getConfig('theme');
-        $content = str_replace('%theme_url%', $themeUrl, $content);
+        $variables['%theme_url%'] = $themeUrl;
 
         // replace %meta.*%
         if (!empty($meta)) {
-            $metaKeys = $metaValues = array();
             foreach ($meta as $metaKey => $metaValue) {
                 if (is_scalar($metaValue) || ($metaValue === null)) {
-                    $metaKeys[] = '%meta.' . $metaKey . '%';
-                    $metaValues[] = strval($metaValue);
+                    $variables['%meta.' . $metaKey . '%'] = strval($metaValue);
                 }
             }
-            $content = str_replace($metaKeys, $metaValues, $content);
         }
 
+        $content = str_replace(array_keys($variables), $variables, $content);
         return $content;
     }
 

From 5bb1c325ff1229f0114dca3796a214c61bebbfc4 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2016 00:54:36 +0100
Subject: [PATCH 010/188] Add onSinglePageLoading event; allow skipping pages
 in onSinglePageLoaded

---
 lib/Pico.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 1f4d0eb..5ab4e7f 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1017,6 +1017,9 @@ class Pico
 
             $id = substr($file, $contentDirLength, -$contentExtLength);
 
+            // trigger onSinglePageLoading event
+            $this->triggerEvent('onSinglePageLoading', array(&$id));
+
             // drop inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists)
             $conflictFile = $contentDir . $id . '/index' . $contentExt;
             if (in_array($conflictFile, $files, true)) {
@@ -1061,10 +1064,12 @@ class Pico
 
             unset($rawContent, $meta);
 
-            // trigger event
+            // trigger onSinglePageLoaded event
             $this->triggerEvent('onSinglePageLoaded', array(&$page));
 
-            $this->pages[$id] = $page;
+            if ($page !== null) {
+                $this->pages[$id] = $page;
+            }
         }
     }
 

From 75d5081bfbe6c9c056e859e2b455c9b44c2e5d6c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2016 20:06:24 +0100
Subject: [PATCH 011/188] Use scope isolated includes for plugins & config

---
 lib/Pico.php                  | 20 ++++++++++++++++++--
 plugins/00-PicoDeprecated.php | 10 +++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 5ab4e7f..10465f2 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -398,10 +398,18 @@ class Pico
      */
     protected function loadPlugins()
     {
+        // scope isolated require_once()
+        $includeClosure = function ($pluginFile) {
+            require_once($pluginFile);
+        };
+        if (PHP_VERSION_ID >= 50400) {
+            $includeClosure = $includeClosure->bindTo(null);
+        }
+
         $this->plugins = array();
         $pluginFiles = $this->getFiles($this->getPluginsDir(), '.php');
         foreach ($pluginFiles as $pluginFile) {
-            require_once($pluginFile);
+            $includeClosure($pluginFile);
 
             $className = preg_replace('/^[0-9]+-/', '', basename($pluginFile, '.php'));
             if (class_exists($className)) {
@@ -508,7 +516,15 @@ class Pico
     {
         $config = null;
         if (file_exists($this->getConfigDir() . 'config.php')) {
-            require($this->getConfigDir() . 'config.php');
+            // scope isolated require()
+            $includeClosure = function ($configFile) {
+                require($configFile);
+            };
+            if (PHP_VERSION_ID >= 50400) {
+                $includeClosure = $includeClosure->bindTo(null);
+            }
+
+            $includeClosure($this->getConfigDir() . 'config.php');
         }
 
         $defaultConfig = array(
diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php
index 1077800..c5d9850 100644
--- a/plugins/00-PicoDeprecated.php
+++ b/plugins/00-PicoDeprecated.php
@@ -165,10 +165,18 @@ class PicoDeprecated extends AbstractPicoPlugin
     protected function loadRootDirConfig(array &$realConfig)
     {
         if (file_exists($this->getRootDir() . 'config.php')) {
+            // scope isolated require()
+            $includeClosure = function ($configFile) {
+                require($configFile);
+            };
+            if (PHP_VERSION_ID >= 50400) {
+                $includeClosure = $includeClosure->bindTo(null);
+            }
+
             // config.php in Pico::$rootDir is deprecated
             // use config.php in Pico::$configDir instead
             $config = null;
-            require($this->getRootDir() . 'config.php');
+            $includeClosure($this->getRootDir() . 'config.php');
 
             if (is_array($config)) {
                 if (isset($config['base_url'])) {

From cd74b681f5dea400bfb28f196230e07560f21af7 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2016 20:47:25 +0100
Subject: [PATCH 012/188] Fix scope isolated config includes

---
 lib/Pico.php                  | 2 +-
 plugins/00-PicoDeprecated.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 10465f2..59e4eae 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -517,7 +517,7 @@ class Pico
         $config = null;
         if (file_exists($this->getConfigDir() . 'config.php')) {
             // scope isolated require()
-            $includeClosure = function ($configFile) {
+            $includeClosure = function ($configFile) use (&$config) {
                 require($configFile);
             };
             if (PHP_VERSION_ID >= 50400) {
diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php
index c5d9850..59600b4 100644
--- a/plugins/00-PicoDeprecated.php
+++ b/plugins/00-PicoDeprecated.php
@@ -165,8 +165,10 @@ class PicoDeprecated extends AbstractPicoPlugin
     protected function loadRootDirConfig(array &$realConfig)
     {
         if (file_exists($this->getRootDir() . 'config.php')) {
+            $config = null;
+
             // scope isolated require()
-            $includeClosure = function ($configFile) {
+            $includeClosure = function ($configFile) use (&$config) {
                 require($configFile);
             };
             if (PHP_VERSION_ID >= 50400) {
@@ -175,7 +177,6 @@ class PicoDeprecated extends AbstractPicoPlugin
 
             // config.php in Pico::$rootDir is deprecated
             // use config.php in Pico::$configDir instead
-            $config = null;
             $includeClosure($this->getRootDir() . 'config.php');
 
             if (is_array($config)) {

From 988a23fd024b065811185fca517939e59d561473 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2016 20:54:58 +0100
Subject: [PATCH 013/188] Modular config: Load config from any
 config/*.config.php

Resolves #330

After loading the `config/config.php`, Pico proceeds with any existing `config/*.config.php` in alphabetical order. The file order is crucial: Config values which has been set already, cannot be overwritten by a succeeding file. This is also true for arrays, i.e. when specifying `$config['test'] = array('foo' => 'bar')` in `config/a.config.php` and `$config['test'] = array('baz' => 42)` in `config/b.config.php`, `$config['test']['baz']` will be undefined
---
 lib/Pico.php | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 59e4eae..25e4938 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -506,7 +506,15 @@ class Pico
     }
 
     /**
-     * Loads the config.php from Pico::$configDir
+     * Loads the config.php and any *.config.php from Pico::$configDir
+     *
+     * After loading the {@path "config/config.php"}, Pico proceeds with any
+     * existing {@path "config/*.config.php"} in alphabetical order. The file
+     * order is crucial: Config values which has been set already, cannot be
+     * overwritten by a succeeding file. This is also true for arrays,
+     * i.e. when specifying `$config['test'] = array('foo' => 'bar')` in
+     * `config/a.config.php` and `$config['test'] = array('baz' => 42)` in
+     * `config/b.config.php`, `$config['test']['baz']` will be undefined!
      *
      * @see    Pico::setConfig()
      * @see    Pico::getConfig()
@@ -514,20 +522,33 @@ class Pico
      */
     protected function loadConfig()
     {
-        $config = null;
-        if (file_exists($this->getConfigDir() . 'config.php')) {
-            // scope isolated require()
-            $includeClosure = function ($configFile) use (&$config) {
-                require($configFile);
-            };
-            if (PHP_VERSION_ID >= 50400) {
-                $includeClosure = $includeClosure->bindTo(null);
-            }
-
-            $includeClosure($this->getConfigDir() . 'config.php');
+        // scope isolated require()
+        $includeClosure = function ($configFile) {
+            require($configFile);
+            return (isset($config) && is_array($config)) ? $config : array();
+        };
+        if (PHP_VERSION_ID >= 50400) {
+            $includeClosure = $includeClosure->bindTo(null);
         }
 
-        $defaultConfig = array(
+        // load main config file (config/config.php)
+        $this->config = is_array($this->config) ? $this->config : array();
+        if (file_exists($this->getConfigDir() . 'config.php')) {
+            $this->config += $includeClosure($this->getConfigDir() . 'config.php');
+        }
+
+        // merge $config of config/*.config.php files
+        $configFiles = glob($this->getConfigDir() . '?*.config.php', GLOB_MARK);
+        if ($configFiles) {
+            foreach ($configFiles as $configFile) {
+                if (substr($configFile, -1) !== '/') {
+                    $this->config += $includeClosure($configFile);
+                }
+            }
+        }
+
+        // merge default config
+        $this->config += array(
             'site_title' => 'Pico',
             'base_url' => '',
             'rewrite_url' => null,
@@ -541,9 +562,6 @@ class Pico
             'timezone' => ''
         );
 
-        $this->config = is_array($this->config) ? $this->config : array();
-        $this->config += is_array($config) ? $config + $defaultConfig : $defaultConfig;
-
         if (empty($this->config['base_url'])) {
             $this->config['base_url'] = $this->getBaseUrl();
         } else {

From dc621b24cd182bf245e99b99272fd26a5832ba1c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2016 21:00:00 +0100
Subject: [PATCH 014/188] Improve class docs of Pico::loadConfig()

---
 lib/Pico.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 25e4938..12bd993 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -509,12 +509,12 @@ class Pico
      * Loads the config.php and any *.config.php from Pico::$configDir
      *
      * After loading the {@path "config/config.php"}, Pico proceeds with any
-     * existing {@path "config/*.config.php"} in alphabetical order. The file
-     * order is crucial: Config values which has been set already, cannot be
-     * overwritten by a succeeding file. This is also true for arrays,
-     * i.e. when specifying `$config['test'] = array('foo' => 'bar')` in
-     * `config/a.config.php` and `$config['test'] = array('baz' => 42)` in
-     * `config/b.config.php`, `$config['test']['baz']` will be undefined!
+     * existing `config/*.config.php` in alphabetical order. The file order is
+     * crucial: Config values which has been set already, cannot be overwritten
+     * by a succeeding file. This is also true for arrays, i.e. when specifying
+     * `$config['test'] = array('foo' => 'bar')` in `config/a.config.php` and
+     * `$config['test'] = array('baz' => 42)` in `config/b.config.php`,
+     * `$config['test']['baz']` will be undefined!
      *
      * @see    Pico::setConfig()
      * @see    Pico::getConfig()

From 3d11b8a9799df2546d492044aa97dd1b16f7a1f5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 11 Mar 2016 19:07:45 +0100
Subject: [PATCH 015/188] Replace is_a() function calls with instanceof
 operator

---
 lib/AbstractPicoPlugin.php    | 4 ++--
 lib/Pico.php                  | 4 ++--
 lib/PicoTwigExtension.php     | 8 ++++----
 plugins/00-PicoDeprecated.php | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 68587f0..2b7a56c 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -199,7 +199,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
             }
 
             // plugins which don't implement PicoPluginInterface are always enabled
-            if (is_a($plugin, 'PicoPluginInterface') && !$plugin->isEnabled()) {
+            if (($plugin instanceof PicoPluginInterface) && !$plugin->isEnabled()) {
                 if ($recursive) {
                     if (!$plugin->isStatusChanged()) {
                         $plugin->setEnabled(true, true, true);
@@ -272,7 +272,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
             $this->dependants = array();
             foreach ($this->getPlugins() as $pluginName => $plugin) {
                 // only plugins which implement PicoPluginInterface support dependencies
-                if (is_a($plugin, 'PicoPluginInterface')) {
+                if ($plugin instanceof PicoPluginInterface) {
                     $dependencies = $plugin->getDependencies();
                     if (in_array(get_called_class(), $dependencies)) {
                         $this->dependants[$pluginName] = $plugin;
diff --git a/lib/Pico.php b/lib/Pico.php
index 12bd993..eada6de 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -457,7 +457,7 @@ class Pico
         }
 
         $className = get_class($plugin);
-        if (!is_a($plugin, 'PicoPluginInterface')) {
+        if (!($plugin instanceof PicoPluginInterface)) {
             throw new RuntimeException(
                 "Unable to load plugin '" . $className . "': "
                 . "Manually loaded plugins must implement 'PicoPluginInterface'"
@@ -1477,7 +1477,7 @@ class Pico
             foreach ($this->plugins as $plugin) {
                 // only trigger events for plugins that implement PicoPluginInterface
                 // deprecated events (plugins for Pico 0.9 and older) will be triggered by `PicoDeprecated`
-                if (is_a($plugin, 'PicoPluginInterface')) {
+                if ($plugin instanceof PicoPluginInterface) {
                     $plugin->handleEvent($eventName, $params);
                 }
             }
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index c249ff4..383330a 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -102,7 +102,7 @@ class PicoTwigExtension extends Twig_Extension
      */
     public function mapFilter($var, $mapKeyPath)
     {
-        if (!is_array($var) && (!is_object($var) || !is_a($var, 'Traversable'))) {
+        if (!is_array($var) && (!is_object($var) || !($var instanceof Traversable))) {
             throw new Twig_Error_Runtime(sprintf(
                 'The map filter only works with arrays or "Traversable", got "%s"',
                 is_object($var) ? get_class($var) : gettype($var)
@@ -141,7 +141,7 @@ class PicoTwigExtension extends Twig_Extension
      */
     public function sortByFilter($var, $sortKeyPath, $fallback = 'bottom')
     {
-        if (is_object($var) && is_a($var, 'Traversable')) {
+        if (is_object($var) && ($var instanceof Traversable)) {
             $var = iterator_to_array($var, true);
         } elseif (!is_array($var)) {
             throw new Twig_Error_Runtime(sprintf(
@@ -204,9 +204,9 @@ class PicoTwigExtension extends Twig_Extension
 
         foreach ($keyPath as $key) {
             if (is_object($var)) {
-                if (is_a($var, 'ArrayAccess')) {
+                if ($var instanceof ArrayAccess) {
                     // use ArrayAccess, see below
-                } elseif (is_a($var, 'Traversable')) {
+                } elseif ($var instanceof Traversable) {
                     $var = iterator_to_array($var);
                 } elseif (isset($var->{$key})) {
                     $var = $var->{$key};
diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php
index 59600b4..e2db93a 100644
--- a/plugins/00-PicoDeprecated.php
+++ b/plugins/00-PicoDeprecated.php
@@ -68,7 +68,7 @@ class PicoDeprecated extends AbstractPicoPlugin
     {
         if (!empty($plugins)) {
             foreach ($plugins as $plugin) {
-                if (!is_a($plugin, 'PicoPluginInterface')) {
+                if (!($plugin instanceof PicoPluginInterface)) {
                     // the plugin doesn't implement PicoPluginInterface; it uses deprecated events
                     // enable PicoDeprecated if it hasn't be explicitly enabled/disabled yet
                     if (!$this->isStatusChanged()) {

From d56d3f8c8ca7d178d0861668a7258b64e30642db Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 12 Mar 2016 00:18:49 +0100
Subject: [PATCH 016/188] Revert "Default theme: Move elements into Twig
 blocks"

This reverts commit a3fa373119c12cae834bcfab758a11b036234c76.

At first glance this adds flexibility, but at the moment it is impossible with Twig to ensure the existance of a block. As a result, custom themes may break the plugin. A custom theme should overwrite a plugin's template explicitly.
---
 themes/default/index.twig | 90 ++++++++++++++++-----------------------
 1 file changed, 37 insertions(+), 53 deletions(-)

diff --git a/themes/default/index.twig b/themes/default/index.twig
index 1b9f2ce..37f8f16 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -1,67 +1,51 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
     <meta charset="utf-8" />
 
-    {% block documentHeader %}
-        <title>{% block title %}{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}{% endblock %}</title>
-        {% if meta.description %}
-            <meta name="description" content="{{ meta.description|striptags }}">
-        {% endif %}{% if meta.robots %}
-            <meta name="robots" content="{{ meta.robots }}">
-        {% endif %}
-    {% endblock %}
+    <title>{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}</title>
+    {% if meta.description %}
+        <meta name="description" content="{{ meta.description|striptags }}">
+    {% endif %}{% if meta.robots %}
+        <meta name="robots" content="{{ meta.robots }}">
+    {% endif %}
 
-    {% block stylesheets %}
-        <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" type="text/css" />
-        <link rel="stylesheet" href="{{ theme_url }}/style.css" type="text/css" />
-    {% endblock %}
+    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" type="text/css" />
+    <link rel="stylesheet" href="{{ theme_url }}/style.css" type="text/css" />
 
-    {% block javascript %}
-        <script src="{{ theme_url }}/scripts/modernizr-2.6.1.min.js"></script>
-    {% endblock %}
+    <script src="{{ theme_url }}/scripts/modernizr-2.6.1.min.js"></script>
 </head>
 <body>
 
-    {% block pageHeader %}
-        <header id="header">
-            <div class="inner clearfix">
-                <h1><a href="{{ "index"|link }}" id="logo">{{ site_title }}</a></h1>
-                {% block header %}
-                    <nav>
-                        <a href="#" class="menu-icon"></a>
-                        <ul>
-                            {% for page in pages if page.title %}
-                                <li{% if page.id == current_page.id %} class="active"{% endif %}>
-                                    <a href="{{ page.url }}">{{ page.title }}</a>
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </nav>
-                {% endblock %}
-            </div>
-        </header>
-    {% endblock %}
+    <header id="header">
+        <div class="inner clearfix">
+            <h1><a href="{{ "index"|link }}" id="logo">{{ site_title }}</a></h1>
+            <nav>
+                <a href="#" class="menu-icon"></a>
+                <ul>
+                    {% for page in pages if page.title %}
+                        <li{% if page.id == current_page.id %} class="active"{% endif %}>
+                            <a href="{{ page.url }}">{{ page.title }}</a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </nav>
+        </div>
+    </header>
 
-    {% block pageContent %}
-        <section id="content">
-            <div class="inner">
-                {% block content content %}
-            </div>
-        </section>
-    {% endblock %}
+    <section id="content">
+        <div class="inner">
+            {{ content }}
+        </div>
+    </section>
 
-    {% block pageFooter %}
-        <footer id="footer">
-            <div class="inner">
-                {% block footer %}
-                    <a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
-                    and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
-                    Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
-                {% endblock %}
-            </div>
-        </footer>
-    {% endblock %}
+    <footer id="footer">
+        <div class="inner">
+            <a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
+            and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
+            Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
+        </div>
+    </footer>
 
 </body>
 </html>

From b133f6dae5db4cab49178ea4e1e9267e01e8ad88 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 22 Apr 2016 14:23:46 +0200
Subject: [PATCH 017/188] Add Pico::VERSION_ID (like PHP_VERSION_ID)

---
 lib/Pico.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index eada6de..652570d 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -32,6 +32,13 @@ class Pico
      * @var string
      */
     const VERSION = '1.1.0-dev';
+    
+    /**
+     * Pico version ID
+     * 
+     * @var int
+     */
+    const VERSION_ID = 10100;
 
     /**
      * Sort files in alphabetical ascending order

From a11912249787713cf769692d5d8032eef1ff1725 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 22 Apr 2016 14:31:14 +0200
Subject: [PATCH 018/188] Fix coding standard violation

---
 lib/Pico.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 652570d..3767081 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -32,10 +32,10 @@ class Pico
      * @var string
      */
     const VERSION = '1.1.0-dev';
-    
+
     /**
      * Pico version ID
-     * 
+     *
      * @var int
      */
     const VERSION_ID = 10100;

From 1b3ef7516d5c6bee125bda4e955ea3452f0b5766 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 23 Apr 2016 21:40:30 +0200
Subject: [PATCH 019/188] Drop the "index" part of URLs

Closes #347. Thanks @Robby-
---
 lib/Pico.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 3767081..d0985dd 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1387,9 +1387,18 @@ class Pico
                 . (is_object($queryData) ? get_class($queryData) : gettype($queryData)) . ' given'
             );
         }
+
+        // drop "index"
+        if ($page === 'index') {
+            $page = '';
+        } elseif (($pagePathLength = strrpos($page, '/')) !== false) {
+            if (substr($page, $pagePathLength + 1) === 'index') {
+                $page = substr($page, 0, $pagePathLength);
+            }
+        }
+
         if (!empty($queryData)) {
-            $page = !empty($page) ? $page : 'index';
-            $queryData = $this->isUrlRewritingEnabled() ? '?' . $queryData : '&' . $queryData;
+            $queryData = ($this->isUrlRewritingEnabled() || empty($page)) ? '?' . $queryData : '&' . $queryData;
         }
 
         if (empty($page)) {

From d19621a908f110dbc603dfd747e9b9508b7bb286 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 24 Apr 2016 01:22:43 +0200
Subject: [PATCH 020/188] Improve themes dir guessing; add $config['theme_url']
 config

---
 config/config.php.template |  6 ++---
 lib/Pico.php               | 49 ++++++++++++++++++++++++++++++++++----
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/config/config.php.template b/config/config.php.template
index 0d44037..f04a4bc 100644
--- a/config/config.php.template
+++ b/config/config.php.template
@@ -10,23 +10,23 @@
  * {@path "config/config.php"}, uncomment the line, then make and
  * save your changes.
  *
- * @author  Gilbert Pellegrom
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT
- * @version 1.0
+ * @version 1.1
  */
 
 /*
  * BASIC
  */
 // $config['site_title'] = 'Pico';              // Site title
-// $config['base_url'] = '';                    // Override base URL (e.g. http://example.com)
+// $config['base_url'] = '';                    // Override base URL (e.g. http://example.com/pico/)
 // $config['rewrite_url'] = null;               // A boolean indicating forced URL rewriting
 
 /*
  * THEME
  */
 // $config['theme'] = 'default';                // Set the theme (defaults to "default")
+// $config['theme_url'] = '';                   // Override the base URL of the themes folder (e.g. http://example.com/pico/themes/)
 // $config['twig_config'] = array(              // Twig settings
 //     'cache' => false,                        // To enable Twig caching change this to a path to a writable directory
 //     'autoescape' => false,                   // Auto-escape Twig vars
diff --git a/lib/Pico.php b/lib/Pico.php
index d0985dd..d19b159 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -22,7 +22,7 @@
  * @author  Daniel Rudolf
  * @link    <http://picocms.org>
  * @license The MIT License <http://opensource.org/licenses/MIT>
- * @version 1.0
+ * @version 1.1
  */
 class Pico
 {
@@ -590,6 +590,14 @@ class Pico
             $this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']);
         }
 
+        if (empty($this->config['theme_url'])) {
+            $this->config['theme_url'] = $this->getBaseThemeUrl();
+        } elseif (preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $this->config['theme_url'])) {
+            $this->config['theme_url'] = rtrim($this->config['theme_url'], '/') . '/';
+        } else {
+            $this->config['theme_url'] = $this->getBaseUrl() . rtrim($this->config['theme_url'], '/') . '/';
+        }
+
         if (empty($this->config['timezone'])) {
             // explicitly set a default timezone to prevent a E_NOTICE
             // when no timezone is set; the `date_default_timezone_get()`
@@ -973,8 +981,7 @@ class Pico
         $variables['%base_url%'] = rtrim($this->getBaseUrl(), '/');
 
         // replace %theme_url%
-        $themeUrl = $this->getBaseUrl() . basename($this->getThemesDir()) . '/' . $this->getConfig('theme');
-        $variables['%theme_url%'] = $themeUrl;
+        $variables['%theme_url%'] = $this->getBaseThemeUrl() . $this->getConfig('theme');
 
         // replace %meta.*%
         if (!empty($meta)) {
@@ -1311,7 +1318,7 @@ class Pico
             'base_dir' => rtrim($this->getRootDir(), '/'),
             'base_url' => rtrim($this->getBaseUrl(), '/'),
             'theme_dir' => $this->getThemesDir() . $this->getConfig('theme'),
-            'theme_url' => $this->getBaseUrl() . basename($this->getThemesDir()) . '/' . $this->getConfig('theme'),
+            'theme_url' => $this->getBaseThemeUrl() . $this->getConfig('theme'),
             'rewrite_url' => $this->isUrlRewritingEnabled(),
             'site_title' => $this->getConfig('site_title'),
             'meta' => $this->meta,
@@ -1410,6 +1417,40 @@ class Pico
         }
     }
 
+    /**
+     * Returns the URL of the themes folder of this Pico instance
+     *
+     * We assume that the themes folder is a arbitrary deep sub folder of the
+     * script's base path (i.e. the directory {@path "index.php"} is in resp.
+     * the `httpdocs` directory). Usually the script's base path is identical
+     * to {@link Pico::$rootDir}, but this may aberrate when Pico got installed
+     * as a composer dependency. However, ultimately it allows us to use
+     * {@link Pico::getBaseUrl()} as origin of the theme URL. Otherwise Pico
+     * falls back to the basename of {@link Pico::$themesDir} (i.e. assuming
+     * that `Pico::$themesDir` is `foo/bar/baz`, the base URL of the themes
+     * folder will be `baz/`; this ensures BC to Pico < 1.1). Pico's base URL
+     * always gets prepended appropriately.
+     *
+     * @return string the URL of the themes folder
+     */
+    public function getBaseThemeUrl()
+    {
+        $themeUrl = $this->getConfig('theme_url');
+        if (!empty($themeUrl)) {
+            return $themeUrl;
+        }
+
+        $basePath = dirname($_SERVER['SCRIPT_FILENAME']) . '/';
+        $basePathLength = strlen($basePath);
+        if (substr($this->getThemesDir(), 0, $basePathLength) === $basePath) {
+            $this->config['theme_url'] = $this->getBaseUrl() . substr($this->getThemesDir(), $basePathLength);
+        } else {
+            $this->config['theme_url'] = $this->getBaseUrl() . basename($this->getThemesDir()) . '/';
+        }
+
+        return $this->config['theme_url'];
+    }
+
     /**
      * Recursively walks through a directory and returns all containing files
      * matching the specified file extension

From 6465c2b0a99b5262f25083af70b94668c1cac6af Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 24 Apr 2016 20:11:05 +0200
Subject: [PATCH 021/188] Support REQUEST_URI routing method

With Pico 1.0 you had to setup URL rewriting (e.g. using `mod_rewrite` on Apache) in a way that rewritten URLs follow the `QUERY_STRING` principles. Starting with version 1.1, Pico additionally supports the `REQUEST_URI` routing method, what allows you to simply rewrite all requests to just `index.php`. Pico then reads the requested page from the `REQUEST_URI` environment variable provided by the webserver. Please note that `QUERY_STRING` takes precedence over `REQUEST_URI`.
---
 .htaccess    | 11 +++++++---
 lib/Pico.php | 58 +++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/.htaccess b/.htaccess
index 192f3a4..875db33 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,13 +1,18 @@
 <IfModule mod_rewrite.c>
     RewriteEngine On
-    #May be required to access sub-directories
+    # May be required to access sub-directories
     #RewriteBase /
+
+    # Deny access to internal dirs by passing the URL to Pico
+    RewriteRule ^(.git|config|content|content-sample|lib|vendor)(/|$) index.php [L]
+
+    # Enable URL rewriting
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteRule ^(.*)$ index.php?$1 [L,QSA]
-    RewriteRule ^(config|content|content-sample|lib|vendor)/.* - [R=404,L]
+    RewriteRule ^ index.php [L]
 
     <IfModule mod_env.c>
+        # Let Pico know about available URL rewriting
         SetEnv PICO_URL_REWRITING 1
     </IfModule>
 </IfModule>
diff --git a/lib/Pico.php b/lib/Pico.php
index d19b159..c814ea1 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -656,13 +656,19 @@ class Pico
     /**
      * Evaluates the requested URL
      *
-     * Pico 1.0 uses the `QUERY_STRING` routing method (e.g. `/pico/?sub/page`)
+     * Pico uses the `QUERY_STRING` routing method (e.g. `/pico/?sub/page`)
      * to support SEO-like URLs out-of-the-box with any webserver. You can
-     * still setup URL rewriting (e.g. using `mod_rewrite` on Apache) to
-     * basically remove the `?` from URLs, but your rewritten URLs must follow
-     * the new `QUERY_STRING` principles. URL rewriting requires some special
-     * configuration on your webserver, but this should be "basic work" for
-     * any webmaster...
+     * still setup URL rewriting to basically remove the `?` from URLs.
+     * However, URL rewriting requires some special configuration of your
+     * webserver, but this should be "basic work" for any webmaster...
+     *
+     * With Pico 1.0 you had to setup URL rewriting (e.g. using `mod_rewrite`
+     * on Apache) in a way that rewritten URLs follow the `QUERY_STRING`
+     * principles. Starting with version 1.1, Pico additionally supports the
+     * `REQUEST_URI` routing method, what allows you to simply rewrite all
+     * requests to just `index.php`. Pico then reads the requested page from
+     * the `REQUEST_URI` environment variable provided by the webserver.
+     * Please note that `QUERY_STRING` takes precedence over `REQUEST_URI`.
      *
      * Pico 0.9 and older required Apache with `mod_rewrite` enabled, thus old
      * plugins, templates and contents may require you to enable URL rewriting
@@ -675,23 +681,43 @@ class Pico
      * enabled URL rewriting. In content files you can use the `%base_url%`
      * variable; e.g. `%base_url%?sub/page` will be replaced accordingly.
      *
+     * Heads up! Pico always interprets the first parameter as name of the
+     * requested page (provided that the parameter has no value). According to
+     * that you MUST NOT call Pico with a parameter without value as first
+     * parameter (e.g. http://example.com/pico/?someBooleanParam), otherwise
+     * Pico interprets `someBooleanParam` as name of the requested page. Use
+     * `/pico/?someBooleanParam=` or `/pico/?index&someBooleanParam` instead.
+     *
      * @see    Pico::getRequestUrl()
      * @return void
      */
     protected function evaluateRequestUrl()
     {
         // use QUERY_STRING; e.g. /pico/?sub/page
-        // if you want to use rewriting, you MUST make your rules to
-        // rewrite the URLs to follow the QUERY_STRING method
-        //
-        // Note: you MUST NOT call the index page with /pico/?someBooleanParameter;
-        // use /pico/?someBooleanParameter= or /pico/?index&someBooleanParameter instead
-        $pathComponent = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
-        if (($pathComponentLength = strpos($pathComponent, '&')) !== false) {
-            $pathComponent = substr($pathComponent, 0, $pathComponentLength);
+        $pathComponent = $_SERVER['QUERY_STRING'];
+        if (!empty($pathComponent)) {
+            if (($pathComponentLength = strpos($pathComponent, '&')) !== false) {
+                $pathComponent = substr($pathComponent, 0, $pathComponentLength);
+            }
+            if (strpos($pathComponent, '=') === false) {
+                $this->requestUrl = trim(rawurldecode($pathComponent), '/');
+            }
+        }
+
+        // use REQUEST_URI (requires URL rewriting); e.g. /pico/sub/page
+        if (($this->requestUrl === null) && $this->isUrlRewritingEnabled()) {
+            $basePath = dirname($_SERVER['SCRIPT_NAME']) . '/';
+            $basePathLength = strlen($basePath);
+
+            $requestUri = $_SERVER['REQUEST_URI'];
+            if (substr($requestUri, 0, $basePathLength) === $basePath) {
+                $requestUri = substr($requestUri, $basePathLength);
+                if (($requestUriLength = strpos($requestUri, '?')) !== false) {
+                    $requestUri = substr($requestUri, 0, $requestUriLength);
+                }
+                $this->requestUrl = rtrim(rawurldecode($requestUri), '/');
+            }
         }
-        $this->requestUrl = (strpos($pathComponent, '=') === false) ? rawurldecode($pathComponent) : '';
-        $this->requestUrl = trim($this->requestUrl, '/');
     }
 
     /**

From 6c4f69c1079ce9cf219b450b4f3913ac0fc5bac7 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 24 Apr 2016 20:49:06 +0200
Subject: [PATCH 022/188] Update inline user docs to reflect
 6465c2b0a99b5262f25083af70b94668c1cac6af

---
 content-sample/index.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content-sample/index.md b/content-sample/index.md
index 086c56c..b498bc0 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -284,13 +284,13 @@ still shows no rewritten URLs, force URL rewriting by setting
 `$config['rewrite_url'] = true;` in your `config/config.php`.
 
 If you're using Nginx, you can use the following configuration to enable
-URL rewriting. Don't forget to adjust the path (`/pico`; line `1` and `4`)
+URL rewriting. Don't forget to adjust the path (`/pico/`; line `1` and `3`)
 to match your installation directory. You can then enable URL rewriting by
 setting `$config['rewrite_url'] = true;` in your `config/config.php`.
 
-    location ~ ^/pico(.*) {
+    location /pico/ {
         index index.php;
-        try_files $uri $uri/ /pico/?$1&$args;
+        try_files $uri $uri/ /pico/$is_args$args;
     }
 
 ## Documentation

From e01044319ad52ae3da541ba80ed8bb55c2921dcb Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 24 Apr 2016 21:13:47 +0200
Subject: [PATCH 023/188] Build system: Use dynamic phpDoc title

---
 .phpdoc.xml                     | 2 +-
 _build/deploy-phpdoc-branch.sh  | 6 +++++-
 _build/deploy-phpdoc-release.sh | 6 +++++-
 lib/Pico.php                    | 2 ++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.phpdoc.xml b/.phpdoc.xml
index c46b6da..94996fb 100644
--- a/.phpdoc.xml
+++ b/.phpdoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <phpdoc>
-    <title><![CDATA[Pico 1.0 API Documentation]]></title>
+    <title><![CDATA[Pico API Documentation]]></title>
     <parser>
         <target>_build/phpdoc.cache</target>
     </parser>
diff --git a/_build/deploy-phpdoc-branch.sh b/_build/deploy-phpdoc-branch.sh
index c4a94a9..720ee15 100755
--- a/_build/deploy-phpdoc-branch.sh
+++ b/_build/deploy-phpdoc-branch.sh
@@ -18,6 +18,10 @@ fi
 DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
 DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 
+# get current Pico milestone
+VERSION="$(php -r 'require_once(__DIR__ . "/lib/Pico.php"); echo Pico::VERSION;')"
+MILESTONE="Pico$([[ "$VERSION" =~ ^([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATCH[1]}")"
+
 # clone repo
 echo "Cloning repo..."
 git clone --branch="gh-pages" "https://github.com/$TRAVIS_REPO_SLUG.git" "$DEPLOYMENT_DIR"
@@ -33,7 +37,7 @@ github-setup.sh
 generate-phpdoc.sh \
     "$TRAVIS_BUILD_DIR/.phpdoc.xml" \
     "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
-    "Pico 1.0 API Documentation ($TRAVIS_BRANCH branch)"
+    "$MILESTONE API Documentation ($TRAVIS_BRANCH branch)"
 [ $? -eq 0 ] || exit 1
 [ -n "$(git status --porcelain "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache")" ] || exit 0
 
diff --git a/_build/deploy-phpdoc-release.sh b/_build/deploy-phpdoc-release.sh
index 8d3410e..6ab1042 100755
--- a/_build/deploy-phpdoc-release.sh
+++ b/_build/deploy-phpdoc-release.sh
@@ -29,10 +29,14 @@ github-setup.sh
 
 # generate phpDocs
 if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
+    # get current Pico milestone
+    MILESTONE="Pico$([[ "$TRAVIS_TAG" =~ ^v([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATCH[1]}")"
+
+    # generate phpDocs
     generate-phpdoc.sh \
         "$TRAVIS_BUILD_DIR/.phpdoc.xml" \
         "-" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
-        "Pico 1.0 API Documentation ($TRAVIS_TAG)"
+        "$MILESTONE API Documentation ($TRAVIS_TAG)"
     [ $? -eq 0 ] || exit 1
 
     # commit phpDocs
diff --git a/lib/Pico.php b/lib/Pico.php
index b73400e..156d0fe 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -4,6 +4,7 @@
  * Pico
  *
  * Pico is a stupidly simple, blazing fast, flat file CMS.
+ *
  * - Stupidly Simple: Pico makes creating and maintaining a
  *   website as simple as editing text files.
  * - Blazing Fast: Pico is seriously lightweight and doesn't
@@ -16,6 +17,7 @@
  *   for powerful and flexible themes.
  * - Open Source: Pico is completely free and open source,
  *   released under the MIT license.
+ *
  * See <http://picocms.org/> for more info.
  *
  * @author  Gilbert Pellegrom

From 0f8deda6a310da3f48bc72fe0010212653a359ac Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 27 Apr 2016 21:07:59 +0200
Subject: [PATCH 024/188] Update .htaccess

Sync with Pico 1.0.3; see ee5b4f0
---
 .htaccess | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 875db33..54cbc9b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,8 +3,9 @@
     # May be required to access sub-directories
     #RewriteBase /
 
-    # Deny access to internal dirs by passing the URL to Pico
-    RewriteRule ^(.git|config|content|content-sample|lib|vendor)(/|$) index.php [L]
+    # Deny access to internal dirs and files by passing the URL to Pico
+    RewriteRule ^(\.git|config|content|content-sample|lib|vendor)(/|$) index.php [L]
+    RewriteRule ^(CHANGELOG.md|composer.(json|lock)) index.php [L]
 
     # Enable URL rewriting
     RewriteCond %{REQUEST_FILENAME} !-f

From eeb43e131faa9b2bc64853e74506baf22c99ab7b Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 6 May 2016 23:19:40 +0200
Subject: [PATCH 025/188] Pico::prepareFileContent(): Declare $variables
 variable

---
 lib/Pico.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index 156d0fe..bcea0f2 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -997,6 +997,8 @@ class Pico
      */
     public function prepareFileContent($rawContent, array $meta)
     {
+        $variables = array();
+
         // remove meta header
         $metaHeaderPattern = "/^(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
             . "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s";

From f251bc83ec995d05e0e33140df22a451c0cfe4af Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 20 Jun 2016 22:38:24 +0200
Subject: [PATCH 026/188] Update composer.json: Use Symfony YAML 3.1 and later

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5894970..0a354a4 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "php": ">=5.3.6",
         "twig/twig": "^1.18",
         "erusev/parsedown-extra": "^0.7",
-        "symfony/yaml" : "^2.3"
+        "symfony/yaml" : "^3.1"
     },
     "require-dev" : {
         "phpdocumentor/phpdocumentor": "^2.8",

From 81dddc94cf0c8d08ec3def69a628197a4c81aea8 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 20 Jun 2016 22:46:57 +0200
Subject: [PATCH 027/188] Revert "Update composer.json: Use Symfony YAML 3.1
 and later"

Symfony YAML >= 3.0 requires PHP >= 5.5.9 and we're currently not planning to raise Pico's PHP requirement.

This reverts commit f251bc83ec995d05e0e33140df22a451c0cfe4af.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0a354a4..5894970 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "php": ">=5.3.6",
         "twig/twig": "^1.18",
         "erusev/parsedown-extra": "^0.7",
-        "symfony/yaml" : "^3.1"
+        "symfony/yaml" : "^2.3"
     },
     "require-dev" : {
         "phpdocumentor/phpdocumentor": "^2.8",

From 848e28b7e695e76e0021216c66e4c26d2e1e74ae Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 14 Jul 2016 00:20:22 +0200
Subject: [PATCH 028/188] Declare Pico::getFiles() public

This might be a useful helper method for plugins (e.g. PicoAdmin)
---
 lib/Pico.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 86c2c1b..1f129b4 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1506,7 +1506,7 @@ class Pico
      *     or Pico::SORT_NONE to leave the result unsorted
      * @return array                 list of found files
      */
-    protected function getFiles($directory, $fileExtension = '', $order = self::SORT_ASC)
+    public function getFiles($directory, $fileExtension = '', $order = self::SORT_ASC)
     {
         $directory = rtrim($directory, '/');
         $result = array();

From aa1bc077a785986889e737d4b2c2715284571fff Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 14 Jul 2016 00:24:06 +0200
Subject: [PATCH 029/188] Add $dropIndex parameter to Pico::getPageUrl() method

This allows one to prevent Pico from removing the last "index" path component. Example use case: Pico's official admin plugin. We must distinguish between "content/sub.md" and "content/sub/index.md", otherwise it wouldn't be possible to edit both pages.
---
 lib/Pico.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 1f129b4..b2f04a6 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1424,9 +1424,11 @@ class Pico
      * @param  string       $page      identifier of the page to link to
      * @param  array|string $queryData either an array containing properties to
      *     create a URL-encoded query string from, or a already encoded string
+     * @param  boolean      $dropIndex when the last path component is "index",
+     *     then passing TRUE (default) leads to removing this path component
      * @return string                  URL
      */
-    public function getPageUrl($page, $queryData = null)
+    public function getPageUrl($page, $queryData = null, $dropIndex = true)
     {
         if (is_array($queryData)) {
             $queryData = http_build_query($queryData, '', '&');
@@ -1438,11 +1440,13 @@ class Pico
         }
 
         // drop "index"
-        if ($page === 'index') {
-            $page = '';
-        } elseif (($pagePathLength = strrpos($page, '/')) !== false) {
-            if (substr($page, $pagePathLength + 1) === 'index') {
-                $page = substr($page, 0, $pagePathLength);
+        if ($dropIndex) {
+            if ($page === 'index') {
+                $page = '';
+            } elseif (($pagePathLength = strrpos($page, '/')) !== false) {
+                if (substr($page, $pagePathLength + 1) === 'index') {
+                    $page = substr($page, 0, $pagePathLength);
+                }
             }
         }
 

From 21bd18bcf02b3a415aaffcf813c085d113e3fc99 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 20 Jul 2016 19:23:19 +0200
Subject: [PATCH 030/188] Replace Pico::discoverRequestFile() with public
 Pico::resolveFilePath()

This allows plugins (e.g. PicoAdmin) to safely resolve file paths without the need of re-implementing the method.
---
 lib/Pico.php | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 11d3ade..5e5cf83 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -308,7 +308,7 @@ class Pico
         $this->triggerEvent('onRequestUrl', array(&$this->requestUrl));
 
         // discover requested file
-        $this->discoverRequestFile();
+        $this->requestFile = $this->resolveFilePath($this->requestUrl);
         $this->triggerEvent('onRequestFile', array(&$this->requestFile));
 
         // load raw file content
@@ -735,24 +735,29 @@ class Pico
     }
 
     /**
-     * Uses the request URL to discover the content file to serve
+     * Resolves a given file path to its corresponding content file
+     *
+     * This method also prevents `content_dir` breakouts using malicious
+     * request URLs. We don't use `realpath()`, because we neither want to
+     * check for file existance, nor prohibit symlinks which intentionally
+     * point to somewhere outside the `content_dir` folder. It is STRONGLY
+     * RECOMMENDED to use PHP's `open_basedir` feature - always, not just
+     * with Pico!
      *
      * @see    Pico::getRequestFile()
-     * @return void
+     * @param  string $requestUrl path name (likely from a URL) to resolve
+     * @return string             path to the resolved content file
      */
-    protected function discoverRequestFile()
+    public function resolveFilePath($requestUrl)
     {
         $contentDir = $this->getConfig('content_dir');
         $contentExt = $this->getConfig('content_ext');
 
-        if (empty($this->requestUrl)) {
-            $this->requestFile = $contentDir . 'index' . $contentExt;
+        if (empty($requestUrl)) {
+            return $contentDir . 'index' . $contentExt;
         } else {
-            // prevent content_dir breakouts using malicious request URLs
-            // we don't use realpath() here because we neither want to check for file existance
-            // nor prohibit symlinks which intentionally point to somewhere outside the content_dir
-            // it is STRONGLY RECOMMENDED to use open_basedir - always, not just with Pico!
-            $requestUrl = str_replace('\\', '/', $this->requestUrl);
+            // prevent content_dir breakouts
+            $requestUrl = str_replace('\\', '/', $requestUrl);
             $requestUrlParts = explode('/', $requestUrl);
 
             $requestFileParts = array();
@@ -768,31 +773,29 @@ class Pico
             }
 
             if (empty($requestFileParts)) {
-                $this->requestFile = $contentDir . 'index' . $contentExt;
-                return;
+                return $contentDir . 'index' . $contentExt;
             }
 
             // discover the content file to serve
             // Note: $requestFileParts neither contains a trailing nor a leading slash
-            $this->requestFile = $contentDir . implode('/', $requestFileParts);
-            if (is_dir($this->requestFile)) {
+            $requestFile = $contentDir . implode('/', $requestFileParts);
+            if (is_dir($requestFile)) {
                 // if no index file is found, try a accordingly named file in the previous dir
                 // if this file doesn't exist either, show the 404 page, but assume the index
                 // file as being requested (maintains backward compatibility to Pico < 1.0)
-                $indexFile = $this->requestFile . '/index' . $contentExt;
-                if (file_exists($indexFile) || !file_exists($this->requestFile . $contentExt)) {
-                    $this->requestFile = $indexFile;
-                    return;
+                $indexFile = $requestFile . '/index' . $contentExt;
+                if (file_exists($indexFile) || !file_exists($requestFile . $contentExt)) {
+                    return $indexFile;
                 }
             }
-            $this->requestFile .= $contentExt;
+            return $requestFile . $contentExt;
         }
     }
 
     /**
      * Returns the absolute path to the content file to serve
      *
-     * @see    Pico::discoverRequestFile()
+     * @see    Pico::resolveFilePath()
      * @return string|null file path
      */
     public function getRequestFile()

From 6a13915f15a753f2b8dd56c761fbc0b7d5a0a553 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 2 Aug 2016 02:31:20 +0200
Subject: [PATCH 031/188] Refactor default theme

---
 config/config.php.template                    |   3 +
 themes/default/font/LICENSE.txt               |   1 +
 themes/default/font/fontello.eot              | Bin 5864 -> 6116 bytes
 themes/default/font/fontello.svg              |   6 +-
 themes/default/font/fontello.ttf              | Bin 5696 -> 5948 bytes
 themes/default/font/fontello.woff             | Bin 3428 -> 3564 bytes
 themes/default/font/fontello.woff2            | Bin 2888 -> 2956 bytes
 themes/default/fontello.css                   |   5 +-
 themes/default/index.twig                     |  54 +-
 themes/default/js/pico.js                     |  67 ++
 themes/default/js/utils.js                    | 161 +++++
 themes/default/scripts/modernizr-2.6.1.min.js |   4 -
 themes/default/style.css                      | 573 +++++++-----------
 13 files changed, 504 insertions(+), 370 deletions(-)
 create mode 100644 themes/default/js/pico.js
 create mode 100644 themes/default/js/utils.js
 delete mode 100644 themes/default/scripts/modernizr-2.6.1.min.js

diff --git a/config/config.php.template b/config/config.php.template
index bd8c182..34b3063 100644
--- a/config/config.php.template
+++ b/config/config.php.template
@@ -27,6 +27,9 @@
  */
 // $config['theme'] = 'default';                // Set the theme (defaults to "default")
 // $config['theme_url'] = '';                   // Override the base URL of the themes folder (e.g. http://example.com/pico/themes/)
+// $config['theme_config'] = array(             // Settings of the theme; depends on the theme used
+//     'widescreen' => false                    // Default theme: Allocate more horicontal space (i.e. make the site container wider)
+// );
 // $config['twig_config'] = array(              // Twig settings
 //     'cache' => false,                        // To enable Twig caching change this to a path to a writable directory
 //     'autoescape' => false,                   // Auto-escape Twig vars
diff --git a/themes/default/font/LICENSE.txt b/themes/default/font/LICENSE.txt
index bf29f26..270e046 100644
--- a/themes/default/font/LICENSE.txt
+++ b/themes/default/font/LICENSE.txt
@@ -20,3 +20,4 @@ Font license info
     License:    SIL OFL 1.1 <http://scripts.sil.org/OFL>
     Homepage:   http://fortawesome.github.com/Font-Awesome/
 
+    Icons:      menu, github-circled ("octocat"), twitter ("birdy"), chat
diff --git a/themes/default/font/fontello.eot b/themes/default/font/fontello.eot
index b3ae4d971c5489002cad31e996c07441da3e2515..0d93cf8c5321162fae67e2f60cff9f4b4e351b01 100644
GIT binary patch
delta 807
zcmZvaO-NKx6vzMf-uEGI%x5x<Fi4Fyet?E%>TJxfB!dJCEi#IHjiVFJ8z18<X4=fI
zMYPb~Dxw&IpmvoZEecxbLa<c@E!t%;i?G=Q7Q%Gy)2K!Fa?ZKG^L5|7?-q}2wriWU
zKyU4m)}y4OLt9G&*?i<qV-CO$$;8-rduLzd>^8v85TB3RmJ{n=nInEe@*;l2jc6as
z3J{1=JTl|V+P9Y$Cy9qioLOtZA%8Wk>&RBjrgAe+ADtct#3ev6k_l_txEsC+=t+wA
zB$J7}r5_jP$Wb6iG-<opng&`yUnLbx&Bra?Aync|#Fe&{bx;g^A>Jg8q%AwK@u2P?
z?WF+xoio4SzB%#hF<^Y4_=uB9I9~@_Ujw0+#J9jm8|XkEc*=6qsHz!0IXZzbsN5fv
z;H|Kuf{B9njrFs2uZ=ff&iI8u3c_Etku~T>GE_G}bp|TH!HX!}E8Q=xm&?Gv>)qB=
zY3xlZrF<cGWt#V#Z+mZfz^wH1WIs6+@0DoWhtfKHk-5vC#h}Owp!`!@<f|}o2<?as
zbhR)=m0!U42vjISRi>yrXM#`3?`0EU3>W0CqfOm3k7;VSwedhu)9V|Wn!CGtV)dON
zLEOB@wR`+0?(<}@dgr^D53*2|*l&iIkN>CX5mN?y&8kmTQL^c4w(BEJE;^<BAtYNv
z(exFw_Xh%^C=dUBZO;B{%g;nn1c>Dsy)nI|Rh4PJ6v)y8l;V#?23Fvz-&n;s#PUO3
o7g3ebZ7_wYOoI|nTCRHaT4p+@&&OSQW3FN+($|;QjKh_`0p|Xmc>n+a

delta 536
zcmYjNJ!lj`7=80|d+Tm6XJIM{3sE8%Ih1fVF<wN1prCR=v<jPZa~sI!mSm!5mCiy^
z<gy@26cq#;3vn9@5duO~42WW9A^3NNLK?f^`F26bH@x}Y`@T0HGxM$7Ic#<MfNEdc
zs_50`#&WybT6+37{S9E7IC-vCK04}M_zZ|D^~HMR$8Q%WUs2yC?$)mw&-&EWfOC+2
zZ#r&7H`^<hsZRrL-0&A-)=ShLv)!1zKK=Mo^axPH#Aq1!SDZ6@UILb3zY>PQl3zTo
zCRljF!u~Kat=(_PV7=#7nr+s7Sr(c8!p({NR*WC+SL$EX-kcu=@9ypE2Z}v_+>DzG
z=KQ$33GCt{Fc!}T@%OPqFMz$zsc#?~<)9x!5U0k^PQXrHiz5ZTO+8Dt#R;*NjL5-S
znEQY!sGJQkJ2ZvRsBnVKC4mmM?rg1fyE_@XH0BOFXOd?jtaM#UQ37wt;AiBak`L-Y
zTF_NBkX?*e-e|5)_Ky64t2&wG<HMi5|8p{I9~;zJJ;wuP{(K%Q0^&YdHbtWbnclLC
i%F{v$CA26&*F)bF&9xb0f_bYkW5UHLAYFF{dj0{IfOe$-

diff --git a/themes/default/font/fontello.svg b/themes/default/font/fontello.svg
index 6514c03..181dad9 100644
--- a/themes/default/font/fontello.svg
+++ b/themes/default/font/fontello.svg
@@ -8,9 +8,11 @@
 <missing-glyph horiz-adv-x="1000" />
 <glyph glyph-name="chat" unicode="&#xe800;" d="M786 421q0-77-53-143t-143-104-197-38q-48 0-98 9-70-49-155-72-21-5-48-9h-2q-6 0-12 5t-6 12q-1 1-1 3t1 4 1 3l1 3t2 3 2 3 3 3 2 2q3 3 13 14t15 16 12 17 14 21 11 25q-69 40-108 98t-40 125q0 78 53 144t143 104 197 38 197-38 143-104 53-144z m214-142q0-67-40-126t-108-98q5-14 11-25t14-21 13-16 14-17 13-14q0 0 2-2t3-3 2-3 2-3l1-3t1-3 1-4-1-3q-2-8-7-13t-13-4q-27 4-48 9-85 23-155 72-50-9-98-9-151 0-263 74 32-3 49-3 90 0 172 25t148 72q69 52 107 119t37 141q0 43-13 85 72-39 114-99t42-128z" horiz-adv-x="1000" />
 
-<glyph glyph-name="twitter" unicode="&#xf099;" d="M904 622q-37-54-90-93 0-8 0-23 0-73-21-145t-64-139-103-117-144-82-181-30q-151 0-276 81 19-2 43-2 126 0 224 77-59 1-105 36t-64 89q19-3 34-3 24 0 48 6-63 13-104 62t-41 115v2q38-21 82-23-37 25-59 64t-22 86q0 49 25 91 68-83 164-133t208-55q-5 21-5 41 0 75 53 127t127 53q79 0 132-57 61 12 114 44-20-64-79-100 52 6 104 28z" horiz-adv-x="928.6" />
+<glyph glyph-name="birdy" unicode="&#xf099;" d="M904 622q-37-54-90-93 0-8 0-23 0-73-21-145t-64-139-103-117-144-82-181-30q-151 0-276 81 19-2 43-2 126 0 224 77-59 1-105 36t-64 89q19-3 34-3 24 0 48 6-63 13-104 62t-41 115v2q38-21 82-23-37 25-59 64t-22 86q0 49 25 91 68-83 164-133t208-55q-5 21-5 41 0 75 53 127t127 53q79 0 132-57 61 12 114 44-20-64-79-100 52 6 104 28z" horiz-adv-x="928.6" />
 
-<glyph glyph-name="github" unicode="&#xf09b;" d="M857 350q0-140-82-252t-211-155q-15-3-22 4t-7 17v118q0 54-29 79 32 3 57 10t53 22 45 37 30 58 11 84q0 68-44 115 21 51-5 114-15 5-45-6t-51-25l-21-13q-52 15-107 15t-108-15q-8 6-23 15t-47 22-48 7q-24-63-4-114-44-47-44-115 0-47 12-83t29-59 45-37 52-22 57-10q-22-20-27-58-12-5-25-8t-32-3-36 12-31 35q-11 18-27 29t-28 14l-11 1q-12 0-16-2t-3-7 5-8 7-6l4-3q12-6 24-21t18-29l5-13q8-21 25-34t37-17 39-4 31 2l13 3q0-22 0-50t1-30q0-10-8-17t-22-4q-129 43-211 155t-82 252q0 117 58 215t155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+<glyph glyph-name="octocat" unicode="&#xf09b;" d="M857 350q0-140-82-252t-211-155q-15-3-22 4t-7 17v118q0 54-29 79 32 3 57 10t53 22 45 37 30 58 11 84q0 68-44 115 21 51-5 114-15 5-45-6t-51-25l-21-13q-52 15-107 15t-108-15q-8 6-23 15t-47 22-48 7q-24-63-4-114-44-47-44-115 0-47 12-83t29-59 45-37 52-22 57-10q-22-20-27-58-12-5-25-8t-32-3-36 12-31 35q-11 18-27 29t-28 14l-11 1q-12 0-16-2t-3-7 5-8 7-6l4-3q12-6 24-21t18-29l5-13q8-21 25-34t37-17 39-4 31 2l13 3q0-22 0-50t1-30q0-10-8-17t-22-4q-129 43-211 155t-82 252q0 117 58 215t155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="menu" unicode="&#xf0c9;" d="M857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
 </font>
 </defs>
 </svg>
\ No newline at end of file
diff --git a/themes/default/font/fontello.ttf b/themes/default/font/fontello.ttf
index f9b65ca25d0b21287c7f9631d7ab6e44dc8b4643..fb114894e16899384d5df3c0de7d6eecbe1482bf 100644
GIT binary patch
delta 804
zcmZvaO=uHA6vzK>XLnOJHHjrgC{@#%en5+@HEl22FM|;*SV<~Y6uYKrBh4mDx=QOM
z9>jxqsOBUh1Vz-F81YoWLp>Dqq=I)9a?)HBl|p>8t?0oS-kbTo`Oll3xAU@Rbzcz#
zz>g~su;YoT@$ilIWsYpHC66b1`-j6PegHJdd@^O3_Rz@l1?ER=Pg9qiu>QWT0^SI(
zhv)2h>-x==Y33N4J#Q}B91rlkg~x{Z?DE{>d&d%hI0L9gCT$jHja$u^0Z)bngBgx^
z4v8t|GIJzjIZI7#JcDPAT`-$ZnM$9~m_IN#TIQ0Cs`n%FC+2X@w9>Edw(RD!R6u!S
z=NFw9hkrc)jCZ^qw+m_e^H}#P5PHUZ4J4Br=)*9Stm)+7iyfIrq8Ys1ZCss_kM;`^
z<x-4BXuWimI?oo|ssUN9nyg<Bj|Nwy!23p-4KzT3Qbp}{?M`jIUI+f2yO~+ey3H=<
z3g_TcNxx4DHL;}8m5pwR)lxvTZ$oVzu1RSnD#k=n0QH~Zw6ey3aSwViG#c$9Rg)h;
zN*o$gp{X;RTp^*%$j_xDh;T|CI?*w}{eZ4Dcen2d>YmoNj?RJT;81ISNHBM9@y;#&
zv+nYAFtG8}Ukp;nC${@T<l_HnHtv@TuBX6JAB+92r_C694)IN8G1<P1M{?)<2fx89
zs`CDCUoBXF$NCdd6<%g}$I?T+t6P&Y*UCKd`;+Fj6#|tN%}uN!0a5v`dqhOz8VgcM
gBOPigV>;UT3x(NbPd?@F6LVB6ox51sW$bPI4MC%p1ONa4

delta 537
zcmYk2K}Z!*6o&shcbs|7NKY3n0+9(5qaK<Pwn<Y73ko#eOKcG`KA&#{r+3k7=}K2E
z!i6<03X2MYHZ8)paUsznh(aL<cP)Y_U8uNmBjNL(fxt8T_nhzCbLXCWR$D%0<{$v1
zF%JoKEqlB7!(n-cnSWGof3~%~%e(ax5Z&a#eCVrh)5D+1&!`vq``WWMDkk8Z<-Rwj
zis7Tji+9M^0aq3MDaCv(*`rStCuYaq4TWz3d6DW03jW-vbEEDfU}+X~1kBi-GDm(-
zJ`;p`=EPS<u)cGtohapfqc!f>`o+Zw{TYS7?r-uo*}Lb5g|(OU4S-z(80)Gur3d=l
zb)cG$K#!U%s6RdDSAml&<cARK4GtQRfw<atGlx{<iMA>}PA*3|aYZaePepS!NTvjg
za7yv*8G46B0Zep|Q~V5I3wzJ^mMWFw5qDXbRHTx~;8_SOI&B<87mVsO8>Mj`iOJ}k
zY%1TC-Lf&hh+6nkdNQ28ybo7y#U(%9Y^MMFXu-bJY{vOSujx7b#1;j_D@O5OOk`n{
lcWqmGrZ9vQrl^9M4}5Lw2jf~7CavPQ4yH$d@+r5m<_I`ua*qH2

diff --git a/themes/default/font/fontello.woff b/themes/default/font/fontello.woff
index a2ef51165dccc7da3d5f0bbce731ab5950b5bb12..d37a53602bdff4bb0f1e9525bec8c58ac30ea3a8 100644
GIT binary patch
delta 1567
zcmXYxcU03?9K~M}V$dW684d`R9hpWD0Wst-l_f<4p(_5uULh$Wm>`5;3MvYT0a<0J
zs3-`=$gn^O9+rrMDg^|U0xAktSu#qc59>SUbKbl6+<V^p{qg&bsZFY@BzQVI0~COZ
zI0;Cr`^McO6&;=pJRQ(Hr^oU1-ev{>DjRACh_9`t*Fq4J!G>Nx)RAz%V@a=#3W|@@
z1OV*_J!OdIn%)(;P<9v-dVT<4g#h5$XGKE)Fvc<1#f`&^{C5<?qB)_^`wRev4uIUc
z8<%-*-r*sPU|6EU&?-CET~OnOLlb%k)EW?791Y_W&Wt+&y%eZdFIG{~1|XUhw3=Ie
zG+`Aq6@z6mPQZ)trBG{rV;nyk!(fI$PX<3C0Y3CmcM*9Dn{_M>@Bq;YhIT^sG&w9?
zWyglVG7$o}khC{;MvW(a4MKtuWH^wD+zvvzT#O$C4Ile?W-UV)h%i!saJO0Ec8WPo
z#K*K_x+EzP3Ywv(PNRW=KXxzp)(wzZ@%cG?{*AK{Bn-xZBnUkzLpnR<R6-DOC5p(i
zdO)6~XK0<ZKFv`3F>k#t4xmd3#jyKP)Iv<5$~*l~qZUMN)7mAZ)NL>7^w@oeZ~wkU
zYkAD#^E37W(4lTB6xk`r^~F@};2{yo*ZLc&;=PvK$leLg@L<B3e>0|S2NYh@rlOdv
z_ugM-(VmB%$dnwShWmPqG@I*f&>HDdGxTjNFG>7_rS7EC@w(8`d}5)aYV>c?;Mz=S
zOuR?*WL#5&X=Gqw>-lHTUEEx}4*6_7U|s6iN)s4v6dF4DkZ9})x}t6-c^Y>>*nEki
zK>H%MM<7sXj}a;2?n<RIy@}F-`J@um8upZOQ%JK6JtT->Ew&qDCbe7AJ5R51(LKx~
z3FlC#JwQ%JvppPlx}S!$rd2dOj%~ZeX7oONE*V+cFaD`*PJ7$AE2bGW@#!_{<LMd%
z*YUjlMt_lC91D)zwN%V4dl6ihTL03^KY6V|9WVa2O6BXC&^&h?hkXL6ec$37bBLap
zRJ*bif3!^5-1{)w{-S%gUqauhtGQXchtEj+4px)4OC_i1(M5#oRaU7Ki!rjx&5~?K
z+uU1QZZS&;>6GRw+SG9y>k@4(ai@~Y*!_EEH7<7MCu{u=&1U)ZvZrvggI{+rD(VKx
zw_VIvyi;oSk*rf}AAAz*?_4i$>MT2xrEz&ZHTcR@@({|g{`v-LWAtE7MBU9ZynHp+
zM`p*TDLGjmIrIK@gAqu-uQSJMQyqp9<7RU09lmGeT?ajRaeB~g@za(giFpmdV>2&p
z0+KETj5l+QzgV)Ij6@uh;B?8Sp@pvl0a;01wQQPxKId+iv2XvYBg@gAes3RDe;$py
zm*9_f|6p@HJv-HAbg9cJtU%e_fcLOZXs%YCrlXilEWeH5Wc6w|*`k&_kYMc3xhYc{
zlP1Ig{Y&Kmb9jz{dt2&#*`b!FpV+<6`{&E}#T6EL`Wg}Wda-36nkN>C(U*-n+}#5<
z#Pyh|>KiIH1*QF6Vrwx=>T2<+>-^x`<5yexnd+L&9cc7_(r_^MEmLI5<5m?LUiW@4
z=cedc;jKG#Gxss#%j0rqXIRylQyCjsk!6&UR_q^cbLX!nOM6voi?<W<jk;ng23RpW
zLZ#iaf^Hk@LLo(U=bf^!%D_}F>cb1WdS5jzyj>n2C%4a|Ouv@lCdq_6?{jw(89owG
zisT694W81H;G^ac*s#KDvpXW{jB@d+H1X@I;)Jx<znkHExc>90W+otN<<I#?lSiA?
z^<V7rP~Z7A>xH`eMe$~-`fuyh#hd4N+OEq)4~8h|{~sPfz(_)7?###{^LI10c{4am
zJ#1T0lu^3ELXum$iDR);D&G;sRw5L9A1(?@C0M%dQ7UzL1+UB3-kPEc(#x=Ua0J0X
za*IqxxQ|b<Qc6V`Ok?1fUR^>IK$W7gV0EZtfj7WN4e|LXlN`|*QNHLGQI6<5U(Z@c
kBCs%!ZoPVeM!%;^x0VR>EG??D`6!UMEMEwKc${$ZKX`eFX#fBK

delta 1392
zcmXYwdo<K(7{}ka8O;ohND}QR6Q*3wxRee<lCXANw^K@H+(y={8I4THZ)oIN%wluP
zC{vPaZgH?uVpG#)Bweu~m)I6dHZuEad(Zit=lA`d@AE$I?~iAC%c!<Sw7ZiNKmmAE
zg24K<s%bCQ*p8UPFNfOI`Wbg`Q#t^s45;@*4lyX6Zvr_iF7%#2&4RV4H_E>&@D!f{
z0NMh2>JW-jzXBV=WpkkC3;-?*03tU{oOOiFIthF6FJMOb8)SC)=@94*!>k+t45REY
z!jXmsvw{F1G{BG<#ES5}+V7#zgx)CBx)6Q5EygF5!xzBIu~3uOP`wX8ctjw~5jCJD
ztbsN~0S-$52NNk!|Id5k$S*8TF!b!<PejAvvWJ&+wsIp*^1*RHYKFnJ!TUU%h%#<u
zFl;7GKpg`)H@0tQo1iF=8N_4`2V@04VKMo<`E{&eCX*!uS){-pLt?ghka{t_H-#ru
zDIsT5&>(F)#vOd^8SKg~MD0NGWIF%YrR$|xr?9j=^3?S407oJv!pKb4O%<UT3H#W^
zUM)bwwaeb8QX_a@Z#X$TIZ;pWVb^kSi-3u~QfIVo)WPi1RNAum-j}Y+vCj$IKG%wN
z#Ngu6fkmSi?EHTlV}^!|eZw#hnsXDzUQG#?z%x@#FZlkoXVg2RZ{QH>ueK5DE?Pa3
zi}^>`oEr6d)23|mkW16=10=duA1qV4tWsSZ-idB;(IRrPp~tp>G@+ck!AoRlSUp0-
zPWJAcLp||hVEQ-a_zWChH&T-SG{fStd4WQqz@V2FHz8LMrjpg=*GJnJ2ZVk>OPf<q
z%N)D=mCM&F@4+&)(1`l1s#%{c<yvQCP5t483WvRx4aSw9FVk~87tS6c8&sK4om%(L
zD4pZsOX)F9^j^W%xAWm!G|we$b=}=U^pyWKaicb)Xvp?uVdkNad$Xl<XTv<6tM6~k
zP3Kz;B<`o|hNd65g+;nKcRGiJ$y-{rWr)BtU%+jP;|O0a=prl4Q5IUQ6D}-mLu{Qq
zGbdQjjuBg1cg8|X=S%Axt>M_bL%~(L*lP!2(og60@b%3dZ?DUel6@`XmL)?ckb>I&
z*P+kGY5G@bQ?9$+cga)qpWC}wVvR=0*mUuJ8?1x&h0i=Z`Ojj;ZRV?}3iZ`WJ%gXG
zlX{x=*myJQ#*v;TQT4#>=Bo1qU!MFzo3tuJG$d<yA8)%de`|fs<Bjo1<QQx9ShdH*
zpz4(QLV%)=*wV@?ZG2W&)72mm4KCOXGG?9{zq->e`f2e#-P-3(yiN3YIe%Kl7Fc^v
z{;*SMex__CtB)Hit?`=MfxVm86o<pj7O3hZ%vzUpBZ-SbQE@D#i{T7fFkTm=E?RHe
zc#WG(SG*)D={PD!me@@>d}q(JvToQ0C0cSqgvB2o#gWtWSl987cowE`qC!oboqok+
zZ&SCUe?z?4-A|cAqm>fcQ)-7}R9VhZevzOfm-eZfc&dHazo28d*UjkfDn2#)k<{?s
zwo(KU&#}+CY4%j@?!hC9Pm|>D+7(`b58`q)UeX2z#+PMD)%>b(ld?H#zhCHL;fM3(
zygE!d;rL*%#<gyz+^R}%SG9xQLB7Y9=T^riJ3A+%@8w3r&Hc8U;9c<uJz#dl%71fn
zzCSpiWnvolD6>Qn!Hn;Gs4^O9rfinrh&rf4EX`&TH<{u<aw+a2+z$*~^skh_dITD4
zCkq8o5?E0XEbs>C`WwW26g5elD$W-tiE|UE*4uB2+NC!2QvJphW7~TDQj63C6gWD7
K56kAN#Qg`EnKpL-

diff --git a/themes/default/font/fontello.woff2 b/themes/default/font/fontello.woff2
index 9821cb2e2aeb516162585f03b10f70828e88a329..38039ce15ec297de54c53f8d7ce8ce6d383be50d 100644
GIT binary patch
literal 2956
zcmV;73v={$Pew8T0RR9101J!&4*&oF02e#}01Gq#0RR9100000000000000000000
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
C7oh?G

literal 2888
zcmV-O3%B%lPew8T0RR9101HR}4*&oF02V+101EK{0RR9100000000000000000000
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

diff --git a/themes/default/fontello.css b/themes/default/fontello.css
index 8fd6a40..e9a005e 100644
--- a/themes/default/fontello.css
+++ b/themes/default/fontello.css
@@ -55,6 +55,7 @@
     /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
 
-.icon-chat:before { content: '\e800'; } /* '' */
-.icon-birdy:before { content: '\f099'; } /* '' */
+.icon-menu:before { content: '\f0c9'; } /* '' */
 .icon-octocat:before { content: '\f09b'; } /* '' */
+.icon-birdy:before { content: '\f099'; } /* '' */
+.icon-chat:before { content: '\e800'; } /* '' */
diff --git a/themes/default/index.twig b/themes/default/index.twig
index 8d6bc03..ec76b84 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -1,28 +1,32 @@
 <!DOCTYPE html>
-<html lang="en" class="no-js">
+<html class="no-js">
 <head>
     <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 
     <title>{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}</title>
     {% if meta.description %}
-        <meta name="description" content="{{ meta.description|striptags }}">
+        <meta name="description" content="{{ meta.description|striptags }}" />
     {% endif %}{% if meta.robots %}
-        <meta name="robots" content="{{ meta.robots }}">
+        <meta name="robots" content="{{ meta.robots }}" />
     {% endif %}
 
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700" type="text/css" />
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono" type="text/css" />
     <link rel="stylesheet" href="{{ theme_url }}/style.css" type="text/css" />
     <link rel="stylesheet" href="{{ theme_url }}/fontello.css" type="text/css" />
-
-    <script src="{{ theme_url }}/scripts/modernizr-2.6.1.min.js"></script>
 </head>
-<body>
+<body{% if config.theme_config.widescreen %} class="widescreen"{% endif %}>
 
-    <header id="header">
-        <div class="inner clearfix">
-            <h1><a href="{{ "index"|link }}" id="logo">{{ site_title }}</a></h1>
-            <nav>
-                <a href="#" class="menu-icon"></a>
+    <header>
+        <div class="container">
+            <a id="page-menu-toggle" title="Toggle Menu" role="button" aria-controls="page-menu" aria-expanded="false" tabindex="1">
+                <span class="icon-menu" aria-hidden="true"></span>
+                <span class="sr-only">Toggle Menu</span>
+            </a>
+            <h1>
+                <a href="{{ "index"|link }}">{{ site_title }}</a>
+            </h1>
+            <nav id="page-menu" role="region" tabindex="-1">
                 <ul>
                     {% for page in pages if page.title %}
                         <li{% if page.id == current_page.id %} class="active"{% endif %}>
@@ -34,24 +38,32 @@
         </div>
     </header>
 
-    <section id="content">
-        <div class="inner">
+    <main>
+        <div class="container">
             {{ content }}
         </div>
-    </section>
+    </main>
 
-    <footer id="footer">
-        <div class="inner">
+    <footer>
+        <div class="container">
             <div class="social">
                 {% for social in meta.social %}
-                    <a href="{{ social.url }}" title="{{ social.title }}"><span class="icon-{{ social.icon }}"></span></a>
+                    <a href="{{ social.url }}" title="{{ social.title }}" role="button">
+                        <span class="icon-{{ social.icon }}" aria-hidden="true"></span>
+                        <span class="sr-only">{{ social.title }}</span>
+                    </a>
                 {% endfor %}
             </div>
-            <a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
-            and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
-            Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
+            <p>
+                <a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
+                and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
+                Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
+            </p>
         </div>
     </footer>
 
+    <script src="{{ theme_url }}/js/utils.js" type="text/javascript"></script>
+    <script src="{{ theme_url }}/js/pico.js" type="text/javascript"></script>
+
 </body>
 </html>
diff --git a/themes/default/js/pico.js b/themes/default/js/pico.js
new file mode 100644
index 0000000..b110a10
--- /dev/null
+++ b/themes/default/js/pico.js
@@ -0,0 +1,67 @@
+/**
+ * Pico's Default Theme - JavaScript helper
+ *
+ * Pico is a stupidly simple, blazing fast, flat file CMS.
+ *
+ * @author  Daniel Rudolf
+ * @link    http://picocms.org
+ * @license http://opensource.org/licenses/MIT The MIT License
+ * @version 1.1
+ */
+
+function main() {
+    // capability CSS classes
+    document.documentElement.classList.remove('no-js');
+    document.documentElement.classList.add('js');
+
+    // wrap tables
+    utils.forEach(document.querySelectorAll('main table'), function (_, table) {
+        if (!table.parentElement.classList.contains('table-responsive')) {
+            var tableWrapper = document.createElement('div');
+            tableWrapper.classList.add('table-responsive');
+
+            table.parentElement.insertBefore(tableWrapper, table);
+            tableWrapper.appendChild(table);
+        }
+    });
+
+    // responsive menu
+    var menu = document.getElementById('page-menu'),
+        menuToggle = document.getElementById('page-menu-toggle'),
+        toggleMenuEvent = function (event) {
+            if (event.type === 'keydown') {
+                if ((event.keyCode != 13) && (event.keyCode != 32)) {
+                    return;
+                }
+            }
+
+            event.preventDefault();
+
+            if (menuToggle.getAttribute('aria-expanded') === 'false') {
+                menuToggle.setAttribute('aria-expanded', 'true');
+                utils.slideDown(menu, null, function () {
+                    if (event.type === 'keydown') menu.focus();
+                });
+            } else {
+                menuToggle.setAttribute('aria-expanded', 'false');
+                utils.slideUp(menu);
+            }
+        },
+        onResizeEvent = function () {
+            if (utils.isElementVisible(menuToggle)) {
+                menu.classList.add('hidden');
+                menuToggle.addEventListener('click', toggleMenuEvent);
+                menuToggle.addEventListener('keydown', toggleMenuEvent);
+            } else {
+                menuToggle.removeEventListener('keydown', toggleMenuEvent);
+                menuToggle.removeEventListener('click', toggleMenuEvent);
+                menu.classList.remove('hidden', 'slide', 'up');
+                delete menu.dataset.slideId;
+            }
+        };
+
+    window.addEventListener('resize', onResizeEvent);
+    onResizeEvent();
+}
+
+main();
diff --git a/themes/default/js/utils.js b/themes/default/js/utils.js
new file mode 100644
index 0000000..b500be9
--- /dev/null
+++ b/themes/default/js/utils.js
@@ -0,0 +1,161 @@
+/**
+ * Pico's Default Theme - JavaScript helper
+ *
+ * Pico is a stupidly simple, blazing fast, flat file CMS.
+ *
+ * @author  Daniel Rudolf
+ * @link    http://picocms.org
+ * @license http://opensource.org/licenses/MIT The MIT License
+ * @version 1.1
+ */
+
+utils = {};
+
+/**
+ * Iterates through an iterable object (e.g. plain objects, arrays, NodeList)
+ *
+ * @param  object   object   the object to iterate through
+ * @param  function callback function to call on every item; the key is passed
+ *     as first, the value as second parameter
+ * @return void
+ */
+utils.forEach = function (object, callback) {
+    var i = 0,
+        keys = Object.keys(object),
+        length = keys.length;
+    for (; i < length; i++) {
+        if (callback(keys[i], object[keys[i]]) === false) {
+            return;
+        }
+    }
+};
+
+/**
+ * Slides a element up (i.e. hide a element by changing its height to 0)
+ *
+ * @param  HTMLElement element        the element to slide up
+ * @param  function    finishCallback function to call when the animation has
+ *     been finished (i.e. the element is hidden)
+ * @param  function    startCallback  function to call when the animation starts
+ * @return void
+ */
+utils.slideUp = function (element, finishCallback, startCallback) {
+    utils.slideOut(element, {
+        cssRule: 'height',
+        cssRuleRef: 'clientHeight',
+        cssClass: 'up',
+        startCallback: startCallback,
+        finishCallback: finishCallback
+    });
+};
+
+/**
+ * Slides a element down (i.e. show a hidden element)
+ *
+ * @param  HTMLElement element        the element to slide down
+ * @param  function    finishCallback function to call when the animation has
+ *     been finished (i.e. the element is visible)
+ * @param  function    startCallback  function to call when the animation starts
+ * @return void
+ */
+utils.slideDown = function (element, finishCallback, startCallback) {
+    utils.slideIn(element, {
+        cssRule: 'height',
+        cssRuleRef: 'clientHeight',
+        cssClass: 'up',
+        startCallback: startCallback,
+        finishCallback: finishCallback
+    });
+};
+
+/**
+ * Slides a element out (i.e. hide the element)
+ *
+ * @param  HTMLElement element the element to slide out
+ * @param  object      options the settings of the sliding process
+ * @return void
+ */
+utils.slideOut = function (element, options) {
+    element.style[options.cssRule] = element[options.cssRuleRef] + 'px';
+
+    var slideId = parseInt(element.dataset.slideId) || 0;
+    element.dataset.slideId = ++slideId;
+
+    window.requestAnimationFrame(function () {
+        element.classList.add('slide');
+
+        window.requestAnimationFrame(function () {
+            element.classList.add(options.cssClass);
+
+            if (options.startCallback) {
+                options.startCallback();
+            }
+
+            window.setTimeout(function () {
+                if (parseInt(element.dataset.slideId) !== slideId) return;
+
+                element.classList.add('hidden');
+                element.classList.remove('slide');
+                element.classList.remove(options.cssClass);
+                element.style[options.cssRule] = null;
+
+                if (options.finishCallback) {
+                    window.requestAnimationFrame(options.finishCallback);
+                }
+            }, 500);
+        });
+    });
+};
+
+/**
+ * Slides a element in (i.e. make the element visible)
+ *
+ * @param  HTMLElement element the element to slide in
+ * @param  object      options the settings of the sliding process
+ * @return void
+ */
+utils.slideIn = function (element, options) {
+    var cssRuleOriginalValue = element[options.cssRuleRef] + 'px',
+        slideId = parseInt(element.dataset.slideId) || 0;
+
+    element.dataset.slideId = ++slideId;
+
+    element.style[options.cssRule] = null;
+    element.classList.remove('hidden', 'slide', options.cssClass);
+    var cssRuleValue = element[options.cssRuleRef] + 'px';
+
+    element.classList.add('slide');
+
+    window.requestAnimationFrame(function () {
+        element.style[options.cssRule] = cssRuleOriginalValue;
+
+        window.requestAnimationFrame(function () {
+            element.style[options.cssRule] = cssRuleValue;
+
+            if (options.startCallback) {
+                options.startCallback();
+            }
+
+            window.setTimeout(function () {
+                if (parseInt(element.dataset.slideId) !== slideId) return;
+
+                element.classList.remove('slide');
+                element.style[options.cssRule] = null;
+
+                if (options.finishCallback) {
+                    window.requestAnimationFrame(options.finishCallback);
+                }
+            }, 500);
+        });
+    });
+};
+
+/**
+ * Check whether a element is visible or not
+ *
+ * @param  HTMLElement element the element to test
+ * @return boolean             TRUE when the element is visible, FALSE otherwise
+ */
+utils.isElementVisible = function (element) {
+    return !!(element.offsetWidth || element.offsetHeight || element.getClientRects().length);
+};
\ No newline at end of file
diff --git a/themes/default/scripts/modernizr-2.6.1.min.js b/themes/default/scripts/modernizr-2.6.1.min.js
deleted file mode 100644
index 3c2d12e..0000000
--- a/themes/default/scripts/modernizr-2.6.1.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.6.1 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-cssclasses-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function C(a){j.cssText=a}function D(a,b){return C(n.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a){var e=a[d];if(!F(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),H(e,b,c))}function J(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)u[c[d]]=c[d]in k;return u.list&&(u.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),u}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)k.setAttribute("type",f=a[d]),e=k.type!=="text",e&&(k.value=l,k.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&k.style.WebkitAppearance!==c?(g.appendChild(k),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(k,null).WebkitAppearance!=="textfield"&&k.offsetHeight!==0,g.removeChild(k)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=k.checkValidity&&k.checkValidity()===!1:e=k.value!=l)),t[a[d]]=!!e;return t}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.6.1",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k=b.createElement("input"),l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k=b.createElement("div"),l=b.body,m=l?l:b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),k.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,"</style>"].join(""),k.id=h,(l?k:m).innerHTML+=f,m.appendChild(k),l||(m.style.background="",g.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return I("flexWrap")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!I("indexedDB",a)},s.hashchange=function(){return z("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return C("background-color:rgba(150,255,150,.5)"),F(j.backgroundColor,"rgba")},s.hsla=function(){return C("background-color:hsla(120,40%,100%,.5)"),F(j.backgroundColor,"rgba")||F(j.backgroundColor,"hsla")},s.multiplebgs=function(){return C("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return I("backgroundSize")},s.borderimage=function(){return I("borderImage")},s.borderradius=function(){return I("borderRadius")},s.boxshadow=function(){return I("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return D("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return I("animationName")},s.csscolumns=function(){return I("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return C((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),F(j.backgroundImage,"gradient")},s.cssreflections=function(){return I("boxReflect")},s.csstransforms=function(){return!!I("transform")},s.csstransforms3d=function(){var a=!!I("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return I("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(['#modernizr:after{content:"',l,'";visibility:hidden}'].join(""),function(b){a=b.offsetHeight>=1}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h),localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=function(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var K in s)B(s,K)&&(x=K.toLowerCase(),e[x]=s[K](),v.push((e[x]?"":"no-")+x));return e.input||J(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)B(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},C(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^<|^(?:a|b|button|code|div|fieldset|form|h1|h2|h3|h4|h5|h6|i|iframe|img|input|label|li|link|ol|option|p|param|q|script|select|span|strong|style|table|tbody|td|textarea|tfoot|th|thead|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.hasEvent=z,e.testProp=function(a){return G([a])},e.testAllProps=I,e.testStyles=y,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/themes/default/style.css b/themes/default/style.css
index 9da7a0d..ad4857b 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -1,394 +1,285 @@
-/*=================================*/
-/* Pico Default Theme
-/* By: Gilbert Pellegrom
-/* http: //dev7studios.com
-/*=================================*/
+/**
+ * Pico's Default Theme
+ *
+ * Pico's default theme is a bit bare - but that's intentional! The default
+ * theme isn't meant for production use, it's actually a template for you to
+ * design your own theme around.
+ *
+ * Pico is a stupidly simple, blazing fast, flat file CMS.
+ *
+ * @author  Daniel Rudolf
+ * @link    http://picocms.org
+ * @license http://opensource.org/licenses/MIT The MIT License
+ * @version 1.1
+ */
 
-/* Reset Styles
-/*---------------------------------------------*/
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
+* {
+    box-sizing: border-box;
+    border: 0 none;
     margin: 0;
     padding: 0;
-    border: 0;
-    outline: 0;
-    font-weight: inherit;
-    font-style: inherit;
-    font-size: 100%;
-    font-family: inherit;
-    vertical-align: baseline;
 }
 
 body {
-    line-height: 1;
-    color: black;
-    background: white;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-
-caption, th, td {
-    text-align: left;
-    font-weight: normal;
-}
-
-blockquote:before, blockquote:after,
-q:before, q:after {
-    content: "";
-}
-
-blockquote, q {
-    quotes: "" "";
-}
-
-/* HTML5 tags */
-header, section, footer,
-aside, nav, article, figure {
-    display: block;
-}
-
-/* hand cursor on clickable input elements */
-label, input[type=button], input[type=submit], button {
-    cursor: pointer;
-}
-
-/* make buttons play nice in IE:
-   www.viget.com/inspire/styling-the-button-element-in-internet-explorer/ */
-button {
-    width: auto;
-    overflow: visible;
-}
-
-/* Sharper Thumbnails */
-img {
-    -ms-interpolation-mode: bicubic;
-}
-
-/* Input Styles
-/*---------------------------------------------*/
-input,
-textarea,
-select {
-    padding: 5px;
-    font: 400 1em Verdana, Sans-serif;
-    color: #666;
-    background: #fff;
-    border: 1px solid #999999;
-    margin: 0 0 1em 0;
-}
-
-input:focus,
-textarea:focus,
-select:focus {
-    color: #000;
-    background: #fff;
-    border: 1px solid #666666;
-}
-
-/* Main Styles
-/*---------------------------------------------*/
-body {
-    font: 14px/1.8em 'Open Sans', Helvetica, Arial, Helvetica, sans-serif;
+    font-family: 'Droid Sans', 'Helvetica', 'Arial', sans-serif;
+    font-size: 16px;
+    line-height: 1.6;
     color: #444;
-    background: #fff;
-    -webkit-font-smoothing: antialiased;
 }
 
-a, a:visited {
-    color: #2EAE9B;
-    text-decoration: none;
-    -webkit-transition: all 0.2s linear;
-    -moz-transition: all 0.2s linear;
-    -ms-transition: all 0.2s linear;
-    -o-transition: all 0.2s linear;
-    transition: all 0.2s linear;
-}
-
-a:hover, a:active {
-    color: #000;
-    text-decoration: none;
-}
-
-h1, h2, h3, h4, h5, h6 {
-    color: #000;
-    line-height: 1.2em;
-    margin-bottom: 0.6em;
-}
-
-h1 {
-    font-size: 2em;
-}
-
-h2 {
-    font-size: 1.7em;
-}
-
-h3 {
-    font-size: 1.5em;
-    margin-top: 2em;
-}
-
-p, table, ol, ul, pre, blockquote, dl {
+p, hr, table, .table-responsive, ol, ul, dl, pre, blockquote {
     margin-bottom: 1em;
 }
 
-ol, ul {
-    padding-left: 30px;
+.hidden { display: none !important; }
+.sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0 none;
 }
 
-b, strong {
-    font-weight: bold;
+.slide {
+    overflow-y: hidden !important;
+    -webkit-transition: height .5s ease-in !important;
+            transition: height .5s ease-in !important;
 }
+.slide.up { height: 0 !important; }
 
-i, em {
-    font-style: italic;
-}
+/*** BASIC LAYOUT ***/
 
-u {
-    text-decoration: underline;
-}
-
-abbr, acronym {
-    cursor: help;
-    border-bottom: 0.1em dotted;
-}
-
-td, td img {
-    vertical-align: top;
-}
-
-td, th {
-    border: solid 1px #999;
-    padding: 0.25em 0.5em;
-}
-
-th {
-    font-weight: bold;
-    text-align: center;
-    background: #eee;
-}
-
-sub {
-    vertical-align: sub;
-    font-size: smaller;
-}
-
-sup {
-    vertical-align: super;
-    font-size: smaller;
-}
-
-code {
-    font-family: Courier, "Courier New", Monaco, Tahoma;
-    background: #eee;
-    color: #333;
-    padding: 0px 2px;
-}
-
-pre {
-    background: #eee;
-    padding: 20px;
-    overflow: auto;
-}
-
-blockquote {
-    font-style: italic;
-    margin-left: 15px;
-    padding-left: 10px;
-    border-left: 5px solid #dddddd;
-}
-
-dd {
-    margin-left: 2em;
-}
-
-/* Structure Styles
-/*---------------------------------------------*/
+html { height: 100%; }
 body {
     display: flex;
     flex-direction: column;
-    min-height: 100vh;
     height: 100%;
 }
-body > * {
-    flex: none;
-    width: 100%;
+main {
+    flex: 1 0 auto;
+    margin: 5em 0 4em;
 }
 
-.inner {
-    width: 100%;
-    max-width: 850px;
+.container {
+    max-width: 47em;
+    padding: 0 0.5em;
     margin: 0 auto;
 }
 
-#header {
-    background: #2EAE9B;
-    padding: 60px 0;
-    margin-bottom: 80px;
-    color: #afe1da;
+.widescreen .container { max-width: 72em; }
+
+main .container {
+    /* very ugly, avoid this whenever possible! */
+    overflow-x: auto;
 }
-#header a {
-    color: #afe1da;
-}
-#header h1 a,
-#header a:hover,
-#header .active a {
-    color: #fff;
-}
-#header h1 {
-    font-weight: bold;
-    margin: 0;
+
+/*** BASIC LAYOUT: HEADER ***/
+
+header { background: #2EAE9B; }
+
+header h1 {
     float: left;
+    font-size: 2rem;
+    margin: 0 1em 1.5em 0;
 }
-#header .menu-icon {
-    display: none;
-    width: 35px;
-    height: 35px;
-    background: #afe1da url(menu-icon.png) center;
+header h1 a, header h1 a:hover { color: #fff; }
+
+header nav {
+    text-align: right;
+    margin: 3em 0;
 }
-#header nav {
-    float: right;
+header nav ul {
     list-style: none;
     margin: 0;
     padding: 0;
 }
-#header nav a {
-    font-weight: bold;
-    margin-left: 20px;
-}
-#header a:hover#menu-icon {
-    background-color: #444;
-    border-radius: 4px 4px 0 0;
-}
-#header ul {
-    list-style: none;
-}
-#header li {
+header nav ul li {
     display: inline-block;
-    float: left;
+    margin-left: 1em;
+    padding: 0;
+    font-weight: bold;
 }
-#content {
-    flex: 1 0 auto;
+
+header nav a, #page-menu-toggle { color: #afe1da; }
+header nav .active a, header nav a:hover, #page-menu-toggle:hover { color: #fff; }
+
+#page-menu-toggle {
+    display: none;
+    float: right;
+    width: 2em;
+    margin: 0 0 0.5em 1em;
+    font-size: 1.5rem;
+    line-height: 2em;
+    text-align: center;
+    cursor: pointer;
 }
-#footer {
+#page-menu-toggle > * { vertical-align: middle; }
+
+/*** BASIC LAYOUT: FOOTER ***/
+
+footer {
     background: #707070;
-    padding: 60px 0;
-    margin-top: 80px;
     color: #C0C0C0;
 }
-#footer .social {
+
+footer a { color: #ddd; }
+footer a:hover { color: #fff; }
+
+footer p {
+    margin: 3em 0;
+}
+
+footer .social {
     float: right;
     margin: 0 0 0.5em 1em;
-    font-size: 200%;
-}
-#footer a { color: #ddd; }
-#footer a:hover { color: #fff; }
-
-/* Misc Styles
-/*---------------------------------------------*/
-.clearfix:before,
-.clearfix:after {
-    content: " ";
-    display: table;
-}
-.clearfix:after {
-    clear: both;
-}
-.clearfix {
-    *zoom: 1;
+    font-size: 2rem;
 }
 
-/* Media Queries
-/*---------------------------------------------*/
+/*** BASIC LAYOUT: EXTRA SMALL DEVICES ***/
 
-/* Small Devices, Tablets */
-@media only screen and (max-width : 768px) {
-    .inner {
-        width: 85%;
+@media (max-width: 767px) {
+    main { margin: 2em 0 1em; }
+
+    header h1 {
+        float: none;
+        margin: 0.5em 0;
     }
-    .inner img {
-        width:100%;
-    }
-    #header {
-        margin-bottom: 40px;
-    }
-    #header h1 a {
-        font-size:1em;
-    }
-    #header .menu-icon {
-        display:inline-block;
-    }
-    #header nav a { color: #000; }
-    #header nav a:hover { color: #afe1da; }
-    #header nav ul, nav:active ul {
-        display: none;
-        position: absolute;
-        padding: 20px;
-        background: #fff;
-        border: 5px solid #444;
-        right: 2.7em;
-        top: 100px;
-        width: 80%;
-        border-radius: 4px 0 4px 4px;
-        z-index: 9999;
-    }
-    #header nav li {
-        text-align: center;
-        width: 100%;
-        padding: 10px 0;
+
+    header nav {
+        clear: right;
         margin: 0;
     }
-    #header nav:hover ul {
-        display: block;
+    header nav ul {
+        padding-bottom: 1em;
     }
+    header nav ul li {
+        display: block;
+        margin: 0;
+        text-align: center;
+    }
+    header nav ul li a {
+        display: block;
+        padding: 0.5em 0;
+    }
+
+    .js #page-menu-toggle { display: block; }
+
+    footer p { margin: 1em 0; }
 }
 
-/* Extra Small Devices, Phones */
-@media only screen and (max-width : 480px) {
-    .inner {
-        width: 85%;
-    }
-    .inner img {
-        width:100%;
-    }
-    #header {
-        margin-bottom: 30px;
-    }
-    #header h1 a {
-        font-size:1em;
-    }
-    #header .menu-icon {
-        display:inline-block;
-    }
-    #header nav a { color: #000; }
-    #header nav a:hover { color: #afe1da; }
-    #header nav ul, nav:active ul {
-        display: none;
-        position: absolute;
-        padding: 20px;
-        background: #fff;
-        border: 5px solid #444;
-        right: 0em;
-        top: 100px;
-        width: auto;
-        border-radius: 4px 0 4px 4px;
-    }
-    #header nav li {
-        text-align: center;
-        width: 100%;
-        padding: 10px 0;
-        margin: 0;
-    }
-    #header nav:hover ul {
-        display: block;
-    }
+/*** TEXT ***/
+
+a {
+    color: #2EAE9B;
+    text-decoration: none;
+    -webkit-transition: color .2s ease-in;
+            transition: color .2s ease-in;
+}
+a:hover { color: #444; }
+
+h1, h2, h3, h4, h5, h6 {
+    margin-bottom: 0.6em;
+    font-weight: bold;
+    color: #333;
+}
+h1 { font-size: 2rem; }
+h2 { font-size: 1.7rem; }
+h3 { font-size: 1.4rem; }
+h4 { font-size: 1.1rem; }
+h5 { font-size: 1rem; }
+h6 { font-size: 1rem; font-weight: normal; font-style: italic; }
+
+img { max-width: 100%; }
+
+p, td, th, li, dd {
+    text-align: justify;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+}
+
+hr {
+    border: 0.15em solid #f5f5f5;
+    border-radius: 0.3em;
+}
+
+abbr { text-decoration: underline dotted; }
+
+/*** TABLES ***/
+
+table { border-spacing: 0; }
+
+td, th {
+    padding: 0.4em 1em;
+    vertical-align: top;
+}
+th {
+    font-weight: bold;
+    text-align: center;
+    background: #f5f5f5;
+    color: #333;
+}
+
+td, th {                                         border: solid 1px #ccc; }
+tr:not(:last-child) td, tr:not(:last-child) th { border-bottom: 0 none; }
+thead tr:last-child th {                         border-bottom: 0 none; }
+td:not(:last-child), th:not(:last-child) {       border-right: 0 none; }
+
+tr:first-child td:first-child, tr:first-child th:first-child { border-top-left-radius: 0.3em; }
+tr:first-child td:last-child, tr:first-child th:last-child {   border-top-right-radius: 0.3em; }
+tbody tr:last-child td:first-child {                           border-bottom-left-radius: 0.3em; }
+tbody tr:last-child td:last-child {                            border-bottom-right-radius: 0.3em; }
+table thead + tbody tr:first-child td {                        border-radius: 0 !important; }
+
+.table-responsive { overflow-x: auto; }
+
+/*** LISTS ***/
+
+ol, ul {
+    list-style-position: outside;
+    padding-left: 1.5em;
+}
+ol { padding-left: 2.5em; }
+li { padding-left: 0.5em; }
+
+dt { font-weight: bold; }
+dd { margin-left: 2em; }
+
+/*** CODE ***/
+
+code {
+    margin: 0 0.1em;
+    padding: 0.1em 0.2em;
+    border: 1px solid #ccc;
+    border-radius: 0.3em;
+    background: #f5f5f5;
+    font-family: 'Droid Sans Mono', 'Courier New', 'Courier', monospace;
+    font-size: 0.9em;
+}
+
+pre {
+    padding: 0 0.9em;
+    border: 1px solid #ccc;
+    border-radius: 0.3em;
+    background: #f5f5f5;
+    line-height: 1.4;
+}
+pre code {
+    display: block;
+    margin: 0;
+    padding: 1em 0;
+    border: 0 none;
+    background: transparent;
+    overflow-x: auto;
+}
+
+/*** BLOCKQUOTE ***/
+
+blockquote {
+    font-style: italic;
+    margin-left: 1em;
+    padding-left: 1em;
+    border-left: 0.5em solid #f5f5f5;
 }

From 432710c4005bce52a51643bbd9755cddc93fbbab Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 2 Aug 2016 21:49:46 +0200
Subject: [PATCH 032/188] Default theme: Improve compatibility with older
 browsers

Namely (it could hardly be different...) Internet Explorer - even IE11 still causes trouble. The default theme now supports IE9+, even older browsers will present broken markup. The sliding animation works with IE10+ (however, it is still usable, there's just no nice animation).

Furthermore this commit heavily improves the sliding process by allowing to abort the animation. I've updated Pico's screenshot in the , too.
---
 README.md                                     |   2 +-
 themes/default/index.twig                     |   1 +
 .../default/js/modernizr-3.3.1-custom.min.js  |   3 +
 themes/default/js/pico.js                     |  15 +-
 themes/default/js/utils.js                    | 154 ++++++++----------
 themes/default/style.css                      |  99 ++++++-----
 6 files changed, 138 insertions(+), 136 deletions(-)
 create mode 100644 themes/default/js/modernizr-3.3.1-custom.min.js

diff --git a/README.md b/README.md
index 2d833d5..964c789 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Pico is a stupidly simple, blazing fast, flat file CMS. See http://picocms.org/
 
 Screenshot
 -------
-![Pico Screenshot](https://cloud.githubusercontent.com/assets/640217/11488596/70b39396-978d-11e5-885e-01341ad9dd75.gif)
+![Pico Screenshot](https://cloud.githubusercontent.com/assets/920356/17342119/f5a85ee8-58f7-11e6-856e-cd72f76cec61.png)
 
 Install
 -------
diff --git a/themes/default/index.twig b/themes/default/index.twig
index ec76b84..75a1007 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -62,6 +62,7 @@
         </div>
     </footer>
 
+    <script src="{{ theme_url }}/js/modernizr-3.3.1-custom.min.js" type="text/javascript"></script>
     <script src="{{ theme_url }}/js/utils.js" type="text/javascript"></script>
     <script src="{{ theme_url }}/js/pico.js" type="text/javascript"></script>
 
diff --git a/themes/default/js/modernizr-3.3.1-custom.min.js b/themes/default/js/modernizr-3.3.1-custom.min.js
new file mode 100644
index 0000000..1454151
--- /dev/null
+++ b/themes/default/js/modernizr-3.3.1-custom.min.js
@@ -0,0 +1,3 @@
+/*! modernizr 3.3.1 (Custom Build) | MIT *
+ * https://modernizr.com/download/?-classlist-csstransitions-dataset-requestanimationframe !*/
+!function(e,n,t){function r(e,n){return typeof e===n}function i(){var e,n,t,i,o,s,a;for(var f in y)if(y.hasOwnProperty(f)){if(e=[],n=y[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;t<n.options.aliases.length;t++)e.push(n.options.aliases[t].toLowerCase());for(i=r(n.fn,"function")?n.fn():n.fn,o=0;o<e.length;o++)s=e[o],a=s.split("."),1===a.length?Modernizr[a[0]]=i:(!Modernizr[a[0]]||Modernizr[a[0]]instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=i),C.push((i?"":"no-")+a.join("-"))}}function o(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function s(e,n){return!!~(""+e).indexOf(n)}function a(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function f(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var i;for(var o in e)if(e[o]in n)return t===!1?e[o]:(i=n[e[o]],r(i,"function")?f(i,t||n):i);return!1}function l(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=o(x?"svg":"body"),e.fake=!0),e}function p(e,t,r,i){var s,a,f,u,l="modernizr",p=o("div"),c=d();if(parseInt(r,10))for(;r--;)f=o("div"),f.id=i?i[r]:l+(r+1),p.appendChild(f);return s=o("style"),s.type="text/css",s.id="s"+l,(c.fake?c:p).appendChild(s),c.appendChild(p),s.styleSheet?s.styleSheet.cssText=e:s.appendChild(n.createTextNode(e)),p.id=l,c.fake&&(c.style.background="",c.style.overflow="hidden",u=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),a=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=u,w.offsetHeight):p.parentNode.removeChild(p),!!a}function c(n,r){var i=n.length;if("CSS"in e&&"supports"in e.CSS){for(;i--;)if(e.CSS.supports(l(n[i]),r))return!0;return!1}if("CSSSupportsRule"in e){for(var o=[];i--;)o.push("("+l(n[i])+":"+r+")");return o=o.join(" or "),p("@supports ("+o+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function m(e,n,i,f){function u(){d&&(delete E.style,delete E.modElem)}if(f=r(f,"undefined")?!1:f,!r(i,"undefined")){var l=c(e,i);if(!r(l,"undefined"))return l}for(var d,p,m,v,h,y=["modernizr","tspan","samp"];!E.style&&y.length;)d=!0,E.modElem=o(y.shift()),E.style=E.modElem.style;for(m=e.length,p=0;m>p;p++)if(v=e[p],h=E.style[v],s(v,"-")&&(v=a(v)),E.style[v]!==t){if(f||r(i,"undefined"))return u(),"pfx"==n?v:!0;try{E.style[v]=i}catch(g){}if(E.style[v]!=h)return u(),"pfx"==n?v:!0}return u(),!1}function v(e,n,t,i,o){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+S.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?m(a,n,i,o):(a=(e+" "+T.join(s+" ")+s).split(" "),u(a,n,t))}function h(e,n,r){return v(e,t,t,n,r)}var y=[],g={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){y.push({name:e,fn:n,options:t})},addAsyncTest:function(e){y.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=g,Modernizr=new Modernizr;var C=[],w=n.documentElement;Modernizr.addTest("classlist","classList"in w);var x="svg"===w.nodeName.toLowerCase();Modernizr.addTest("dataset",function(){var e=o("div");return e.setAttribute("data-a-b","c"),!(!e.dataset||"c"!==e.dataset.aB)});var _="Moz O ms Webkit",S=g._config.usePrefixes?_.split(" "):[];g._cssomPrefixes=S;var T=g._config.usePrefixes?_.toLowerCase().split(" "):[];g._domPrefixes=T;var b={elem:o("modernizr")};Modernizr._q.push(function(){delete b.elem});var E={style:b.elem.style};Modernizr._q.unshift(function(){delete E.style}),g.testAllProps=v,g.testAllProps=h,Modernizr.addTest("csstransitions",h("transition","all",!0));var z=function(n){var r,i=prefixes.length,o=e.CSSRule;if("undefined"==typeof o)return t;if(!n)return!1;if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in o)return"@"+n;for(var s=0;i>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in o)return"@-"+a.toLowerCase()+"-"+n}return!1};g.atRule=z;var P=g.prefixed=function(e,n,t){return 0===e.indexOf("@")?z(e):(-1!=e.indexOf("-")&&(e=a(e)),n?v(e,n,t):v(e,"pfx"))};Modernizr.addTest("requestanimationframe",!!P("requestAnimationFrame",e),{aliases:["raf"]}),i(),delete g.addTest,delete g.addAsyncTest;for(var A=0;A<Modernizr._q.length;A++)Modernizr._q[A]();e.Modernizr=Modernizr}(window,document);
diff --git a/themes/default/js/pico.js b/themes/default/js/pico.js
index b110a10..06e8e26 100644
--- a/themes/default/js/pico.js
+++ b/themes/default/js/pico.js
@@ -11,14 +11,13 @@
 
 function main() {
     // capability CSS classes
-    document.documentElement.classList.remove('no-js');
-    document.documentElement.classList.add('js');
+    document.documentElement.className = 'js';
 
     // wrap tables
     utils.forEach(document.querySelectorAll('main table'), function (_, table) {
-        if (!table.parentElement.classList.contains('table-responsive')) {
+        if (!/\btable-responsive\b/.test(table.parentElement.className)) {
             var tableWrapper = document.createElement('div');
-            tableWrapper.classList.add('table-responsive');
+            tableWrapper.className = 'table-responsive';
 
             table.parentElement.insertBefore(tableWrapper, table);
             tableWrapper.appendChild(table);
@@ -49,14 +48,14 @@ function main() {
         },
         onResizeEvent = function () {
             if (utils.isElementVisible(menuToggle)) {
-                menu.classList.add('hidden');
+                menu.className = 'hidden';
                 menuToggle.addEventListener('click', toggleMenuEvent);
                 menuToggle.addEventListener('keydown', toggleMenuEvent);
             } else {
-                menuToggle.removeEventListener('keydown', toggleMenuEvent);
+                menu.className = '';
+                menu.removeAttribute('data-slide-id');
                 menuToggle.removeEventListener('click', toggleMenuEvent);
-                menu.classList.remove('hidden', 'slide', 'up');
-                delete menu.dataset.slideId;
+                menuToggle.removeEventListener('keydown', toggleMenuEvent);
             }
         };
 
diff --git a/themes/default/js/utils.js b/themes/default/js/utils.js
index b500be9..7cbb50d 100644
--- a/themes/default/js/utils.js
+++ b/themes/default/js/utils.js
@@ -16,7 +16,8 @@ utils = {};
  *
  * @param  object   object   the object to iterate through
  * @param  function callback function to call on every item; the key is passed
- *     as first, the value as second parameter
+ *     as first, the value as second parameter; the callback may return FALSE
+ *     to stop the iteration
  * @return void
  */
 utils.forEach = function (object, callback) {
@@ -31,7 +32,16 @@ utils.forEach = function (object, callback) {
 };
 
 /**
- * Slides a element up (i.e. hide a element by changing its height to 0)
+ * Checks whether the client's browser is able to slide elements or not
+ *
+ * @return boolean TRUE when the browser supports sliding, FALSE otherwise
+ */
+utils.canSlide = function () {
+    return (Modernizr.classlist && Modernizr.requestanimationframe && Modernizr.csstransitions);
+};
+
+/**
+ * Slides a element up (i.e. hide a element by changing its height to 0px)
  *
  * @param  HTMLElement element        the element to slide up
  * @param  function    finishCallback function to call when the animation has
@@ -40,12 +50,40 @@ utils.forEach = function (object, callback) {
  * @return void
  */
 utils.slideUp = function (element, finishCallback, startCallback) {
-    utils.slideOut(element, {
-        cssRule: 'height',
-        cssRuleRef: 'clientHeight',
-        cssClass: 'up',
-        startCallback: startCallback,
-        finishCallback: finishCallback
+    if (!utils.canSlide()) {
+        if (startCallback) startCallback();
+        element.className += (element.className !== '') ? ' hidden' : 'hidden';
+        if (finishCallback) window.requestAnimationFrame(finishCallback);
+        return;
+    }
+
+    element.style.height = element.clientHeight + 'px';
+
+    var slideId = parseInt(element.getAttribute('data-slide-id')) || 0;
+    element.setAttribute('data-slide-id', ++slideId);
+
+    window.requestAnimationFrame(function () {
+        element.classList.add('slide');
+
+        window.requestAnimationFrame(function () {
+            element.style.height = '0px';
+
+            if (startCallback) {
+                startCallback();
+            }
+
+            window.setTimeout(function () {
+                if (parseInt(element.getAttribute('data-slide-id')) !== slideId) return;
+
+                element.classList.add('hidden');
+                element.classList.remove('slide');
+                element.style.height = null;
+
+                if (finishCallback) {
+                    window.requestAnimationFrame(finishCallback);
+                }
+            }, 500);
+        });
     });
 };
 
@@ -59,48 +97,43 @@ utils.slideUp = function (element, finishCallback, startCallback) {
  * @return void
  */
 utils.slideDown = function (element, finishCallback, startCallback) {
-    utils.slideIn(element, {
-        cssRule: 'height',
-        cssRuleRef: 'clientHeight',
-        cssClass: 'up',
-        startCallback: startCallback,
-        finishCallback: finishCallback
-    });
-};
+    if (!utils.canSlide()) {
+        if (startCallback) startCallback();
+        element.className = element.className.replace(/\bhidden\b */g, '');
+        if (finishCallback) window.requestAnimationFrame(finishCallback);
+        return;
+    }
 
-/**
- * Slides a element out (i.e. hide the element)
- *
- * @param  HTMLElement element the element to slide out
- * @param  object      options the settings of the sliding process
- * @return void
- */
-utils.slideOut = function (element, options) {
-    element.style[options.cssRule] = element[options.cssRuleRef] + 'px';
+    var cssRuleOriginalValue = element.clientHeight + 'px',
+        slideId = parseInt(element.getAttribute('data-slide-id')) || 0;
 
-    var slideId = parseInt(element.dataset.slideId) || 0;
-    element.dataset.slideId = ++slideId;
+    element.setAttribute('data-slide-id', ++slideId);
+
+    element.style.height = null;
+    element.classList.remove('hidden');
+    element.classList.remove('slide');
+    var cssRuleValue = element.clientHeight + 'px';
+
+    element.style.height = cssRuleOriginalValue;
 
     window.requestAnimationFrame(function () {
         element.classList.add('slide');
 
         window.requestAnimationFrame(function () {
-            element.classList.add(options.cssClass);
+            element.style.height = cssRuleValue;
 
-            if (options.startCallback) {
-                options.startCallback();
+            if (startCallback) {
+                startCallback();
             }
 
             window.setTimeout(function () {
-                if (parseInt(element.dataset.slideId) !== slideId) return;
+                if (parseInt(element.getAttribute('data-slide-id')) !== slideId) return;
 
-                element.classList.add('hidden');
                 element.classList.remove('slide');
-                element.classList.remove(options.cssClass);
-                element.style[options.cssRule] = null;
+                element.style.height = null;
 
-                if (options.finishCallback) {
-                    window.requestAnimationFrame(options.finishCallback);
+                if (finishCallback) {
+                    window.requestAnimationFrame(finishCallback);
                 }
             }, 500);
         });
@@ -108,54 +141,11 @@ utils.slideOut = function (element, options) {
 };
 
 /**
- * Slides a element in (i.e. make the element visible)
+ * Checks whether a element is visible or not
  *
- * @param  HTMLElement element the element to slide in
- * @param  object      options the settings of the sliding process
- * @return void
- */
-utils.slideIn = function (element, options) {
-    var cssRuleOriginalValue = element[options.cssRuleRef] + 'px',
-        slideId = parseInt(element.dataset.slideId) || 0;
-
-    element.dataset.slideId = ++slideId;
-
-    element.style[options.cssRule] = null;
-    element.classList.remove('hidden', 'slide', options.cssClass);
-    var cssRuleValue = element[options.cssRuleRef] + 'px';
-
-    element.classList.add('slide');
-
-    window.requestAnimationFrame(function () {
-        element.style[options.cssRule] = cssRuleOriginalValue;
-
-        window.requestAnimationFrame(function () {
-            element.style[options.cssRule] = cssRuleValue;
-
-            if (options.startCallback) {
-                options.startCallback();
-            }
-
-            window.setTimeout(function () {
-                if (parseInt(element.dataset.slideId) !== slideId) return;
-
-                element.classList.remove('slide');
-                element.style[options.cssRule] = null;
-
-                if (options.finishCallback) {
-                    window.requestAnimationFrame(options.finishCallback);
-                }
-            }, 500);
-        });
-    });
-};
-
-/**
- * Check whether a element is visible or not
- *
- * @param  HTMLElement element the element to test
+ * @param  HTMLElement element the element to check
  * @return boolean             TRUE when the element is visible, FALSE otherwise
  */
 utils.isElementVisible = function (element) {
     return !!(element.offsetWidth || element.offsetHeight || element.getClientRects().length);
-};
\ No newline at end of file
+};
diff --git a/themes/default/style.css b/themes/default/style.css
index ad4857b..6318568 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -7,6 +7,7 @@
  *
  * Pico is a stupidly simple, blazing fast, flat file CMS.
  *
+ * @author  Gilbert Pellegrom
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
@@ -20,15 +21,8 @@
     padding: 0;
 }
 
-body {
-    font-family: 'Droid Sans', 'Helvetica', 'Arial', sans-serif;
-    font-size: 16px;
-    line-height: 1.6;
-    color: #444;
-}
-
-p, hr, table, .table-responsive, ol, ul, dl, pre, blockquote {
-    margin-bottom: 1em;
+article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
+    display:block
 }
 
 .hidden { display: none !important; }
@@ -48,19 +42,17 @@ p, hr, table, .table-responsive, ol, ul, dl, pre, blockquote {
     -webkit-transition: height .5s ease-in !important;
             transition: height .5s ease-in !important;
 }
-.slide.up { height: 0 !important; }
 
 /*** BASIC LAYOUT ***/
 
-html { height: 100%; }
-body {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-}
+html, body { height: 100%; }
+
+body { display: flex; flex-direction: column; }
+main { flex: 1 0 auto; }
+header, footer { flex: 0 0 auto; }
+
 main {
-    flex: 1 0 auto;
-    margin: 5em 0 4em;
+    padding: 5em 0 4em;
 }
 
 .container {
@@ -83,13 +75,14 @@ header { background: #2EAE9B; }
 header h1 {
     float: left;
     font-size: 2rem;
-    margin: 0 1em 1.5em 0;
+    margin: 0;
+    padding: 1.5em 1em 1.5em 0;
 }
 header h1 a, header h1 a:hover { color: #fff; }
 
 header nav {
     text-align: right;
-    margin: 3em 0;
+    padding: 3em 0;
 }
 header nav ul {
     list-style: none;
@@ -106,17 +99,7 @@ header nav ul li {
 header nav a, #page-menu-toggle { color: #afe1da; }
 header nav .active a, header nav a:hover, #page-menu-toggle:hover { color: #fff; }
 
-#page-menu-toggle {
-    display: none;
-    float: right;
-    width: 2em;
-    margin: 0 0 0.5em 1em;
-    font-size: 1.5rem;
-    line-height: 2em;
-    text-align: center;
-    cursor: pointer;
-}
-#page-menu-toggle > * { vertical-align: middle; }
+#page-menu-toggle { display: none; }
 
 /*** BASIC LAYOUT: FOOTER ***/
 
@@ -129,35 +112,36 @@ footer a { color: #ddd; }
 footer a:hover { color: #fff; }
 
 footer p {
-    margin: 3em 0;
+    margin: 0;
+    padding: 3em 0;
 }
 
 footer .social {
     float: right;
-    margin: 0 0 0.5em 1em;
+    padding: 1.5em 0 0.5em 1em;
     font-size: 2rem;
 }
 
 /*** BASIC LAYOUT: EXTRA SMALL DEVICES ***/
 
 @media (max-width: 767px) {
-    main { margin: 2em 0 1em; }
+    main { padding: 2em 0 1em; }
 
     header h1 {
         float: none;
-        margin: 0.5em 0;
+        padding: 0.5em 0;
     }
 
     header nav {
         clear: right;
-        margin: 0;
+        padding: 0;
     }
     header nav ul {
         padding-bottom: 1em;
     }
     header nav ul li {
         display: block;
-        margin: 0;
+        margin-left: 0;
         text-align: center;
     }
     header nav ul li a {
@@ -165,13 +149,44 @@ footer .social {
         padding: 0.5em 0;
     }
 
-    .js #page-menu-toggle { display: block; }
+    .js #page-menu-toggle {
+        display: block;
+        float: right;
+        width: 2em;
+        margin: 0.6667em 0 0.6667em 1.3333em;
+        font-size: 1.5rem;
+        line-height: 2em;
+        text-align: center;
+        cursor: pointer;
+    }
+    .js #page-menu-toggle > * { vertical-align: middle;  }
 
-    footer p { margin: 1em 0; }
+    footer p { padding: 1em 0; }
+    footer .social { padding: 0.5em 0 0.5em 1em; }
 }
 
 /*** TEXT ***/
 
+body {
+    font-family: 'Droid Sans', 'Helvetica', 'Arial', sans-serif;
+    font-size: 16px;
+    line-height: 1.6;
+    font-variant-ligatures: common-ligatures;
+    text-rendering: optimizeLegibility;
+    font-kerning: normal;
+    color: #444;
+}
+
+p, td, th, li, dd {
+    text-align: justify;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+}
+
+p, hr, table, .table-responsive, ol, ul, dl, pre, blockquote {
+    margin-bottom: 1em;
+}
+
 a {
     color: #2EAE9B;
     text-decoration: none;
@@ -194,12 +209,6 @@ h6 { font-size: 1rem; font-weight: normal; font-style: italic; }
 
 img { max-width: 100%; }
 
-p, td, th, li, dd {
-    text-align: justify;
-    overflow-wrap: break-word;
-    word-wrap: break-word;
-}
-
 hr {
     border: 0.15em solid #f5f5f5;
     border-radius: 0.3em;

From 518d9b5aef8eb3abb05178d4e97537ac20dba54c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 2 Aug 2016 22:49:53 +0200
Subject: [PATCH 033/188] Default theme: Fix rem unit

---
 themes/default/style.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/default/style.css b/themes/default/style.css
index 6318568..690fbca 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -167,9 +167,11 @@ footer .social {
 
 /*** TEXT ***/
 
+html { font-size: 16px; }
+
 body {
     font-family: 'Droid Sans', 'Helvetica', 'Arial', sans-serif;
-    font-size: 16px;
+    font-size: 1rem;
     line-height: 1.6;
     font-variant-ligatures: common-ligatures;
     text-rendering: optimizeLegibility;

From d143105279ffd133688a77066bca19db0d6fee84 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 2 Aug 2016 23:42:48 +0200
Subject: [PATCH 034/188] Default theme (JavaScript): Fix coding standard

---
 .phpcs.xml                 | 11 +++++++++++
 themes/default/js/pico.js  |  7 +++++--
 themes/default/js/utils.js | 15 ++++++++++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 77a35e5..a0785b8 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -41,4 +41,15 @@
     <rule ref="PSR2">
         <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
     </rule>
+
+    <!--
+        The PHP-FIG PSR-2 Coding Style doesn't fully apply to JavaScript files
+        Furthermore, some sniffs aren't able to handle JavaScript peculiarities
+    -->
+    <rule ref="Generic.ControlStructures.InlineControlStructure">
+        <exclude-pattern>*.js</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.Functions.MultiLineFunctionDeclaration">
+        <exclude-pattern>*.js</exclude-pattern>
+    </rule>
 </ruleset>
diff --git a/themes/default/js/pico.js b/themes/default/js/pico.js
index 06e8e26..90c1a4c 100644
--- a/themes/default/js/pico.js
+++ b/themes/default/js/pico.js
@@ -9,7 +9,8 @@
  * @version 1.1
  */
 
-function main() {
+function main()
+{
     // capability CSS classes
     document.documentElement.className = 'js';
 
@@ -39,7 +40,9 @@ function main() {
             if (menuToggle.getAttribute('aria-expanded') === 'false') {
                 menuToggle.setAttribute('aria-expanded', 'true');
                 utils.slideDown(menu, null, function () {
-                    if (event.type === 'keydown') menu.focus();
+                    if (event.type === 'keydown') {
+                        menu.focus();
+                    }
                 });
             } else {
                 menuToggle.setAttribute('aria-expanded', 'false');
diff --git a/themes/default/js/utils.js b/themes/default/js/utils.js
index 7cbb50d..a67ea27 100644
--- a/themes/default/js/utils.js
+++ b/themes/default/js/utils.js
@@ -20,7 +20,8 @@ utils = {};
  *     to stop the iteration
  * @return void
  */
-utils.forEach = function (object, callback) {
+utils.forEach = function (object, callback)
+{
     var i = 0,
         keys = Object.keys(object),
         length = keys.length;
@@ -36,7 +37,8 @@ utils.forEach = function (object, callback) {
  *
  * @return boolean TRUE when the browser supports sliding, FALSE otherwise
  */
-utils.canSlide = function () {
+utils.canSlide = function ()
+{
     return (Modernizr.classlist && Modernizr.requestanimationframe && Modernizr.csstransitions);
 };
 
@@ -49,7 +51,8 @@ utils.canSlide = function () {
  * @param  function    startCallback  function to call when the animation starts
  * @return void
  */
-utils.slideUp = function (element, finishCallback, startCallback) {
+utils.slideUp = function (element, finishCallback, startCallback)
+{
     if (!utils.canSlide()) {
         if (startCallback) startCallback();
         element.className += (element.className !== '') ? ' hidden' : 'hidden';
@@ -96,7 +99,8 @@ utils.slideUp = function (element, finishCallback, startCallback) {
  * @param  function    startCallback  function to call when the animation starts
  * @return void
  */
-utils.slideDown = function (element, finishCallback, startCallback) {
+utils.slideDown = function (element, finishCallback, startCallback)
+{
     if (!utils.canSlide()) {
         if (startCallback) startCallback();
         element.className = element.className.replace(/\bhidden\b */g, '');
@@ -146,6 +150,7 @@ utils.slideDown = function (element, finishCallback, startCallback) {
  * @param  HTMLElement element the element to check
  * @return boolean             TRUE when the element is visible, FALSE otherwise
  */
-utils.isElementVisible = function (element) {
+utils.isElementVisible = function (element)
+{
     return !!(element.offsetWidth || element.offsetHeight || element.getClientRects().length);
 };

From eef41698f1f9922d7b42c4dcdf88430ba184cbb0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 3 Aug 2016 01:01:20 +0200
Subject: [PATCH 035/188] Default theme: Add basic form themeing

---
 themes/default/style.css | 46 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/themes/default/style.css b/themes/default/style.css
index 690fbca..afc4723 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -185,7 +185,7 @@ p, td, th, li, dd {
     word-wrap: break-word;
 }
 
-p, hr, table, .table-responsive, ol, ul, dl, pre, blockquote {
+p, hr, table, .table-responsive, ol, ul, dl, pre, blockquote, fieldset {
     margin-bottom: 1em;
 }
 
@@ -267,11 +267,11 @@ code {
     border-radius: 0.3em;
     background: #f5f5f5;
     font-family: 'Droid Sans Mono', 'Courier New', 'Courier', monospace;
-    font-size: 0.9em;
+    font-size: 0.9rem;
 }
 
 pre {
-    padding: 0 0.9em;
+    padding: 0 1em;
     border: 1px solid #ccc;
     border-radius: 0.3em;
     background: #f5f5f5;
@@ -280,7 +280,7 @@ pre {
 pre code {
     display: block;
     margin: 0;
-    padding: 1em 0;
+    padding: 1.1111em 0;
     border: 0 none;
     background: transparent;
     overflow-x: auto;
@@ -294,3 +294,41 @@ blockquote {
     padding-left: 1em;
     border-left: 0.5em solid #f5f5f5;
 }
+
+/*** FORMS ***/
+
+label { font-weight: bold; }
+
+input::-moz-focus-inner, button::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+input, button {
+    padding: 0.5em 1em;
+    outline: 0 none;
+    border: solid 1px #ccc;
+    border-radius: 0.3em;
+    background: #fff;
+    font-size: 1rem;
+}
+input:focus:not([type="checkbox"]):not([type="radio"]), button:focus {
+    border-color: #2EAE9B;
+    box-shadow: 0 0 8px #2EAE9B;
+}
+
+input[type="button"]:focus, input[type="submit"]:focus, input[type="reset"]:focus, button:focus,
+input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover, button:hover {
+    background: #f5f5f5;
+    cursor: pointer;
+}
+
+fieldset {
+    padding: 1em;
+    border: solid 1px #ccc;
+    border-radius: 0.3em;
+    background: #f5f5f5;
+}
+fieldset label, fieldset input, fieldset button                                     { margin: 0.2em 0.5em; }
+fieldset label:first-child, fieldset input:first-child, fieldset button:first-child { margin-left: 0; }
+fieldset label:last-child, fieldset input:last-child, fieldset button:last-child    { margin-right: 0; }

From 51e8f316929fa09da74cac7c302f1b5565f35bd0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 3 Aug 2016 02:01:44 +0200
Subject: [PATCH 036/188] Default theme: Improve form theming

---
 themes/default/style.css | 42 +++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/themes/default/style.css b/themes/default/style.css
index afc4723..af7654f 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -297,38 +297,58 @@ blockquote {
 
 /*** FORMS ***/
 
-label { font-weight: bold; }
+label, fieldset legend { font-weight: bold; }
 
 input::-moz-focus-inner, button::-moz-focus-inner {
     border: 0;
     padding: 0;
 }
 
-input, button {
-    padding: 0.5em 1em;
-    outline: 0 none;
+input:not([type="checkbox"]):not([type="radio"]), button, select, textarea, fieldset, fieldset legend {
     border: solid 1px #ccc;
     border-radius: 0.3em;
     background: #fff;
+    -webkit-transition: none .2s ease-in;
+            transition: none .2s ease-in;
+    -webkit-transition-property: border-color, background, box-shadow;
+            transition-property: border-color, background, box-shadow;
+}
+
+input:not([type="checkbox"]):not([type="radio"]), button, select, textarea {
+    padding: 0.5em 1em;
+    outline: 0 none;
     font-size: 1rem;
 }
-input:focus:not([type="checkbox"]):not([type="radio"]), button:focus {
+input:focus:not([type="checkbox"]):not([type="radio"]), button:focus, select:focus, textarea:focus {
     border-color: #2EAE9B;
     box-shadow: 0 0 8px #2EAE9B;
 }
-
 input[type="button"]:focus, input[type="submit"]:focus, input[type="reset"]:focus, button:focus,
 input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover, button:hover {
     background: #f5f5f5;
     cursor: pointer;
 }
 
+textarea, select[multiple] {
+    vertical-align: bottom;
+    overflow: auto;
+}
+
 fieldset {
     padding: 1em;
-    border: solid 1px #ccc;
-    border-radius: 0.3em;
     background: #f5f5f5;
 }
-fieldset label, fieldset input, fieldset button                                     { margin: 0.2em 0.5em; }
-fieldset label:first-child, fieldset input:first-child, fieldset button:first-child { margin-left: 0; }
-fieldset label:last-child, fieldset input:last-child, fieldset button:last-child    { margin-right: 0; }
+fieldset legend { padding: 0 0.5em; }
+
+fieldset label, fieldset input, fieldset button,
+fieldset select, fieldset textarea {
+    margin: 0.2em 0.5em;
+}
+fieldset label:first-child, fieldset input:first-child, fieldset button:first-child,
+fieldset select:first-child, fieldset textarea:first-child {
+    margin-left: 0;
+}
+fieldset label:last-child, fieldset input:last-child, fieldset button:last-child,
+fieldset select:last-child, fieldset textarea:last-child {
+    margin-right: 0;
+}

From 65a37f1464050cc874217c8d4dc22dbec46a309b Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 3 Aug 2016 17:14:54 +0200
Subject: [PATCH 037/188] Default theme: Add basic support for IE8

Forms still look broken and I definitly will *NOT* fix that. We don't support IE8 officially!

+ some minor improvements
---
 themes/default/index.twig                     | 18 ++--
 .../default/js/modernizr-3.3.1-custom.min.js  |  4 +-
 themes/default/js/pico.js                     | 15 ++--
 themes/default/js/utils.js                    | 21 -----
 themes/default/style.css                      | 87 ++++++++++---------
 5 files changed, 64 insertions(+), 81 deletions(-)

diff --git a/themes/default/index.twig b/themes/default/index.twig
index 75a1007..7a8b8c6 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -17,16 +17,16 @@
 </head>
 <body{% if config.theme_config.widescreen %} class="widescreen"{% endif %}>
 
-    <header>
+    <div id="header">
         <div class="container">
-            <a id="page-menu-toggle" title="Toggle Menu" role="button" aria-controls="page-menu" aria-expanded="false" tabindex="1">
+            <a id="nav-toggle" title="Toggle Menu" role="button" aria-controls="nav" aria-expanded="false" tabindex="1">
                 <span class="icon-menu" aria-hidden="true"></span>
                 <span class="sr-only">Toggle Menu</span>
             </a>
             <h1>
                 <a href="{{ "index"|link }}">{{ site_title }}</a>
             </h1>
-            <nav id="page-menu" role="region" tabindex="-1">
+            <div id="nav" role="region" tabindex="-1">
                 <ul>
                     {% for page in pages if page.title %}
                         <li{% if page.id == current_page.id %} class="active"{% endif %}>
@@ -34,17 +34,17 @@
                         </li>
                     {% endfor %}
                 </ul>
-            </nav>
+            </div>
         </div>
-    </header>
+    </div>
 
-    <main>
+    <div id="main">
         <div class="container">
             {{ content }}
         </div>
-    </main>
+    </div>
 
-    <footer>
+    <div id="footer">
         <div class="container">
             <div class="social">
                 {% for social in meta.social %}
@@ -60,7 +60,7 @@
                 Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
             </p>
         </div>
-    </footer>
+    </div>
 
     <script src="{{ theme_url }}/js/modernizr-3.3.1-custom.min.js" type="text/javascript"></script>
     <script src="{{ theme_url }}/js/utils.js" type="text/javascript"></script>
diff --git a/themes/default/js/modernizr-3.3.1-custom.min.js b/themes/default/js/modernizr-3.3.1-custom.min.js
index 1454151..33ad568 100644
--- a/themes/default/js/modernizr-3.3.1-custom.min.js
+++ b/themes/default/js/modernizr-3.3.1-custom.min.js
@@ -1,3 +1,3 @@
 /*! modernizr 3.3.1 (Custom Build) | MIT *
- * https://modernizr.com/download/?-classlist-csstransitions-dataset-requestanimationframe !*/
-!function(e,n,t){function r(e,n){return typeof e===n}function i(){var e,n,t,i,o,s,a;for(var f in y)if(y.hasOwnProperty(f)){if(e=[],n=y[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;t<n.options.aliases.length;t++)e.push(n.options.aliases[t].toLowerCase());for(i=r(n.fn,"function")?n.fn():n.fn,o=0;o<e.length;o++)s=e[o],a=s.split("."),1===a.length?Modernizr[a[0]]=i:(!Modernizr[a[0]]||Modernizr[a[0]]instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=i),C.push((i?"":"no-")+a.join("-"))}}function o(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function s(e,n){return!!~(""+e).indexOf(n)}function a(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function f(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var i;for(var o in e)if(e[o]in n)return t===!1?e[o]:(i=n[e[o]],r(i,"function")?f(i,t||n):i);return!1}function l(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=o(x?"svg":"body"),e.fake=!0),e}function p(e,t,r,i){var s,a,f,u,l="modernizr",p=o("div"),c=d();if(parseInt(r,10))for(;r--;)f=o("div"),f.id=i?i[r]:l+(r+1),p.appendChild(f);return s=o("style"),s.type="text/css",s.id="s"+l,(c.fake?c:p).appendChild(s),c.appendChild(p),s.styleSheet?s.styleSheet.cssText=e:s.appendChild(n.createTextNode(e)),p.id=l,c.fake&&(c.style.background="",c.style.overflow="hidden",u=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),a=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=u,w.offsetHeight):p.parentNode.removeChild(p),!!a}function c(n,r){var i=n.length;if("CSS"in e&&"supports"in e.CSS){for(;i--;)if(e.CSS.supports(l(n[i]),r))return!0;return!1}if("CSSSupportsRule"in e){for(var o=[];i--;)o.push("("+l(n[i])+":"+r+")");return o=o.join(" or "),p("@supports ("+o+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function m(e,n,i,f){function u(){d&&(delete E.style,delete E.modElem)}if(f=r(f,"undefined")?!1:f,!r(i,"undefined")){var l=c(e,i);if(!r(l,"undefined"))return l}for(var d,p,m,v,h,y=["modernizr","tspan","samp"];!E.style&&y.length;)d=!0,E.modElem=o(y.shift()),E.style=E.modElem.style;for(m=e.length,p=0;m>p;p++)if(v=e[p],h=E.style[v],s(v,"-")&&(v=a(v)),E.style[v]!==t){if(f||r(i,"undefined"))return u(),"pfx"==n?v:!0;try{E.style[v]=i}catch(g){}if(E.style[v]!=h)return u(),"pfx"==n?v:!0}return u(),!1}function v(e,n,t,i,o){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+S.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?m(a,n,i,o):(a=(e+" "+T.join(s+" ")+s).split(" "),u(a,n,t))}function h(e,n,r){return v(e,t,t,n,r)}var y=[],g={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){y.push({name:e,fn:n,options:t})},addAsyncTest:function(e){y.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=g,Modernizr=new Modernizr;var C=[],w=n.documentElement;Modernizr.addTest("classlist","classList"in w);var x="svg"===w.nodeName.toLowerCase();Modernizr.addTest("dataset",function(){var e=o("div");return e.setAttribute("data-a-b","c"),!(!e.dataset||"c"!==e.dataset.aB)});var _="Moz O ms Webkit",S=g._config.usePrefixes?_.split(" "):[];g._cssomPrefixes=S;var T=g._config.usePrefixes?_.toLowerCase().split(" "):[];g._domPrefixes=T;var b={elem:o("modernizr")};Modernizr._q.push(function(){delete b.elem});var E={style:b.elem.style};Modernizr._q.unshift(function(){delete E.style}),g.testAllProps=v,g.testAllProps=h,Modernizr.addTest("csstransitions",h("transition","all",!0));var z=function(n){var r,i=prefixes.length,o=e.CSSRule;if("undefined"==typeof o)return t;if(!n)return!1;if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in o)return"@"+n;for(var s=0;i>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in o)return"@-"+a.toLowerCase()+"-"+n}return!1};g.atRule=z;var P=g.prefixed=function(e,n,t){return 0===e.indexOf("@")?z(e):(-1!=e.indexOf("-")&&(e=a(e)),n?v(e,n,t):v(e,"pfx"))};Modernizr.addTest("requestanimationframe",!!P("requestAnimationFrame",e),{aliases:["raf"]}),i(),delete g.addTest,delete g.addAsyncTest;for(var A=0;A<Modernizr._q.length;A++)Modernizr._q[A]();e.Modernizr=Modernizr}(window,document);
+ * https://modernizr.com/download/?-classlist-csstransitions-requestanimationframe !*/
+!function(e,n,t){function r(e,n){return typeof e===n}function i(){var e,n,t,i,o,s,a;for(var f in y)if(y.hasOwnProperty(f)){if(e=[],n=y[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;t<n.options.aliases.length;t++)e.push(n.options.aliases[t].toLowerCase());for(i=r(n.fn,"function")?n.fn():n.fn,o=0;o<e.length;o++)s=e[o],a=s.split("."),1===a.length?Modernizr[a[0]]=i:(!Modernizr[a[0]]||Modernizr[a[0]]instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=i),C.push((i?"":"no-")+a.join("-"))}}function o(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function s(e,n){return!!~(""+e).indexOf(n)}function a(e,n){return function(){return e.apply(n,arguments)}}function f(e,n,t){var i;for(var o in e)if(e[o]in n)return t===!1?e[o]:(i=n[e[o]],r(i,"function")?a(i,t||n):i);return!1}function l(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):T?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function u(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=l(T?"svg":"body"),e.fake=!0),e}function p(e,t,r,i){var o,s,a,f,u="modernizr",p=l("div"),c=d();if(parseInt(r,10))for(;r--;)a=l("div"),a.id=i?i[r]:u+(r+1),p.appendChild(a);return o=l("style"),o.type="text/css",o.id="s"+u,(c.fake?c:p).appendChild(o),c.appendChild(p),o.styleSheet?o.styleSheet.cssText=e:o.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",f=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=f,w.offsetHeight):p.parentNode.removeChild(p),!!s}function c(n,r){var i=n.length;if("CSS"in e&&"supports"in e.CSS){for(;i--;)if(e.CSS.supports(u(n[i]),r))return!0;return!1}if("CSSSupportsRule"in e){for(var o=[];i--;)o.push("("+u(n[i])+":"+r+")");return o=o.join(" or "),p("@supports ("+o+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function m(e,n,i,a){function f(){d&&(delete P.style,delete P.modElem)}if(a=r(a,"undefined")?!1:a,!r(i,"undefined")){var u=c(e,i);if(!r(u,"undefined"))return u}for(var d,p,m,v,h,y=["modernizr","tspan","samp"];!P.style&&y.length;)d=!0,P.modElem=l(y.shift()),P.style=P.modElem.style;for(m=e.length,p=0;m>p;p++)if(v=e[p],h=P.style[v],s(v,"-")&&(v=o(v)),P.style[v]!==t){if(a||r(i,"undefined"))return f(),"pfx"==n?v:!0;try{P.style[v]=i}catch(g){}if(P.style[v]!=h)return f(),"pfx"==n?v:!0}return f(),!1}function v(e,n,t,i,o){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+_.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?m(a,n,i,o):(a=(e+" "+E.join(s+" ")+s).split(" "),f(a,n,t))}function h(e,n,r){return v(e,t,t,n,r)}var y=[],g={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){y.push({name:e,fn:n,options:t})},addAsyncTest:function(e){y.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=g,Modernizr=new Modernizr;var C=[],w=n.documentElement;Modernizr.addTest("classlist","classList"in w);var x="Moz O ms Webkit",_=g._config.usePrefixes?x.split(" "):[];g._cssomPrefixes=_;var S=function(n){var r,i=prefixes.length,o=e.CSSRule;if("undefined"==typeof o)return t;if(!n)return!1;if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in o)return"@"+n;for(var s=0;i>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in o)return"@-"+a.toLowerCase()+"-"+n}return!1};g.atRule=S;var E=g._config.usePrefixes?x.toLowerCase().split(" "):[];g._domPrefixes=E;var T="svg"===w.nodeName.toLowerCase(),z={elem:l("modernizr")};Modernizr._q.push(function(){delete z.elem});var P={style:z.elem.style};Modernizr._q.unshift(function(){delete P.style}),g.testAllProps=v;var b=g.prefixed=function(e,n,t){return 0===e.indexOf("@")?S(e):(-1!=e.indexOf("-")&&(e=o(e)),n?v(e,n,t):v(e,"pfx"))};Modernizr.addTest("requestanimationframe",!!b("requestAnimationFrame",e),{aliases:["raf"]}),g.testAllProps=h,Modernizr.addTest("csstransitions",h("transition","all",!0)),i(),delete g.addTest,delete g.addAsyncTest;for(var L=0;L<Modernizr._q.length;L++)Modernizr._q[L]();e.Modernizr=Modernizr}(window,document);
diff --git a/themes/default/js/pico.js b/themes/default/js/pico.js
index 90c1a4c..8fde1fc 100644
--- a/themes/default/js/pico.js
+++ b/themes/default/js/pico.js
@@ -15,19 +15,20 @@ function main()
     document.documentElement.className = 'js';
 
     // wrap tables
-    utils.forEach(document.querySelectorAll('main table'), function (_, table) {
-        if (!/\btable-responsive\b/.test(table.parentElement.className)) {
+    var tables = document.querySelectorAll('#main > .container > table');
+    for (var i = 0; i < tables.length; i++) {
+        if (!/\btable-responsive\b/.test(tables[i].parentElement.className)) {
             var tableWrapper = document.createElement('div');
             tableWrapper.className = 'table-responsive';
 
-            table.parentElement.insertBefore(tableWrapper, table);
-            tableWrapper.appendChild(table);
+            tables[i].parentElement.insertBefore(tableWrapper, tables[i]);
+            tableWrapper.appendChild(tables[i]);
         }
-    });
+    }
 
     // responsive menu
-    var menu = document.getElementById('page-menu'),
-        menuToggle = document.getElementById('page-menu-toggle'),
+    var menu = document.getElementById('nav'),
+        menuToggle = document.getElementById('nav-toggle'),
         toggleMenuEvent = function (event) {
             if (event.type === 'keydown') {
                 if ((event.keyCode != 13) && (event.keyCode != 32)) {
diff --git a/themes/default/js/utils.js b/themes/default/js/utils.js
index a67ea27..f8755d8 100644
--- a/themes/default/js/utils.js
+++ b/themes/default/js/utils.js
@@ -11,27 +11,6 @@
 
 utils = {};
 
-/**
- * Iterates through an iterable object (e.g. plain objects, arrays, NodeList)
- *
- * @param  object   object   the object to iterate through
- * @param  function callback function to call on every item; the key is passed
- *     as first, the value as second parameter; the callback may return FALSE
- *     to stop the iteration
- * @return void
- */
-utils.forEach = function (object, callback)
-{
-    var i = 0,
-        keys = Object.keys(object),
-        length = keys.length;
-    for (; i < length; i++) {
-        if (callback(keys[i], object[keys[i]]) === false) {
-            return;
-        }
-    }
-};
-
 /**
  * Checks whether the client's browser is able to slide elements or not
  *
diff --git a/themes/default/style.css b/themes/default/style.css
index af7654f..8477e2f 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -21,10 +21,6 @@
     padding: 0;
 }
 
-article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
-    display:block
-}
-
 .hidden { display: none !important; }
 .sr-only {
     position: absolute;
@@ -48,10 +44,10 @@ article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, s
 html, body { height: 100%; }
 
 body { display: flex; flex-direction: column; }
-main { flex: 1 0 auto; }
-header, footer { flex: 0 0 auto; }
+#main { flex: 1 0 auto; }
+#header, #footer { flex: 0 0 auto; }
 
-main {
+#main {
     padding: 5em 0 4em;
 }
 
@@ -63,93 +59,98 @@ main {
 
 .widescreen .container { max-width: 72em; }
 
-main .container {
-    /* very ugly, avoid this whenever possible! */
-    overflow-x: auto;
-}
+/* very ugly overflow fix, avoid this whenever possible! */
+#main .container { overflow-x: auto; }
 
 /*** BASIC LAYOUT: HEADER ***/
 
-header { background: #2EAE9B; }
+#header { background: #2EAE9B; }
 
-header h1 {
+#header h1 {
     float: left;
     font-size: 2rem;
     margin: 0;
     padding: 1.5em 1em 1.5em 0;
 }
-header h1 a, header h1 a:hover { color: #fff; }
+#header h1 a, #header h1 a:hover { color: #fff; }
 
-header nav {
+#nav {
     text-align: right;
     padding: 3em 0;
 }
-header nav ul {
+#nav ul {
     list-style: none;
     margin: 0;
     padding: 0;
 }
-header nav ul li {
+#nav ul li {
     display: inline-block;
     margin-left: 1em;
     padding: 0;
     font-weight: bold;
 }
 
-header nav a, #page-menu-toggle { color: #afe1da; }
-header nav .active a, header nav a:hover, #page-menu-toggle:hover { color: #fff; }
+#nav a, #nav-toggle { color: #afe1da; }
+#nav .active a, #nav a:hover, #nav-toggle:hover { color: #fff; }
 
-#page-menu-toggle { display: none; }
+#nav-toggle { display: none; }
+
+/* IE8 + IE9 clearfix */
+#header > .container:after {
+    content: '';
+    display: block;
+    clear: both;
+}
 
 /*** BASIC LAYOUT: FOOTER ***/
 
-footer {
+#footer {
     background: #707070;
     color: #C0C0C0;
 }
 
-footer a { color: #ddd; }
-footer a:hover { color: #fff; }
+#footer a { color: #ddd; }
+#footer a:hover { color: #fff; }
 
-footer p {
+#footer p {
     margin: 0;
     padding: 3em 0;
 }
 
-footer .social {
+#footer .social {
     float: right;
-    padding: 1.5em 0 0.5em 1em;
+    padding: 1.5em 0 1.5em 1em;
     font-size: 2rem;
 }
 
 /*** BASIC LAYOUT: EXTRA SMALL DEVICES ***/
 
 @media (max-width: 767px) {
-    main { padding: 2em 0 1em; }
+    #main { padding: 2em 0 1em; }
 
-    header h1 {
+    #header h1 {
         float: none;
         padding: 0.5em 0;
     }
 
-    header nav {
+    #nav {
         clear: right;
         padding: 0;
     }
-    header nav ul {
+    #nav ul {
         padding-bottom: 1em;
     }
-    header nav ul li {
+    #nav ul li {
         display: block;
         margin-left: 0;
         text-align: center;
     }
-    header nav ul li a {
+    #nav ul li a {
         display: block;
         padding: 0.5em 0;
     }
 
-    .js #page-menu-toggle {
+    .js #nav-toggle {
         display: block;
         float: right;
         width: 2em;
@@ -159,13 +160,13 @@ footer .social {
         text-align: center;
         cursor: pointer;
     }
-    .js #page-menu-toggle > * { vertical-align: middle;  }
+    .js #nav-toggle > * { vertical-align: middle;  }
 
-    footer p { padding: 1em 0; }
-    footer .social { padding: 0.5em 0 0.5em 1em; }
+    #footer p { padding: 1em 0; }
+    #footer .social { padding: 0.5em 0 0.5em 1em; }
 }
 
-/*** TEXT ***/
+/*** TYPOGRAPHY ***/
 
 html { font-size: 16px; }
 
@@ -245,6 +246,7 @@ tbody tr:last-child td:last-child {                            border-bottom-rig
 table thead + tbody tr:first-child td {                        border-radius: 0 !important; }
 
 .table-responsive { overflow-x: auto; }
+.table-responsive > table { margin-bottom: 0; }
 
 /*** LISTS ***/
 
@@ -299,11 +301,6 @@ blockquote {
 
 label, fieldset legend { font-weight: bold; }
 
-input::-moz-focus-inner, button::-moz-focus-inner {
-    border: 0;
-    padding: 0;
-}
-
 input:not([type="checkbox"]):not([type="radio"]), button, select, textarea, fieldset, fieldset legend {
     border: solid 1px #ccc;
     border-radius: 0.3em;
@@ -352,3 +349,9 @@ fieldset label:last-child, fieldset input:last-child, fieldset button:last-child
 fieldset select:last-child, fieldset textarea:last-child {
     margin-right: 0;
 }
+
+/* Firefox input size fix */
+input::-moz-focus-inner, button::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}

From 73a0b40f728358dbe7ddb2f9a75bcb90c2abd35a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 3 Aug 2016 17:56:11 +0200
Subject: [PATCH 038/188] Default theme: Fix hr element theming in IE8+

---
 themes/default/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/default/style.css b/themes/default/style.css
index 8477e2f..df99720 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -215,6 +215,7 @@ img { max-width: 100%; }
 hr {
     border: 0.15em solid #f5f5f5;
     border-radius: 0.3em;
+    background: #f5f5f5;
 }
 
 abbr { text-decoration: underline dotted; }

From f9f998af652e744fcb0e2c3d4accd6fad5f17e65 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 3 Aug 2016 18:35:41 +0200
Subject: [PATCH 039/188] Default theme: Fix default container width

---
 themes/default/style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/default/style.css b/themes/default/style.css
index df99720..0c1aa24 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -52,11 +52,10 @@ body { display: flex; flex-direction: column; }
 }
 
 .container {
-    max-width: 47em;
+    max-width: 48em;
     padding: 0 0.5em;
     margin: 0 auto;
 }
-
 .widescreen .container { max-width: 72em; }
 
 /* very ugly overflow fix, avoid this whenever possible! */

From f73c9622b8a9a389965809ff0becff4db0e30c09 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 17 Sep 2016 20:02:29 +0200
Subject: [PATCH 040/188] Fix Pico::evaluateRequestUrl(): PHP's built-in
 webserver doesn't always set QUERY_STRING

---
 lib/Pico.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 5e5cf83..9de5d5f 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -697,7 +697,7 @@ class Pico
     protected function evaluateRequestUrl()
     {
         // use QUERY_STRING; e.g. /pico/?sub/page
-        $pathComponent = $_SERVER['QUERY_STRING'];
+        $pathComponent = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
         if (!empty($pathComponent)) {
             if (($pathComponentLength = strpos($pathComponent, '&')) !== false) {
                 $pathComponent = substr($pathComponent, 0, $pathComponentLength);

From 0b4099fdb0445ebea3d49c4c2dec5cc35079c2e3 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 17 Sep 2016 20:02:49 +0200
Subject: [PATCH 041/188] Improve class docs

---
 lib/Pico.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index 9de5d5f..58b6de0 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1431,6 +1431,9 @@ class Pico
     /**
      * Returns the URL to a given page
      *
+     * This method can be used in Twig templates by applying the `link` filter
+     * to a string representing a page identifier.
+     *
      * @param  string       $page      identifier of the page to link to
      * @param  array|string $queryData either an array containing properties to
      *     create a URL-encoded query string from, or a already encoded string

From a74db1ddbb68d83f965a976b13ce69d71d8b4420 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 17 Sep 2016 20:09:04 +0200
Subject: [PATCH 042/188] Add Pico::filterVariable() method

This method can be used to validate and filter input data and can be called via `Pico::getUrlParameter()` (URL GET parameters) and `Pico::getFormParameter()` (HTTP POST parameters). `Pico::filterVariable()` is basically a wrapper for PHP's `filter_var()` function with various compatibility extensions to allow theme developers to use its functionality in Twig templates. Therefore Pico 1.1 adds the `url_param` (`Pico::getUrlParameter()`) and `form_param` (`Pico::getFormParameter()`) Twig functions.

Resolves #305
---
 lib/Pico.php | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 58b6de0..10abb8c 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1321,8 +1321,10 @@ class Pico
         $this->twig->addExtension(new Twig_Extension_Debug());
         $this->twig->addExtension(new PicoTwigExtension($this));
 
-        // register link filter
+        // register link filter and the url_param and form_param functions
         $this->twig->addFilter(new Twig_SimpleFilter('link', array($this, 'getPageUrl')));
+        $this->twig->addFunction(new Twig_SimpleFunction('url_param', array($this, 'getUrlParameter')));
+        $this->twig->addFunction(new Twig_SimpleFunction('form_param', array($this, 'getFormParameter')));
 
         // register content filter
         // we pass the $pages array by reference to prevent multiple parser runs for the same page
@@ -1510,6 +1512,134 @@ class Pico
         return $this->config['theme_url'];
     }
 
+    /**
+     * Filters a URL GET parameter with a specified filter
+     *
+     * This method is just an alias for {@link Pico::filterVariable()}, see
+     * {@link Pico::filterVariable()} for a detailed description. It can be
+     * used in Twig templates by calling the `url_param` function.
+     *
+     * @see    Pico::filterVariable()
+     * @param  string                    $name    name of the URL GET parameter
+     *     to filter
+     * @param  int|string                $filter  the filter to apply
+     * @param  mixed|array               $options either a associative options
+     *     array to be used by the filter or a scalar default value
+     * @param  int|string|int[]|string[] $flags   flags and flag strings to
+     *     be used by the filter
+     * @return mixed                              either the filtered data,
+     *     FALSE if the filter fails, or NULL if the URL GET parameter doesn't
+     *     exist and no default value is given
+     */
+    public function getUrlParameter($name, $filter = '', $options = null, $flags = null)
+    {
+        $variable = (isset($_GET[$name]) && is_scalar($_GET[$name])) ? $_GET[$name] : null;
+        return $this->filterVariable($variable, $filter, $options, $flags);
+    }
+
+    /**
+     * Filters a HTTP POST parameter with a specified filter
+     *
+     * This method is just an alias for {@link Pico::filterVariable()}, see
+     * {@link Pico::filterVariable()} for a detailed description. It can be
+     * used in Twig templates by calling the `form_param` function.
+     *
+     * @see    Pico::filterVariable()
+     * @param  string                    $name    name of the HTTP POST
+     *     parameter to filter
+     * @param  int|string                $filter  the filter to apply
+     * @param  mixed|array               $options either a associative options
+     *     array to be used by the filter or a scalar default value
+     * @param  int|string|int[]|string[] $flags   flags and flag strings to
+     *     be used by the filter
+     * @return mixed                              either the filtered data,
+     *     FALSE if the filter fails, or NULL if the HTTP POST parameter
+     *     doesn't exist and no default value is given
+     */
+    public function getFormParameter($name, $filter = '', $options = null, $flags = null)
+    {
+        $variable = (isset($_POST[$name]) && is_scalar($_POST[$name])) ? $_POST[$name] : null;
+        return $this->filterVariable($variable, $filter, $options, $flags);
+    }
+
+    /**
+     * Filters a variable with a specified filter
+     *
+     * This method basically wraps around PHP's `filter_var()` function. It
+     * filters data by either validating or sanitizing it. This is especially
+     * useful when the data source contains unknown (or foreign) data, like
+     * user supplied input. Validation is used to validate or check if the data
+     * meets certain qualifications, but will not change the data itself.
+     * Sanitization will sanitize the data, so it may alter it by removing
+     * undesired characters. It doesn't actually validate the data! The
+     * behaviour of most filters can optionally be tweaked by flags.
+     *
+     * Heads up! Input validation is hard! Always validate your input data the
+     * most paranoid way you can imagine. Always prefer validation filters over
+     * sanitization filters; be very careful with sanitization filters, you
+     * might create cross-site scripting vulnerabilities!
+     *
+     * @see    https://secure.php.net/manual/en/function.filter-var.php
+     *     PHP's `filter_var()` function
+     * @see    https://secure.php.net/manual/en/filter.filters.validate.php
+     *     Validate filters
+     * @see    https://secure.php.net/manual/en/filter.filters.sanitize.php
+     *     Sanitize filters
+     * @param  mixed                     $variable value to filter
+     * @param  int|string                $filter   ID (int) or name (string) of
+     *     the filter to apply; if omitted, the method will return FALSE
+     * @param  mixed|array               $options  either a associative array
+     *     of options to be used by the filter (e.g. `array('default' => 42)`),
+     *     or a scalar default value that will be returned when the passed
+     *     value is NULL (optional)
+     * @param  int|string|int[]|string[] $flags    either a bitwise disjunction
+     *     of flags or a string with the significant part of a flag constant
+     *     (the constant name is the result of "FILTER_FLAG_" and the given
+     *     string in ASCII-only uppercase); you may also pass an array of flags
+     *     and flag strings (optional)
+     * @return mixed                               with a validation filter,
+     *     the method either returns the validated value or, provided that the
+     *     value wasn't valid, the given default value or FALSE; with a
+     *     sanitization filter, the method returns the sanitized value; if no
+     *     value (i.e. NULL) was given, the method always returns either the
+     *     provided default value or NULL
+     */
+    protected function filterVariable($variable, $filter = '', $options = null, $flags = null)
+    {
+        $defaultValue = null;
+        if (is_array($options)) {
+            $defaultValue = isset($options['default']) ? $options['default'] : null;
+        } elseif ($options !== null) {
+            $defaultValue = $options;
+            $options = array('default' => $defaultValue);
+        }
+
+        if ($variable === null) {
+            return $defaultValue;
+        }
+
+        $filter = !empty($filter) ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false;
+        if (!$filter) {
+            return false;
+        }
+
+        $filterOptions = array('options' => $options, 'flags' => 0);
+        foreach ((array) $flags as $flag) {
+            if (is_numeric($flag)) {
+                $filterOptions['flags'] |= (int) $flag;
+            } elseif (is_string($flag)) {
+                $flag = strtoupper(preg_replace('/[^a-zA-Z0-9_]/', '', $flag));
+                if (($flag === 'NULL_ON_FAILURE') && ($filter ===  FILTER_VALIDATE_BOOLEAN)) {
+                    $filterOptions['flags'] |= FILTER_NULL_ON_FAILURE;
+                } else {
+                    $filterOptions['flags'] |= (int) constant('FILTER_FLAG_' . $flag);
+                }
+            }
+        }
+
+        return filter_var($variable, $filter, $filterOptions);
+    }
+
     /**
      * Recursively walks through a directory and returns all containing files
      * matching the specified file extension

From 00603f61fcb21312df38be1ccfb6b4a97494be43 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 1 Oct 2016 18:58:04 +0200
Subject: [PATCH 043/188] Add integrated 404 Not Found page

Resolves #299
---
 lib/Pico.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 10abb8c..034c294 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -847,8 +847,14 @@ class Pico
             return $this->loadFileContent($contentDir . '404' . $contentExt);
         }
 
-        $errorFile = $contentDir . '404' . $contentExt;
-        throw new RuntimeException('Required "' . $errorFile . '" not found');
+        // fallback to built-in error message
+        $rawErrorContent = "---\n"
+            . "Title: Error 404\n"
+            . "Robots: noindex,nofollow\n"
+            . "---\n\n"
+            . "# Error 404\n\n"
+            . "Woops. Looks like this page doesn't exist.\n";
+        return $rawErrorContent;
     }
 
     /**

From 3ebb51a55eaefcde2424d643b46a47a7d423a7d5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 1 Oct 2016 19:01:21 +0200
Subject: [PATCH 044/188] Improve class docs

Follow-up to 00603f6
---
 lib/Pico.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 034c294..56587bd 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -819,10 +819,11 @@ class Pico
      * Returns the raw contents of the first found 404 file when traversing
      * up from the directory the requested file is in
      *
+     * If no suitable `404.md` is found, fallback to a built-in error message.
+     *
      * @see    Pico::getRawContent()
      * @param  string $file     path to requested (but not existing) file
      * @return string           raw contents of the 404 file
-     * @throws RuntimeException thrown when no suitable 404 file is found
      */
     public function load404Content($file)
     {

From bea610dbf4bff80c2f833e4f822d3adc2a566bc9 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 5 Oct 2016 14:17:10 +0200
Subject: [PATCH 045/188] Pico::evaluateRequestUrl(): Replace strpos()+substr()
 with strstr()

---
 lib/Pico.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 56587bd..7eeb024 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -699,9 +699,7 @@ class Pico
         // use QUERY_STRING; e.g. /pico/?sub/page
         $pathComponent = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
         if (!empty($pathComponent)) {
-            if (($pathComponentLength = strpos($pathComponent, '&')) !== false) {
-                $pathComponent = substr($pathComponent, 0, $pathComponentLength);
-            }
+            $pathComponent = strstr($pathComponent, '&', true) ?: $pathComponent;
             if (strpos($pathComponent, '=') === false) {
                 $this->requestUrl = trim(rawurldecode($pathComponent), '/');
             }
@@ -715,9 +713,7 @@ class Pico
             $requestUri = $_SERVER['REQUEST_URI'];
             if (substr($requestUri, 0, $basePathLength) === $basePath) {
                 $requestUri = substr($requestUri, $basePathLength);
-                if (($requestUriLength = strpos($requestUri, '?')) !== false) {
-                    $requestUri = substr($requestUri, 0, $requestUriLength);
-                }
+                $requestUri = strstr($requestUri, '?', true) ?: $requestUri;
                 $this->requestUrl = rtrim(rawurldecode($requestUri), '/');
             }
         }

From 38615e444d5f05e292ce7ad73267d22fe44e7a19 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 9 Oct 2016 02:49:30 +0200
Subject: [PATCH 046/188] Use Pico::loadFileContent() in Pico::readPages()

---
 lib/Pico.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 7eeb024..7634206 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1130,7 +1130,7 @@ class Pico
 
             $url = $this->getPageUrl($id);
             if ($file !== $this->requestFile) {
-                $rawContent = file_get_contents($file);
+                $rawContent = $this->loadFileContent($file);
 
                 $headers = $this->getMetaHeaders();
                 try {

From 0a269746ebab9d32c61e892effcfd1bea9da5c02 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 26 Nov 2016 16:48:10 +0100
Subject: [PATCH 047/188] Add Pico::is404Content() method

---
 lib/Pico.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index 7634206..b9d5f9d 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -145,6 +145,14 @@ class Pico
      */
     protected $rawContent;
 
+    /**
+     * Boolean indicating whether Pico is serving a 404 page
+     *
+     * @see Pico::is404Content()
+     * @var boolean
+     */
+    protected $is404Content = false;
+
     /**
      * Meta data of the page to serve
      *
@@ -322,6 +330,7 @@ class Pico
 
             header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
             $this->rawContent = $this->load404Content($this->requestFile);
+            $this->is404Content = true;
 
             $this->triggerEvent('on404ContentLoaded', array(&$this->rawContent));
         }
@@ -866,6 +875,17 @@ class Pico
         return $this->rawContent;
     }
 
+    /**
+     * Returns TRUE when Pico is serving a 404 page
+     *
+     * @see    Pico::load404Content()
+     * @return boolean TRUE if Pico is serving a 404 page, FALSE otherwise
+     */
+    public function is404Content()
+    {
+        return $this->is404Content;
+    }
+
     /**
      * Returns known meta headers and triggers the onMetaHeaders event
      *

From 7a6e4f8271c53d18ef8c04f701fa339e270c926c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 17:18:59 +0100
Subject: [PATCH 048/188] Sort all loaded plugins using a plugin dependency
 topology

Execution order matters: if plugin A depends on plugin B, it usually means that plugin B does stuff which plugin A requires. However, Pico loads plugins in alphabetical order, so events might get fired on plugin A before plugin B.

Hence plugins need to be sorted. Pico sorts plugins using a dependency topology, this means that it moves all plugins, on which a plugin depends, in front of that plugin. The order isn't touched apart from that, so they are still sorted alphabetically, as long as this doesn't interfere with the dependency topology. Circular dependencies are being ignored; their behavior is undefiend. Missing dependencies are being ignored until you try to enable the dependant plugin.

This method bases on [Marc J. Schmidt's Topological Sort library](https://github.com/marcj/topsort.php) in version 1.1.0, licensed under the MIT license. It uses the `ArraySort` implementation ([class `\MJS\TopSort\Implementations\ArraySort`](https://github.com/marcj/topsort.php/blob/1.1.0/src/Implementations/ArraySort.php)).
---
 lib/Pico.php | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index b9d5f9d..826542a 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -300,6 +300,7 @@ class Pico
 
         // load plugins
         $this->loadPlugins();
+        $this->sortPlugins();
         $this->triggerEvent('onPluginsLoaded', array(&$this->plugins));
 
         // load config
@@ -491,6 +492,72 @@ class Pico
         return $plugin;
     }
 
+    /**
+     * Sorts all loaded plugins using a plugin dependency topology
+     *
+     * Execution order matters: if plugin A depends on plugin B, it usually
+     * means that plugin B does stuff which plugin A requires. However, Pico
+     * loads plugins in alphabetical order, so events might get fired on
+     * plugin A before plugin B.
+     *
+     * Hence plugins need to be sorted. Pico sorts plugins using a dependency
+     * topology, this means that it moves all plugins, on which a plugin
+     * depends, in front of that plugin. The order isn't touched apart from
+     * that, so they are still sorted alphabetically, as long as this doesn't
+     * interfere with the dependency topology. Circular dependencies are being
+     * ignored; their behavior is undefiend. Missing dependencies are being
+     * ignored until you try to enable the dependant plugin.
+     *
+     * This method bases on Marc J. Schmidt's Topological Sort library in
+     * version 1.1.0, licensed under the MIT license. It uses the `ArraySort`
+     * implementation (class `\MJS\TopSort\Implementations\ArraySort`).
+     *
+     * @see    Pico::loadPlugins()
+     * @see    Pico::getPlugins()
+     * @see    https://github.com/marcj/topsort.php
+     *     Marc J. Schmidt's Topological Sort / Dependency resolver in PHP
+     * @see    https://github.com/marcj/topsort.php/blob/1.1.0/src/Implementations/ArraySort.php
+     *     \MJS\TopSort\Implementations\ArraySort class
+     * @return void
+     */
+    protected function sortPlugins()
+    {
+        $plugins = $this->plugins;
+        $sortedPlugins = array();
+        $visitedPlugins = array();
+        $visitPlugin = function ($plugin) use ($plugins, &$sortedPlugins, &$visitedPlugins, &$visitPlugin) {
+            $pluginName = get_class($plugin);
+
+            // skip already visited plugins and ignore circular dependencies
+            if (!isset($visitedPlugins[$pluginName])) {
+                $visitedPlugins[$pluginName] = true;
+
+                $dependencies = array();
+                if ($plugin instanceof PicoPluginInterface) {
+                    $dependencies = $plugin->getDependencies();
+                } else {
+                    $dependencies = array('PicoDeprecated');
+                }
+
+                foreach ($dependencies as $dependency) {
+                    // ignore missing dependencies
+                    // this is only a problem when the user tries to enable this plugin
+                    if (isset($plugins[$dependency])) {
+                        $visitPlugin($plugins[$dependency]);
+                    }
+                }
+
+                $sortedPlugins[$pluginName] = $plugin;
+            }
+        };
+
+        foreach ($this->plugins as $plugin) {
+            $visitPlugin($plugin);
+        }
+
+        $this->plugins = $sortedPlugins;
+    }
+
     /**
      * Returns the instance of a named plugin
      *

From 5cf47e65de66ffc963263a059eb5fe5defadd3e2 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 19:03:58 +0100
Subject: [PATCH 049/188] Various small improvements

---
 lib/AbstractPicoPlugin.php    |  2 +-
 lib/Pico.php                  | 50 ++++++++++++++++++++---------------
 lib/PicoTwigExtension.php     |  2 +-
 plugins/00-PicoDeprecated.php |  2 +-
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index b0506dc..0ce2ff6 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -238,7 +238,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     protected function checkDependants($recursive)
     {
         $dependants = $this->getDependants();
-        if (!empty($dependants)) {
+        if ($dependants) {
             if ($recursive) {
                 foreach ($this->getDependants() as $pluginName => $plugin) {
                     if ($plugin->isEnabled()) {
diff --git a/lib/Pico.php b/lib/Pico.php
index 826542a..56f18f4 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -290,11 +290,16 @@ class Pico
      * meta headers, processes Markdown, does Twig processing and returns
      * the rendered contents.
      *
-     * @return string           rendered Pico contents
+     * @return string    rendered Pico contents
      * @throws Exception thrown when a not recoverable error occurs
      */
     public function run()
     {
+        // check lock
+        if ($this->locked) {
+            throw new LogicException('You cannot run the same Pico instance multiple times');
+        }
+
         // lock Pico
         $this->locked = true;
 
@@ -378,7 +383,7 @@ class Pico
 
         // render template
         $this->twigVariables = $this->getTwigVariables();
-        if (isset($this->meta['template']) && $this->meta['template']) {
+        if (!empty($this->meta['template'])) {
             $templateName = $this->meta['template'];
         } else {
             $templateName = 'index';
@@ -639,6 +644,7 @@ class Pico
             'base_url' => '',
             'rewrite_url' => null,
             'theme' => 'default',
+            'theme_url' => '',
             'date_format' => '%D %T',
             'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false),
             'pages_order_by' => 'alpha',
@@ -648,7 +654,7 @@ class Pico
             'timezone' => ''
         );
 
-        if (empty($this->config['base_url'])) {
+        if (!$this->config['base_url']) {
             $this->config['base_url'] = $this->getBaseUrl();
         } else {
             $this->config['base_url'] = rtrim($this->config['base_url'], '/') . '/';
@@ -658,7 +664,7 @@ class Pico
             $this->config['rewrite_url'] = $this->isUrlRewritingEnabled();
         }
 
-        if (empty($this->config['content_dir'])) {
+        if (!$this->config['content_dir']) {
             // try to guess the content directory
             if (is_dir($this->getRootDir() . 'content')) {
                 $this->config['content_dir'] = $this->getRootDir() . 'content/';
@@ -669,7 +675,7 @@ class Pico
             $this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']);
         }
 
-        if (empty($this->config['theme_url'])) {
+        if (!$this->config['theme_url']) {
             $this->config['theme_url'] = $this->getBaseThemeUrl();
         } elseif (preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $this->config['theme_url'])) {
             $this->config['theme_url'] = rtrim($this->config['theme_url'], '/') . '/';
@@ -677,7 +683,7 @@ class Pico
             $this->config['theme_url'] = $this->getBaseUrl() . rtrim($this->config['theme_url'], '/') . '/';
         }
 
-        if (empty($this->config['timezone'])) {
+        if (!$this->config['timezone']) {
             // explicitly set a default timezone to prevent a E_NOTICE
             // when no timezone is set; the `date_default_timezone_get()`
             // function always returns a timezone, at least UTC
@@ -774,7 +780,7 @@ class Pico
     {
         // use QUERY_STRING; e.g. /pico/?sub/page
         $pathComponent = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
-        if (!empty($pathComponent)) {
+        if ($pathComponent) {
             $pathComponent = strstr($pathComponent, '&', true) ?: $pathComponent;
             if (strpos($pathComponent, '=') === false) {
                 $this->requestUrl = trim(rawurldecode($pathComponent), '/');
@@ -786,8 +792,8 @@ class Pico
             $basePath = dirname($_SERVER['SCRIPT_NAME']) . '/';
             $basePathLength = strlen($basePath);
 
-            $requestUri = $_SERVER['REQUEST_URI'];
-            if (substr($requestUri, 0, $basePathLength) === $basePath) {
+            $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
+            if ($requestUri && (substr($requestUri, 0, $basePathLength) === $basePath)) {
                 $requestUri = substr($requestUri, $basePathLength);
                 $requestUri = strstr($requestUri, '?', true) ?: $requestUri;
                 $this->requestUrl = rtrim(rawurldecode($requestUri), '/');
@@ -825,7 +831,7 @@ class Pico
         $contentDir = $this->getConfig('content_dir');
         $contentExt = $this->getConfig('content_ext');
 
-        if (empty($requestUrl)) {
+        if (!$requestUrl) {
             return $contentDir . 'index' . $contentExt;
         } else {
             // prevent content_dir breakouts
@@ -844,7 +850,7 @@ class Pico
                 $requestFileParts[] = $requestUrlPart;
             }
 
-            if (empty($requestFileParts)) {
+            if (!$requestFileParts) {
                 return $contentDir . 'index' . $contentExt;
             }
 
@@ -1041,7 +1047,7 @@ class Pico
                 }
                 $meta['date_formatted'] = utf8_encode(strftime($this->getConfig('date_format'), $meta['time']));
             } else {
-                $meta['time'] = $meta['date_formatted'] = '';
+                $meta['date'] = $meta['time'] = $meta['date_formatted'] = '';
             }
         } else {
             // guarantee array key existance
@@ -1125,7 +1131,7 @@ class Pico
         $variables['%theme_url%'] = $this->getBaseThemeUrl() . $this->getConfig('theme');
 
         // replace %meta.*%
-        if (!empty($meta)) {
+        if ($meta) {
             foreach ($meta as $metaKey => $metaValue) {
                 if (is_scalar($metaValue) || ($metaValue === null)) {
                     $variables['%meta.' . $metaKey . '%'] = strval($metaValue);
@@ -1483,7 +1489,7 @@ class Pico
     public function getBaseUrl()
     {
         $baseUrl = $this->getConfig('base_url');
-        if (!empty($baseUrl)) {
+        if ($baseUrl) {
             return $baseUrl;
         }
 
@@ -1555,11 +1561,11 @@ class Pico
             }
         }
 
-        if (!empty($queryData)) {
-            $queryData = ($this->isUrlRewritingEnabled() || empty($page)) ? '?' . $queryData : '&' . $queryData;
+        if ($queryData) {
+            $queryData = ($this->isUrlRewritingEnabled() || !$page) ? '?' . $queryData : '&' . $queryData;
         }
 
-        if (empty($page)) {
+        if (!$page) {
             return $this->getBaseUrl() . $queryData;
         } elseif (!$this->isUrlRewritingEnabled()) {
             return $this->getBaseUrl() . '?' . rawurlencode($page) . $queryData;
@@ -1587,7 +1593,7 @@ class Pico
     public function getBaseThemeUrl()
     {
         $themeUrl = $this->getConfig('theme_url');
-        if (!empty($themeUrl)) {
+        if ($themeUrl) {
             return $themeUrl;
         }
 
@@ -1708,7 +1714,7 @@ class Pico
             return $defaultValue;
         }
 
-        $filter = !empty($filter) ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false;
+        $filter = $filter ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false;
         if (!$filter) {
             return false;
         }
@@ -1719,7 +1725,7 @@ class Pico
                 $filterOptions['flags'] |= (int) $flag;
             } elseif (is_string($flag)) {
                 $flag = strtoupper(preg_replace('/[^a-zA-Z0-9_]/', '', $flag));
-                if (($flag === 'NULL_ON_FAILURE') && ($filter ===  FILTER_VALIDATE_BOOLEAN)) {
+                if (($flag === 'NULL_ON_FAILURE') && ($filter === FILTER_VALIDATE_BOOLEAN)) {
                     $filterOptions['flags'] |= FILTER_NULL_ON_FAILURE;
                 } else {
                     $filterOptions['flags'] |= (int) constant('FILTER_FLAG_' . $flag);
@@ -1762,7 +1768,7 @@ class Pico
                 if (is_dir($directory . '/' . $file)) {
                     // get files recursively
                     $result = array_merge($result, $this->getFiles($directory . '/' . $file, $fileExtension, $order));
-                } elseif (empty($fileExtension) || (substr($file, -$fileExtensionLength) === $fileExtension)) {
+                } elseif (!$fileExtension || (substr($file, -$fileExtensionLength) === $fileExtension)) {
                     $result[] = $directory . '/' . $file;
                 }
             }
@@ -1809,7 +1815,7 @@ class Pico
      */
     public function triggerEvent($eventName, array $params = array())
     {
-        if (!empty($this->plugins)) {
+        if ($this->plugins) {
             foreach ($this->plugins as $plugin) {
                 // only trigger events for plugins that implement PicoPluginInterface
                 // deprecated events (plugins for Pico 0.9 and older) will be triggered by `PicoDeprecated`
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 0ed4008..7267232 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -196,7 +196,7 @@ class PicoTwigExtension extends Twig_Extension
      */
     public static function getKeyOfVar($var, $keyPath)
     {
-        if (empty($keyPath)) {
+        if (!$keyPath) {
             return null;
         } elseif (!is_array($keyPath)) {
             $keyPath = array($keyPath);
diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php
index 6095ecc..228212d 100644
--- a/plugins/00-PicoDeprecated.php
+++ b/plugins/00-PicoDeprecated.php
@@ -66,7 +66,7 @@ class PicoDeprecated extends AbstractPicoPlugin
      */
     public function onPluginsLoaded(array &$plugins)
     {
-        if (!empty($plugins)) {
+        if ($plugins) {
             foreach ($plugins as $plugin) {
                 if (!($plugin instanceof PicoPluginInterface)) {
                     // the plugin doesn't implement PicoPluginInterface; it uses deprecated events

From ea2146b2db19ae4e72f5b72c272c47292183e9dc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 19:31:29 +0100
Subject: [PATCH 050/188] Remove default plugins PicoParsePagesContent and
 PicoExcerpt

As previously announced (see [Upgrade to Pico 1.0 page](http://picocms.org/in-depth/upgrade/)) we'll remove the default plugins `PicoParsePagesContent` and `PicoExcerpt` with the next Pico milestone. Needless to say, that you can still install both plugins without any problem - we'll add them to Pico's official [Plugins collection](http://picocms.org/plugins/) by then. Please note that the disadvantages of these plugins are still critical and we strongly advise to not use them. Please refer to the [Upgrade to Pico 1.0 page](http://picocms.org/in-depth/upgrade/) for details.
---
 plugins/01-PicoParsePagesContent.php | 40 --------------
 plugins/02-PicoExcerpt.php           | 81 ----------------------------
 2 files changed, 121 deletions(-)
 delete mode 100644 plugins/01-PicoParsePagesContent.php
 delete mode 100644 plugins/02-PicoExcerpt.php

diff --git a/plugins/01-PicoParsePagesContent.php b/plugins/01-PicoParsePagesContent.php
deleted file mode 100644
index 6611c90..0000000
--- a/plugins/01-PicoParsePagesContent.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Parses the contents of all pages
- *
- * This plugin exists for backward compatibility and is disabled by default.
- * It gets automatically enabled when {@link PicoDeprecated} is enabled. You
- * can avoid this by calling {@link PicoParsePagesContent::setEnabled()}.
- *
- * This plugin heavily impacts Pico's performance, you should avoid to enable
- * it whenever possible! If you must parse the contents of a page, do this
- * selectively and only for pages you really need to.
- *
- * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.0
- */
-class PicoParsePagesContent extends AbstractPicoPlugin
-{
-    /**
-     * This plugin is disabled by default
-     *
-     * @see AbstractPicoPlugin::$enabled
-     */
-    protected $enabled = false;
-
-    /**
-     * Parses the contents of all pages
-     *
-     * @see DummyPlugin::onSinglePageLoaded()
-     */
-    public function onSinglePageLoaded(array &$pageData)
-    {
-        if (!isset($pageData['content'])) {
-            $pageData['content'] = $this->prepareFileContent($pageData['raw_content'], $pageData['meta']);
-            $pageData['content'] = $this->parseFileContent($pageData['content']);
-        }
-    }
-}
diff --git a/plugins/02-PicoExcerpt.php b/plugins/02-PicoExcerpt.php
deleted file mode 100644
index 00cae14..0000000
--- a/plugins/02-PicoExcerpt.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Creates a excerpt for the contents of each page (as of Pico v0.9 and older)
- *
- * This plugin exists for backward compatibility and is disabled by default.
- * It gets automatically enabled when {@link PicoDeprecated} is enabled. You
- * can avoid this by calling {@link PicoExcerpt::setEnabled()}.
- *
- * This plugin doesn't do its job very well and depends on
- * {@link PicoParsePagesContent}, what heavily impacts Pico's performance. You
- * should either use the Description meta header field or write something own.
- * Best solution seems to be a filter for twig, see e.g.
- * {@link https://gist.github.com/james2doyle/6629712}.
- *
- * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.0
- */
-class PicoExcerpt extends AbstractPicoPlugin
-{
-    /**
-     * This plugin is disabled by default
-     *
-     * @see AbstractPicoPlugin::$enabled
-     */
-    protected $enabled = false;
-
-    /**
-     * This plugin depends on PicoParsePagesContent
-     *
-     * @see PicoParsePagesContent
-     * @see AbstractPicoPlugin::$dependsOn
-     */
-    protected $dependsOn = array('PicoParsePagesContent');
-
-    /**
-     * Adds the default excerpt length of 50 words to the config
-     *
-     * @see DummyPlugin::onConfigLoaded()
-     */
-    public function onConfigLoaded(array &$config)
-    {
-        if (!isset($config['excerpt_length'])) {
-            $config['excerpt_length'] = 50;
-        }
-    }
-
-    /**
-     * Creates a excerpt for the contents of each page
-     *
-     * @see PicoExcerpt::createExcerpt()
-     * @see DummyPlugin::onSinglePageLoaded()
-     */
-    public function onSinglePageLoaded(array &$pageData)
-    {
-        if (!isset($pageData['excerpt'])) {
-            $pageData['excerpt'] = $this->createExcerpt(
-                strip_tags($pageData['content']),
-                $this->getConfig('excerpt_length')
-            );
-        }
-    }
-
-    /**
-     * Helper function to create a excerpt of a string
-     *
-     * @param  string $string    the string to create a excerpt from
-     * @param  int    $wordLimit the maximum number of words the excerpt should be long
-     * @return string            excerpt of $string
-     */
-    protected function createExcerpt($string, $wordLimit)
-    {
-        $words = explode(' ', $string);
-        if (count($words) > $wordLimit) {
-            return trim(implode(' ', array_slice($words, 0, $wordLimit))) . '&hellip;';
-        }
-        return $string;
-    }
-}

From b7126506788d6d1e84d87688e72229cd3e41c0fd Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 19:36:52 +0100
Subject: [PATCH 051/188] Default theme: Navigation: Show top-level pages only

---
 themes/default/index.twig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/themes/default/index.twig b/themes/default/index.twig
index 7a8b8c6..832054c 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -29,9 +29,12 @@
             <div id="nav" role="region" tabindex="-1">
                 <ul>
                     {% for page in pages if page.title %}
-                        <li{% if page.id == current_page.id %} class="active"{% endif %}>
-                            <a href="{{ page.url }}">{{ page.title }}</a>
-                        </li>
+                        {% set pageDepth = page.id|split('/')|length %}
+                        {% if (pageDepth == 2) and (page.id ends with "/index") or (pageDepth == 1) %}
+                            <li{% if page.id == current_page.id %} class="active"{% endif %}>
+                                <a href="{{ page.url }}">{{ page.title }}</a>
+                            </li>
+                        {% endif %}
                     {% endfor %}
                 </ul>
             </div>

From b493ebdb84e0da20e73ee21992ff36868be0008f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 19:37:23 +0100
Subject: [PATCH 052/188] Default theme: Navigation: Hide pages starting with a
 underscore (_)

---
 themes/default/index.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/index.twig b/themes/default/index.twig
index 832054c..084075e 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -28,7 +28,7 @@
             </h1>
             <div id="nav" role="region" tabindex="-1">
                 <ul>
-                    {% for page in pages if page.title %}
+                    {% for page in pages if page.title and not (page.id starts with "_") %}
                         {% set pageDepth = page.id|split('/')|length %}
                         {% if (pageDepth == 2) and (page.id ends with "/index") or (pageDepth == 1) %}
                             <li{% if page.id == current_page.id %} class="active"{% endif %}>

From 82c6dd979513b8d63b634ddaa820417b8de08f82 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 19:47:37 +0100
Subject: [PATCH 053/188] Don't sort pages when a unknown sort method is
 specified

Specifying a custom sort method usually means that all pages are sort by a plugin, so Pico's default alphabetical order is overwritten anyway. Letting Pico sort the pages first and discarding the result is burned CPU time...
---
 lib/Pico.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 56f18f4..051a383 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1279,6 +1279,12 @@ class Pico
     {
         // sort pages
         $order = $this->getConfig('pages_order');
+        $orderBy = $this->getConfig('pages_order_by');
+
+        if (($orderBy !== 'date') && ($orderBy !== 'alpha')) {
+            return;
+        }
+
         $alphaSortClosure = function ($a, $b) use ($order) {
             $aSortKey = (basename($a['id']) === 'index') ? dirname($a['id']) : $a['id'];
             $bSortKey = (basename($b['id']) === 'index') ? dirname($b['id']) : $b['id'];
@@ -1287,7 +1293,7 @@ class Pico
             return $cmp * (($order === 'desc') ? -1 : 1);
         };
 
-        if ($this->getConfig('pages_order_by') === 'date') {
+        if ($orderBy === 'date') {
             // sort by date
             uasort($this->pages, function ($a, $b) use ($alphaSortClosure, $order) {
                 if (empty($a['time']) || empty($b['time'])) {

From bc5729629debabc4bc365897bc834477323fcafc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 20:01:38 +0100
Subject: [PATCH 054/188] Fire onMetaHeaders event only once, cache results of
 Pico::getMetaHeaders()

---
 lib/Pico.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 051a383..e6af4e7 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -153,6 +153,14 @@ class Pico
      */
     protected $is404Content = false;
 
+    /**
+     * List of known meta headers
+     *
+     * @see Pico::getMetaHeaders()
+     * @var string[]|null
+     */
+    protected $metaHeaders;
+
     /**
      * Meta data of the page to serve
      *
@@ -344,10 +352,11 @@ class Pico
         $this->triggerEvent('onContentLoaded', array(&$this->rawContent));
 
         // parse file meta
-        $headers = $this->getMetaHeaders();
+        $this->metaHeaders = $this->getMetaHeaders();
+        $this->triggerEvent('onMetaHeaders', array(&$this->metaHeaders));
 
-        $this->triggerEvent('onMetaParsing', array(&$this->rawContent, &$headers));
-        $this->meta = $this->parseFileMeta($this->rawContent, $headers);
+        $this->triggerEvent('onMetaParsing', array(&$this->rawContent, &$this->metaHeaders));
+        $this->meta = $this->parseFileMeta($this->rawContent, $this->metaHeaders);
         $this->triggerEvent('onMetaParsed', array(&$this->meta));
 
         // register parsedown
@@ -960,10 +969,7 @@ class Pico
     }
 
     /**
-     * Returns known meta headers and triggers the onMetaHeaders event
-     *
-     * Heads up! Calling this method triggers the `onMetaHeaders` event.
-     * Keep this in mind to prevent a infinite loop!
+     * Returns known meta headers
      *
      * @return string[] known meta headers; the array value specifies the
      *     YAML key to search for, the array key is later used to access the
@@ -971,7 +977,11 @@ class Pico
      */
     public function getMetaHeaders()
     {
-        $headers = array(
+        if ($this->metaHeaders !== null) {
+            return $this->metaHeaders;
+        }
+
+        return array(
             'title' => 'Title',
             'description' => 'Description',
             'author' => 'Author',
@@ -979,9 +989,6 @@ class Pico
             'robots' => 'Robots',
             'template' => 'Template'
         );
-
-        $this->triggerEvent('onMetaHeaders', array(&$headers));
-        return $headers;
     }
 
     /**

From 5d48aa704062008dcdb94aceea8319bbd52bf4b6 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 20:04:07 +0100
Subject: [PATCH 055/188] Let Pico::getTwigVariables() return the "real" array

Currently Pico::getTwigVariables() always returns the default twig variables and ignores all additions/changes made through the onPageRendering event. The method now returns the "real" variables array used by Twig.
---
 lib/Pico.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index e6af4e7..91b174e 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1474,6 +1474,10 @@ class Pico
      */
     protected function getTwigVariables()
     {
+        if ($this->twigVariables !== null) {
+            return $this->twigVariables;
+        }
+
         $frontPage = $this->getConfig('content_dir') . 'index' . $this->getConfig('content_ext');
         return array(
             'config' => $this->getConfig(),

From 5193b77fdf51316fb2521a7189cb44e695c75f7c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 20:22:38 +0100
Subject: [PATCH 056/188] Reuse YAML parser instance

---
 lib/Pico.php | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 91b174e..54562c9 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -153,6 +153,14 @@ class Pico
      */
     protected $is404Content = false;
 
+    /**
+     * Symfony YAML instance used for meta header parsing
+     *
+     * @see Pico::registerYamlParser()
+     * @var \Symfony\Component\Yaml\Parser|null
+     */
+    protected $yamlParser;
+
     /**
      * List of known meta headers
      *
@@ -352,6 +360,9 @@ class Pico
         $this->triggerEvent('onContentLoaded', array(&$this->rawContent));
 
         // parse file meta
+        $this->triggerEvent('onYamlParserRegistration');
+        $this->registerYamlParser();
+
         $this->metaHeaders = $this->getMetaHeaders();
         $this->triggerEvent('onMetaHeaders', array(&$this->metaHeaders));
 
@@ -991,6 +1002,28 @@ class Pico
         );
     }
 
+    /**
+     * Registers the Symfony YAML parser
+     *
+     * @see    Pico::getYamlParser()
+     * @return void
+     */
+    protected function registerYamlParser()
+    {
+        $this->yamlParser = new \Symfony\Component\Yaml\Parser();
+    }
+
+    /**
+     * Returns the Symfony YAML parser
+     *
+     * @see    Pico::registerYamlParser()
+     * @return \Symfony\Component\Yaml\Parser|null Symfony YAML parser
+     */
+    public function getYamlParser()
+    {
+        return $this->yamlParser;
+    }
+
     /**
      * Parses the file meta from raw file contents
      *
@@ -1015,8 +1048,7 @@ class Pico
         $pattern = "/^(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
             . "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s";
         if (preg_match($pattern, $rawContent, $rawMetaMatches) && isset($rawMetaMatches[3])) {
-            $yamlParser = new \Symfony\Component\Yaml\Parser();
-            $meta = $yamlParser->parse($rawMetaMatches[3]);
+            $meta = $this->yamlParser->parse($rawMetaMatches[3]);
 
             if ($meta !== null) {
                 // the parser may return a string for non-YAML 1-liners

From ec3f7fb626137cca05adc1ea1fd5621af33dab47 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 20:22:50 +0100
Subject: [PATCH 057/188] Improve class docs

---
 lib/Pico.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 54562c9..3d0b7dc 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1006,6 +1006,9 @@ class Pico
      * Registers the Symfony YAML parser
      *
      * @see    Pico::getYamlParser()
+     * @see    http://symfony.com/doc/current/components/yaml/introduction.html
+     *     Symfony YAML component website
+     * @see    https://github.com/symfony/yaml Symfony YAML component on GitHub
      * @return void
      */
     protected function registerYamlParser()
@@ -1035,7 +1038,6 @@ class Pico
      * for users and pure (!) theme developers ONLY.
      *
      * @see    Pico::getFileMeta()
-     * @see    http://symfony.com/doc/current/components/yaml/introduction.html
      * @param  string   $rawContent the raw file contents
      * @param  string[] $headers    known meta headers
      * @return array                parsed meta data
@@ -1112,6 +1114,10 @@ class Pico
      * Registers the Parsedown Extra markdown parser
      *
      * @see    Pico::getParsedown()
+     * @see    http://parsedown.org/ Parsedown website
+     * @see    https://github.com/erusev/parsedown Parsedown on GitHub
+     * @see    https://github.com/erusev/parsedown-extra
+     *     Parsedown Extra on GitHub
      * @return void
      */
     protected function registerParsedown()
@@ -1453,6 +1459,8 @@ class Pico
      * as well as Pico's {@link PicoTwigExtension} Twig extension.
      *
      * @see    Pico::getTwig()
+     * @see    http://twig.sensiolabs.org/ Twig website
+     * @see    https://github.com/twigphp/Twig Twig on GitHub
      * @return void
      */
     protected function registerTwig()

From 9a2dd4f07820569d3e8445dd41d90175d0db54d0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 6 Dec 2016 20:52:27 +0100
Subject: [PATCH 058/188] Mark Twig variables rewrite_url and is_front_page as
 deprecated

---
 content-sample/index.md       |  2 --
 lib/Pico.php                  |  3 ---
 plugins/00-PicoDeprecated.php | 13 ++++++++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/content-sample/index.md b/content-sample/index.md
index 98cef99..d8d2f97 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -183,7 +183,6 @@ to use in your theme. Please note that paths (e.g. `{{ base_dir }}`) and URLs
                      is enabled or not
 * `{{ theme_dir }}` - The path to the currently active theme
 * `{{ theme_url }}` - The URL to the currently active theme
-* `{{ rewrite_url }}` - A boolean flag indicating enabled/disabled URL rewriting
 * `{{ site_title }}` - Shortcut to the site title (see `config/config.php`)
 * `{{ meta }}` - Contains the meta values from the current page
     * `{{ meta.title }}`
@@ -213,7 +212,6 @@ to use in your theme. Please note that paths (e.g. `{{ base_dir }}`) and URLs
 * `{{ prev_page }}` - The data of the previous page (relative to `current_page`)
 * `{{ current_page }}` - The data of the current page
 * `{{ next_page }}` - The data of the next page (relative to `current_page`)
-* `{{ is_front_page }}` - A boolean flag for the front page
 
 Pages can be used like the following:
 
diff --git a/lib/Pico.php b/lib/Pico.php
index 3d0b7dc..85388b1 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1518,14 +1518,12 @@ class Pico
             return $this->twigVariables;
         }
 
-        $frontPage = $this->getConfig('content_dir') . 'index' . $this->getConfig('content_ext');
         return array(
             'config' => $this->getConfig(),
             'base_dir' => rtrim($this->getRootDir(), '/'),
             'base_url' => rtrim($this->getBaseUrl(), '/'),
             'theme_dir' => $this->getThemesDir() . $this->getConfig('theme'),
             'theme_url' => $this->getBaseThemeUrl() . $this->getConfig('theme'),
-            'rewrite_url' => $this->isUrlRewritingEnabled(),
             'site_title' => $this->getConfig('site_title'),
             'meta' => $this->meta,
             'content' => $this->content,
@@ -1533,7 +1531,6 @@ class Pico
             'prev_page' => $this->previousPage,
             'current_page' => $this->currentPage,
             'next_page' => $this->nextPage,
-            'is_front_page' => ($this->requestFile === $frontPage),
             'version' => static::VERSION
         );
     }
diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php
index 228212d..2d4a333 100644
--- a/plugins/00-PicoDeprecated.php
+++ b/plugins/00-PicoDeprecated.php
@@ -392,7 +392,8 @@ class PicoDeprecated extends AbstractPicoPlugin
     }
 
     /**
-     * Triggers the deprecated event before_render($twigVariables, $twig, $templateName)
+     * Adds the deprecated variables rewrite_url and is_front_page, triggers
+     * the deprecated event before_render($twigVariables, $twig, $templateName)
      *
      * Please note that the `before_render()` event gets `$templateName` passed
      * without its file extension. The file extension is later added again.
@@ -401,6 +402,16 @@ class PicoDeprecated extends AbstractPicoPlugin
      */
     public function onPageRendering(Twig_Environment &$twig, array &$twigVariables, &$templateName)
     {
+        // rewrite_url and is_front_page are deprecated since Pico 1.1
+        if (!isset($twigVariables['rewrite_url'])) {
+            $twigVariables['rewrite_url'] = $this->isUrlRewritingEnabled();
+        }
+
+        if (!isset($twigVariables['is_front_page'])) {
+            $frontPage = $this->getConfig('content_dir') . 'index' . $this->getConfig('content_ext');
+            $twigVariables['is_front_page'] = ($this->getRequestFile() === $frontPage);
+        }
+
         // template name contains file extension since Pico 1.0
         $fileExtension = '';
         if (($fileExtensionPos = strrpos($templateName, '.')) !== false) {

From 9b72b5c316b38129952a4d59af05a0138ca1a15a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 14:49:05 +0100
Subject: [PATCH 059/188] Give pages starting with a underscore (_) a special
 treatment

Follow-up to b493ebdb84e0da20e73ee21992ff36868be0008f
---
 content-sample/_meta.md   | 12 ++++++++++++
 content-sample/index.md   | 10 ----------
 lib/Pico.php              | 20 ++++++++++++++++----
 themes/default/index.twig |  4 ++--
 4 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 content-sample/_meta.md

diff --git a/content-sample/_meta.md b/content-sample/_meta.md
new file mode 100644
index 0000000..e43ed5e
--- /dev/null
+++ b/content-sample/_meta.md
@@ -0,0 +1,12 @@
+---
+social:
+    - title: Visit us on GitHub
+      url: https://github.com/picocms/Pico
+      icon: octocat
+    - title: Check us out on Twitter
+      url: https://twitter.com/gitpicocms
+      icon: birdy
+    - title: Join us on Freenode IRC Webchat
+      url: https://webchat.freenode.net/?channels=%23picocms
+      icon: chat
+---
\ No newline at end of file
diff --git a/content-sample/index.md b/content-sample/index.md
index d8d2f97..bb5d334 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -1,16 +1,6 @@
 ---
 Title: Welcome
 Description: Pico is a stupidly simple, blazing fast, flat file CMS.
-social:
-    - title: Visit us on GitHub
-      url: https://github.com/picocms/Pico
-      icon: octocat
-    - title: Check us out on Twitter
-      url: https://twitter.com/gitpicocms
-      icon: birdy
-    - title: Join us on Freenode IRC Webchat
-      url: https://webchat.freenode.net/?channels=%23picocms
-      icon: chat
 ---
 
 ## Welcome to Pico
diff --git a/lib/Pico.php b/lib/Pico.php
index 85388b1..c8db789 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -344,8 +344,11 @@ class Pico
         // load raw file content
         $this->triggerEvent('onContentLoading', array(&$this->requestFile));
 
-        $notFoundFile = '404' . $this->getConfig('content_ext');
-        if (file_exists($this->requestFile) && (basename($this->requestFile) !== $notFoundFile)) {
+        if (
+            file_exists($this->requestFile)
+            && (basename($this->requestFile) !== '404' . $this->getConfig('content_ext'))
+            && !preg_match('/(?:^|\/)_/', $this->requestFile)
+        ) {
             $this->rawContent = $this->loadFileContent($this->requestFile);
         } else {
             $this->triggerEvent('on404ContentLoading', array(&$this->requestFile));
@@ -1294,6 +1297,7 @@ class Pico
                 'time' => &$meta['time'],
                 'date' => &$meta['date'],
                 'date_formatted' => &$meta['date_formatted'],
+                'hidden' => (bool) preg_match('/(?:^|\/)_/', $id),
                 'raw_content' => &$rawContent,
                 'meta' => &$meta
             );
@@ -1331,6 +1335,10 @@ class Pico
         }
 
         $alphaSortClosure = function ($a, $b) use ($order) {
+            if ($a['hidden'] xor $b['hidden']) {
+                return (!!$a['hidden'] - !!$b['hidden']) * (($order === 'desc') ? -1 : 1);
+            }
+
             $aSortKey = (basename($a['id']) === 'index') ? dirname($a['id']) : $a['id'];
             $bSortKey = (basename($b['id']) === 'index') ? dirname($b['id']) : $b['id'];
 
@@ -1341,8 +1349,12 @@ class Pico
         if ($orderBy === 'date') {
             // sort by date
             uasort($this->pages, function ($a, $b) use ($alphaSortClosure, $order) {
-                if (empty($a['time']) || empty($b['time'])) {
-                    $cmp = (empty($a['time']) - empty($b['time']));
+                if ($a['hidden'] xor $b['hidden']) {
+                    return $alphaSortClosure($a, $b);
+                }
+
+                if (!$a['time'] || !$b['time']) {
+                    $cmp = (!$a['time'] - !$b['time']);
                 } else {
                     $cmp = ($b['time'] - $a['time']);
                 }
diff --git a/themes/default/index.twig b/themes/default/index.twig
index 084075e..4197e13 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -28,7 +28,7 @@
             </h1>
             <div id="nav" role="region" tabindex="-1">
                 <ul>
-                    {% for page in pages if page.title and not (page.id starts with "_") %}
+                    {% for page in pages if page.title and not page.hidden %}
                         {% set pageDepth = page.id|split('/')|length %}
                         {% if (pageDepth == 2) and (page.id ends with "/index") or (pageDepth == 1) %}
                             <li{% if page.id == current_page.id %} class="active"{% endif %}>
@@ -50,7 +50,7 @@
     <div id="footer">
         <div class="container">
             <div class="social">
-                {% for social in meta.social %}
+                {% for social in pages._meta.meta.social %}
                     <a href="{{ social.url }}" title="{{ social.title }}" role="button">
                         <span class="icon-{{ social.icon }}" aria-hidden="true"></span>
                         <span class="sr-only">{{ social.title }}</span>

From 2e880d6c7fa40ff9a1eddac0804f799f51a936ae Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 14:49:57 +0100
Subject: [PATCH 060/188] Discover the previous and next pages of all pages

---
 lib/Pico.php | 71 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 25 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index c8db789..dfcc774 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -391,6 +391,7 @@ class Pico
 
         $this->readPages();
         $this->sortPages();
+        $this->discoverPageSiblings();
         $this->discoverCurrentPage();
 
         $this->triggerEvent('onPagesLoaded', array(
@@ -1237,8 +1238,11 @@ class Pico
      * | date_formatted | string | formatted date of the page               |
      * | raw_content    | string | raw, not yet parsed contents of the page |
      * | meta           | string | parsed meta data of the page             |
+     * | previous_page  | &array | reference to the previous page           |
+     * | next_page      | &array | reference to the next page               |
      *
      * @see    Pico::sortPages()
+     * @see    Pico::discoverPageSiblings()
      * @see    Pico::getPages()
      * @return void
      */
@@ -1372,11 +1376,47 @@ class Pico
         }
     }
 
+    /**
+     * Walks through the list of all known pages and discovers the previous and
+     * next page respectively
+     *
+     * @see    Pico::readPages()
+     * @see    Pico::getPages()
+     * @return void
+     */
+    protected function discoverPageSiblings()
+    {
+        if (($this->getConfig('order_by') === 'date') && ($this->getConfig('order') === 'desc')) {
+            $precedingPageKey = 'next_page';
+            $succeedingPageKey = 'previous_page';
+        } else {
+            $precedingPageKey = 'previous_page';
+            $succeedingPageKey = 'next_page';
+        }
+
+        $precedingPageId = null;
+        foreach ($this->pages as $id => &$pageData) {
+            $pageData[$precedingPageKey] = null;
+            $pageData[$succeedingPageKey] = null;
+
+            if ($pageData['hidden']) {
+                continue;
+            }
+
+            if ($precedingPageId !== null) {
+                $precedingPageData = &$this->pages[$precedingPageId];
+                $pageData[$precedingPageKey] = &$precedingPageData;
+                $precedingPageData[$succeedingPageKey] = &$pageData;
+            }
+
+            $precedingPageId = $id;
+        }
+    }
+
     /**
      * Returns the list of known pages
      *
      * @see    Pico::readPages()
-     * @see    Pico::sortPages()
      * @return array[]|null the data of all pages
      */
     public function getPages()
@@ -1385,8 +1425,8 @@ class Pico
     }
 
     /**
-     * Walks through the list of known pages and discovers the requested page
-     * as well as the previous and next page relative to it
+     * Discovers the page data of the requested page as well as the previous
+     * and next page relative to it
      *
      * @see    Pico::getCurrentPage()
      * @see    Pico::getPreviousPage()
@@ -1395,8 +1435,6 @@ class Pico
      */
     protected function discoverCurrentPage()
     {
-        $pageIds = array_keys($this->pages);
-
         $contentDir = $this->getConfig('content_dir');
         $contentDirLength = strlen($contentDir);
 
@@ -1407,27 +1445,10 @@ class Pico
         }
 
         $currentPageId = substr($this->requestFile, $contentDirLength, -strlen($this->getConfig('content_ext')));
-        $currentPageIndex = array_search($currentPageId, $pageIds);
-        if ($currentPageIndex !== false) {
+        if (isset($this->pages[$currentPageId])) {
             $this->currentPage = &$this->pages[$currentPageId];
-
-            if (($this->getConfig('order_by') === 'date') && ($this->getConfig('order') === 'desc')) {
-                $previousPageOffset = 1;
-                $nextPageOffset = -1;
-            } else {
-                $previousPageOffset = -1;
-                $nextPageOffset = 1;
-            }
-
-            if (isset($pageIds[$currentPageIndex + $previousPageOffset])) {
-                $previousPageId = $pageIds[$currentPageIndex + $previousPageOffset];
-                $this->previousPage = &$this->pages[$previousPageId];
-            }
-
-            if (isset($pageIds[$currentPageIndex + $nextPageOffset])) {
-                $nextPageId = $pageIds[$currentPageIndex + $nextPageOffset];
-                $this->nextPage = &$this->pages[$nextPageId];
-            }
+            $this->previousPage = &$this->pages[$currentPageId]['previous_page'];
+            $this->nextPage = &$this->pages[$currentPageId]['next_page'];
         }
     }
 

From 8f7e4da53df04b60bba72baa1eb5b545ef3cb797 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 15:31:06 +0100
Subject: [PATCH 061/188] Rename Pico 1.1 to Pico 2.0

---
 config/config.php.template    | 2 +-
 lib/AbstractPicoPlugin.php    | 2 +-
 lib/Pico.php                  | 8 ++++----
 lib/PicoPluginInterface.php   | 2 +-
 lib/PicoTwigExtension.php     | 2 +-
 plugins/00-PicoDeprecated.php | 6 +++---
 plugins/DummyPlugin.php       | 2 +-
 themes/default/js/pico.js     | 2 +-
 themes/default/js/utils.js    | 2 +-
 themes/default/style.css      | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/config/config.php.template b/config/config.php.template
index 34b3063..dc19eff 100644
--- a/config/config.php.template
+++ b/config/config.php.template
@@ -12,7 +12,7 @@
  *
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.1
+ * @version 2.0
  */
 
 /*
diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 0ce2ff6..4acbde5 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -8,7 +8,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.0
+ * @version 2.0
  */
 abstract class AbstractPicoPlugin implements PicoPluginInterface
 {
diff --git a/lib/Pico.php b/lib/Pico.php
index dfcc774..1644209 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -24,7 +24,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.1
+ * @version 2.0
  */
 class Pico
 {
@@ -33,7 +33,7 @@ class Pico
      *
      * @var string
      */
-    const VERSION = '1.1.0-dev';
+    const VERSION = '2.0.0-dev';
 
     /**
      * Pico version ID
@@ -773,7 +773,7 @@ class Pico
      *
      * With Pico 1.0 you had to setup URL rewriting (e.g. using `mod_rewrite`
      * on Apache) in a way that rewritten URLs follow the `QUERY_STRING`
-     * principles. Starting with version 1.1, Pico additionally supports the
+     * principles. Starting with version 2.0, Pico additionally supports the
      * `REQUEST_URI` routing method, what allows you to simply rewrite all
      * requests to just `index.php`. Pico then reads the requested page from
      * the `REQUEST_URI` environment variable provided by the webserver.
@@ -1672,7 +1672,7 @@ class Pico
      * {@link Pico::getBaseUrl()} as origin of the theme URL. Otherwise Pico
      * falls back to the basename of {@link Pico::$themesDir} (i.e. assuming
      * that `Pico::$themesDir` is `foo/bar/baz`, the base URL of the themes
-     * folder will be `baz/`; this ensures BC to Pico < 1.1). Pico's base URL
+     * folder will be `baz/`; this ensures BC to Pico < 2.0). Pico's base URL
      * always gets prepended appropriately.
      *
      * @return string the URL of the themes folder
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index ffa839b..337a8ba 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -23,7 +23,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.0
+ * @version 2.0
  */
 interface PicoPluginInterface
 {
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 7267232..7c7de70 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -6,7 +6,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.0
+ * @version 2.0
  */
 class PicoTwigExtension extends Twig_Extension
 {
diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php
index 2d4a333..c79d7f3 100644
--- a/plugins/00-PicoDeprecated.php
+++ b/plugins/00-PicoDeprecated.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Serve features of Pico deprecated since v1.0
+ * Maintain backward compatibility to older Pico releases
  *
  * This plugin exists for backward compatibility and is disabled by default.
  * It gets automatically enabled when a plugin which doesn't implement
@@ -39,7 +39,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.0
+ * @version 2.0
  */
 class PicoDeprecated extends AbstractPicoPlugin
 {
@@ -402,7 +402,7 @@ class PicoDeprecated extends AbstractPicoPlugin
      */
     public function onPageRendering(Twig_Environment &$twig, array &$twigVariables, &$templateName)
     {
-        // rewrite_url and is_front_page are deprecated since Pico 1.1
+        // rewrite_url and is_front_page are deprecated since Pico 2.0
         if (!isset($twigVariables['rewrite_url'])) {
             $twigVariables['rewrite_url'] = $this->isUrlRewritingEnabled();
         }
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 667de54..9214029 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -9,7 +9,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.0
+ * @version 2.0
  */
 final class DummyPlugin extends AbstractPicoPlugin
 {
diff --git a/themes/default/js/pico.js b/themes/default/js/pico.js
index 8fde1fc..492829d 100644
--- a/themes/default/js/pico.js
+++ b/themes/default/js/pico.js
@@ -6,7 +6,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.1
+ * @version 2.0
  */
 
 function main()
diff --git a/themes/default/js/utils.js b/themes/default/js/utils.js
index f8755d8..3b48911 100644
--- a/themes/default/js/utils.js
+++ b/themes/default/js/utils.js
@@ -6,7 +6,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.1
+ * @version 2.0
  */
 
 utils = {};
diff --git a/themes/default/style.css b/themes/default/style.css
index 0c1aa24..331ba8b 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -11,7 +11,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 1.1
+ * @version 2.0
  */
 
 * {

From 1f35346f534a43ed0eb78a2f610f901667f81bcc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 16:37:20 +0100
Subject: [PATCH 062/188] Improve detection of hidden files to serve 404
 contents instead

Follow-up to 9b72b5c316b38129952a4d59af05a0138ca1a15a
---
 lib/Pico.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 1644209..d2f1b2a 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -344,11 +344,8 @@ class Pico
         // load raw file content
         $this->triggerEvent('onContentLoading', array(&$this->requestFile));
 
-        if (
-            file_exists($this->requestFile)
-            && (basename($this->requestFile) !== '404' . $this->getConfig('content_ext'))
-            && !preg_match('/(?:^|\/)_/', $this->requestFile)
-        ) {
+        $hiddenFileRegex = '/(?:^|\/)(?:_|404' . preg_quote($this->getConfig('content_ext'), '/') . '$)/';
+        if (file_exists($this->requestFile) && !preg_match($hiddenFileRegex, $this->requestFile)) {
             $this->rawContent = $this->loadFileContent($this->requestFile);
         } else {
             $this->triggerEvent('on404ContentLoading', array(&$this->requestFile));

From 46f5d3d56dde87337177b8cc968a4637331b11a1 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 17:08:40 +0100
Subject: [PATCH 063/188] Move Twig link filter and url_param and form_param
 functions to PicoTwigExtension

---
 lib/Pico.php              |  5 -----
 lib/PicoTwigExtension.php | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index d2f1b2a..671f0e2 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1500,11 +1500,6 @@ class Pico
         $this->twig->addExtension(new Twig_Extension_Debug());
         $this->twig->addExtension(new PicoTwigExtension($this));
 
-        // register link filter and the url_param and form_param functions
-        $this->twig->addFilter(new Twig_SimpleFilter('link', array($this, 'getPageUrl')));
-        $this->twig->addFunction(new Twig_SimpleFunction('url_param', array($this, 'getUrlParameter')));
-        $this->twig->addFunction(new Twig_SimpleFunction('form_param', array($this, 'getFormParameter')));
-
         // register content filter
         // we pass the $pages array by reference to prevent multiple parser runs for the same page
         // this is the reason why we can't register this filter as part of PicoTwigExtension
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 7c7de70..e631736 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -51,7 +51,7 @@ class PicoTwigExtension extends Twig_Extension
     }
 
     /**
-     * Returns the Twig filters markdown, map and sort_by
+     * Returns a list of Pico-specific Twig filters
      *
      * @see    Twig_ExtensionInterface::getFilters()
      * @return Twig_SimpleFilter[] array of Pico's Twig filters
@@ -62,6 +62,21 @@ class PicoTwigExtension extends Twig_Extension
             'markdown' => new Twig_SimpleFilter('markdown', array($this, 'markdownFilter')),
             'map' => new Twig_SimpleFilter('map', array($this, 'mapFilter')),
             'sort_by' => new Twig_SimpleFilter('sort_by', array($this, 'sortByFilter')),
+            'link' => new Twig_SimpleFilter('link', array($this->pico, 'getPageUrl'))
+        );
+    }
+
+    /**
+     * Returns a list of Pico-specific Twig functions
+     *
+     * @see    Twig_ExtensionInterface::getFunctions()
+     * @return Twig_SimpleFunction[] array of Pico's Twig functions
+     */
+    public function getFunctions()
+    {
+        return array(
+            'url_param' => new Twig_SimpleFunction('url_param', array($this->pico, 'getUrlParameter')),
+            'form_param' => new Twig_SimpleFunction('form_param', array($this->pico, 'getFormParameter'))
         );
     }
 

From 586d792c323adfb7b21aa74e4419f4d7afcef99d Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 17:09:30 +0100
Subject: [PATCH 064/188] Update Pico::VERSION_ID constant

---
 lib/Pico.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 671f0e2..cf2ea44 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -40,7 +40,7 @@ class Pico
      *
      * @var int
      */
-    const VERSION_ID = 10100;
+    const VERSION_ID = 20000;
 
     /**
      * Sort files in alphabetical ascending order

From eec1d625c4856e6756a357d3840af42dfa46e3e0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 20:36:46 +0100
Subject: [PATCH 065/188] Add Pico::getFilesGlob() method

---
 lib/Pico.php | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index cf2ea44..53c2bde 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -650,13 +650,9 @@ class Pico
         }
 
         // merge $config of config/*.config.php files
-        $configFiles = glob($this->getConfigDir() . '?*.config.php', GLOB_MARK);
-        if ($configFiles) {
-            foreach ($configFiles as $configFile) {
-                if (substr($configFile, -1) !== '/') {
-                    $this->config += $includeClosure($configFile);
-                }
-            }
+        $configFiles = $this->getFilesGlob($this->getConfigDir() . '?*.config.php');
+        foreach ($configFiles as $configFile) {
+            $this->config += $includeClosure($configFile);
         }
 
         // merge default config
@@ -1856,6 +1852,39 @@ class Pico
         return $result;
     }
 
+    /**
+     * Returns all files in a directory matching a libc glob() pattern
+     *
+     * @see    https://secure.php.net/manual/en/function.glob.php
+     *     PHP's glob() function
+     * @param  string $pattern the pattern to search for; see PHP's glob()
+     *     function for details
+     * @param  int    $order   specify whether and how files should be sorted;
+     *     use Pico::SORT_ASC for a alphabetical ascending order (this is the
+     *     default behaviour), Pico::SORT_DESC for a descending order or
+     *     Pico::SORT_NONE to leave the result unsorted
+     * @return array           list of found files
+     */
+    public function getFilesGlob($pattern, $order = self::SORT_ASC)
+    {
+        $result = array();
+        $sortFlag = ($order === self::SORT_NONE) ? GLOB_NOSORT : 0;
+
+        $files = glob($pattern, GLOB_MARK | $sortFlag);
+        if ($files) {
+            foreach ($files as $file) {
+                // exclude dirs and files ending with a ~ (vim/nano backup) or # (emacs backup)
+                if (in_array(substr($file, -1), array('/', '~', '#'))) {
+                    continue;
+                }
+
+                $result[] = $file;
+            }
+        }
+
+        return ($order === self::SORT_DESC) ? array_reverse($result) : $result;
+    }
+
     /**
      * Makes a relative path absolute to Pico's root dir
      *

From 9254240e4495a8c2f15e957d88ef86971fdbd8bd Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 20:37:17 +0100
Subject: [PATCH 066/188] Load plugins from <plugin name>.php and <plugin
 name>/<plugin name>.php only

---
 lib/Pico.php | 67 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 18 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 53c2bde..ba72d3c 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -426,15 +426,18 @@ class Pico
     /**
      * Loads plugins from Pico::$pluginsDir in alphabetical order
      *
+     * Pico tries to load plugins from `<plugin name>/<plugin name>.php` and
+     * `<plugin name>.php` only. Plugin names are treated case insensitive.
+     * Pico will throw a RuntimeException if it can't load a plugin.
+     *
      * Plugin files MAY be prefixed by a number (e.g. 00-PicoDeprecated.php)
      * to indicate their processing order. Plugins without a prefix will be
-     * loaded last. If you want to use a prefix, you MUST consider the
-     * following directives:
-     * - 00 to 19: Reserved
-     * - 20 to 39: Low level code helper plugins
-     * - 40 to 59: Plugins manipulating routing or the pages array
-     * - 60 to 79: Plugins hooking into template or markdown parsing
-     * - 80 to 99: Plugins using the `onPageRendered` event
+     * loaded last. If you want to use a prefix, you MUST NOT use the reserved
+     * prefixes `00` to `09`.
+     *
+     * Please note that Pico will change the processing order when needed to
+     * incorporate plugin dependencies. See {@see Pico::sortPlugins()} for
+     * details.
      *
      * @see    Pico::loadPlugin()
      * @see    Pico::getPlugin()
@@ -444,6 +447,41 @@ class Pico
      */
     protected function loadPlugins()
     {
+        $this->plugins = array();
+
+        // discover plugin files
+        $pluginFiles = array();
+        $files = scandir($this->getPluginsDir());
+        if ($files !== false) {
+            foreach ($files as $file) {
+                if ($file[0] === '.') {
+                    continue;
+                }
+
+                if (is_dir($this->getPluginsDir() . $file)) {
+                    $className = preg_replace('/^[0-9]+-/', '', $file);
+
+                    $subdirFiles = $this->getFilesGlob($this->getPluginsDir() . $file . '/?*.php', self::SORT_NONE);
+                    foreach ($subdirFiles as $subdirFile) {
+                        $subdirFile = basename($subdirFile, '.php');
+                        if (strcasecmp($className, $subdirFile) === 0) {
+                            $pluginFiles[$className] = $file . '/' . $subdirFile . '.php';
+                        }
+                    }
+
+                    if (!isset($pluginFiles[$className])) {
+                        throw new RuntimeException(
+                            "Unable to load plugin '" . $className . "' from "
+                            . "'" . $file . "/" . $className . ".php': File not found"
+                        );
+                    }
+                } elseif (substr($file, -4) === '.php') {
+                    $className = preg_replace('/^[0-9]+-/', '', substr($file, 0, -4));
+                    $pluginFiles[$className] = $file;
+                }
+            }
+        }
+
         // scope isolated require_once()
         $includeClosure = function ($pluginFile) {
             require_once($pluginFile);
@@ -452,27 +490,20 @@ class Pico
             $includeClosure = $includeClosure->bindTo(null);
         }
 
-        $this->plugins = array();
-        $pluginFiles = $this->getFiles($this->getPluginsDir(), '.php');
-        foreach ($pluginFiles as $pluginFile) {
-            $includeClosure($pluginFile);
+        foreach ($pluginFiles as $className => $pluginFile) {
+            $includeClosure($this->getPluginsDir() . $pluginFile);
 
-            $className = preg_replace('/^[0-9]+-/', '', basename($pluginFile, '.php'));
-            if (class_exists($className)) {
+            if (class_exists($className, false)) {
                 // class name and file name can differ regarding case sensitivity
                 $plugin = new $className($this);
                 $className = get_class($plugin);
 
                 $this->plugins[$className] = $plugin;
             } else {
-                // TODO: breaks backward compatibility
-                /*
-                $pluginFileName = substr($pluginFile, strlen($this->getPluginsDir()));
                 throw new RuntimeException(
                     "Unable to load plugin '" . $className . "' "
-                    . "from '" . $pluginFileName . "'"
+                    . "from '" . $pluginFile . "'"
                 );
-                */
             }
         }
     }

From c56ba02b0b9523d3d052039e119b730e19e14fc1 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Dec 2016 20:58:38 +0100
Subject: [PATCH 067/188] Reintroduce plugin prefix classifications

This partially reverts commit 9254240
---
 lib/Pico.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index ba72d3c..8f5868a 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -433,7 +433,13 @@ class Pico
      * Plugin files MAY be prefixed by a number (e.g. 00-PicoDeprecated.php)
      * to indicate their processing order. Plugins without a prefix will be
      * loaded last. If you want to use a prefix, you MUST NOT use the reserved
-     * prefixes `00` to `09`.
+     * prefixes `00` to `09`. Prefixes are completely optional, however, you
+     * SHOULD take the following prefix classification into consideration:
+     * - 10 to 19: Reserved
+     * - 20 to 39: Low level code helper plugins
+     * - 40 to 59: Plugins manipulating routing or the pages array
+     * - 60 to 79: Plugins hooking into template or markdown parsing
+     * - 80 to 99: Plugins using the `onPageRendered` event
      *
      * Please note that Pico will change the processing order when needed to
      * incorporate plugin dependencies. See {@see Pico::sortPlugins()} for

From 0a080c89654daee606ff2da6d4c4443901843c89 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Feb 2017 15:55:53 +0100
Subject: [PATCH 068/188] Add lazy init for Symfony YAML, Parsedown and Twig

---
 content-sample/_meta.md |  2 +-
 lib/Pico.php            | 67 +++++++++++++++--------------------------
 2 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/content-sample/_meta.md b/content-sample/_meta.md
index e43ed5e..faab0cf 100644
--- a/content-sample/_meta.md
+++ b/content-sample/_meta.md
@@ -9,4 +9,4 @@ social:
     - title: Join us on Freenode IRC Webchat
       url: https://webchat.freenode.net/?channels=%23picocms
       icon: chat
----
\ No newline at end of file
+---
diff --git a/lib/Pico.php b/lib/Pico.php
index 8f5868a..b49ea36 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -156,7 +156,7 @@ class Pico
     /**
      * Symfony YAML instance used for meta header parsing
      *
-     * @see Pico::registerYamlParser()
+     * @see Pico::getYamlParser()
      * @var \Symfony\Component\Yaml\Parser|null
      */
     protected $yamlParser;
@@ -359,10 +359,10 @@ class Pico
 
         $this->triggerEvent('onContentLoaded', array(&$this->rawContent));
 
-        // parse file meta
+        // register YAML parser
         $this->triggerEvent('onYamlParserRegistration');
-        $this->registerYamlParser();
 
+        // parse file meta
         $this->metaHeaders = $this->getMetaHeaders();
         $this->triggerEvent('onMetaHeaders', array(&$this->metaHeaders));
 
@@ -372,7 +372,6 @@ class Pico
 
         // register parsedown
         $this->triggerEvent('onParsedownRegistration');
-        $this->registerParsedown();
 
         // parse file content
         $this->triggerEvent('onContentParsing', array(&$this->rawContent));
@@ -1036,28 +1035,17 @@ class Pico
         );
     }
 
-    /**
-     * Registers the Symfony YAML parser
-     *
-     * @see    Pico::getYamlParser()
-     * @see    http://symfony.com/doc/current/components/yaml/introduction.html
-     *     Symfony YAML component website
-     * @see    https://github.com/symfony/yaml Symfony YAML component on GitHub
-     * @return void
-     */
-    protected function registerYamlParser()
-    {
-        $this->yamlParser = new \Symfony\Component\Yaml\Parser();
-    }
-
     /**
      * Returns the Symfony YAML parser
      *
-     * @see    Pico::registerYamlParser()
-     * @return \Symfony\Component\Yaml\Parser|null Symfony YAML parser
+     * @return \Symfony\Component\Yaml\Parser Symfony YAML parser
      */
     public function getYamlParser()
     {
+        if ($this->yamlParser === null) {
+            $this->yamlParser = new \Symfony\Component\Yaml\Parser();
+        }
+
         return $this->yamlParser;
     }
 
@@ -1084,7 +1072,7 @@ class Pico
         $pattern = "/^(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
             . "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s";
         if (preg_match($pattern, $rawContent, $rawMetaMatches) && isset($rawMetaMatches[3])) {
-            $meta = $this->yamlParser->parse($rawMetaMatches[3]);
+            $meta = $this->getYamlParser()->parse($rawMetaMatches[3]);
 
             if ($meta !== null) {
                 // the parser may return a string for non-YAML 1-liners
@@ -1144,29 +1132,17 @@ class Pico
         return $this->meta;
     }
 
-    /**
-     * Registers the Parsedown Extra markdown parser
-     *
-     * @see    Pico::getParsedown()
-     * @see    http://parsedown.org/ Parsedown website
-     * @see    https://github.com/erusev/parsedown Parsedown on GitHub
-     * @see    https://github.com/erusev/parsedown-extra
-     *     Parsedown Extra on GitHub
-     * @return void
-     */
-    protected function registerParsedown()
-    {
-        $this->parsedown = new ParsedownExtra();
-    }
-
     /**
      * Returns the Parsedown Extra markdown parser
      *
-     * @see    Pico::registerParsedown()
-     * @return ParsedownExtra|null Parsedown Extra markdown parser
+     * @return ParsedownExtra Parsedown Extra markdown parser
      */
     public function getParsedown()
     {
+        if ($this->parsedown === null) {
+            $this->parsedown = new ParsedownExtra();
+        }
+
         return $this->parsedown;
     }
 
@@ -1232,11 +1208,7 @@ class Pico
      */
     public function parseFileContent($content)
     {
-        if ($this->parsedown === null) {
-            throw new LogicException("Unable to parse file contents: Parsedown instance wasn't registered yet");
-        }
-
-        return $this->parsedown->text($content);
+        return $this->getParsedown()->text($content);
     }
 
     /**
@@ -1528,6 +1500,11 @@ class Pico
      */
     protected function registerTwig()
     {
+        if ($this->twig !== null) {
+            // nothing to do
+            return;
+        }
+
         $twigLoader = new Twig_Loader_Filesystem($this->getThemesDir() . $this->getConfig('theme'));
         $this->twig = new Twig_Environment($twigLoader, $this->getConfig('twig_config'));
         $this->twig->addExtension(new Twig_Extension_Debug());
@@ -1559,6 +1536,10 @@ class Pico
      */
     public function getTwig()
     {
+        if ($this->twig === null) {
+            $this->registerTwig();
+        }
+
         return $this->twig;
     }
 

From 9b7523b9e8fd418d9307208b8cde5b190703b1fb Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Feb 2017 16:52:18 +0100
Subject: [PATCH 069/188] Use .yml files to configure Pico

 Instead of using `*.config.php` files, use `*.yml` files to configure Pico. YAML is much easier to understand, more user friendly and (at least a bit) more error-tolerant, but still very powerful. Don't break BC by letting `PicoDeprecated` still read `config/config.php`.
---
 .gitignore                    |  2 +-
 config/config.php.template    | 61 ---------------------------------
 config/config.yml.template    | 41 +++++++++++++++++++++++
 content-sample/index.md       | 10 +++---
 lib/Pico.php                  | 35 +++++++++----------
 plugins/00-PicoDeprecated.php | 63 ++++++++++++++++++++++++++++++-----
 6 files changed, 121 insertions(+), 91 deletions(-)
 delete mode 100644 config/config.php.template
 create mode 100644 config/config.yml.template

diff --git a/.gitignore b/.gitignore
index 673e405..7cb4a74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ desktop.ini
 /_build/deploy-*.git
 
 # User config
-/config/config.php
+/config/config.yml
 
 # User themes
 /themes/*
diff --git a/config/config.php.template b/config/config.php.template
deleted file mode 100644
index dc19eff..0000000
--- a/config/config.php.template
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Pico configuration
- *
- * This is the configuration file for {@link Pico}. It comes loaded with the
- * default values, which can be found in {@link Pico::getConfig()} (see
- * {@path "lib/Pico.php"}).
- *
- * To override any of the default settings below, copy this file to
- * {@path "config/config.php"}, uncomment the line, then make and
- * save your changes.
- *
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.0
- */
-
-/*
- * BASIC
- */
-// $config['site_title'] = 'Pico';              // Site title
-// $config['base_url'] = '';                    // Override base URL (e.g. http://example.com/pico/)
-// $config['rewrite_url'] = null;               // A boolean indicating forced URL rewriting
-
-/*
- * THEME
- */
-// $config['theme'] = 'default';                // Set the theme (defaults to "default")
-// $config['theme_url'] = '';                   // Override the base URL of the themes folder (e.g. http://example.com/pico/themes/)
-// $config['theme_config'] = array(             // Settings of the theme; depends on the theme used
-//     'widescreen' => false                    // Default theme: Allocate more horicontal space (i.e. make the site container wider)
-// );
-// $config['twig_config'] = array(              // Twig settings
-//     'cache' => false,                        // To enable Twig caching change this to a path to a writable directory
-//     'autoescape' => false,                   // Auto-escape Twig vars
-//     'debug' => false                         // Enable Twig debug
-// );
-
-/*
- * CONTENT
- */
-// $config['date_format'] = '%D %T';            // Set the PHP date format as described here: http://php.net/manual/en/function.strftime.php
-// $config['pages_order_by'] = 'alpha';         // Order pages by "alpha" or "date"
-// $config['pages_order'] = 'asc';              // Order pages "asc" or "desc"
-// $config['content_dir'] = 'content-sample/';  // Content directory
-// $config['content_ext'] = '.md';              // File extension of content files to serve
-
-/*
- * TIMEZONE
- */
-// $config['timezone'] = 'UTC';                 // Timezone may be required by your php install
-
-/*
- * PLUGINS
- */
-// $config['DummyPlugin.enabled'] = false;      // Force DummyPlugin to be disabled
-
-/*
- * CUSTOM
- */
-// $config['custom_setting'] = 'Hello';         // Can be accessed by {{ config.custom_setting }} in a theme
diff --git a/config/config.yml.template b/config/config.yml.template
new file mode 100644
index 0000000..aed7698
--- /dev/null
+++ b/config/config.yml.template
@@ -0,0 +1,41 @@
+##
+# Basic
+#
+site_title: Pico                    # The title of your website
+base_url: ~                         # Pico will try to guess its base URL, if this fails, override it here
+                                    # Example: http://example.com/pico/
+rewrite_url: ~                      # A boolean (true or false) indicating whether URL rewriting is forced
+timezone: UTC                       # Your PHP installation might require you to manually specify a timezone
+
+##
+# Theme
+#
+theme: default                      # The name of your custom theme
+theme_url: ~                        # Pico will try to guess the URL to the themes dir of your installation
+                                    # If this fails, override it here. Example: http://example.com/pico/themes/
+theme_config:
+    widescreen: false               # Default theme: Use more horicontal space (i.e. make the site container wider)
+twig_config:
+    cache: false                    # Enable Twig template caching by specifying a path to a writable directory
+    autoescape: false               # Let Twig escape variables by default
+    debug: false                    # Enable Twig's debugging mode
+
+##
+# Content
+#
+date_format: %D %T                  # Pico's default date format
+                                    # List of available variables: http://php.net/manual/en/function.strftime.php
+pages_order_by: alpha               # Change how Pico sorts pages ("alpha" for alphabetical order, or "date")
+pages_order: asc                    # Sort pages in ascending ("asc") or descending ("desc") order
+content_dir: content/               # The path to Pico's content directory
+content_ext: .md                    # The file extension of your Markdown files
+
+##
+# Plugins
+#
+DummyPlugin.enabled: false          # Force the plugin "DummyPlugin" to be disabled
+
+##
+# Custom
+#
+my_custom_setting: Hello World!     # You can access custom settings in themes using {{ config.my_custom_setting }}
diff --git a/content-sample/index.md b/content-sample/index.md
index bb5d334..11f4943 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -263,10 +263,12 @@ to the brand new plugin system introduced with Pico 1.0. Please refer to the
 ## Config
 
 You can override the default Pico settings (and add your own custom settings)
-by editing `config/config.php` in the Pico directory. For a brief overview of
-the available settings and their defaults see `config/config.php.template`. To
-override a setting, copy `config/config.php.template` to `config/config.php`,
-uncomment the setting and set your custom value.
+by editing `config/config.yml` in the Pico directory. For a brief overview of
+the available settings and their defaults see `config/config.yml.template`. To
+override a setting, simply copy the line from `config/config.yml.template`
+to `config/config.yml` and set your custom value. Pico will read all `*.yml`
+files in the `config/` dir, thus you can even use a distinct settings file to
+configure your custom theme (e.g. `config/my_theme.yml`).
 
 ### URL Rewriting
 
diff --git a/lib/Pico.php b/lib/Pico.php
index b49ea36..3c96bd6 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -670,25 +670,26 @@ class Pico
      */
     protected function loadConfig()
     {
-        // scope isolated require()
-        $includeClosure = function ($configFile) {
-            require($configFile);
-            return (isset($config) && is_array($config)) ? $config : array();
+        // load config closure
+        $yamlParser = $this->getYamlParser();
+        $loadConfigClosure = function ($configFile) use ($yamlParser) {
+            $yaml = file_get_contents($configFile);
+            $config = $yamlParser->parse($yaml);
+            return is_array($config) ? $config : array();
         };
-        if (PHP_VERSION_ID >= 50400) {
-            $includeClosure = $includeClosure->bindTo(null);
-        }
 
-        // load main config file (config/config.php)
+        // load main config file (config/config.yml)
         $this->config = is_array($this->config) ? $this->config : array();
-        if (file_exists($this->getConfigDir() . 'config.php')) {
-            $this->config += $includeClosure($this->getConfigDir() . 'config.php');
+        if (file_exists($this->getConfigDir() . 'config.yml')) {
+            $this->config += $loadConfigClosure($this->getConfigDir() . 'config.yml');
         }
 
-        // merge $config of config/*.config.php files
-        $configFiles = $this->getFilesGlob($this->getConfigDir() . '?*.config.php');
+        // merge $config of config/*.yml files
+        $configFiles = $this->getFilesGlob($this->getConfigDir() . '*.yml');
         foreach ($configFiles as $configFile) {
-            $this->config += $includeClosure($configFile);
+            if ($configFile !== 'config.yml') {
+                $this->config += $loadConfigClosure($configFile);
+            }
         }
 
         // merge default config
@@ -697,14 +698,14 @@ class Pico
             'base_url' => '',
             'rewrite_url' => null,
             'theme' => 'default',
-            'theme_url' => '',
+            'theme_url' => null,
             'date_format' => '%D %T',
             'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false),
             'pages_order_by' => 'alpha',
             'pages_order' => 'asc',
             'content_dir' => null,
             'content_ext' => '.md',
-            'timezone' => ''
+            'timezone' => null
         );
 
         if (!$this->config['base_url']) {
@@ -1333,8 +1334,8 @@ class Pico
     protected function sortPages()
     {
         // sort pages
-        $order = $this->getConfig('pages_order');
-        $orderBy = $this->getConfig('pages_order_by');
+        $order = strtolower($this->getConfig('pages_order'));
+        $orderBy = strtolower($this->getConfig('pages_order_by'));
 
         if (($orderBy !== 'date') && ($orderBy !== 'alpha')) {
             return;
diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php
index c79d7f3..ed00e7e 100644
--- a/plugins/00-PicoDeprecated.php
+++ b/plugins/00-PicoDeprecated.php
@@ -4,11 +4,9 @@
  * Maintain backward compatibility to older Pico releases
  *
  * This plugin exists for backward compatibility and is disabled by default.
- * It gets automatically enabled when a plugin which doesn't implement
- * {@link PicoPluginInterface} is loaded. This plugin triggers deprecated
- * events and automatically enables {@link PicoParsePagesContent} and
- * {@link PicoExcerpt}. These plugins heavily impact Pico's performance! You
- * can disable this plugin by calling {@link PicoDeprecated::setEnabled()}.
+ * It gets automatically enabled when a plugin which either doesn't implement
+ * {@link PicoPluginInterface} (plugins for Pico 0.X) or define the
+ * {@link PicoDeprecated::API_VERSION} (plugins for Pico 1.0) is loaded.
  *
  * The following deprecated events are triggered by this plugin:
  *
@@ -32,9 +30,10 @@
  * | onPageRendering     | before_render($twigVariables, $twig, $templateName)       |
  * | onPageRendered      | after_render($output)                                     |
  *
- * Since Pico 1.0 the config is stored in {@path "config/config.php"}. This
- * plugin tries to read {@path "config.php"} in Pico's root dir and overwrites
- * all settings previously specified in {@path "config/config.php"}.
+ * Since Pico 2.0 the config is stored in `config/*.yml` files. This plugin
+ * also tries to read {@path "config/config.php"} (Pico 1.0) and
+ * {@path "config.php"} in Pico's root dir (Pico 0.X) and overwrites all
+ * previously specified settings.
  *
  * @author  Daniel Rudolf
  * @link    http://picocms.org
@@ -110,6 +109,7 @@ class PicoDeprecated extends AbstractPicoPlugin
     public function onConfigLoaded(array &$config)
     {
         $this->defineConstants();
+        $this->loadScriptedConfig($config);
         $this->loadRootDirConfig($config);
         $this->enablePlugins();
         $GLOBALS['config'] = &$config;
@@ -154,6 +154,53 @@ class PicoDeprecated extends AbstractPicoPlugin
         }
     }
 
+    /**
+     * Read config.php in Pico's config dir (i.e. config/config.php)
+     *
+     * @see    PicoDeprecated::onConfigLoaded()
+     * @see    Pico::loadConfig()
+     * @param  array &$realConfig array of config variables
+     * @return void
+     */
+    protected function loadScriptedConfig(array &$realConfig)
+    {
+        if (file_exists($this->getConfigDir() . 'config.php')) {
+            // scope isolated require()
+            $includeClosure = function ($configFile) {
+                require($configFile);
+                return (isset($config) && is_array($config)) ? $config : array();
+            };
+            if (PHP_VERSION_ID >= 50400) {
+                $includeClosure = $includeClosure->bindTo(null);
+            }
+
+            // config.php in Pico::$configDir (i.e. config/config.php) is deprecated
+            // use *.yml files in Pico::$configDir instead
+            $config = $includeClosure($this->getConfigDir() . 'config.php');
+
+            if ($config) {
+                if (!empty($config['base_url'])) {
+                    $config['base_url'] = rtrim($config['base_url'], '/') . '/';
+                }
+                if (!empty($config['content_dir'])) {
+                    $config['content_dir'] = $this->getAbsolutePath($config['content_dir']);
+                }
+                if (!empty($config['theme_url'])) {
+                    if (preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $config['theme_url'])) {
+                        $config['theme_url'] = rtrim($config['theme_url'], '/') . '/';
+                    } else {
+                        $config['theme_url'] = $this->getBaseUrl() . rtrim($config['theme_url'], '/') . '/';
+                    }
+                }
+                if (!empty($config['timezone'])) {
+                    date_default_timezone_set($config['timezone']);
+                }
+
+                $realConfig = $config + $realConfig;
+            }
+        }
+    }
+
     /**
      * Read config.php in Pico's root dir
      *

From 5429a3a93276ad08c8221a2c19156a1cf63d3040 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Feb 2017 20:20:26 +0100
Subject: [PATCH 070/188] Add Pico::getTwigTemplate()

---
 lib/Pico.php | 48 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 3c96bd6..786608b 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -236,11 +236,19 @@ class Pico
     /**
      * Variables passed to the twig template
      *
-     * @see Pico::getTwigVariables
+     * @see Pico::getTwigVariables()
      * @var array|null
      */
     protected $twigVariables;
 
+    /**
+     * Name of the Twig template to render
+     *
+     * @see Pico::getTwigTemplate()
+     * @var string|null
+     */
+    protected $twigTemplate;
+
     /**
      * Constructs a new Pico instance
      *
@@ -403,20 +411,10 @@ class Pico
 
         // render template
         $this->twigVariables = $this->getTwigVariables();
-        if (!empty($this->meta['template'])) {
-            $templateName = $this->meta['template'];
-        } else {
-            $templateName = 'index';
-        }
-        if (file_exists($this->getThemesDir() . $this->getConfig('theme') . '/' . $templateName . '.twig')) {
-            $templateName .= '.twig';
-        } else {
-            $templateName .= '.html';
-        }
+        $this->twigTemplate = $this->getTwigTemplate();
+        $this->triggerEvent('onPageRendering', array(&$this->twig, &$this->twigVariables, &$this->twigTemplate));
 
-        $this->triggerEvent('onPageRendering', array(&$this->twig, &$this->twigVariables, &$templateName));
-
-        $output = $this->twig->render($templateName, $this->twigVariables);
+        $output = $this->twig->render($this->twigTemplate, $this->twigVariables);
         $this->triggerEvent('onPageRendered', array(&$output));
 
         return $output;
@@ -1575,6 +1573,28 @@ class Pico
         );
     }
 
+    /**
+     * Returns the name of the Twig template to render
+     *
+     * @return string template name
+     */
+    protected function getTwigTemplate()
+    {
+        if ($this->twigTemplate !== null) {
+            return $this->twigTemplate;
+        }
+
+        $templateName = $this->meta['template'] ?: 'index';
+
+        if (file_exists($this->getThemesDir() . $this->getConfig('theme') . '/' . $templateName . '.twig')) {
+            $templateName .= '.twig';
+        } else {
+            $templateName .= '.html';
+        }
+
+        return $templateName;
+    }
+
     /**
      * Returns the base URL of this Pico instance
      *

From d4c65fa5231abe3b3aa84c34a91f87717aa5e63f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Feb 2017 21:49:54 +0100
Subject: [PATCH 071/188] Allow configuring Parsedown

---
 config/config.yml.template | 13 +++++++---
 lib/Pico.php               | 52 ++++++++++++++++++++++++++------------
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/config/config.yml.template b/config/config.yml.template
index aed7698..c40dc4c 100644
--- a/config/config.yml.template
+++ b/config/config.yml.template
@@ -3,7 +3,7 @@
 #
 site_title: Pico                    # The title of your website
 base_url: ~                         # Pico will try to guess its base URL, if this fails, override it here
-                                    # Example: http://example.com/pico/
+                                    #     Example: http://example.com/pico/
 rewrite_url: ~                      # A boolean (true or false) indicating whether URL rewriting is forced
 timezone: UTC                       # Your PHP installation might require you to manually specify a timezone
 
@@ -12,7 +12,7 @@ timezone: UTC                       # Your PHP installation might require you to
 #
 theme: default                      # The name of your custom theme
 theme_url: ~                        # Pico will try to guess the URL to the themes dir of your installation
-                                    # If this fails, override it here. Example: http://example.com/pico/themes/
+                                    #     If this fails, override it here. Example: http://example.com/pico/themes/
 theme_config:
     widescreen: false               # Default theme: Use more horicontal space (i.e. make the site container wider)
 twig_config:
@@ -24,11 +24,18 @@ twig_config:
 # Content
 #
 date_format: %D %T                  # Pico's default date format
-                                    # List of available variables: http://php.net/manual/en/function.strftime.php
+                                    #     See http://php.net/manual/en/function.strftime.php for more info
 pages_order_by: alpha               # Change how Pico sorts pages ("alpha" for alphabetical order, or "date")
 pages_order: asc                    # Sort pages in ascending ("asc") or descending ("desc") order
 content_dir: content/               # The path to Pico's content directory
 content_ext: .md                    # The file extension of your Markdown files
+content_config:
+    extra: true                     # Use the Parsedown Extra parser to support extended markup
+                                    #     See https://michelf.ca/projects/php-markdown/extra/ for more info
+    breaks: false                   # A boolean indicating whether breaks in the markup should be reflected in the
+                                    #     parsed contents of the page
+    escape: false                   # Escape HTML markup in your content files
+    auto_urls: true                 # Automatically link URLs found in your markup
 
 ##
 # Plugins
diff --git a/lib/Pico.php b/lib/Pico.php
index 786608b..477b079 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -695,15 +695,16 @@ class Pico
             'site_title' => 'Pico',
             'base_url' => '',
             'rewrite_url' => null,
+            'timezone' => null,
             'theme' => 'default',
             'theme_url' => null,
+            'twig_config' => null,
             'date_format' => '%D %T',
-            'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false),
             'pages_order_by' => 'alpha',
             'pages_order' => 'asc',
             'content_dir' => null,
             'content_ext' => '.md',
-            'timezone' => null
+            'content_config' => null
         );
 
         if (!$this->config['base_url']) {
@@ -716,6 +717,29 @@ class Pico
             $this->config['rewrite_url'] = $this->isUrlRewritingEnabled();
         }
 
+        if (!$this->config['timezone']) {
+            // explicitly set a default timezone to prevent a E_NOTICE
+            // when no timezone is set; the `date_default_timezone_get()`
+            // function always returns a timezone, at least UTC
+            $this->config['timezone'] = @date_default_timezone_get();
+        }
+        date_default_timezone_set($this->config['timezone']);
+
+        if (!$this->config['theme_url']) {
+            $this->config['theme_url'] = $this->getBaseThemeUrl();
+        } elseif (preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $this->config['theme_url'])) {
+            $this->config['theme_url'] = rtrim($this->config['theme_url'], '/') . '/';
+        } else {
+            $this->config['theme_url'] = $this->getBaseUrl() . rtrim($this->config['theme_url'], '/') . '/';
+        }
+
+        $defaultTwigConfig = array('cache' => false, 'autoescape' => false, 'debug' => false);
+        if (!is_array($this->config['twig_config'])) {
+            $this->config['twig_config'] = $defaultTwigConfig;
+        } else {
+            $this->config['twig_config'] += $defaultTwigConfig;
+        }
+
         if (!$this->config['content_dir']) {
             // try to guess the content directory
             if (is_dir($this->getRootDir() . 'content')) {
@@ -727,21 +751,12 @@ class Pico
             $this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']);
         }
 
-        if (!$this->config['theme_url']) {
-            $this->config['theme_url'] = $this->getBaseThemeUrl();
-        } elseif (preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $this->config['theme_url'])) {
-            $this->config['theme_url'] = rtrim($this->config['theme_url'], '/') . '/';
+        $defaultContentConfig = array('extra' => true, 'breaks' => false, 'escape' => false, 'auto_urls' => true);
+        if (!is_array($this->config['content_config'])) {
+            $this->config['content_config'] = $defaultContentConfig;
         } else {
-            $this->config['theme_url'] = $this->getBaseUrl() . rtrim($this->config['theme_url'], '/') . '/';
+            $this->config['content_config'] += $defaultContentConfig;
         }
-
-        if (!$this->config['timezone']) {
-            // explicitly set a default timezone to prevent a E_NOTICE
-            // when no timezone is set; the `date_default_timezone_get()`
-            // function always returns a timezone, at least UTC
-            $this->config['timezone'] = @date_default_timezone_get();
-        }
-        date_default_timezone_set($this->config['timezone']);
     }
 
     /**
@@ -1139,7 +1154,12 @@ class Pico
     public function getParsedown()
     {
         if ($this->parsedown === null) {
-            $this->parsedown = new ParsedownExtra();
+            $className = $this->config['content_config']['extra'] ? 'ParsedownExtra' : 'Parsedown';
+            $this->parsedown = new $className();
+
+            $this->parsedown->setBreaksEnabled((bool) $this->config['content_config']['breaks']);
+            $this->parsedown->setMarkupEscaped((bool) $this->config['content_config']['escape']);
+            $this->parsedown->setUrlsLinked((bool) $this->config['content_config']['auto_urls']);
         }
 
         return $this->parsedown;

From 882a80a1796f7a37d1894cbfd7f594d63f841dd2 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 6 Feb 2017 00:01:25 +0100
Subject: [PATCH 072/188] Update docs to reflect 9b7523b

---
 .phpdoc.xml             |  2 +-
 content-sample/index.md | 22 +++++++++++-----------
 lib/Pico.php            | 20 ++++++++++----------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.phpdoc.xml b/.phpdoc.xml
index 94996fb..301f928 100644
--- a/.phpdoc.xml
+++ b/.phpdoc.xml
@@ -20,7 +20,7 @@
 
         <!-- exclude user config -->
         <ignore>config/*</ignore>
-        <file>config/config.php.template</file>
+        <file>config/config.yml.template</file>
 
         <!-- exclude all plugins -->
         <ignore>plugins/*</ignore>
diff --git a/content-sample/index.md b/content-sample/index.md
index 11f4943..4d70b45 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -156,15 +156,15 @@ details.
 
 You can create themes for your Pico installation in the `themes` folder. Check
 out the default theme for an example. Pico uses [Twig][] for template
-rendering. You can select your theme by setting the `$config['theme']` option
-in `config/config.php` to the name of your theme folder.
+rendering. You can select your theme by setting the `theme` option in
+`config/config.yml` to the name of your theme folder.
 
 All themes must include an `index.twig` (or `index.html`) file to define the
 HTML structure of the theme. Below are the Twig variables that are available
 to use in your theme. Please note that paths (e.g. `{{ base_dir }}`) and URLs
 (e.g. `{{ base_url }}`) don't have a trailing slash.
 
-* `{{ config }}` - Contains the values you set in `config/config.php`
+* `{{ config }}` - Contains the values you set in `config/config.yml`
                    (e.g. `{{ config.theme }}` becomes `default`)
 * `{{ base_dir }}` - The path to your Pico root directory
 * `{{ base_url }}` - The URL to your Pico site; use Twigs `link` filter to
@@ -173,7 +173,7 @@ to use in your theme. Please note that paths (e.g. `{{ base_dir }}`) and URLs
                      is enabled or not
 * `{{ theme_dir }}` - The path to the currently active theme
 * `{{ theme_url }}` - The URL to the currently active theme
-* `{{ site_title }}` - Shortcut to the site title (see `config/config.php`)
+* `{{ site_title }}` - Shortcut to the site title (see `config/config.yml`)
 * `{{ meta }}` - Contains the meta values from the current page
     * `{{ meta.title }}`
     * `{{ meta.description }}`
@@ -247,10 +247,10 @@ steps (e.g. specifying config variables), the plugin docs or `README` file will
 explain what to do.
 
 Plugins which were written to work with Pico 1.0 can be enabled and disabled
-through your `config/config.php`. If you want to e.g. disable the `PicoExcerpt`
-plugin, add the following line to your `config/config.php`:
-`$config['PicoExcerpt.enabled'] = false;`. To force the plugin to be enabled
-replace `false` with `true`.
+through your `config/config.yml`. If you want to e.g. disable the `PicoExcerpt`
+plugin, add the following line to your `config/config.yml`:
+`PicoExcerpt.enabled: false`. To force the plugin to be enabled replace `false`
+with `true`.
 
 #### Plugins for developers
 
@@ -281,14 +281,14 @@ enabled - try it yourself, click on the [second URL](%base_url%/sub/page). If
 you get an error message from your web server, please make sure to enable the
 [`mod_rewrite` module][ModRewrite]. Assuming the second URL works, but Pico
 still shows no rewritten URLs, force URL rewriting by setting
-`$config['rewrite_url'] = true;` in your `config/config.php`.
+`rewrite_url: true` in your `config/config.yml`.
 
 If you're using Nginx, you can use the following configuration to enable URL
 rewriting (lines `5` to `8`) and denying access to Pico's internal files
 (lines `1` to `3`). You'll need to adjust the path (`/pico` on lines `1`, `5`
 and `7`) to match your installation directory. Additionally, you'll need to
-enable URL rewriting by setting `$config['rewrite_url'] = true;` in your
-`config/config.php`. The Nginx configuration should provide the *bare minimum*
+enable URL rewriting by setting `rewrite_url: true` in your
+`config/config.yml`. The Nginx configuration should provide the *bare minimum*
 you need for Pico. Nginx is a very extensive subject. If you have any trouble,
 please read through our [Nginx configuration docs][NginxConfig].
 
diff --git a/lib/Pico.php b/lib/Pico.php
index 477b079..c99ea64 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -652,15 +652,15 @@ class Pico
     }
 
     /**
-     * Loads the config.php and any *.config.php from Pico::$configDir
+     * Loads the config.yml and any other *.yml from Pico::$configDir
      *
-     * After loading the {@path "config/config.php"}, Pico proceeds with any
-     * existing `config/*.config.php` in alphabetical order. The file order is
-     * crucial: Config values which has been set already, cannot be overwritten
-     * by a succeeding file. This is also true for arrays, i.e. when specifying
-     * `$config['test'] = array('foo' => 'bar')` in `config/a.config.php` and
-     * `$config['test'] = array('baz' => 42)` in `config/b.config.php`,
-     * `$config['test']['baz']` will be undefined!
+     * After loading {@path "config/config.yml"}, Pico proceeds with any other
+     * existing `config/*.yml` file in alphabetical order. The file order is
+     * crucial: Config values which have been set already, cannot be
+     * overwritten by a succeeding file. This is also true for arrays, i.e.
+     * when specifying `test: { foo: bar }` in `config/a.yml` and
+     * `test: { baz: 42 }` in `config/b.yml`, `{{ config.test.baz }}` will be
+     * undefined!
      *
      * @see    Pico::setConfig()
      * @see    Pico::getConfig()
@@ -763,12 +763,12 @@ class Pico
      * Sets Pico's config before calling Pico::run()
      *
      * This method allows you to modify Pico's config without creating a
-     * {@path "config/config.php"} or changing some of its variables before
+     * {@path "config/config.yml"} or changing some of its variables before
      * Pico starts processing.
      *
      * You can call this method between {@link Pico::__construct()} and
      * {@link Pico::run()} only. Options set with this method cannot be
-     * overwritten by {@path "config/config.php"}.
+     * overwritten by {@path "config/config.yml"}.
      *
      * @see    Pico::loadConfig()
      * @see    Pico::getConfig()

From 56fffe9ac27123aa1ad2584eb9c3ccea02811634 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 12 Feb 2017 17:57:03 +0100
Subject: [PATCH 073/188] Add Bountysource to default contents and README.md

---
 README.md                          |   1 +
 content-sample/index.md            |   3 +++
 themes/default/font/fontello.eot   | Bin 5864 -> 6400 bytes
 themes/default/font/fontello.svg   |  10 ++++++----
 themes/default/font/fontello.ttf   | Bin 5696 -> 6232 bytes
 themes/default/font/fontello.woff  | Bin 3428 -> 3812 bytes
 themes/default/font/fontello.woff2 | Bin 2888 -> 3216 bytes
 themes/default/fontello.css        |   1 +
 8 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8797fe0..4ac24a9 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ Pico
 [![Build Status](https://api.travis-ci.org/picocms/Pico.svg)](https://travis-ci.org/picocms/Pico)
 [![Freenode IRC Webchat](https://picocms.github.io/badges/pico-chat.svg)](https://webchat.freenode.net/?channels=%23picocms)
 [![Tweet Button](https://cloud.githubusercontent.com/assets/640217/11483728/b0842918-976f-11e5-9185-d53261b3125b.png)](https://twitter.com/intent/tweet?text=Pico+is+a+stupidly+simple%2C+blazing+fast%2C+flat+file+CMS.+Visit+http%3A%2F%2Fpicocms.org+and+downlaod+%23picocms+today%21+via+%40gitpicocms&amp;related=gitpicocms)
+[![Open Bounties on Bountysource](https://www.bountysource.com/badge/team?team_id=198139&style=bounties_received)](https://www.bountysource.com/teams/picocms/issues)
 
 Pico is a stupidly simple, blazing fast, flat file CMS.
 
diff --git a/content-sample/index.md b/content-sample/index.md
index a9d5763..6a51011 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -11,6 +11,9 @@ social:
     - title: Join us on Freenode IRC Webchat
       url: https://webchat.freenode.net/?channels=%23picocms
       icon: chat
+    - title: Help us by creating/collecting bounties and pledging to fundraisers
+      url: https://www.bountysource.com/teams/picocms/issues
+      icon: dollar
 ---
 
 ## Welcome to Pico
diff --git a/themes/default/font/fontello.eot b/themes/default/font/fontello.eot
index b3ae4d971c5489002cad31e996c07441da3e2515..767907e332c78306737180d6aad1ae51d165ce57 100644
GIT binary patch
delta 1450
zcmZWpO>7%g5T1GO?c4S4dhNKocH%m&ah*-o7}w2@ot7vuYUmH7qBLzt3sP~DG^z7v
z5>q80;r7A-_0VV$0#PI+a_FH&g-THmAR(wK4j^$r;?e^bq#UZMJrp4Xm{|u25VM+@
z{buIPo1K00HlMuMEujryymd_$MCIny>uaTzdg^k=DggXWeB$}hJ>7$;<0AlgjPTgR
ze7U-BabuS7HR8`EF4R);$A$nfOXN?Tt4`0qy>{gk;a32R>U4RzO7<|}e$v|X-0Hcb
z-Y<Uw@RtFU^vqOw()8A|<hn@y!pzK6y{r!KaWdQ{LuO{aw$eiB3Ev}O&n-@r*_(Wg
z@I%7pe0imcmKh}M7o1us&rf~(Vfzk%Kmve$S6y7LZCt(ZF%@&4{70%wQ`MiJ?)n@c
z_C4XZ07>eQhe2R-<=O&Rk>P_QCm;^ZP02|C-UjaF$fv#gI9Pvlk{@qW;4~kFcemUm
zeNu=yF@21`7?+y40p`f+?~*00H|+vSgmut>0o#O!??3$D(aA;w;NR~Q;S*Ba*5ki3
zP<b=C^gd<3dS5alWH!S}O-UPjw|Pep9-V|H`?20V{*6!*_Smg!f+H(9-VG&R*8m!K
z_$h9{D4d2fFbU^j0hVC}Dy8X6a=Rl0P6Zif6;$ORR8(;Y1TqwC9vG$Jv%n>CISW!n
zsm_9`psLJ*qAX|#h;V`w;5ZeHBM8e&uT~EZ_ZRo(vt8{87&UM-px9m5okYj$m;364
zo}y#NY}uK^zTQFPg-%zM(OAL#pD6Z9yHF&10dLgqF0Ee*S?#Ir{&bvWowo3R<Mb}{
zX~|Nk&Ca%_`}0pY(u})l%Sf4qsWFWUvsFqpy~{O&7`860*S>m(DF-D(-4=$b+fvu{
zga`(L9oQmT+-=)Z7-11^)b6}?`KK;!=@$xZ+)8E-=MUt2hLork425JQE{A&Z2fPPz
zcm0p|{5}gA;)XOGVX2lag1Q-yiYbMPK{QluN&kmYhZ+^OlaA5^>@DR63w@k3(-2$$
zvO_>%3>Y&H`~9SmfFK+>er*4~WWp7S)74>1)v;w4rrly+PIS6MIEXv29*sqNx(mhL
z9PUAv`nd;lN?&iGNF3|wj<#b`#G)azu+t?M+nJUzJIQunG?tVsT^-l8=Ts9rhI5%P
z3uya!M8ToMj`QR&Mk1{p!ITqsc3PQe!qgXDq*zT)4P-J>24qfzRi@S*%gwd+4Wky1
zMAPQ>WU@c8%MO1r_IkLi>AF@{;;jjbo5qO3Bo;#=pA9D>W<;6+U2jq2(Nt=8>}aiJ
zl8Vr^v)qnEO*D)b0!%W+3PjAjYsKxb9#V9}OxT%p?^Y-MZeG87vr<138h8u_-}F2D
z!`=Kd|L8`AZ&I`AvY<)YB3jg(XV{7-NtXYR;(MC>5ox;G*i(P|uh7|kz}A{86j-IK
zJ{b%mkfu=rc*FZdeT+qKUE9Fot(OANqN~shaTKVa1TisFt|@2FFHNqhixV}v+G=ug
Wac-`><bAEX$|#jPdh3DyoADQQ$?;|Y

delta 909
zcmYjPUr1A76hGhn?!CM2&bt}g)Kz1R(t)$toWsE8EGaQVn-*H3T-V%8=Z0QwJuP2)
z2*E!WqOhny=%oi~5j})N2v#IW;Zr>bQSG6^7hl3!=iY=o_dDM?zjMw#_ntr3{rPG>
zZwCn5XZavIms**c4QH~8e{w$nU>o^(d#BGIa-IDIK*EU6N0V~;?ReiZ;@ik~qZ5jY
zUoWr#Mi2U31L=73=Il%l;uZig9hb+_XtyACp%mi7*9IPSCl>%{06CP1$(N0%OO^n5
z1^vN9B9@g6$7mNC9;4x4BB^AgH>d%>hL>eH6_ptu(eMUd#-yA{!&mV$;_rxEBXTnK
z?%qBpfWZX7tfo_AO2<iY6`%-<fTr|lEd8aa>IH!9IpQ0jr80sOyg-^ywsnD^z9vUF
ztc^ZVw@E0wIZq>nD{z5E;1-5z;r|F@fFgU5v3`=+@%5usi}Ip0>UI`_hy{EYfIMv8
z*_<yFc5CR>GHVfnt}$9>!lSM(GX)D^DM;8cov8Yr9#T1Wg%$SN&gIrvN|-vUy3W;H
z#19vi=_M*c1kQw8U5?TcmO>F>$O*zS^pyT@lq7*Lc!q#s@eBdWjsVufbpgjgH!9H9
z(cTme)K+^vmE~nTXRRXYG=DVfZzMKrsg<uhOzHw5;&&3-voL9v_PhM`ZU^JFIm`_<
zTVSM4aE2{qR&SZRzUF|PGdU{UlISvtCV>$sYr>3z+f!jGCKhROL3#D_Wrp-lZB$Xo
zI1wzTlGEE#)9kBl<m^(h+05^8@Qt;;W?zdsZSZ6j+&;a-SnSkFYOc@RumvK`YrXmK
z@SFL+EG*JIwnFPYc3vlZN1rEX@rB=bYqQ!-tme`A0ZQCton{D-`=}8p)yCbqlaK)k
zcV`S8z3NiY7740Pjn7ChHzc+aCyQ;Tge4rX(S)oRl&gb^5*y{?gGyq&U;SvR;Bd8Q
KB*z#368{1zNV9<e

diff --git a/themes/default/font/fontello.svg b/themes/default/font/fontello.svg
index 6514c03..2ff27a7 100644
--- a/themes/default/font/fontello.svg
+++ b/themes/default/font/fontello.svg
@@ -1,16 +1,18 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2016 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
 <defs>
 <font id="fontello" horiz-adv-x="1000" >
 <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
 <missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="chat" unicode="&#xe800;" d="M786 421q0-77-53-143t-143-104-197-38q-48 0-98 9-70-49-155-72-21-5-48-9h-2q-6 0-12 5t-6 12q-1 1-1 3t1 4 1 3l1 3t2 3 2 3 3 3 2 2q3 3 13 14t15 16 12 17 14 21 11 25q-69 40-108 98t-40 125q0 78 53 144t143 104 197 38 197-38 143-104 53-144z m214-142q0-67-40-126t-108-98q5-14 11-25t14-21 13-16 14-17 13-14q0 0 2-2t3-3 2-3 2-3l1-3t1-3 1-4-1-3q-2-8-7-13t-13-4q-27 4-48 9-85 23-155 72-50-9-98-9-151 0-263 74 32-3 49-3 90 0 172 25t148 72q69 52 107 119t37 141q0 43-13 85 72-39 114-99t42-128z" horiz-adv-x="1000" />
+<glyph glyph-name="chat" unicode="&#xe800;" d="M786 421q0-77-53-143t-143-104-197-38q-48 0-98 9-70-49-155-72-21-5-48-9h-2q-6 0-12 5t-6 12q-1 1-1 3t1 4 1 3l1 3t2 3 2 3 3 3 2 2q3 3 13 14t15 16 12 17 14 21 11 25q-69 40-108 98t-40 125q0 78 53 144t143 104 197 38 197-38 143-104 53-144z m214-142q0-67-40-126t-108-98q5-14 11-25t14-21 13-16 14-17 13-14q0 0 2-2t3-3 2-3 2-3l1-3t1-3 1-4-1-3q-2-8-7-13t-12-4q-28 4-48 9-86 23-156 72-50-9-98-9-151 0-263 74 32-3 49-3 90 0 172 25t148 72q69 52 107 119t37 141q0 43-13 85 72-39 114-99t42-128z" horiz-adv-x="1000" />
 
-<glyph glyph-name="twitter" unicode="&#xf099;" d="M904 622q-37-54-90-93 0-8 0-23 0-73-21-145t-64-139-103-117-144-82-181-30q-151 0-276 81 19-2 43-2 126 0 224 77-59 1-105 36t-64 89q19-3 34-3 24 0 48 6-63 13-104 62t-41 115v2q38-21 82-23-37 25-59 64t-22 86q0 49 25 91 68-83 164-133t208-55q-5 21-5 41 0 75 53 127t127 53q79 0 132-57 61 12 114 44-20-64-79-100 52 6 104 28z" horiz-adv-x="928.6" />
+<glyph glyph-name="birdy" unicode="&#xf099;" d="M904 622q-37-54-90-93 0-8 0-23 0-73-21-145t-64-139-103-117-144-82-181-30q-151 0-276 81 19-2 43-2 126 0 224 77-59 1-105 36t-64 89q19-3 34-3 24 0 48 6-63 13-104 62t-41 115v2q38-21 82-23-37 25-59 64t-22 86q0 49 25 91 68-83 164-133t208-55q-5 21-5 41 0 75 53 127t127 53q79 0 132-57 61 12 115 44-21-64-80-100 52 6 104 28z" horiz-adv-x="928.6" />
 
-<glyph glyph-name="github" unicode="&#xf09b;" d="M857 350q0-140-82-252t-211-155q-15-3-22 4t-7 17v118q0 54-29 79 32 3 57 10t53 22 45 37 30 58 11 84q0 68-44 115 21 51-5 114-15 5-45-6t-51-25l-21-13q-52 15-107 15t-108-15q-8 6-23 15t-47 22-48 7q-24-63-4-114-44-47-44-115 0-47 12-83t29-59 45-37 52-22 57-10q-22-20-27-58-12-5-25-8t-32-3-36 12-31 35q-11 18-27 29t-28 14l-11 1q-12 0-16-2t-3-7 5-8 7-6l4-3q12-6 24-21t18-29l5-13q8-21 25-34t37-17 39-4 31 2l13 3q0-22 0-50t1-30q0-10-8-17t-22-4q-129 43-211 155t-82 252q0 117 58 215t155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+<glyph glyph-name="octocat" unicode="&#xf09b;" d="M429 779q116 0 215-58t156-156 57-215q0-140-82-252t-211-155q-15-3-22 4t-7 17q0 1 0 43t0 75q0 54-29 79 32 3 57 10t53 22 45 37 30 58 11 84q0 67-44 115 21 51-4 114-16 5-46-6t-51-25l-21-13q-52 15-107 15t-108-15q-8 6-23 15t-47 22-47 7q-25-63-5-114-44-48-44-115 0-47 12-83t29-59 45-37 52-22 57-10q-21-20-27-58-12-5-25-8t-32-3-36 12-31 35q-11 18-27 29t-28 14l-11 1q-12 0-16-2t-3-7 5-8 7-6l4-3q12-6 24-21t18-29l6-13q7-21 24-34t37-17 39-3 31 1l13 3q0-22 0-50t1-30q0-10-8-17t-22-4q-129 43-211 155t-82 252q0 117 58 215t155 156 216 58z m-267-616q2 4-3 7-6 1-8-1-1-4 4-7 5-3 7 1z m18-19q4 3-1 9-6 5-9 2-4-3 1-9 5-6 9-2z m16-25q6 4 0 11-4 7-9 3-5-3 0-10t9-4z m24-23q4 4-2 10-7 7-11 2-5-5 2-11 6-6 11-1z m32-14q1 6-8 9-8 2-10-4t7-9q8-3 11 4z m35-3q0 7-10 6-9 0-9-6 0-7 10-6 9 0 9 6z m32 5q-1 7-10 5-9-1-8-8t10-4 8 7z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="dollar" unicode="&#xf155;" d="M546 189q0-86-56-147t-144-77v-97q0-8-5-13t-13-5h-75q-7 0-13 5t-5 13v97q-37 5-71 18t-57 25-41 26-26 21-10 10q-9 12-1 23l58 76q3 5 12 6 9 1 14-5l1-1q63-55 135-70 21-4 42-4 45 0 79 24t35 68q0 16-9 30t-18 23-33 21-37 18-45 18q-21 9-34 14t-34 15-35 17-32 20-29 24-25 27-20 32-11 37-5 44q0 77 55 135t142 75v100q0 7 5 13t13 5h75q8 0 13-5t5-13v-98q32-3 62-13t48-19 36-20 21-17 9-7q9-11 3-22l-46-81q-4-9-12-9-8-2-15 4-2 2-9 7t-21 14-33 18-42 15-47 6q-53 0-87-24t-33-62q0-14 4-27t17-23 22-18 31-18 34-15 39-15q30-11 45-17t43-20 42-24 34-28 30-35 18-43 7-52z" horiz-adv-x="571.4" />
 </font>
 </defs>
 </svg>
\ No newline at end of file
diff --git a/themes/default/font/fontello.ttf b/themes/default/font/fontello.ttf
index f9b65ca25d0b21287c7f9631d7ab6e44dc8b4643..0555b75ef32a5c69e5a44497ceaface7b075046b 100644
GIT binary patch
delta 1397
zcmZWpO>7%Q6n<}Jc6PnHUOU@eJ9Qmrah*-o7}rf4J1tQXXh>Q}MX8(6R-oc0Y0~@}
z$5ahSxV>;dJ+#^$KoqG`d*A>PYNd(;NC;IG2aq@*!GQx8q#O`x59NRg=GjF8#H`-D
z`QG0=eLFK>WPivv00AHZ7l1=`vON8acd2KSERRTzy-?oMKjIyo0>C4LXJ%I`)qU%C
zmI;4Ia%=Wn-IL!p1%Nq5e(y|mVfCFWmroFW6~L%2R5q$)j}jgttu3r<o;e)+_9p;;
z89+%d&Q}_9W^gl0z6%skTqKJ+%#RcPlyGKowSK;X$`k&PCTC@Rw!+@xR|wxHY_3+$
zSJ5)Vgj)@JYn9dcuRrMO1_&hq*f-VnjryHy=Wb9lzmWe>wKiY<`RTsT0OH>gej6}N
zN{2j*09&cl*T5Q|m^uatXm3hBVkfY0FGs!*jN^#@V45FoF2PA&4lZH$E44O#04qda
zi^wc#ow90FV60tQ0|smh?!R~c{Rh*{CcwYf6ww+;Igh{Ano$kf9_0;WXp`G)2aUC7
z01-raPZ%CdLt9#*L4kiI)TA?WOK@aGH&B#(Lj!2u<tMlSWjG0^U=Gg08f?IMSQ=Z%
zq;|MM;Cz^IwuGvjL`4;oAZSOyR)J9&z6@L<m&+hkl<G353aZL7D9W0KfC$G(0UoE0
zaSCCh_F8pfe5kZHpY7{PLfOD_NOAhGKZR~^S=rYp4wPIc?#SL84i-j`7khnG#^Oc)
ze^aR-onndXMf|vauXgid#Om_;htdg_b+<={UAM3{sHMgt+nsD@dMN*dE6s$TwhYfS
zOpR$=n4MCp>0Q1V#;A4iX8p^nOqq}jbw?Pg?nqtNlOh}n_h5(U@V9OA&}KF_>UUqi
z^iv<V^mE1S+)8B+<`3itMwOTqjzpxLkfQ_n1Hpvc-T33(7SBRPxFJnfSgPfSux^H=
zVoIT67!8$Mvh}}+q2?0X$;&Vcd&hDk#X-)QX$UR=*(4B{0mjUOEk5bgLl_PnJ+gma
zD(MTw?dx%*>N>Iy(|&0%Cwl!+9KmjE#Nx4m{$i<+!#(H|pL;N;3>JzdlK4P>tP4{j
z9*dxby*|0v&a{j>Db|g#cuKN#^|-D*ubS91p36j8NZZeC1xF9M?vvwa+nqgO&rP^H
ztxPOw>T54itfqUznT(VnnG;c!sSVfibDe|Zs3q)J+T4*!4JCIu(a&ezh*mUR*D6Y)
zGih<tm{OR;Qbgpl(WGtK(hTW(hnk3a-tPF}ddD0!p=+nPW5-N1j2A;pGQ|qnX5P0F
zPE?O5x?v`rOuF!x$rhU*UHfFoI~5sz2nOG3G5p=V{Imb)<`Unct9e}}j?g2s)ynwK
zP+CcCxlWoMD)!Xh{>yZXe`QzN847FyT^||@Y)I3k0eCZz>O(9AkJLL@x_w)F4t<4g
u3rB$pN)WS)mAZ2JY;A5+U7xMfJ5`r+>nkgjTChX+l`=I}zCEG;Zu|wfALStc

delta 860
zcmYjPO-vI}5T3VhciHYP+hSUNs@A1ZXr$QMmIf0n1ql$ufNe4052V!6A`~{TAfAwm
z2g3o~iw2FFka*!hY+^hZLzIMQBr!229z2j3g@YO{T!>nyy~w;bZ{~Y%-tNrz=CgOz
zJqrW?%y1JZXl>D+=9RzMpSbfIwYe+m@rBg$UjRrL@r6VtuDzQYSVMdd^+94<SNTsl
z7C?02xjLk!GPmz6^dW8skhD~MQp0@<Vim2B8oe>}v^TQ^Km(|ubTU4BRXkhr3V_!!
zAehFTqSG{ncp350bVi?1-l7Nm2V5+p<B2%q$!E-O;v#0^Ga7uCz9RmCSRIRJlJ6fL
zasU*`0L+FqKB;%NN*e$sECQOeiKO<espchs?FHgnKrlBD!2xa{Ev=m~5Db-^<ghsU
z%!rYYxU)zjxodEdMvMpKNHkrb3t$lG%BSH*D`IpSSO_8(a4-PduycQBF_+u#;VA|d
zB7}m+;9VfRQOWEXUdCj`j8Tx7f>7f)J!V{?>#T6l){}LylrVKxqn7ht!XM|>=w&KF
z1kQy!RC`$oOTk1Ka)z)BZ7bwPNd^dma|9R`=LoRu7+_^w3^)#Y(SgqHuBLFnU+Z>N
zSCsRdwT2j5+^Jb#Be7Y_tbFweQWppjpM%i8r8%>5SoPIA?Tp)IH#gX9fw4Nl5w?_D
z-Q~`DZ)GVb+pC<4q{@;kFal*|{G#A=RmsJ~qRcJnuYax1kpB728mfrX!3wH4-0j{L
zkH3*CRf^4K{(zlt^m|%7?Zy`G^6J=R1%|QM`StO;1LlTZkmz=vn~zVn%>Qj}g>F;H
zSQhM^xjz_?f0q5i<}VfWF<R`+f-DdqkI>6Uvk=Wc8VUmn_QE83{YI&2mjn%2d`^Pd
tH)02Iut+c^Ea8Anq~m&#etlTilM{SuSWiz48h*Ko!&ae@Y`?rG{R4g*tFiz9

diff --git a/themes/default/font/fontello.woff b/themes/default/font/fontello.woff
index a2ef51165dccc7da3d5f0bbce731ab5950b5bb12..f79d69fe8c88e727dbd43f2b565a379575dd1089 100644
GIT binary patch
delta 2254
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
bGb47&;e%#sYV5Qm2$0SDMwpPh42%CCj3v5!

delta 1867
zcmXX`c|6qVAODUSh8f3TvhqXDa%4<1DApAvBxh^gW*p;K){tY0^_{74t4t+lrlQ3<
zb1jRFoJ$iqvX$@)xwjB0VjpeK>-By<&-?v)f1c0h`Q!P_$j!*$W9%#}AOr-Kh#w@j
zAEit=cx9LjPG;4+wJUZ`+9U`<qyuga;B2hmFzy>lr2}mca4LxTeNo<>zR{5i5X7eg
zG)Vvjfzdq_jUEsRG)oBL&wwB-J(ZK;8bG}Oa?yVSkKi}p0zxj*fHnoZLlA^CE_Q)K
zivs<reh`GI112JX9_Fn0pMgLG+6>@w04iuB<oUqRNCvnZ1vqXWqJKe9NSH71Vex=t
z_Q9u(fI_JZP#CKK_<wkdo&K2`>JKzi@Q4^tocH98tUNvJLL>x3!i~VVU-+cG1(rvT
z@CV7l^MGFhNSr;X*}};8rT9@OQ$88KgH%dn__`2vibA0>p$uVPTiPWhd*ME0-$Q1Q
zr~>UuG9Q$xjI@Kk=1g>+V6ie;tkTpVF(lGlj7^JcqxANo@ctBkS{sIM$ioSimh~dW
zW%Fb|n4~GD>L*iW?6bvH&=9|{@MUnxO2$JGCQ%qQU}Y-qgSYN9JztLZKiL<83rV`H
z$XGhM?cc<p@ZGOb7n(66-dRlD=5&4Oychc%Lm##-YlV+wZJpj!|2rV(Q~jmMNiDZv
zWPf8OYxd<La|;^LmU4t3{MSxRkrKFG&;pi?kO)D(uKkfOj~`aOVH755CEdf#%5e<{
zt&*(OZn#ON-C2I?!<Exp(oOEvOR+M0!~UJl$Hpb8*(>>^GKc6Aj%+ox%4sZWp-*!S
zG3aTG96fOB{Fs-}^xd3i={f`C+`YX$B;VHNcklz4BA|Egm3xcvX{M*&*1?pEyi?ty
zf~8`DCr}h=K3H;9lsIgp@N0WSRjtcLnVErZomTnhd!$<q8&{lhM=A)a7R}}>0*T@1
zLeixMQXfP9^?Jzvq!L;3*2kN$4nzOU|5lxzKWX$L@4E9lgPTPpOSSB9Yq#5t4Og3w
zaP6W^CYSqdf+K7!+bwCqLru*xJec8-!=Sgsg)(1k$iX{}Q99Di^Hx+DHB`;e^;`am
zCdRSVHNWUc%YJEI)2Q=UH_LrM;y510EO^SknkqT?=yeG%A<0cQZksz91m{+dz6u<f
z(@=S!v1onV?&wgm%5zgIU6lF^4wc3+H$<7qT>Bi3#{Iv*xQ+5Ms!VdXT=B?HCBi)o
zCk&m8Yv$md26p9GTVuslj9d87wU(laboL~#?rpr$&ie0SRRag&;fPu4u1BT){DkNt
zdBbOK7~9kwURXa;Q`K3=WlwCFOc<{`(|Y-Ml>NizUnKqW<MD<ubET2Xya0y2)51AT
zCi$1*os406Y*Cft+F?{jc0(LL|7xzNENfN&ZZ~{+lgTcKRp>Ofgqo0!*NUv9$6Lbd
zzti4v<cg&6tA_F}cPqF&KCvt)7c3#5k;Dqq>9sG2SSH0<&%Hxak$LlF;*tSr_X!3K
z-KV_k;)xv}uTRdDb2Xl+J~|aue9JvDpYbSD<6}2Ax^>Ds_t8|Jjr#kFNY$H9i`2T5
z3SpSD7I4Kzs;A<34;tS4xPUv<y65QIAD4-Lp)oc#x6MnajI0PD6tAg{dIoOhEnO`Q
zuR)e#ye9ndzjj+>R+Kwgi=T1wbMx3<+nrr#Z(oS%%8UVj{o8Mb-V{ued{%e#ybm_!
zctfY93EFW_uixDZqr|sA5t)e~!bH|7#2Hy^;kN|Q&s=^LZz6GL539mbQe*N%Nrn7b
zU`8Opu=t9*Ai4r!e`O#b1Q$dE019$~`1VDxi$e0y1#t4hf-$q-OjJg{?PF7X;vOdr
zlOl6&+&~j~?DknDtOP6}AsiBEF6{1P9dy<@$p$Uq)e-Za8Yjf<;zkn%eDW6J=JLn^
zw&*t9KNT}f>}2(^`N#S`p^E2S34<o?gd5&Rv+TR_W=UU~XEE|Pm&!K+hsqUF=hCIN
z>W<P?30mAKv+;ea8{tOm?X!&ss&4mxD44|@R;u^tYTc57OGcf~oDB2}wa;3il_?jy
zmzLb`y!xP7@7_@9a(|O``k|h_)sct+UlW&}%88`yi*J^698*H{d95;^QmQ<s2ck!Z
z&kgF)2y<>)vxBtWOlRyQ**5UWZ?6J(jKq*?<<$umon;uRf<s}&g`W#kqzsDG$tvXa
zazP=FP94H?cwC&OsXlGolkZ@*L{>ih{rfFX`A^5xr*^Y{`0#9zYN)vKG?}FRBCF#c
z(OQclmHtTb_uDH*U5Ul@K_W3Le~h^PDA936=Elc|?(Tz(54O>oi4AE2lko04^mGvW
zzX|Qbga`u5%mhvfCx?^3$z-YOD?enn78%wSso?69wTx<23UyLg2*`a59eguTH11yt
CVG6kb

diff --git a/themes/default/font/fontello.woff2 b/themes/default/font/fontello.woff2
index 9821cb2e2aeb516162585f03b10f70828e88a329..f4eb8014cdc6339c95e8541d4a3d19733a802740 100644
GIT binary patch
literal 3216
zcmV;B3~%#yPew8T0RR9101S`-4*&oF02o*R01P+)0RR9100000000000000000000
z0000SR0dW6gE9yp36^jX2nvcMh;9Kk0we<z3k(1RAO(d@2T2Tp1{;eOBT|zlPxhCP
zlMOG@&UF$z1Od#<84e$Shvf|#kSfps0Qm(ZfP<No(A>G59y19+d9OG)kO9H-{o0G?
zKG^+0A>s`otCl6;cwi5}zT+z+Om%*KuKmp`<`1(OB9cVwO#k?MXQdK4{qAVAK*lVa
z>fV4L>kZnb$jk;>s+{WXLuHqQkBKjU0C*mCsgoPVmc4xSm(OyEf;wtBVW}vEXete}
zx9Q2{aqF^W;CF8|x|-M^^xg>8o!{Fz48XyxlfSH=pEK?I|3*~dMg=)xXI=At()Q)2
z?WG;%I61<!N4XoeH)aXwP+@MsY){TjPP_S8H4u<(?pQ%sb>K>+6>ow70cwlmg1<<g
zkBaWV@a0mmEJXCZ1vb6qVs|?g^-dP!5D<JRM{-B~H}(b#>dEo%!7B@w{HL*u17o%5
zPc^eO*eD+UJE1dod{%sR=8J#-%7At^G*B6z`En;MzbHy8s$9r`th|hurfELZZ#~ef
z|Aga5Ht}IHV4x^hXn+6l9MNTn(O#Q@2bP79hbks&Vf166DL0jPjad#O)o?l=$7g&%
zs1#WAgCO$aFOk_7I3I64jVns;aZ8#-kFxa7Cyb!|bzLisfmP_&ev8l_okc)y+_EUh
zhVb(oCV$(Oh9(E=gN1kAs41HjVP?)7yif|QtG3pAknF-v8<g&AJC;z}%uuTYKa)hj
z^HLH5uRb2=xpF<Q;?2-p8iW4PO2k7@nDLt-STtlH7)u+1<($W=!%-J?Z$P5OK;x7v
z8`&04q-wx8^CEGuj=mY$B1&VpKMtO2E0!d`c^~J>v=F=o2g_UZUA;_@7V4EO7P#!T
zsB9r;`&HDbK!HoBVhi~~BKBr+ArTx9<oaJDdvdme7lVB^_QmylXx*0d58QQ=(cADN
z<Bfn1w-Q(A$5@m>Q;-Tl<Wh!=oa`ibg_k$o(59*H{e}cjH7Pt}3o??mLLWk(5DHuy
zY?hw9Db<AQ#u7$W*%Jq;Z;1ejB82!{Q<g320^uDt$HMuRD1=ycG|OKj`(b`DB8<}P
z2oZH^iQ&bP&*r-yE)xFH@0K{cnD;LhkC>(Dl_W&QBNOdkPDE$7Mv^1y0s2wqa%jrJ
z!y!`@w9WaPam^TWP0?bIy>3R4v@uF2be~l=q>u_4#hpfy0>w0x!n;9+1nnb)?pAbB
zP9q=zMTZ((@<i3ifS@`8ibN+7Nxx$KF^SOUnw=b9b?&<5g<wfUCZTIdLY4(2a|J0}
zLn=3r#x10C2Qs(|ncN3i+`lLr1)JI<!E#tO%SAzXAe0Y61t3%iLPa1{3_>L!R0>jC
z2AQZ!P@WTsMd<}Ed-?51q^v?URe*9g&&|zJ36YUxwWH~w-lvA{sMM8eOI7|4mMN7t
zWO6fMYgOk+f#bC`kb7}Fg<2HtPaf|d@c>cgko*(fcVJ2%=9)0MZmCQ2j>ssEP0*hn
za-Ql@pP8^UxU&(iyS+stvXbOWQp*Sms%+D<=A{=ktR((^{g44s*EWPOIeFdE1W3l1
zDeQgmv%A?;tH?y-&l=5kS*bfMf>EbXChT0u{k?hrL+v~Ja(0`%vkcCu;G;AJiYKYV
zh~YKT76tLUxQ}AoP&CtqovoP4jUI0<1=YPtMKHMz%Z=1`dx)~R2w}TXnugxSEW^04
zv6ifYE)?G|HPRxW%#69)*K*-F!P1icgy@ynoIIU)XlXrW<5MS348ee~q-0xmVdS;k
z^s?Y<nNU+6#Cp2KBbME!V>@d-d#tL3RJ7J=rJ}^I($XG!ip8SG=WfB|#fq_|11fcn
z-EX+yWg^tMB8<D1&SP`Ut)ok^xbum-L6dvv>H*E(1d0_!iD?mW9SmzK+~U=)Sk7X_
z>ZvjzwLbLf?C!0yuWYUw{uQH|hf&9SiaDXTjpfUFz6tTu`!XVycHTeVXiG~&Jh^PZ
zNV+gHE!W^VIZ;!0vkc0bhN_HgnbbG!;flsNjCe^NsMIoSVxYA%qg7Qj85z39sup^e
zY@7>BNI9TM1TYnVKAMIL%t(P|5x`skx@jIRupk9mL;y<x@Msw>up$LoMF497=%;nK
zz=jlP69H@mpog~M0y|QmT?CDL6)jn;?{ArOtV#}8r#!4nieO!Elx|hjj}gd|6(Uc;
zF`SKU)6XXYd7&Zl5(KWsw(HjufxOWWc?;6(uKM9GXKzKrxGugQ^l9$<v!vM;9P-Um
zLO3ezEQ)x;Hzj3~92rsKgqa%Zi!KjE?cycH^-Jcr;kR$g2m)`%PZ-a;(jZMRAi_&9
zYL-lYKf<z!1jh;Q+)2Q1$5XwKH3c<Z4p$>dcnW0`Ps<1rCuN0P62~PHx_9oh9S;Y*
ziXszbcG6kaVGgDq5Io>~kR@zA@$Ul(E=d@3E^K@Fxi()J@H0pn1PP1jbC-^Bx`fXz
z2l~9R@mT?np1Y{F-Tp9u-#Kz&kMoQ+IUzWx**6En0+NbEDK%@|toOj4eX<CELpTYu
zEEv&Cq%$zBMp7mWJsoR)Q)gz1oOC57@M%+ef|{-h&<1c)Cbj(#a4&oCAPp~blbC4;
zx{;6=A3b7j4)vhXsi|4w;3m^I6yvCMQwEY1QULJLg#!mDh*FEsg9o8uls>puMsQmP
z@131Aai&Zr?LP7Bk;PGagUN`JmAk^q?9};o@i1>(MB;!XP*w#+oDB_uBRuYgFV8fh
z4hWc1NU&yf{{MgH0T$JOp%HspMg$H#XLArldb4*qCBS?;bvvdi<dbshxV^s(&oOK@
z5K?g=2#ss<bz4!%4@5%DHzllY%A5Ah2ATF~1NF|F@R2k=WT>d#@FpfFKqP)guw_K{
zdMx%>UX>V6Ev%#{1c(~Blod7Z9HDtjw*E|A&8dd&@h7;&^G7m`F6Te#bZBV=>0!qL
zHh$R?5$;nN*>L0MtBnrFFk2)@r|o|x?50qJ9sRm<M6OPw!O&q(M@D+SMpKO3NlP1)
z`Fj($7=O~;P<QG?-L@jtfM{h=%Ew`@px-HOkRIISczOM$U~w@|@i<9+dHr8<ybe@q
za5%B5B}p+ys#hvZ@_=Lx57Xd0|Mm)7-NTHP`M~R81q`yrY-N?Sl-vBz{0{C7(P!Ng
zjveboA}Z<<mGUL~tHaLwl)0aF**m923sSA4-9Gxt`4M+x9;iEGw&Dsc+w@X&chBB`
z(6+12{<CQY=&r}_-t{{5+u~PB_*p&g9o~)eNRMdBDy@eDoR*<_P7S~z*AUG$f>L?`
zL8}#bttR?Tj}K>OW<{G+aeA+<tpIPWlP1O{$Mf0*MU)vvw$3$@vDb*&oc<8{8eY^j
z9LNHku(Et;CJF}!XM1Lr6q`|T8qQ6Q4Twe#!$Ek?L~({ia{alKC`ydFgx6vw&M9?-
z>F3C<Og~4lGUqvxz4CDgEzCa-vI2)p2)V!eEUzzjcT8h#bz+=6%d=lftT@$<x3|(_
zhJq1u5H*}ISgKT^k@0YZ8J&CB-<up?NTc?T$e%agEWX{29{%r>)enuM`1h>wv{3#A
zwEmYqAb)ENl*RuagD5JqZA90tR9NiYwpEDgI42j&6R2ocSHzo9L3k=yQXTKlpJbCV
ziYUpZO;F*|71a0`U}p40&=O=J=-^{J7@$IU_aF(r(1`H^XM8t;LTogsh)51;+2|@V
zjP43rl24Mu=>1@TC8=I2Nb!G2%NC2n2w~}B87#xx0jC9Y|6St3&cLo=L|Fx=5YPhs
zETfuBbJ6?B4{Mptda=c|-h5WYv;b2xw1GE%;WHb3&*!^T_0U2LAYe3yYsWu=lF`I>
zQHv1EeO(Xhqmc_JB`p{+ArS~za=|iSF_?A$he|*d+%W|<8TmFfkVr}ubgEI%X)Zu~
z;m)9F-1fS289fOrq}JKD4Ra{CTmFXczl>!k4@??Ef!)YLN!pUM7jLVg-X=?wBS8!$
zi_yNob*CJZ^1%r{E{K*RZlq+NZVV}H>Sdxn!i#DzVnvA-BUT*D{)vr}bIQDyLif>h
z*(iJ0S!w$d!uZ$x9sAJ{dF@k8{UUH~I@ou@4CTwV&jLz(t%(u5PT#lcXNkW9?j$^q
zX5f>;FU-Ei4tQbZ6MZnyDIWR!`kqIO_rm_d5sQIU{nkGrC86@K<#9FTS3k)Z0001r
CQ29y#

literal 2888
zcmV-O3%B%lPew8T0RR9101HR}4*&oF02V+101EK{0RR9100000000000000000000
z0000SLIzd<gB%DT36^jX2nvQkg>3;g0we<v3km=PAO(d@2SE&h1{>BCQIw2Um+T`k
zb~ZgED2-0C3huM#zq$H4w{M4#Aew;p(j)`vi|B}D=!77_GvbM(X*LP#!pw7I)xTiH
z1)jJA|BtqBR+Qk=+~FaX!E80(z}HF8%$F@{MBC}{n*L<)qT&DMO8aN7M3H^|KvvjV
zclnc~`)8IY$H@`qwv@Z#?iN8^C7?rv*%E*}<EmYKtt&*xroB+{g_?gMc)%zAbRYm0
z)Ifkdz5W2q;Lws-ZgwgWg83>1?x7LPQIl|2=~4PBWPn}7o(FJt@1Y-}jTi@qEJ5FN
zH13VU{Y(7un>4;PjbqykR^n>_FuVsO00IC9Xi{tpLpqY!D~sgi=mubRZ3e`3+?PLo
z+uAysMNwu4mCYdS{_#xEDu+nt)qn*25^EcTsxz>`&_D*;KtqPhTx>veKHC=nLf~NN
zMd{XG<c;0JH1QzNSxLjuw5{gg5tyU?R}+&cGO}S&mf$GRt=od2C+{GE65Mt$p|N;*
zbd5V7v<+m@d!ydk!%$jTG)ELhM?;DGXd!kS2X-8d%08TWOv9~tWsBB+l2#*lnUn$F
zVo1R<8q%FqWNA6_Zs?Aus6SZ&X)ziY4U-rhl2A`@M?Ds@z7mjCk4g1e_eUt`;KFPg
zt#OvaUZRmOZv9ZOH$rliQeIc%de=zHt+FFeL8~FH6!lsR7CmhDL>S8=M`o&5bI5`$
z{X`2^E@ZlV9o3tF>T6hd8;U?dWS1jLD1&3H`sgo5SfO3q!T3Cty6Q$|(Pmkp_x$m)
zr1z37N<M6f;dZ1M(BY1xUZaL;K~z!_l@&RRQi;22mO^q^-Hm>GtU(jhhu963`C4xZ
zIiC@zzO`B;Zzu~Z<MGmwD>7qVqM@!MPe4J59Q~%FANo`u$-QFZEVs~+FGN9k^y)81
zB+aizo}SbM74lSXjskIOBV-=!#)IU>?3trb+*%E{)*mE_a#B@Xw@75<>zkqc?d_qE
zCtr&|hdF%C*|6M7kj;eTSP8l0df^V=)Ga2toU1e_bPg9@=s(3AbBcwaf$cO9iqum%
zwRe*Y6k8Y4!M>KXXr@U}ET%G;cO#ImdiAiX9*YVEy%H4qRZuXEJoNY`xL#z^NNL4^
z=qM2x#U~u4BGVphoPnK7P{uiwa~UeQ2`YIORB<y@^Xz<$m||yZnP9c7hAF7%91yAl
zAr*w`LC66@P7vA#LJc78jY4x>30$KR1wnO^SDos1DM(|B>d^!)ZFPQJ4k4t0%G$O1
zvVBaI@2Pi{R!39yk0%?#1(lx8*%r+eQsi-ai_irdPoq^#LEeZD3~33X<ihq7I?%IV
zmval19(S}Ad4Dvpu?Oh&WiC*=sP@b`I{Z11KJt5;PLUaGhg4|*)Hd65qgnK+u2U-v
zi~MMi>e~*Y(w)a0T>{wPj+J;GNVa}r(lo2mTocb`-Op00Mty>--k?DQU&$-G$HEV$
z%qqq94$j$%=)DQEu0}OHMe8TH{uUWXg0v6u0H&w0A?fw_nZxwDILq|zQq<gEn*?`S
zzuCxQclt2LPNcBUq<+}m$84^ry@Twi*F}Bkv0-79BLn(2yz>6FPC9OMY%hLDx*6F?
zfz4fZ?0Dp0R=phRg9%|nsh#D8nKvubk3gt2XJv6`O{DCw$~$3lTy1gVbJeJ&lAYFU
z6y3gN$F9_)dcDZ>wOcfQRz3FZ7N)Ag9@Jk8nu}G|sN{rW&!fdwwzAi-wD-yP3A(fh
zJ^KaST9YWY6y4Gi>IQJVLem`X&Sh0Bwyb4MbE@oeROj{qk<HxU+u>g^=y;fQ{76a6
z+55)2O`R#DeX^${tfF&0Q`*2R!jk+lPq_4znQZYEJTE&c+FTB=)YB_6=psRT-|-1L
zchKjDt!Jv#Z!9o}$$rrm6ZFkJ1EK{E9M~Wy@XsQ!A#n%88qh-{aDq`q&=>+3*MNOA
z0VfD3f({~pLmJ?w!*GHlilCzi;Ft#JbR14_LJ@Ql0i4o+{d5{m5L5((5OjwH+sjx+
zE)wiMRz=w!73)g6VtXMT+hHgZ2-M^eQB&X&rl;?eGcN))>mX_l1d`KtN#jMJ<{d<x
z3$k2F{K)3)M^OcT0&@(he&yL$Nd-4G4cgj5KD6T7i1~QzM*wC2$nX0W0A_kK=i$@q
zFW-Isxn;5U^T2)eyOArja^))7^(%ZT(LUXJt9@hR(3P8;XTJF2;1!<-mTxX?`cT>%
z`L1MX$@YL#ex%nei-+#Fp4mLSxq0ZynlHY%_+>w$s#ofe<Q#r;qkRY4d_>Q5J-cyb
zOC*7}(3P8q&y2k_xaNN=-Cq(|S|Pg9_266Yy|h{Le&1v5D{t2y{J-c~dF0&^+MdT1
zU%c?n6I~BgE#0^HY{e~)*lf+xat7ib9$w$=%QH`$vD>HKm0q!A+t{E?e#W-)yKD_j
zUH#bLOlz69HDL4H%S_K?ffp0&s;k2bp3P78d$tXw(KBoi+E~@^{#(BIjy|%WJBOaQ
z@UF#nPgf(6{pR_5Jpr4ywXAj3=>K!!v3uJNG<!M*uSLK1j?X!9{{9_TCB41&{>HBy
zy!QOagZqQDddcWHWtWBgcOCbZ*5#Ki{B|tV!vgDl+EDODef*_}!968|Q;B|z^u0H-
z|K6^luCJXsd+!gfaQ*mumh-yb{&V%EmF2!#&x<{G{Pc+-|Gwn#!YBXw+hy%9dRpwh
z>WjB%!u$BL)4p-{-`cx!(&Y<v?N3~K(w`|m-?{#3dlgy!_vsa`dw+0tA^qAb>EFMU
zKL52L1^Op!{X@Eez2@H2U&TQCNkStrN%C1pqTY659uUX?Bp8qwlLC<VZAZW)=I?Ru
z+oRU0TrSnz1I@yvFj+R06PIm8OyX7|#(gl!CId2;4RDDEe+0<@BW8dA3V;Yl4uSC3
z+iYrKT|<^!8PQFY3VR`!kWGwq;=Mp0BoHK;1F_Y@88E)c3^-3h1_W#wN7OUGKRR;2
z-PzG38n%^}ndB1f--uvb@<vt3>HIx^Gh3x!_Kv}4cmE=PU$C_%{Zg{N8k!hjEdFVb
zFidRyZ@U+QmRuBTc31eQc_%m~LSLI94>d>wIAxuuwFuvjBhod;Et#*3VKqY*_Et+U
z!^8Mgf3*xN0@Ws%ak|<94T*bOQH-xc0`Y7B)40D^O(>vz-MS3bLXtGKi8xdDR?D!_
z5Sf@7skYz{rC-SkC%vN^^B1P35|bIFL2p#rTid#o@P&$T`#w|2(5w<#$V?ikwBlCc
zMlutdoi&;x#++JyJeF9P4W%a5{(6UEsq~bQRN9(bow2@HGL{NuV$qoIkv=ccp2@_O
zc*>YldOiP0nNJzhu}G$QGLxC#)zXsICxZ?H^SBTxOd)|uWT2n{IvSy%9j$0XHxz_v
zR$v%-r;tPlvlND~fD9%@N<(gk;-lUqGKeYfEDSUwGTi!{MB~a%U|}?I2q}-E*Nuk|
zi(gGir>>w4&1f}XK9w|5At4sE+fL)WA+@W<4B{55ltmLM=p8jGn3u;-BZdevXs!@%
z2J_g37PqXT87=$}01NcPb7CYBCmB348Omg3&Y#L;VkuK%_cW6WVE}_q<L&Vy>qK8Z
zx<=nZ-T8IM-$Rmc9R?n=FftEj=fQ94d6vBlLiPx<=D__p5<Khmbi>$@HTMli)}^Rt
m-8l+))_etsyKjgD9@y|4)wh2vhf$8}Y1+DWjelvK!2<xv)r>a)

diff --git a/themes/default/fontello.css b/themes/default/fontello.css
index 8fd6a40..fb0e8cb 100644
--- a/themes/default/fontello.css
+++ b/themes/default/fontello.css
@@ -58,3 +58,4 @@
 .icon-chat:before { content: '\e800'; } /* '' */
 .icon-birdy:before { content: '\f099'; } /* '' */
 .icon-octocat:before { content: '\f09b'; } /* '' */
+.icon-dollar:before { content: '\f155'; } /* '' */

From 921b95181bb8416d0775223ebbabac00165c0a80 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 19 Feb 2017 23:39:48 +0100
Subject: [PATCH 074/188] Add Bountysource to README.md

---
 README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 4ac24a9..7263776 100644
--- a/README.md
+++ b/README.md
@@ -104,6 +104,19 @@ You want to contribute to Pico? We really appreciate that! You can help make Pic
 
 3. Pico's Core: The supreme discipline is to work on Pico's Core. Your contribution should help *every* Pico user to have a better experience with Pico. If this is the case, fork Pico from https://github.com/picocms/Pico and open a [pull request][PullRequests]. We look forward to your contribution!
 
+Bounties and Fundraisers
+------------------------
+
+Pico uses [Bountysource][] to allow monetary contributions to the project. Bountysource is a crowd funding website that focuses on individual issues and feature requests in Open Source projects using micropayment. Users, or "Backers", can pledge money for fixing a specific issue, implementing new features, or developing a new plugin or theme. Open source software developers, or "Bounty Hunters", can then pick up and solve these tasks to earn the money.
+
+Obviously this won't allow a developer to replace a full time job, it's rather aiming to "stand a coffee". However, it helps bringing users and developers closer together, and shows developers what users want and how much they care about certain things. Nevertheless you can still donate money to the project itself, as an easy way to say "Thank You" and to support Pico.
+
+If you want to encourage developers to [fix a specific issue][Issues] or implement a feature, simply [pledge a new bounty][Bountysource] or back an existing one.
+
+As a developer you can pick up a bounty by simply contributing to Pico (please refer to the "Contributing" section above). You don't have to be a official Pico Contributor! Pico is a Open Source project, anyone can open [pull requests][PullRequests] and claim bounties.
+
+Official Pico Contributors won't claim bounties on their own behalf, Pico will never take any money out of Bountysource. All money collected by Pico is used to pledge new bounties or to support projects Pico depends on.
+
 [Packagist.org]: http://packagist.org/packages/picocms/pico
 [LatestRelease]: https://github.com/picocms/Pico/releases/latest
 [composer]: https://getcomposer.org/
@@ -125,3 +138,4 @@ You want to contribute to Pico? We really appreciate that! You can help make Pic
 [EditInlineDocs]: https://github.com/picocms/Pico/edit/master/content-sample/index.md
 [EditUserDocs]: https://github.com/picocms/picocms.github.io/tree/master/_docs
 [EditDevDocs]: https://github.com/picocms/picocms.github.io/tree/master/_development
+[Bountysource]: https://www.bountysource.com/teams/picocms

From 25468dc33449751d1724ea3f5c474a60269383bc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 19 Feb 2017 23:43:02 +0100
Subject: [PATCH 075/188] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ee2221..919f1a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Pico Changelog
 Released: -
 
 ```
+* [New] Add Bountysource
 * [Changed] Improve documentation
 * [Fixed] Improve hostname detection with proxies
 ```

From 82a342ba445122182b898a2c1800f03c8d16f18c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 1 May 2017 15:12:13 +0200
Subject: [PATCH 076/188] Various small improvements

---
 lib/PicoTwigExtension.php    |   7 -------
 plugins/DummyPlugin.php      |   4 ++--
 themes/default/menu-icon.png | Bin 1398 -> 0 bytes
 3 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 themes/default/menu-icon.png

diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index e631736..d5490e7 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -93,13 +93,6 @@ class PicoTwigExtension extends Twig_Extension
      */
     public function markdownFilter($markdown)
     {
-        if ($this->getPico()->getParsedown() === null) {
-            throw new LogicException(
-                'Unable to apply Twig "markdown" filter: '
-                . 'Parsedown instance wasn\'t registered yet'
-            );
-        }
-
         return $this->getPico()->getParsedown()->text($markdown);
     }
 
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 9214029..582d859 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -291,12 +291,12 @@ final class DummyPlugin extends AbstractPicoPlugin
      *
      * @see    Pico::getTwig()
      * @see    DummyPlugin::onPageRendered()
-     * @param  Twig_Environment &$twig          twig template engine
+     * @param  Twig_Environment $twig           twig template engine
      * @param  array            &$twigVariables template variables
      * @param  string           &$templateName  file name of the template
      * @return void
      */
-    public function onPageRendering(Twig_Environment &$twig, array &$twigVariables, &$templateName)
+    public function onPageRendering(Twig_Environment $twig, array &$twigVariables, &$templateName)
     {
         // your code
     }
diff --git a/themes/default/menu-icon.png b/themes/default/menu-icon.png
deleted file mode 100644
index 1cb463eb2877dbee105192cb444318bf80137628..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1398
zcmeAS@N?(olHy`uVBq!ia0vp^${@_a#=yXsd9V3Aki%FU<nF|<?wrg^AcwQSBeIx*
zfm;}a85w5HkpL<<of#5Q65;D(m7Jfemza{Dl&V*eTL4tez+h8h1!U%?mLw`v<mTiR
zTUFR9fmK)m*&tzkB?YjOl5AV02;Tq&=lr5n1yel}Jp&~>E(HYzo1&C7s~{IQsCFRF
zRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdwuOzWTH?LS3VhGF}m(=3q
zqRfJl%=|nBkhzIT`K2YcN=hJ$-~j5*+yb~odBsp)0sW_6kyxN_sAr&$O;br`8p3%f
zx<E1zZD3zPEVBUyjg@mzYGO%#QAmD%j-4YY>=Zn66Vp?JQWH}uZS>JqAY5t#GSbSw
zC^Hr4SCEhF3~lr=#GvYJ^g-T5@;)SN!J@#xwc`TX1dAv;E=|3&whRo+E}kxqArYK!
zr=QIVb`&{2Icn_>SM7Zb(yZo>oNCzb{#02f@@Lg9fiEZD7%8y2@^mDu%w6bZs@D7U
zyZt%O^LNhd&2?TpTjodlx$kp~zn{C~xjJ;gwvy@zw{KmT!(BMX|B$eoWkgEJis$a@
zG8g5QHdXqslR1B2*^Hi~KFh2>zUy>)OCnw73K+*KzOtRUj_tYKuDp_03wHEf*795T
ze$j5(rdN^O9!ImL+BUmRINJ5i&u&32<G$uZhBtv7FYOwqFW`53V!3D8X$_OBLLY>p
zu6*(9`{(oSz<$>42Qn3clvfo$d6HcyewS5Jp)}1;?eFIKIgOdIPv<b$O8xHK!!iG7
z%c-^>HQb-<ydOkG9S^^xwl6Q@cK;l)<5#Lm*&kG{%GkY5=I1f1P5%t%9nzTl>%MDT
z$2rkD{`qyT-@{clFozsX&Xm~SAip5|AYak)87a$Tq8ndb-n8~q@P@_BtuncHvzGk!
zcz^q5ZH;u!BnM#+xmwmcoq^ldD%?)q+QnfqN$^>cP`C4^jXQ1?ZH`nEobk)!<m)-!
zuP?;#8~f+_^2PSrCe7Q)9<w+tKXCc1Czs4G)!3Z7^&u_O+nsS+ng1@8-ImfHe?H|}
z?UK#3a#pIs-P)30Z8l817kJHjv+(%OrYNB)*TRIp9K956Im<95%EQhqB>wk#i(fC7
z>F0>QFbOX5eeqcGhveC?1&OR*=9$gtzb>NQ9M8Dx*2~{oRSz~F)Nkr{xPOCp18d1C
zYp+k?Z%%C&`jm1u^!vo$nOEX0InQ}El*}#&nzY%$ZddEiN|tEvThmX4?`EIfRq6FW
zb-`yZ;r)z$)&}1jgkJwRY2~6fk&nf6OQ4Zg`0SRaTMiqup2|NkGv&FQ*~vN~)#=Xs
zRuSIr_iu#TrR`}fkmG4kyVe_Ue7;BjGqnkEr{iynn5nPrnb-2q@knS{wcWBlU(Wqp
zF1uv9rrnjU<9u;c^kvoR|5b+@CaswszQjJ$?L(xn@B5zpQ|zkv<YU(ddTu_#YWb_W
z@8t0;^~vd4?p0e;U+>s<>+g=^g_%juKfG4Bls%t4_3>L{HqjqnC#Ywy%S?S^_oT7s
z>g%4en<^o9u1!{%mF2U|r%-KL`I%#hOE(`{ky3u!G5JjKg!lEE|1+*XwdMYsB@y1B
O!qC&z&t;ucLK6UscS%_Q


From a39bc38620745b633186808b2dea00f50089ea46 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 1 May 2017 20:39:11 +0200
Subject: [PATCH 077/188] Update keywords in composer.json; Use screenshot from
 website in README.md

---
 README.md     | 17 +++++++++++++++--
 composer.json |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fd05a72..0daa00b 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,9 @@ Pico is a stupidly simple, blazing fast, flat file CMS.
 Visit us at http://picocms.org/ and see http://picocms.org/about/ for more info.
 
 Screenshot
--------
-![Pico Screenshot](https://cloud.githubusercontent.com/assets/920356/17342119/f5a85ee8-58f7-11e6-856e-cd72f76cec61.png)
+----------
+
+![Pico Screenshot](https://picocms.github.io/screenshot.png)
 
 Install
 -------
@@ -26,17 +27,22 @@ Just [download the latest Pico release][LatestRelease] and upload all files to t
 #### Composer
 
 ###### Step 1 - for users
+
 [Download the *source code* of Pico's latest release][LatestRelease], upload all files to the `httpdocs` directory (e.g. `/var/www/html`) of your server and navigate to the upload directory using a shell.
 
 ###### Step 1 - for developers
+
 Open a shell and navigate to the desired install directory of Pico within the `httpdocs` directory (e.g. `/var/www/html`) of your server. You can now clone Pico's Git repository as follows:
+
 ```shell
 $ git clone https://github.com/picocms/Pico.git .
 ```
 Please note that this gives you the current development version of Pico, what is likely *unstable* and *not ready for production use*!
 
 ###### Step 2
+
 Download [composer][] and run it with the `install` option:
+
 ```shell
 $ curl -sS https://getcomposer.org/installer | php
 $ php composer.phar install
@@ -63,30 +69,37 @@ Run
 You have nothing to consider specially, simply navigate to your Pico install using your favorite web browser. Pico's default contents will explain how to use your brand new, stupidly simple, blazing fast, flat file CMS.
 
 #### You don't have a web server?
+
 Starting with PHP 5.4 the easiest way to try Pico is using [the built-in web server of PHP][PHPServer]. Please note that PHPs built-in web server is for development and testing purposes only!
 
 ###### Step 1
+
 Navigate to Pico's installation directory using a shell.
 
 ###### Step 2
+
 Start PHPs built-in web server:
 ```shell
 $ php -S 127.0.0.1:8080
 ```
 
 ###### Step 3
+
 Access Pico from http://localhost:8080.
 
 Getting Help
 ------------
 
 #### Getting Help as a user
+
 If you want to get started using Pico, please refer to our [user docs][HelpUserDocs]. Please read the [upgrade notes][HelpUpgrade] if you want to upgrade from Pico 0.8 or 0.9 to Pico 1.0. You can find officially supported [plugins][OfficialPlugins] and [themes][OfficialThemes] on our website. A greater choice of third-party plugins and themes can be found in our [Wiki][] on the [plugins][WikiPlugins] or [themes][WikiThemes] pages respectively. If you want to create your own plugin or theme, please refer to the "Getting Help as a developer" section below.
 
 #### Getting Help as a developer
+
 If you're a developer, please refer to the "Contributing" section below and our [contribution guidelines][ContributionGuidelines]. To get you started with creating a plugin or theme, please read the [dev docs on our website][HelpDevDocs].
 
 #### You still need help or experience a problem with Pico?
+
 When the docs can't answer your question, you can get help by joining us on [#picocms on Freenode IRC](https://webchat.freenode.net/?channels=%23picocms). When you're experiencing problems with Pico, please don't hesitate to create a new [Issue][Issues] on GitHub. Concerning problems with plugins or themes, please refer to the website of the developer of this plugin or theme.
 
 **Before creating a new Issue,** please make sure the problem wasn't reported yet using [GitHubs search engine][IssuesSearch]. Please describe your issue as clear as possible and always include the *Pico version* you're using. Provided that you're using *plugins*, include a list of them too. We need information about the *actual and expected behavior*, the *steps to reproduce* the problem, and what steps you have taken to resolve the problem by yourself (i.e. *your own troubleshooting*).
diff --git a/composer.json b/composer.json
index 5894970..f925186 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "picocms/pico",
     "type": "library",
     "description": "Pico is a flat file CMS, this means there is no administration backend and database to deal with. You simply create .md files in the \"content\" folder and that becomes a page.",
-    "keywords": ["flat-file","cms","php","twig","markdown"],
+    "keywords": ["pico", "picocms", "pico-cms", "simple", "flat-file", "cms", "content-management", "website", "markdown-to-html", "php", "markdown", "yaml", "twig" ],
     "homepage": "http://picocms.org/",
     "license": "MIT",
     "authors": [

From cbb8ece5799463303069f466c490494f24a78265 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 1 May 2017 22:12:18 +0200
Subject: [PATCH 078/188] Move PicoDeprecated plugin and default theme to
 separate repos

See https://github.com/picocms/pico-theme for Pico's default theme and https://github.com/picocms/pico-deprecated for the PicoDeprecated plugin.
---
 .gitignore                                    |  13 -
 composer.json                                 |   4 +-
 config/.gitignore                             |   3 +
 plugins/.gitignore                            |   3 +
 plugins/00-PicoDeprecated.php                 | 504 ------------------
 themes/.gitignore                             |   2 +
 themes/default/font/LICENSE.txt               |  23 -
 themes/default/font/fontello.eot              | Bin 6012 -> 0 bytes
 themes/default/font/fontello.svg              |  16 -
 themes/default/font/fontello.ttf              | Bin 5844 -> 0 bytes
 themes/default/font/fontello.woff             | Bin 3484 -> 0 bytes
 themes/default/font/fontello.woff2            | Bin 2924 -> 0 bytes
 themes/default/fontello.css                   |  60 ---
 themes/default/index.twig                     |  73 ---
 .../default/js/modernizr-3.3.1-custom.min.js  |   3 -
 themes/default/js/pico.js                     |  70 ---
 themes/default/js/utils.js                    | 135 -----
 themes/default/style.css                      | 357 -------------
 18 files changed, 11 insertions(+), 1255 deletions(-)
 create mode 100644 config/.gitignore
 create mode 100644 plugins/.gitignore
 delete mode 100644 plugins/00-PicoDeprecated.php
 create mode 100644 themes/.gitignore
 delete mode 100644 themes/default/font/LICENSE.txt
 delete mode 100644 themes/default/font/fontello.eot
 delete mode 100644 themes/default/font/fontello.svg
 delete mode 100644 themes/default/font/fontello.ttf
 delete mode 100644 themes/default/font/fontello.woff
 delete mode 100644 themes/default/font/fontello.woff2
 delete mode 100644 themes/default/fontello.css
 delete mode 100644 themes/default/index.twig
 delete mode 100644 themes/default/js/modernizr-3.3.1-custom.min.js
 delete mode 100644 themes/default/js/pico.js
 delete mode 100644 themes/default/js/utils.js
 delete mode 100644 themes/default/style.css

diff --git a/.gitignore b/.gitignore
index 7cb4a74..67952a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,18 +20,5 @@ desktop.ini
 /_build/phpdoc.cache
 /_build/deploy-*.git
 
-# User config
-/config/config.yml
-
-# User themes
-/themes/*
-!/themes/default
-
-# User plugins
-/plugins/*
-!/plugins/0?-*
-!/plugins/1?-*
-!/plugins/DummyPlugin.php
-
 # User content
 /content
diff --git a/composer.json b/composer.json
index f925186..32403aa 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,10 @@
     "require": {
         "php": ">=5.3.6",
         "twig/twig": "^1.18",
+        "symfony/yaml" : "^2.3",
         "erusev/parsedown-extra": "^0.7",
-        "symfony/yaml" : "^2.3"
+        "picocms/pico-theme": "~2.0.0",
+        "picocms/pico-deprecated": "~2.0.0"
     },
     "require-dev" : {
         "phpdocumentor/phpdocumentor": "^2.8",
diff --git a/config/.gitignore b/config/.gitignore
new file mode 100644
index 0000000..ffe73de
--- /dev/null
+++ b/config/.gitignore
@@ -0,0 +1,3 @@
+# This directory is meant to be empty, except for config.yml.template
+*
+!config.yml.template
diff --git a/plugins/.gitignore b/plugins/.gitignore
new file mode 100644
index 0000000..a549bfa
--- /dev/null
+++ b/plugins/.gitignore
@@ -0,0 +1,3 @@
+# This directory is meant to be empty, except for DummyPlugin.php
+*
+!DummyPlugin.php
diff --git a/plugins/00-PicoDeprecated.php b/plugins/00-PicoDeprecated.php
deleted file mode 100644
index ed00e7e..0000000
--- a/plugins/00-PicoDeprecated.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-
-/**
- * Maintain backward compatibility to older Pico releases
- *
- * This plugin exists for backward compatibility and is disabled by default.
- * It gets automatically enabled when a plugin which either doesn't implement
- * {@link PicoPluginInterface} (plugins for Pico 0.X) or define the
- * {@link PicoDeprecated::API_VERSION} (plugins for Pico 1.0) is loaded.
- *
- * The following deprecated events are triggered by this plugin:
- *
- * | Event               | ... triggers the deprecated event                         |
- * | ------------------- | --------------------------------------------------------- |
- * | onPluginsLoaded     | plugins_loaded()                                          |
- * | onConfigLoaded      | config_loaded($config)                                    |
- * | onRequestUrl        | request_url($url)                                         |
- * | onContentLoading    | before_load_content($file)                                |
- * | onContentLoaded     | after_load_content($file, $rawContent)                    |
- * | on404ContentLoading | before_404_load_content($file)                            |
- * | on404ContentLoaded  | after_404_load_content($file, $rawContent)                |
- * | onMetaHeaders       | before_read_file_meta($headers)                           |
- * | onMetaParsed        | file_meta($meta)                                          |
- * | onContentParsing    | before_parse_content($rawContent)                         |
- * | onContentParsed     | after_parse_content($content)                             |
- * | onContentParsed     | content_parsed($content)                                  |
- * | onSinglePageLoaded  | get_page_data($pages, $meta)                              |
- * | onPagesLoaded       | get_pages($pages, $currentPage, $previousPage, $nextPage) |
- * | onTwigRegistration  | before_twig_register()                                    |
- * | onPageRendering     | before_render($twigVariables, $twig, $templateName)       |
- * | onPageRendered      | after_render($output)                                     |
- *
- * Since Pico 2.0 the config is stored in `config/*.yml` files. This plugin
- * also tries to read {@path "config/config.php"} (Pico 1.0) and
- * {@path "config.php"} in Pico's root dir (Pico 0.X) and overwrites all
- * previously specified settings.
- *
- * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.0
- */
-class PicoDeprecated extends AbstractPicoPlugin
-{
-    /**
-     * This plugin is disabled by default
-     *
-     * @see AbstractPicoPlugin::$enabled
-     */
-    protected $enabled = false;
-
-    /**
-     * The requested file
-     *
-     * @see PicoDeprecated::getRequestFile()
-     * @var string|null
-     */
-    protected $requestFile;
-
-    /**
-     * Enables this plugin on demand and triggers the deprecated event
-     * plugins_loaded()
-     *
-     * @see DummyPlugin::onPluginsLoaded()
-     */
-    public function onPluginsLoaded(array &$plugins)
-    {
-        if ($plugins) {
-            foreach ($plugins as $plugin) {
-                if (!($plugin instanceof PicoPluginInterface)) {
-                    // the plugin doesn't implement PicoPluginInterface; it uses deprecated events
-                    // enable PicoDeprecated if it hasn't be explicitly enabled/disabled yet
-                    if (!$this->isStatusChanged()) {
-                        $this->setEnabled(true, true, true);
-                    }
-                    break;
-                }
-            }
-        } else {
-            // no plugins were found, so it actually isn't necessary to call deprecated events
-            // anyway, this plugin also ensures compatibility apart from events used by old plugins,
-            // so enable PicoDeprecated if it hasn't be explicitly enabled/disabled yet
-            if (!$this->isStatusChanged()) {
-                $this->setEnabled(true, true, true);
-            }
-        }
-
-        if ($this->isEnabled()) {
-            $this->triggerEvent('plugins_loaded');
-        }
-    }
-
-    /**
-     * Triggers the deprecated event config_loaded($config)
-     *
-     * This method also defines deprecated constants, reads the `config.php`
-     * in Pico's root dir, enables the plugins {@link PicoParsePagesContent}
-     * and {@link PicoExcerpt} and makes `$config` globally accessible (the
-     * latter was removed with Pico 0.9 and was added again as deprecated
-     * feature with Pico 1.0)
-     *
-     * @see    PicoDeprecated::defineConstants()
-     * @see    PicoDeprecated::loadRootDirConfig()
-     * @see    PicoDeprecated::enablePlugins()
-     * @see    DummyPlugin::onConfigLoaded()
-     * @param  array &$config array of config variables
-     * @return void
-     */
-    public function onConfigLoaded(array &$config)
-    {
-        $this->defineConstants();
-        $this->loadScriptedConfig($config);
-        $this->loadRootDirConfig($config);
-        $this->enablePlugins();
-        $GLOBALS['config'] = &$config;
-
-        $this->triggerEvent('config_loaded', array(&$config));
-    }
-
-    /**
-     * Defines deprecated constants
-     *
-     * `ROOT_DIR`, `LIB_DIR`, `PLUGINS_DIR`, `THEMES_DIR` and `CONTENT_EXT`
-     * are deprecated since v1.0, `CONTENT_DIR` existed just in v0.9,
-     * `CONFIG_DIR` just for a short time between v0.9 and v1.0 and
-     * `CACHE_DIR` was dropped with v1.0 without a replacement.
-     *
-     * @see    PicoDeprecated::onConfigLoaded()
-     * @return void
-     */
-    protected function defineConstants()
-    {
-        if (!defined('ROOT_DIR')) {
-            define('ROOT_DIR', $this->getRootDir());
-        }
-        if (!defined('CONFIG_DIR')) {
-            define('CONFIG_DIR', $this->getConfigDir());
-        }
-        if (!defined('LIB_DIR')) {
-            $picoReflector = new ReflectionClass('Pico');
-            define('LIB_DIR', dirname($picoReflector->getFileName()) . '/');
-        }
-        if (!defined('PLUGINS_DIR')) {
-            define('PLUGINS_DIR', $this->getPluginsDir());
-        }
-        if (!defined('THEMES_DIR')) {
-            define('THEMES_DIR', $this->getThemesDir());
-        }
-        if (!defined('CONTENT_DIR')) {
-            define('CONTENT_DIR', $this->getConfig('content_dir'));
-        }
-        if (!defined('CONTENT_EXT')) {
-            define('CONTENT_EXT', $this->getConfig('content_ext'));
-        }
-    }
-
-    /**
-     * Read config.php in Pico's config dir (i.e. config/config.php)
-     *
-     * @see    PicoDeprecated::onConfigLoaded()
-     * @see    Pico::loadConfig()
-     * @param  array &$realConfig array of config variables
-     * @return void
-     */
-    protected function loadScriptedConfig(array &$realConfig)
-    {
-        if (file_exists($this->getConfigDir() . 'config.php')) {
-            // scope isolated require()
-            $includeClosure = function ($configFile) {
-                require($configFile);
-                return (isset($config) && is_array($config)) ? $config : array();
-            };
-            if (PHP_VERSION_ID >= 50400) {
-                $includeClosure = $includeClosure->bindTo(null);
-            }
-
-            // config.php in Pico::$configDir (i.e. config/config.php) is deprecated
-            // use *.yml files in Pico::$configDir instead
-            $config = $includeClosure($this->getConfigDir() . 'config.php');
-
-            if ($config) {
-                if (!empty($config['base_url'])) {
-                    $config['base_url'] = rtrim($config['base_url'], '/') . '/';
-                }
-                if (!empty($config['content_dir'])) {
-                    $config['content_dir'] = $this->getAbsolutePath($config['content_dir']);
-                }
-                if (!empty($config['theme_url'])) {
-                    if (preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $config['theme_url'])) {
-                        $config['theme_url'] = rtrim($config['theme_url'], '/') . '/';
-                    } else {
-                        $config['theme_url'] = $this->getBaseUrl() . rtrim($config['theme_url'], '/') . '/';
-                    }
-                }
-                if (!empty($config['timezone'])) {
-                    date_default_timezone_set($config['timezone']);
-                }
-
-                $realConfig = $config + $realConfig;
-            }
-        }
-    }
-
-    /**
-     * Read config.php in Pico's root dir
-     *
-     * @see    PicoDeprecated::onConfigLoaded()
-     * @see    Pico::loadConfig()
-     * @param  array &$realConfig array of config variables
-     * @return void
-     */
-    protected function loadRootDirConfig(array &$realConfig)
-    {
-        if (file_exists($this->getRootDir() . 'config.php')) {
-            $config = null;
-
-            // scope isolated require()
-            $includeClosure = function ($configFile) use (&$config) {
-                require($configFile);
-            };
-            if (PHP_VERSION_ID >= 50400) {
-                $includeClosure = $includeClosure->bindTo(null);
-            }
-
-            // config.php in Pico::$rootDir is deprecated
-            // use config.php in Pico::$configDir instead
-            $includeClosure($this->getRootDir() . 'config.php');
-
-            if (is_array($config)) {
-                if (isset($config['base_url'])) {
-                    $config['base_url'] = rtrim($config['base_url'], '/') . '/';
-                }
-                if (isset($config['content_dir'])) {
-                    $config['content_dir'] = rtrim($config['content_dir'], '/\\') . '/';
-                }
-
-                $realConfig = $config + $realConfig;
-            }
-        }
-    }
-
-    /**
-     * Enables the plugins PicoParsePagesContent and PicoExcerpt
-     *
-     * @see    PicoParsePagesContent
-     * @see    PicoExcerpt
-     * @return void
-     */
-    protected function enablePlugins()
-    {
-        // enable PicoParsePagesContent and PicoExcerpt
-        // we can't enable them during onPluginsLoaded because we can't know
-        // if the user disabled us (PicoDeprecated) manually in the config
-        $plugins = $this->getPlugins();
-        if (isset($plugins['PicoParsePagesContent'])) {
-            // parse all pages content if this plugin hasn't
-            // be explicitly enabled/disabled yet
-            if (!$plugins['PicoParsePagesContent']->isStatusChanged()) {
-                $plugins['PicoParsePagesContent']->setEnabled(true, true, true);
-            }
-        }
-        if (isset($plugins['PicoExcerpt'])) {
-            // enable excerpt plugin if it hasn't be explicitly enabled/disabled yet
-            if (!$plugins['PicoExcerpt']->isStatusChanged()) {
-                $plugins['PicoExcerpt']->setEnabled(true, true, true);
-            }
-        }
-    }
-
-    /**
-     * Triggers the deprecated event request_url($url)
-     *
-     * @see DummyPlugin::onRequestUrl()
-     */
-    public function onRequestUrl(&$url)
-    {
-        $this->triggerEvent('request_url', array(&$url));
-    }
-
-    /**
-     * Sets PicoDeprecated::$requestFile to trigger the deprecated
-     * events after_load_content() and after_404_load_content()
-     *
-     * @see PicoDeprecated::onContentLoaded()
-     * @see PicoDeprecated::on404ContentLoaded()
-     * @see DummyPlugin::onRequestFile()
-     */
-    public function onRequestFile(&$file)
-    {
-        $this->requestFile = &$file;
-    }
-
-    /**
-     * Triggers the deprecated before_load_content($file)
-     *
-     * @see DummyPlugin::onContentLoading()
-     */
-    public function onContentLoading(&$file)
-    {
-        $this->triggerEvent('before_load_content', array(&$file));
-    }
-
-    /**
-     * Triggers the deprecated event after_load_content($file, $rawContent)
-     *
-     * @see DummyPlugin::onContentLoaded()
-     */
-    public function onContentLoaded(&$rawContent)
-    {
-        $this->triggerEvent('after_load_content', array(&$this->requestFile, &$rawContent));
-    }
-
-    /**
-     * Triggers the deprecated before_404_load_content($file)
-     *
-     * @see DummyPlugin::on404ContentLoading()
-     */
-    public function on404ContentLoading(&$file)
-    {
-        $this->triggerEvent('before_404_load_content', array(&$file));
-    }
-
-    /**
-     * Triggers the deprecated event after_404_load_content($file, $rawContent)
-     *
-     * @see DummyPlugin::on404ContentLoaded()
-     */
-    public function on404ContentLoaded(&$rawContent)
-    {
-        $this->triggerEvent('after_404_load_content', array(&$this->requestFile, &$rawContent));
-    }
-
-    /**
-     * Triggers the deprecated event before_read_file_meta($headers)
-     *
-     * @see DummyPlugin::onMetaHeaders()
-     */
-    public function onMetaHeaders(array &$headers)
-    {
-        $this->triggerEvent('before_read_file_meta', array(&$headers));
-    }
-
-    /**
-     * Triggers the deprecated event file_meta($meta)
-     *
-     * @see DummyPlugin::onMetaParsed()
-     */
-    public function onMetaParsed(array &$meta)
-    {
-        $this->triggerEvent('file_meta', array(&$meta));
-    }
-
-    /**
-     * Triggers the deprecated event before_parse_content($rawContent)
-     *
-     * @see DummyPlugin::onContentParsing()
-     */
-    public function onContentParsing(&$rawContent)
-    {
-        $this->triggerEvent('before_parse_content', array(&$rawContent));
-    }
-
-    /**
-     * Triggers the deprecated events after_parse_content($content) and
-     * content_parsed($content)
-     *
-     * @see DummyPlugin::onContentParsed()
-     */
-    public function onContentParsed(&$content)
-    {
-        $this->triggerEvent('after_parse_content', array(&$content));
-
-        // deprecated since v0.8
-        $this->triggerEvent('content_parsed', array(&$content));
-    }
-
-    /**
-     * Triggers the deprecated event get_page_data($pages, $meta)
-     *
-     * @see DummyPlugin::onSinglePageLoaded()
-     */
-    public function onSinglePageLoaded(array &$pageData)
-    {
-        $this->triggerEvent('get_page_data', array(&$pageData, $pageData['meta']));
-    }
-
-    /**
-     * Triggers the deprecated event
-     * get_pages($pages, $currentPage, $previousPage, $nextPage)
-     *
-     * Please note that the `get_pages()` event gets `$pages` passed without a
-     * array index. The index is rebuild later using either the `id` array key
-     * or is derived from the `url` array key. Duplicates are prevented by
-     * adding `~dup` when necessary.
-     *
-     * @see DummyPlugin::onPagesLoaded()
-     */
-    public function onPagesLoaded(
-        array &$pages,
-        array &$currentPage = null,
-        array &$previousPage = null,
-        array &$nextPage = null
-    ) {
-        // remove keys of pages array
-        $plainPages = array();
-        foreach ($pages as &$pageData) {
-            $plainPages[] = &$pageData;
-        }
-        unset($pageData);
-
-        $this->triggerEvent('get_pages', array(&$plainPages, &$currentPage, &$previousPage, &$nextPage));
-
-        // re-index pages array
-        $pages = array();
-        foreach ($plainPages as &$pageData) {
-            if (!isset($pageData['id'])) {
-                $urlPrefixLength = strlen($this->getBaseUrl()) + intval(!$this->isUrlRewritingEnabled());
-                $pageData['id'] = substr($pageData['url'], $urlPrefixLength);
-            }
-
-            // prevent duplicates
-            $id = $pageData['id'];
-            for ($i = 1; isset($pages[$id]); $i++) {
-                $id = $pageData['id'] . '~dup' . $i;
-            }
-
-            $pages[$id] = &$pageData;
-        }
-    }
-
-    /**
-     * Triggers the deprecated event before_twig_register()
-     *
-     * @see DummyPlugin::onTwigRegistration()
-     */
-    public function onTwigRegistration()
-    {
-        $this->triggerEvent('before_twig_register');
-    }
-
-    /**
-     * Adds the deprecated variables rewrite_url and is_front_page, triggers
-     * the deprecated event before_render($twigVariables, $twig, $templateName)
-     *
-     * Please note that the `before_render()` event gets `$templateName` passed
-     * without its file extension. The file extension is later added again.
-     *
-     * @see DummyPlugin::onPageRendering()
-     */
-    public function onPageRendering(Twig_Environment &$twig, array &$twigVariables, &$templateName)
-    {
-        // rewrite_url and is_front_page are deprecated since Pico 2.0
-        if (!isset($twigVariables['rewrite_url'])) {
-            $twigVariables['rewrite_url'] = $this->isUrlRewritingEnabled();
-        }
-
-        if (!isset($twigVariables['is_front_page'])) {
-            $frontPage = $this->getConfig('content_dir') . 'index' . $this->getConfig('content_ext');
-            $twigVariables['is_front_page'] = ($this->getRequestFile() === $frontPage);
-        }
-
-        // template name contains file extension since Pico 1.0
-        $fileExtension = '';
-        if (($fileExtensionPos = strrpos($templateName, '.')) !== false) {
-            $fileExtension = substr($templateName, $fileExtensionPos);
-            $templateName = substr($templateName, 0, $fileExtensionPos);
-        }
-
-        $this->triggerEvent('before_render', array(&$twigVariables, &$twig, &$templateName));
-
-        // add original file extension
-        $templateName = $templateName . $fileExtension;
-    }
-
-    /**
-     * Triggers the deprecated event after_render($output)
-     *
-     * @see DummyPlugin::onPageRendered()
-     */
-    public function onPageRendered(&$output)
-    {
-        $this->triggerEvent('after_render', array(&$output));
-    }
-
-    /**
-     * Triggers a deprecated event on all plugins
-     *
-     * Deprecated events are also triggered on plugins which implement
-     * {@link PicoPluginInterface}. Please note that the methods are called
-     * directly and not through {@link PicoPluginInterface::handleEvent()}.
-     *
-     * @param  string $eventName event to trigger
-     * @param  array  $params    parameters to pass
-     * @return void
-     */
-    protected function triggerEvent($eventName, array $params = array())
-    {
-        foreach ($this->getPlugins() as $plugin) {
-            if (method_exists($plugin, $eventName)) {
-                call_user_func_array(array($plugin, $eventName), $params);
-            }
-        }
-    }
-}
diff --git a/themes/.gitignore b/themes/.gitignore
new file mode 100644
index 0000000..24560b5
--- /dev/null
+++ b/themes/.gitignore
@@ -0,0 +1,2 @@
+# This directory is meant to be empty
+*
diff --git a/themes/default/font/LICENSE.txt b/themes/default/font/LICENSE.txt
deleted file mode 100644
index 0e67558..0000000
--- a/themes/default/font/LICENSE.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Icon fonts generator
-
-## Fontello
-
-    Copyright (C) 2011 by Vitaly Puzrin
-
-    Author:     Vitaly Puzrin
-    License:    The MIT License <https://github.com/fontello/fontello/blob/master/LICENSE>
-    Homepage:   http://fontello.com/
-
-
-
-Font license info
-
-## Font Awesome
-
-    Copyright (C) 2012 by Dave Gandy
-
-    Author:     Dave Gandy
-    License:    SIL OFL 1.1 <http://scripts.sil.org/OFL>
-    Homepage:   http://fortawesome.github.com/Font-Awesome/
-
-    Icons:      menu, github-circled ("octocat"), chat
diff --git a/themes/default/font/fontello.eot b/themes/default/font/fontello.eot
deleted file mode 100644
index ed72da04fb03a22db8bcc8ffae1501b28c48c353..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6012
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

diff --git a/themes/default/font/fontello.svg b/themes/default/font/fontello.svg
deleted file mode 100644
index b48d933..0000000
--- a/themes/default/font/fontello.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
-<defs>
-<font id="fontello" horiz-adv-x="1000" >
-<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
-<missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="chat" unicode="&#xe800;" d="M786 421q0-77-53-143t-143-104-197-38q-48 0-98 9-70-49-155-72-21-5-48-9h-2q-6 0-12 5t-6 12q-1 1-1 3t1 4 1 3l1 3t2 3 2 3 3 3 2 2q3 3 13 14t15 16 12 17 14 21 11 25q-69 40-108 98t-40 125q0 78 53 144t143 104 197 38 197-38 143-104 53-144z m214-142q0-67-40-126t-108-98q5-14 11-25t14-21 13-16 14-17 13-14q0 0 2-2t3-3 2-3 2-3l1-3t1-3 1-4-1-3q-2-8-7-13t-12-4q-28 4-48 9-86 23-156 72-50-9-98-9-151 0-263 74 32-3 49-3 90 0 172 25t148 72q69 52 107 119t37 141q0 43-13 85 72-39 114-99t42-128z" horiz-adv-x="1000" />
-
-<glyph glyph-name="octocat" unicode="&#xf09b;" d="M429 779q116 0 215-58t156-156 57-215q0-140-82-252t-211-155q-15-3-22 4t-7 17q0 1 0 43t0 75q0 54-29 79 32 3 57 10t53 22 45 37 30 58 11 84q0 67-44 115 21 51-4 114-16 5-46-6t-51-25l-21-13q-52 15-107 15t-108-15q-8 6-23 15t-47 22-47 7q-25-63-5-114-44-48-44-115 0-47 12-83t29-59 45-37 52-22 57-10q-21-20-27-58-12-5-25-8t-32-3-36 12-31 35q-11 18-27 29t-28 14l-11 1q-12 0-16-2t-3-7 5-8 7-6l4-3q12-6 24-21t18-29l6-13q7-21 24-34t37-17 39-3 31 1l13 3q0-22 0-50t1-30q0-10-8-17t-22-4q-129 43-211 155t-82 252q0 117 58 215t155 156 216 58z m-267-616q2 4-3 7-6 1-8-1-1-4 4-7 5-3 7 1z m18-19q4 3-1 9-6 5-9 2-4-3 1-9 5-6 9-2z m16-25q6 4 0 11-4 7-9 3-5-3 0-10t9-4z m24-23q4 4-2 10-7 7-11 2-5-5 2-11 6-6 11-1z m32-14q1 6-8 9-8 2-10-4t7-9q8-3 11 4z m35-3q0 7-10 6-9 0-9-6 0-7 10-6 9 0 9 6z m32 5q-1 7-10 5-9-1-8-8t10-4 8 7z" horiz-adv-x="857.1" />
-
-<glyph glyph-name="menu" unicode="&#xf0c9;" d="M857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-14-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
-</font>
-</defs>
-</svg>
\ No newline at end of file
diff --git a/themes/default/font/fontello.ttf b/themes/default/font/fontello.ttf
deleted file mode 100644
index fedcbb768616e5f7bcd8a6b1b6ec04755396b6d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5844
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

diff --git a/themes/default/font/fontello.woff b/themes/default/font/fontello.woff
deleted file mode 100644
index 41eaa45a4a30df12fccfc7c704b393f405c77bb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3484
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

diff --git a/themes/default/font/fontello.woff2 b/themes/default/font/fontello.woff2
deleted file mode 100644
index 0cf1936416b5c9456301913c70ea5cce64af8b71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2924
zcmV-y3zPJBPew8T0RR9101IpY4*&oF02b5$01FcU0RR9100000000000000000000
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
W6ZNf+9wnZNSEX0X(dQH~0002)f^&2L

diff --git a/themes/default/fontello.css b/themes/default/fontello.css
deleted file mode 100644
index ec40869..0000000
--- a/themes/default/fontello.css
+++ /dev/null
@@ -1,60 +0,0 @@
-@font-face {
-    font-family: 'fontello';
-    src: url('font/fontello.eot?13793670');
-    src: url('font/fontello.eot?13793670#iefix') format('embedded-opentype'),
-         url('font/fontello.woff2?13793670') format('woff2'),
-         url('font/fontello.woff?13793670') format('woff'),
-         url('font/fontello.ttf?13793670') format('truetype'),
-         url('font/fontello.svg?13793670#fontello') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
-/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
-/*
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-    @font-face {
-        font-family: 'fontello';
-        src: url('../font/fontello.svg?13793670#fontello') format('svg');
-    }
-}
-*/
-
-[class^="icon-"]:before, [class*=" icon-"]:before {
-    font-family: "fontello";
-    font-style: normal;
-    font-weight: normal;
-    speak: none;
-
-    display: inline-block;
-    text-decoration: inherit;
-    width: 1em;
-    margin-right: .2em;
-    text-align: center;
-    /* opacity: .8; */
-
-    /* For safety - reset parent styles, that can break glyph codes*/
-    font-variant: normal;
-    text-transform: none;
-
-    /* fix buttons height, for twitter bootstrap */
-    line-height: 1em;
-
-    /* Animation center compensation - margins should be symmetric */
-    /* remove if not needed */
-    margin-left: .2em;
-
-    /* you can be more comfortable with increased icons size */
-    /* font-size: 120%; */
-
-    /* Font smoothing. That was taken from TWBS */
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-
-    /* Uncomment for 3D effect */
-    /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
-}
-
-.icon-chat:before { content: '\e800'; } /* '' */
-.icon-octocat:before { content: '\f09b'; } /* '' */
-.icon-menu:before { content: '\f0c9'; } /* '' */
diff --git a/themes/default/index.twig b/themes/default/index.twig
deleted file mode 100644
index 4197e13..0000000
--- a/themes/default/index.twig
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html class="no-js">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
-
-    <title>{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}</title>
-    {% if meta.description %}
-        <meta name="description" content="{{ meta.description|striptags }}" />
-    {% endif %}{% if meta.robots %}
-        <meta name="robots" content="{{ meta.robots }}" />
-    {% endif %}
-
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono" type="text/css" />
-    <link rel="stylesheet" href="{{ theme_url }}/style.css" type="text/css" />
-    <link rel="stylesheet" href="{{ theme_url }}/fontello.css" type="text/css" />
-</head>
-<body{% if config.theme_config.widescreen %} class="widescreen"{% endif %}>
-
-    <div id="header">
-        <div class="container">
-            <a id="nav-toggle" title="Toggle Menu" role="button" aria-controls="nav" aria-expanded="false" tabindex="1">
-                <span class="icon-menu" aria-hidden="true"></span>
-                <span class="sr-only">Toggle Menu</span>
-            </a>
-            <h1>
-                <a href="{{ "index"|link }}">{{ site_title }}</a>
-            </h1>
-            <div id="nav" role="region" tabindex="-1">
-                <ul>
-                    {% for page in pages if page.title and not page.hidden %}
-                        {% set pageDepth = page.id|split('/')|length %}
-                        {% if (pageDepth == 2) and (page.id ends with "/index") or (pageDepth == 1) %}
-                            <li{% if page.id == current_page.id %} class="active"{% endif %}>
-                                <a href="{{ page.url }}">{{ page.title }}</a>
-                            </li>
-                        {% endif %}
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
-    </div>
-
-    <div id="main">
-        <div class="container">
-            {{ content }}
-        </div>
-    </div>
-
-    <div id="footer">
-        <div class="container">
-            <div class="social">
-                {% for social in pages._meta.meta.social %}
-                    <a href="{{ social.url }}" title="{{ social.title }}" role="button">
-                        <span class="icon-{{ social.icon }}" aria-hidden="true"></span>
-                        <span class="sr-only">{{ social.title }}</span>
-                    </a>
-                {% endfor %}
-            </div>
-            <p>
-                <a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
-                and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
-                Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
-            </p>
-        </div>
-    </div>
-
-    <script src="{{ theme_url }}/js/modernizr-3.3.1-custom.min.js" type="text/javascript"></script>
-    <script src="{{ theme_url }}/js/utils.js" type="text/javascript"></script>
-    <script src="{{ theme_url }}/js/pico.js" type="text/javascript"></script>
-
-</body>
-</html>
diff --git a/themes/default/js/modernizr-3.3.1-custom.min.js b/themes/default/js/modernizr-3.3.1-custom.min.js
deleted file mode 100644
index 33ad568..0000000
--- a/themes/default/js/modernizr-3.3.1-custom.min.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! modernizr 3.3.1 (Custom Build) | MIT *
- * https://modernizr.com/download/?-classlist-csstransitions-requestanimationframe !*/
-!function(e,n,t){function r(e,n){return typeof e===n}function i(){var e,n,t,i,o,s,a;for(var f in y)if(y.hasOwnProperty(f)){if(e=[],n=y[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;t<n.options.aliases.length;t++)e.push(n.options.aliases[t].toLowerCase());for(i=r(n.fn,"function")?n.fn():n.fn,o=0;o<e.length;o++)s=e[o],a=s.split("."),1===a.length?Modernizr[a[0]]=i:(!Modernizr[a[0]]||Modernizr[a[0]]instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=i),C.push((i?"":"no-")+a.join("-"))}}function o(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function s(e,n){return!!~(""+e).indexOf(n)}function a(e,n){return function(){return e.apply(n,arguments)}}function f(e,n,t){var i;for(var o in e)if(e[o]in n)return t===!1?e[o]:(i=n[e[o]],r(i,"function")?a(i,t||n):i);return!1}function l(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):T?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function u(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=l(T?"svg":"body"),e.fake=!0),e}function p(e,t,r,i){var o,s,a,f,u="modernizr",p=l("div"),c=d();if(parseInt(r,10))for(;r--;)a=l("div"),a.id=i?i[r]:u+(r+1),p.appendChild(a);return o=l("style"),o.type="text/css",o.id="s"+u,(c.fake?c:p).appendChild(o),c.appendChild(p),o.styleSheet?o.styleSheet.cssText=e:o.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",f=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=f,w.offsetHeight):p.parentNode.removeChild(p),!!s}function c(n,r){var i=n.length;if("CSS"in e&&"supports"in e.CSS){for(;i--;)if(e.CSS.supports(u(n[i]),r))return!0;return!1}if("CSSSupportsRule"in e){for(var o=[];i--;)o.push("("+u(n[i])+":"+r+")");return o=o.join(" or "),p("@supports ("+o+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function m(e,n,i,a){function f(){d&&(delete P.style,delete P.modElem)}if(a=r(a,"undefined")?!1:a,!r(i,"undefined")){var u=c(e,i);if(!r(u,"undefined"))return u}for(var d,p,m,v,h,y=["modernizr","tspan","samp"];!P.style&&y.length;)d=!0,P.modElem=l(y.shift()),P.style=P.modElem.style;for(m=e.length,p=0;m>p;p++)if(v=e[p],h=P.style[v],s(v,"-")&&(v=o(v)),P.style[v]!==t){if(a||r(i,"undefined"))return f(),"pfx"==n?v:!0;try{P.style[v]=i}catch(g){}if(P.style[v]!=h)return f(),"pfx"==n?v:!0}return f(),!1}function v(e,n,t,i,o){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+_.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?m(a,n,i,o):(a=(e+" "+E.join(s+" ")+s).split(" "),f(a,n,t))}function h(e,n,r){return v(e,t,t,n,r)}var y=[],g={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){y.push({name:e,fn:n,options:t})},addAsyncTest:function(e){y.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=g,Modernizr=new Modernizr;var C=[],w=n.documentElement;Modernizr.addTest("classlist","classList"in w);var x="Moz O ms Webkit",_=g._config.usePrefixes?x.split(" "):[];g._cssomPrefixes=_;var S=function(n){var r,i=prefixes.length,o=e.CSSRule;if("undefined"==typeof o)return t;if(!n)return!1;if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in o)return"@"+n;for(var s=0;i>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in o)return"@-"+a.toLowerCase()+"-"+n}return!1};g.atRule=S;var E=g._config.usePrefixes?x.toLowerCase().split(" "):[];g._domPrefixes=E;var T="svg"===w.nodeName.toLowerCase(),z={elem:l("modernizr")};Modernizr._q.push(function(){delete z.elem});var P={style:z.elem.style};Modernizr._q.unshift(function(){delete P.style}),g.testAllProps=v;var b=g.prefixed=function(e,n,t){return 0===e.indexOf("@")?S(e):(-1!=e.indexOf("-")&&(e=o(e)),n?v(e,n,t):v(e,"pfx"))};Modernizr.addTest("requestanimationframe",!!b("requestAnimationFrame",e),{aliases:["raf"]}),g.testAllProps=h,Modernizr.addTest("csstransitions",h("transition","all",!0)),i(),delete g.addTest,delete g.addAsyncTest;for(var L=0;L<Modernizr._q.length;L++)Modernizr._q[L]();e.Modernizr=Modernizr}(window,document);
diff --git a/themes/default/js/pico.js b/themes/default/js/pico.js
deleted file mode 100644
index 492829d..0000000
--- a/themes/default/js/pico.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Pico's Default Theme - JavaScript helper
- *
- * Pico is a stupidly simple, blazing fast, flat file CMS.
- *
- * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.0
- */
-
-function main()
-{
-    // capability CSS classes
-    document.documentElement.className = 'js';
-
-    // wrap tables
-    var tables = document.querySelectorAll('#main > .container > table');
-    for (var i = 0; i < tables.length; i++) {
-        if (!/\btable-responsive\b/.test(tables[i].parentElement.className)) {
-            var tableWrapper = document.createElement('div');
-            tableWrapper.className = 'table-responsive';
-
-            tables[i].parentElement.insertBefore(tableWrapper, tables[i]);
-            tableWrapper.appendChild(tables[i]);
-        }
-    }
-
-    // responsive menu
-    var menu = document.getElementById('nav'),
-        menuToggle = document.getElementById('nav-toggle'),
-        toggleMenuEvent = function (event) {
-            if (event.type === 'keydown') {
-                if ((event.keyCode != 13) && (event.keyCode != 32)) {
-                    return;
-                }
-            }
-
-            event.preventDefault();
-
-            if (menuToggle.getAttribute('aria-expanded') === 'false') {
-                menuToggle.setAttribute('aria-expanded', 'true');
-                utils.slideDown(menu, null, function () {
-                    if (event.type === 'keydown') {
-                        menu.focus();
-                    }
-                });
-            } else {
-                menuToggle.setAttribute('aria-expanded', 'false');
-                utils.slideUp(menu);
-            }
-        },
-        onResizeEvent = function () {
-            if (utils.isElementVisible(menuToggle)) {
-                menu.className = 'hidden';
-                menuToggle.addEventListener('click', toggleMenuEvent);
-                menuToggle.addEventListener('keydown', toggleMenuEvent);
-            } else {
-                menu.className = '';
-                menu.removeAttribute('data-slide-id');
-                menuToggle.removeEventListener('click', toggleMenuEvent);
-                menuToggle.removeEventListener('keydown', toggleMenuEvent);
-            }
-        };
-
-    window.addEventListener('resize', onResizeEvent);
-    onResizeEvent();
-}
-
-main();
diff --git a/themes/default/js/utils.js b/themes/default/js/utils.js
deleted file mode 100644
index 3b48911..0000000
--- a/themes/default/js/utils.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Pico's Default Theme - JavaScript helper
- *
- * Pico is a stupidly simple, blazing fast, flat file CMS.
- *
- * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.0
- */
-
-utils = {};
-
-/**
- * Checks whether the client's browser is able to slide elements or not
- *
- * @return boolean TRUE when the browser supports sliding, FALSE otherwise
- */
-utils.canSlide = function ()
-{
-    return (Modernizr.classlist && Modernizr.requestanimationframe && Modernizr.csstransitions);
-};
-
-/**
- * Slides a element up (i.e. hide a element by changing its height to 0px)
- *
- * @param  HTMLElement element        the element to slide up
- * @param  function    finishCallback function to call when the animation has
- *     been finished (i.e. the element is hidden)
- * @param  function    startCallback  function to call when the animation starts
- * @return void
- */
-utils.slideUp = function (element, finishCallback, startCallback)
-{
-    if (!utils.canSlide()) {
-        if (startCallback) startCallback();
-        element.className += (element.className !== '') ? ' hidden' : 'hidden';
-        if (finishCallback) window.requestAnimationFrame(finishCallback);
-        return;
-    }
-
-    element.style.height = element.clientHeight + 'px';
-
-    var slideId = parseInt(element.getAttribute('data-slide-id')) || 0;
-    element.setAttribute('data-slide-id', ++slideId);
-
-    window.requestAnimationFrame(function () {
-        element.classList.add('slide');
-
-        window.requestAnimationFrame(function () {
-            element.style.height = '0px';
-
-            if (startCallback) {
-                startCallback();
-            }
-
-            window.setTimeout(function () {
-                if (parseInt(element.getAttribute('data-slide-id')) !== slideId) return;
-
-                element.classList.add('hidden');
-                element.classList.remove('slide');
-                element.style.height = null;
-
-                if (finishCallback) {
-                    window.requestAnimationFrame(finishCallback);
-                }
-            }, 500);
-        });
-    });
-};
-
-/**
- * Slides a element down (i.e. show a hidden element)
- *
- * @param  HTMLElement element        the element to slide down
- * @param  function    finishCallback function to call when the animation has
- *     been finished (i.e. the element is visible)
- * @param  function    startCallback  function to call when the animation starts
- * @return void
- */
-utils.slideDown = function (element, finishCallback, startCallback)
-{
-    if (!utils.canSlide()) {
-        if (startCallback) startCallback();
-        element.className = element.className.replace(/\bhidden\b */g, '');
-        if (finishCallback) window.requestAnimationFrame(finishCallback);
-        return;
-    }
-
-    var cssRuleOriginalValue = element.clientHeight + 'px',
-        slideId = parseInt(element.getAttribute('data-slide-id')) || 0;
-
-    element.setAttribute('data-slide-id', ++slideId);
-
-    element.style.height = null;
-    element.classList.remove('hidden');
-    element.classList.remove('slide');
-    var cssRuleValue = element.clientHeight + 'px';
-
-    element.style.height = cssRuleOriginalValue;
-
-    window.requestAnimationFrame(function () {
-        element.classList.add('slide');
-
-        window.requestAnimationFrame(function () {
-            element.style.height = cssRuleValue;
-
-            if (startCallback) {
-                startCallback();
-            }
-
-            window.setTimeout(function () {
-                if (parseInt(element.getAttribute('data-slide-id')) !== slideId) return;
-
-                element.classList.remove('slide');
-                element.style.height = null;
-
-                if (finishCallback) {
-                    window.requestAnimationFrame(finishCallback);
-                }
-            }, 500);
-        });
-    });
-};
-
-/**
- * Checks whether a element is visible or not
- *
- * @param  HTMLElement element the element to check
- * @return boolean             TRUE when the element is visible, FALSE otherwise
- */
-utils.isElementVisible = function (element)
-{
-    return !!(element.offsetWidth || element.offsetHeight || element.getClientRects().length);
-};
diff --git a/themes/default/style.css b/themes/default/style.css
deleted file mode 100644
index 331ba8b..0000000
--- a/themes/default/style.css
+++ /dev/null
@@ -1,357 +0,0 @@
-/**
- * Pico's Default Theme
- *
- * Pico's default theme is a bit bare - but that's intentional! The default
- * theme isn't meant for production use, it's actually a template for you to
- * design your own theme around.
- *
- * Pico is a stupidly simple, blazing fast, flat file CMS.
- *
- * @author  Gilbert Pellegrom
- * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.0
- */
-
-* {
-    box-sizing: border-box;
-    border: 0 none;
-    margin: 0;
-    padding: 0;
-}
-
-.hidden { display: none !important; }
-.sr-only {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    padding: 0;
-    margin: -1px;
-    overflow: hidden;
-    clip: rect(0, 0, 0, 0);
-    border: 0 none;
-}
-
-.slide {
-    overflow-y: hidden !important;
-    -webkit-transition: height .5s ease-in !important;
-            transition: height .5s ease-in !important;
-}
-
-/*** BASIC LAYOUT ***/
-
-html, body { height: 100%; }
-
-body { display: flex; flex-direction: column; }
-#main { flex: 1 0 auto; }
-#header, #footer { flex: 0 0 auto; }
-
-#main {
-    padding: 5em 0 4em;
-}
-
-.container {
-    max-width: 48em;
-    padding: 0 0.5em;
-    margin: 0 auto;
-}
-.widescreen .container { max-width: 72em; }
-
-/* very ugly overflow fix, avoid this whenever possible! */
-#main .container { overflow-x: auto; }
-
-/*** BASIC LAYOUT: HEADER ***/
-
-#header { background: #2EAE9B; }
-
-#header h1 {
-    float: left;
-    font-size: 2rem;
-    margin: 0;
-    padding: 1.5em 1em 1.5em 0;
-}
-#header h1 a, #header h1 a:hover { color: #fff; }
-
-#nav {
-    text-align: right;
-    padding: 3em 0;
-}
-#nav ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-#nav ul li {
-    display: inline-block;
-    margin-left: 1em;
-    padding: 0;
-    font-weight: bold;
-}
-
-#nav a, #nav-toggle { color: #afe1da; }
-#nav .active a, #nav a:hover, #nav-toggle:hover { color: #fff; }
-
-#nav-toggle { display: none; }
-
-/* IE8 + IE9 clearfix */
-#header > .container:after {
-    content: '';
-    display: block;
-    clear: both;
-}
-
-/*** BASIC LAYOUT: FOOTER ***/
-
-#footer {
-    background: #707070;
-    color: #C0C0C0;
-}
-
-#footer a { color: #ddd; }
-#footer a:hover { color: #fff; }
-
-#footer p {
-    margin: 0;
-    padding: 3em 0;
-}
-
-#footer .social {
-    float: right;
-    padding: 1.5em 0 1.5em 1em;
-    font-size: 2rem;
-}
-
-/*** BASIC LAYOUT: EXTRA SMALL DEVICES ***/
-
-@media (max-width: 767px) {
-    #main { padding: 2em 0 1em; }
-
-    #header h1 {
-        float: none;
-        padding: 0.5em 0;
-    }
-
-    #nav {
-        clear: right;
-        padding: 0;
-    }
-    #nav ul {
-        padding-bottom: 1em;
-    }
-    #nav ul li {
-        display: block;
-        margin-left: 0;
-        text-align: center;
-    }
-    #nav ul li a {
-        display: block;
-        padding: 0.5em 0;
-    }
-
-    .js #nav-toggle {
-        display: block;
-        float: right;
-        width: 2em;
-        margin: 0.6667em 0 0.6667em 1.3333em;
-        font-size: 1.5rem;
-        line-height: 2em;
-        text-align: center;
-        cursor: pointer;
-    }
-    .js #nav-toggle > * { vertical-align: middle;  }
-
-    #footer p { padding: 1em 0; }
-    #footer .social { padding: 0.5em 0 0.5em 1em; }
-}
-
-/*** TYPOGRAPHY ***/
-
-html { font-size: 16px; }
-
-body {
-    font-family: 'Droid Sans', 'Helvetica', 'Arial', sans-serif;
-    font-size: 1rem;
-    line-height: 1.6;
-    font-variant-ligatures: common-ligatures;
-    text-rendering: optimizeLegibility;
-    font-kerning: normal;
-    color: #444;
-}
-
-p, td, th, li, dd {
-    text-align: justify;
-    overflow-wrap: break-word;
-    word-wrap: break-word;
-}
-
-p, hr, table, .table-responsive, ol, ul, dl, pre, blockquote, fieldset {
-    margin-bottom: 1em;
-}
-
-a {
-    color: #2EAE9B;
-    text-decoration: none;
-    -webkit-transition: color .2s ease-in;
-            transition: color .2s ease-in;
-}
-a:hover { color: #444; }
-
-h1, h2, h3, h4, h5, h6 {
-    margin-bottom: 0.6em;
-    font-weight: bold;
-    color: #333;
-}
-h1 { font-size: 2rem; }
-h2 { font-size: 1.7rem; }
-h3 { font-size: 1.4rem; }
-h4 { font-size: 1.1rem; }
-h5 { font-size: 1rem; }
-h6 { font-size: 1rem; font-weight: normal; font-style: italic; }
-
-img { max-width: 100%; }
-
-hr {
-    border: 0.15em solid #f5f5f5;
-    border-radius: 0.3em;
-    background: #f5f5f5;
-}
-
-abbr { text-decoration: underline dotted; }
-
-/*** TABLES ***/
-
-table { border-spacing: 0; }
-
-td, th {
-    padding: 0.4em 1em;
-    vertical-align: top;
-}
-th {
-    font-weight: bold;
-    text-align: center;
-    background: #f5f5f5;
-    color: #333;
-}
-
-td, th {                                         border: solid 1px #ccc; }
-tr:not(:last-child) td, tr:not(:last-child) th { border-bottom: 0 none; }
-thead tr:last-child th {                         border-bottom: 0 none; }
-td:not(:last-child), th:not(:last-child) {       border-right: 0 none; }
-
-tr:first-child td:first-child, tr:first-child th:first-child { border-top-left-radius: 0.3em; }
-tr:first-child td:last-child, tr:first-child th:last-child {   border-top-right-radius: 0.3em; }
-tbody tr:last-child td:first-child {                           border-bottom-left-radius: 0.3em; }
-tbody tr:last-child td:last-child {                            border-bottom-right-radius: 0.3em; }
-table thead + tbody tr:first-child td {                        border-radius: 0 !important; }
-
-.table-responsive { overflow-x: auto; }
-.table-responsive > table { margin-bottom: 0; }
-
-/*** LISTS ***/
-
-ol, ul {
-    list-style-position: outside;
-    padding-left: 1.5em;
-}
-ol { padding-left: 2.5em; }
-li { padding-left: 0.5em; }
-
-dt { font-weight: bold; }
-dd { margin-left: 2em; }
-
-/*** CODE ***/
-
-code {
-    margin: 0 0.1em;
-    padding: 0.1em 0.2em;
-    border: 1px solid #ccc;
-    border-radius: 0.3em;
-    background: #f5f5f5;
-    font-family: 'Droid Sans Mono', 'Courier New', 'Courier', monospace;
-    font-size: 0.9rem;
-}
-
-pre {
-    padding: 0 1em;
-    border: 1px solid #ccc;
-    border-radius: 0.3em;
-    background: #f5f5f5;
-    line-height: 1.4;
-}
-pre code {
-    display: block;
-    margin: 0;
-    padding: 1.1111em 0;
-    border: 0 none;
-    background: transparent;
-    overflow-x: auto;
-}
-
-/*** BLOCKQUOTE ***/
-
-blockquote {
-    font-style: italic;
-    margin-left: 1em;
-    padding-left: 1em;
-    border-left: 0.5em solid #f5f5f5;
-}
-
-/*** FORMS ***/
-
-label, fieldset legend { font-weight: bold; }
-
-input:not([type="checkbox"]):not([type="radio"]), button, select, textarea, fieldset, fieldset legend {
-    border: solid 1px #ccc;
-    border-radius: 0.3em;
-    background: #fff;
-    -webkit-transition: none .2s ease-in;
-            transition: none .2s ease-in;
-    -webkit-transition-property: border-color, background, box-shadow;
-            transition-property: border-color, background, box-shadow;
-}
-
-input:not([type="checkbox"]):not([type="radio"]), button, select, textarea {
-    padding: 0.5em 1em;
-    outline: 0 none;
-    font-size: 1rem;
-}
-input:focus:not([type="checkbox"]):not([type="radio"]), button:focus, select:focus, textarea:focus {
-    border-color: #2EAE9B;
-    box-shadow: 0 0 8px #2EAE9B;
-}
-input[type="button"]:focus, input[type="submit"]:focus, input[type="reset"]:focus, button:focus,
-input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover, button:hover {
-    background: #f5f5f5;
-    cursor: pointer;
-}
-
-textarea, select[multiple] {
-    vertical-align: bottom;
-    overflow: auto;
-}
-
-fieldset {
-    padding: 1em;
-    background: #f5f5f5;
-}
-fieldset legend { padding: 0 0.5em; }
-
-fieldset label, fieldset input, fieldset button,
-fieldset select, fieldset textarea {
-    margin: 0.2em 0.5em;
-}
-fieldset label:first-child, fieldset input:first-child, fieldset button:first-child,
-fieldset select:first-child, fieldset textarea:first-child {
-    margin-left: 0;
-}
-fieldset label:last-child, fieldset input:last-child, fieldset button:last-child,
-fieldset select:last-child, fieldset textarea:last-child {
-    margin-right: 0;
-}
-
-/* Firefox input size fix */
-input::-moz-focus-inner, button::-moz-focus-inner {
-    border: 0;
-    padding: 0;
-}

From f52e3dc89004ccf6415ead97cfa3cca830f85b03 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 1 May 2017 22:27:57 +0200
Subject: [PATCH 079/188] Add Pico::getVendorDir()

The vendor directory is the installation path of the `picocms/Pico` package. If `picocms/Pico` is the composer root package (as in pre-bundled releases), it should be identical to `Pico::getRootDir()`. However, if `picocms/Pico` was installed as composer dependency (e.g. by `picocms/pico-composer`), the vendor directory usually corresponds to something like `Pico::getRootDir() . "vendor/picocms/pico"`. The vendor directory is currently only used as a last resort to load Pico's sample contents.
---
 lib/Pico.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 0aed209..2deeb80 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -74,6 +74,14 @@ class Pico
      */
     protected $rootDir;
 
+    /**
+     * Vendor directory of this Pico instance
+     *
+     * @see Pico::getVendorDir()
+     * @var string
+     */
+    protected $vendorDir;
+
     /**
      * Config directory of this Pico instance
      *
@@ -262,6 +270,7 @@ class Pico
     public function __construct($rootDir, $configDir, $pluginsDir, $themesDir)
     {
         $this->rootDir = rtrim($rootDir, '/\\') . '/';
+        $this->vendorDir = dirname(__DIR__) . '/';
         $this->configDir = $this->getAbsolutePath($configDir);
         $this->pluginsDir = $this->getAbsolutePath($pluginsDir);
         $this->themesDir = $this->getAbsolutePath($themesDir);
@@ -277,6 +286,16 @@ class Pico
         return $this->rootDir;
     }
 
+    /**
+     * Returns the vendor directory of this Pico instance
+     *
+     * @return string vendor directory path
+     */
+    public function getVendorDir()
+    {
+        return $this->vendorDir;
+    }
+
     /**
      * Returns the config directory of this Pico instance
      *
@@ -744,8 +763,10 @@ class Pico
             // try to guess the content directory
             if (is_dir($this->getRootDir() . 'content')) {
                 $this->config['content_dir'] = $this->getRootDir() . 'content/';
-            } else {
+            } elseif (is_dir($this->getRootDir() . 'content-sample')) {
                 $this->config['content_dir'] = $this->getRootDir() . 'content-sample/';
+            } else {
+                $this->config['content_dir'] = $this->getVendorDir() . 'content-sample/';
             }
         } else {
             $this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']);

From a114821466e2059d6e7116ca0e6e094b1973d02a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 1 May 2017 23:34:57 +0200
Subject: [PATCH 080/188] Add 2.0-dev branch alias to composer.json

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 32403aa..83d891a 100644
--- a/composer.json
+++ b/composer.json
@@ -40,5 +40,10 @@
             "PicoPluginInterface": "lib/",
             "AbstractPicoPlugin": "lib/"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-pico-1.1": "2.0-dev"
+        }
     }
 }

From bba93752cbec83811f283faefe4437ae54ce1173 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 1 May 2017 23:46:10 +0200
Subject: [PATCH 081/188] Use dev dependencies for pico-deprecated and
 pico-theme

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 83d891a..6134c6e 100644
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,8 @@
         "twig/twig": "^1.18",
         "symfony/yaml" : "^2.3",
         "erusev/parsedown-extra": "^0.7",
-        "picocms/pico-theme": "~2.0.0",
-        "picocms/pico-deprecated": "~2.0.0"
+        "picocms/pico-theme": "~2.0.0@dev",
+        "picocms/pico-deprecated": "~2.0.0@dev"
     },
     "require-dev" : {
         "phpdocumentor/phpdocumentor": "^2.8",

From 1d73524e418e57af9b79ce0a7ba2f209edac1d71 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 2 May 2017 00:22:35 +0200
Subject: [PATCH 082/188] Search for content/index.md to determine the content
 dir to use

---
 lib/Pico.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 2deeb80..4f6f4f0 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -761,9 +761,9 @@ class Pico
 
         if (!$this->config['content_dir']) {
             // try to guess the content directory
-            if (is_dir($this->getRootDir() . 'content')) {
+            if (is_file($this->getRootDir() . 'content/index' . $this->config['content_ext'])) {
                 $this->config['content_dir'] = $this->getRootDir() . 'content/';
-            } elseif (is_dir($this->getRootDir() . 'content-sample')) {
+            } elseif (is_file($this->getRootDir() . 'content-sample/index' . $this->config['content_ext'])) {
                 $this->config['content_dir'] = $this->getRootDir() . 'content-sample/';
             } else {
                 $this->config['content_dir'] = $this->getVendorDir() . 'content-sample/';

From 3f988961659a5650b3e8918b36bb288cd9aa7878 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 2 May 2017 00:26:23 +0200
Subject: [PATCH 083/188] Create empty content/ dir

---
 .gitignore         | 3 ---
 content/.gitignore | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 content/.gitignore

diff --git a/.gitignore b/.gitignore
index 67952a9..1baac08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,3 @@ desktop.ini
 /_build/phpdoc
 /_build/phpdoc.cache
 /_build/deploy-*.git
-
-# User content
-/content
diff --git a/content/.gitignore b/content/.gitignore
new file mode 100644
index 0000000..24560b5
--- /dev/null
+++ b/content/.gitignore
@@ -0,0 +1,2 @@
+# This directory is meant to be empty
+*

From 4d1f92a1f2415a9c48d2f71401b465181c69907f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 2 May 2017 00:35:48 +0200
Subject: [PATCH 084/188] Update CONTRIBUTING.md

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c2ef1b9..a73eaef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -94,4 +94,6 @@ Version 1.0.0
 * [Removed] ...
 ```
 
+Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico::VERSION_ID` constants. If you've simultaneously developed a new version of Pico's official [default theme](https://github.com/picocms/pico-theme) and/or the [`PicoDeprecated` plugin](https://github.com/picocms/pico-deprecated), make sure to remove a previously added `@dev` suffix from the corresponding dependencies in Pico's [`composer.json`](https://github.com/picocms/Pico/blob/master/composer.json).
+
 Travis CI will draft the new [release on GitHub](https://github.com/picocms/Pico/releases) automatically, but will require you to manually amend the descriptions formatting. The latest Pico version is always available at https://github.com/picocms/Pico/releases/latest, so please make sure to publish this URL rather than version-specific URLs. [Packagist](http://packagist.org/packages/picocms/pico) will be updated automatically.

From aaf52dd36cacb6be89f49de708d3a0db6adf900a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 6 May 2017 19:28:06 +0200
Subject: [PATCH 085/188] Create empty assets/ dir

Thanks @smcdougall, see https://github.com/picocms/Pico/commit/3f988961659a5650b3e8918b36bb288cd9aa7878#commitcomment-22043296
---
 assets/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 assets/.gitignore

diff --git a/assets/.gitignore b/assets/.gitignore
new file mode 100644
index 0000000..24560b5
--- /dev/null
+++ b/assets/.gitignore
@@ -0,0 +1,2 @@
+# This directory is meant to be empty
+*

From 8a11a65c9f809719a9d8c642b358316109a40ba9 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 6 May 2017 19:34:58 +0200
Subject: [PATCH 086/188] Create distinct _build/.gitignore

---
 .gitignore        | 5 -----
 _build/.gitignore | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 _build/.gitignore

diff --git a/.gitignore b/.gitignore
index 1baac08..768fc06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,3 @@ desktop.ini
 /composer.lock
 /composer.phar
 /vendor
-
-# Build system
-/_build/phpdoc
-/_build/phpdoc.cache
-/_build/deploy-*.git
diff --git a/_build/.gitignore b/_build/.gitignore
new file mode 100644
index 0000000..41c43ff
--- /dev/null
+++ b/_build/.gitignore
@@ -0,0 +1,4 @@
+# Ignore temporary directories created while building/deploying Pico
+/phpdoc
+/phpdoc.cache
+/deploy-*.git

From 6574d482cc6190dfe6a0c629ba73e1215d6a2c90 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 6 May 2017 20:34:26 +0200
Subject: [PATCH 087/188] Update .gitattributes

---
 .gitattributes | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 00903db..e641f50 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,12 @@
-/_build         export-ignore
-/.gitattributes export-ignore
-/.gitignore     export-ignore
-/.phpcs.xml     export-ignore
-/.phpdoc.xml    export-ignore
-/.travis.yml    export-ignore
-/index.php.dist export-ignore
+/_build             export-ignore
+/assets/.gitignore  export-ignore
+/config/.gitignore  export-ignore
+/content/.gitignore export-ignore
+/plugins/.gitignore export-ignore
+/themes/.gitignore  export-ignore
+/.gitattributes     export-ignore
+/.gitignore         export-ignore
+/.phpcs.xml         export-ignore
+/.phpdoc.xml        export-ignore
+/.travis.yml        export-ignore
+/index.php.dist     export-ignore

From e8e60f49e579e0b5498c6d77de2b7bb17119cc31 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 7 May 2017 14:15:24 +0200
Subject: [PATCH 088/188] Update DummyPlugin

---
 plugins/DummyPlugin.php | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 582d859..1fa56f8 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -11,10 +11,13 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 2.0
  */
-final class DummyPlugin extends AbstractPicoPlugin
+class DummyPlugin extends AbstractPicoPlugin
 {
     /**
-     * This plugin is enabled by default?
+     * This plugin is disabled by default
+     *
+     * If you want to enable your plugin by default, simply remove this class
+     * property.
      *
      * @see AbstractPicoPlugin::$enabled
      * @var boolean
@@ -24,6 +27,9 @@ final class DummyPlugin extends AbstractPicoPlugin
     /**
      * This plugin depends on ...
      *
+     * If your plugin doesn't depend on any other plugin, remove this class
+     * property.
+     *
      * @see AbstractPicoPlugin::$dependsOn
      * @var string[]
      */
@@ -215,6 +221,7 @@ final class DummyPlugin extends AbstractPicoPlugin
      * Triggered before Pico reads all known pages
      *
      * @see    Pico::readPages()
+     * @see    DummyPlugin::onSinglePageLoading()
      * @see    DummyPlugin::onSinglePageLoaded()
      * @see    DummyPlugin::onPagesLoaded()
      * @return void
@@ -225,7 +232,21 @@ final class DummyPlugin extends AbstractPicoPlugin
     }
 
     /**
-     * Triggered when Pico reads a single page from the list of all known pages
+     * Triggered before Pico loads a single page
+     *
+     * @see    Pico::readPages()
+     * @see    DummyPlugin::onSinglePageLoaded()
+     * @see    DummyPlugin::onPagesLoaded()
+     * @param  string &$id relative path to the content file
+     * @return void
+     */
+    public function onSinglePageLoading(&$id)
+    {
+        // your code
+    }
+
+    /**
+     * Triggered when Pico loads a single page
      *
      * The `$pageData` parameter consists of the following values:
      *
@@ -242,6 +263,8 @@ final class DummyPlugin extends AbstractPicoPlugin
      * | raw_content    | string | raw, not yet parsed contents of the page |
      * | meta           | string | parsed meta data of the page             |
      *
+     * Set `$pageData` to `null` to remove this page from the pages array.
+     *
      * @see    DummyPlugin::onPagesLoaded()
      * @param  array &$pageData data of the loaded page
      * @return void

From 36b3aef1c722cf08bc359799154cbe5112f3b9ba Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 7 May 2017 14:20:44 +0200
Subject: [PATCH 089/188] Fix Pico::loadPlugin() when called before
 Pico::loadPlugins()

---
 lib/Pico.php | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 4f6f4f0..c35fd93 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -117,9 +117,9 @@ class Pico
      * List of loaded plugins
      *
      * @see Pico::getPlugins()
-     * @var object[]|null
+     * @var object[]
      */
-    protected $plugins;
+    protected $plugins = array();
 
     /**
      * Current configuration of this Pico instance
@@ -469,8 +469,6 @@ class Pico
      */
     protected function loadPlugins()
     {
-        $this->plugins = array();
-
         // discover plugin files
         $pluginFiles = array();
         $files = scandir($this->getPluginsDir());
@@ -520,6 +518,10 @@ class Pico
                 $plugin = new $className($this);
                 $className = get_class($plugin);
 
+                if (isset($this->plugins[$className])) {
+                    continue;
+                }
+
                 $this->plugins[$className] = $plugin;
             } else {
                 throw new RuntimeException(
@@ -563,9 +565,6 @@ class Pico
             );
         }
 
-        if ($this->plugins === null) {
-            $this->plugins = array();
-        }
         $this->plugins[$className] = $plugin;
 
         return $plugin;
@@ -1296,7 +1295,7 @@ class Pico
         $contentExtLength = strlen($contentExt);
 
         $this->pages = array();
-        $files = $this->getFiles($contentDir, $contentExt, Pico::SORT_NONE);
+        $files = $this->getFiles($contentDir, $contentExt, self::SORT_NONE);
         foreach ($files as $i => $file) {
             // skip 404 page
             if (basename($file) === '404' . $contentExt) {
@@ -2012,13 +2011,11 @@ class Pico
      */
     public function triggerEvent($eventName, array $params = array())
     {
-        if ($this->plugins) {
-            foreach ($this->plugins as $plugin) {
-                // only trigger events for plugins that implement PicoPluginInterface
-                // deprecated events (plugins for Pico 0.9 and older) will be triggered by `PicoDeprecated`
-                if ($plugin instanceof PicoPluginInterface) {
-                    $plugin->handleEvent($eventName, $params);
-                }
+        foreach ($this->plugins as $plugin) {
+            // only trigger events for plugins that implement PicoPluginInterface
+            // deprecated events (plugins for Pico 0.9 and older) will be triggered by `PicoDeprecated`
+            if ($plugin instanceof PicoPluginInterface) {
+                $plugin->handleEvent($eventName, $params);
             }
         }
     }

From 7b222b03e4cbb61a53ea33caf8edfbf05706537f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 10 May 2017 17:00:48 +0200
Subject: [PATCH 090/188] Add Pico::API_VERSION

---
 lib/AbstractPicoPlugin.php | 41 +++++++++++++++++++++++++++++++++
 lib/Pico.php               | 47 +++++++++++++++++++++++++++++---------
 plugins/DummyPlugin.php    |  7 ++++++
 3 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 4acbde5..d767579 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -37,6 +37,14 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      */
     protected $statusChanged = false;
 
+    /**
+     * Boolean indicating whether this plugin matches Pico's API version
+     *
+     * @see AbstractPicoPlugin::checkCompatibility()
+     * @var boolean|null
+     */
+    protected $nativePlugin;
+
     /**
      * List of plugins which this plugin depends on
      *
@@ -81,6 +89,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
                     // make sure dependencies are already fulfilled,
                     // otherwise the plugin needs to be enabled manually
                     try {
+                        $this->checkCompatibility();
                         $this->checkDependencies(false);
                     } catch (RuntimeException $e) {
                         $this->enabled = false;
@@ -105,6 +114,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
         $this->enabled = (bool) $enabled;
 
         if ($enabled) {
+            $this->checkCompatibility();
             $this->checkDependencies($recursive);
         } else {
             $this->checkDependants($recursive);
@@ -283,4 +293,35 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
 
         return $this->dependants;
     }
+
+    /**
+     * Checks compatibility with Pico's API version
+     *
+     * Pico automatically adds a dependency to {@see PicoDeprecated} when the
+     * plugin's API is older than Pico's API. {@see PicoDeprecated} furthermore
+     * throws a exception when it can't provide compatibility in such cases.
+     * However, we still have to decide whether this plugin is compatible to
+     * newer API versions, what defaults to "no" by default.
+     *
+     * @return void
+     * @throws RuntimeException thrown when the plugin's and Pico's API
+     *     aren't compatible
+     */
+    protected function checkCompatibility()
+    {
+        if ($this->nativePlugin === null) {
+            $picoClassName = get_class($this->pico);
+            $picoApiVersion = defined($picoClassName . '::API_VERSION') ? $picoClassName::API_VERSION : 1;
+            $pluginApiVersion = defined('static::API_VERSION') ? static::API_VERSION : 1;
+
+            $this->nativePlugin = ($pluginApiVersion === $picoApiVersion);
+
+            if (!$this->nativePlugin && ($pluginApiVersion > $picoApiVersion)) {
+                throw new RuntimeException(
+                    "Unable to enable plugin '" . get_called_class() . "': The plugin's API (version "
+                    . $pluginApiVersion . ") isn't compatible with Pico's API (version " . $picoApiVersion . ")"
+                );
+            }
+        }
+    }
 }
diff --git a/lib/Pico.php b/lib/Pico.php
index c35fd93..09dbfe7 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -42,6 +42,13 @@ class Pico
      */
     const VERSION_ID = 20000;
 
+    /**
+     * Pico API version
+     *
+     * @var int
+     */
+    const API_VERSION = 2;
+
     /**
      * Sort files in alphabetical ascending order
      *
@@ -121,6 +128,13 @@ class Pico
      */
     protected $plugins = array();
 
+    /**
+     * List of loaded plugins using the current API version
+     *
+     * @var object[]
+     */
+    protected $nativePlugins = array();
+
     /**
      * Current configuration of this Pico instance
      *
@@ -523,6 +537,12 @@ class Pico
                 }
 
                 $this->plugins[$className] = $plugin;
+
+                if ($plugin instanceof PicoPluginInterface) {
+                    if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
+                        $this->nativePlugins[$className] = $plugin;
+                    }
+                }
             } else {
                 throw new RuntimeException(
                     "Unable to load plugin '" . $className . "' "
@@ -567,6 +587,10 @@ class Pico
 
         $this->plugins[$className] = $plugin;
 
+        if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
+            $this->nativePlugins[$className] = $plugin;
+        }
+
         return $plugin;
     }
 
@@ -613,8 +637,9 @@ class Pico
                 $dependencies = array();
                 if ($plugin instanceof PicoPluginInterface) {
                     $dependencies = $plugin->getDependencies();
-                } else {
-                    $dependencies = array('PicoDeprecated');
+                }
+                if (!isset($this->nativePlugins[$pluginName])) {
+                    $dependencies[] = 'PicoDeprecated';
                 }
 
                 foreach ($dependencies as $dependency) {
@@ -1996,10 +2021,14 @@ class Pico
     }
 
     /**
-     * Triggers events on plugins which implement PicoPluginInterface
+     * Triggers events on plugins using the current API version
+     *
+     * Plugins using older API versions are handled by {@see PicoDeprecated}.
+     * Please note that {@see PicoDeprecated} also triggers custom events on
+     * plugins using older API versions, thus you can safely use this method
+     * to trigger custom events on all loaded plugins, no matter what API
+     * version - the event will be triggered in any case
      *
-     * Deprecated events (as used by plugins not implementing
-     * {@link PicoPluginInterface}) are triggered by {@link PicoDeprecated}.
      * You MUST NOT trigger events of Pico's core with a plugin!
      *
      * @see    PicoPluginInterface
@@ -2011,12 +2040,8 @@ class Pico
      */
     public function triggerEvent($eventName, array $params = array())
     {
-        foreach ($this->plugins as $plugin) {
-            // only trigger events for plugins that implement PicoPluginInterface
-            // deprecated events (plugins for Pico 0.9 and older) will be triggered by `PicoDeprecated`
-            if ($plugin instanceof PicoPluginInterface) {
-                $plugin->handleEvent($eventName, $params);
-            }
+        foreach ($this->nativePlugins as $plugin) {
+            $plugin->handleEvent($eventName, $params);
         }
     }
 }
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 1fa56f8..4cd0210 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -13,6 +13,13 @@
  */
 class DummyPlugin extends AbstractPicoPlugin
 {
+    /**
+     * API version used by this plugin
+     *
+     * @var int
+     */
+    const API_VERSION = 2;
+
     /**
      * This plugin is disabled by default
      *

From 6e28a51080259eb3dc9ac88e51ebfa2a10cb32e1 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 13 May 2017 18:08:54 +0200
Subject: [PATCH 091/188] =?UTF-8?q?Refactor=20onPages=E2=80=A6=20and=20onP?=
 =?UTF-8?q?age=E2=80=A6=20core=20events?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add new onPagesDiscovered event passing the unsorted pages array, move the $currentPage, $previousPage and $nextPage arguments from the onPagesLoaded event to the new onCurrentPageDiscovered event, remove the $twig argument from the onPageRendering event and rather trigger the new onTwigRegistered event for this. Also add the new onYamlParserRegistered and onParsedownRegistered events passing the YAML parser resp. the Parsedown instance. Allow plugin's to skip a page by setting the $id argument of the onSinglePageLoading event to NULL.
---
 lib/Pico.php            | 48 ++++++++++++--------
 plugins/DummyPlugin.php | 99 +++++++++++++++++++++++++++++++++--------
 2 files changed, 110 insertions(+), 37 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 09dbfe7..7cb18bd 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -400,9 +400,6 @@ class Pico
 
         $this->triggerEvent('onContentLoaded', array(&$this->rawContent));
 
-        // register YAML parser
-        $this->triggerEvent('onYamlParserRegistration');
-
         // parse file meta
         $this->metaHeaders = $this->getMetaHeaders();
         $this->triggerEvent('onMetaHeaders', array(&$this->metaHeaders));
@@ -411,9 +408,6 @@ class Pico
         $this->meta = $this->parseFileMeta($this->rawContent, $this->metaHeaders);
         $this->triggerEvent('onMetaParsed', array(&$this->meta));
 
-        // register parsedown
-        $this->triggerEvent('onParsedownRegistration');
-
         // parse file content
         $this->triggerEvent('onContentParsing', array(&$this->rawContent));
 
@@ -427,25 +421,24 @@ class Pico
         $this->triggerEvent('onPagesLoading');
 
         $this->readPages();
+        $this->triggerEvent('onPagesDiscovered', array(&$this->pages));
+
         $this->sortPages();
+        $this->triggerEvent('onPagesLoaded', array(&$this->pages));
+
         $this->discoverPageSiblings();
         $this->discoverCurrentPage();
-
-        $this->triggerEvent('onPagesLoaded', array(
-            &$this->pages,
-            &$this->currentPage,
-            &$this->previousPage,
-            &$this->nextPage
-        ));
-
-        // register twig
-        $this->triggerEvent('onTwigRegistration');
-        $this->registerTwig();
+        $this->triggerEvent(
+            'onCurrentPageDiscovered',
+            array(&$this->currentPage, &$this->previousPage, &$this->nextPage)
+        );
 
         // render template
+        $this->registerTwig();
+
         $this->twigVariables = $this->getTwigVariables();
         $this->twigTemplate = $this->getTwigTemplate();
-        $this->triggerEvent('onPageRendering', array(&$this->twig, &$this->twigVariables, &$this->twigTemplate));
+        $this->triggerEvent('onPageRendering', array(&$this->twigTemplate, &$this->twigVariables));
 
         $output = $this->twig->render($this->twigTemplate, $this->twigVariables);
         $this->triggerEvent('onPageRendered', array(&$output));
@@ -1097,12 +1090,16 @@ class Pico
     /**
      * Returns the Symfony YAML parser
      *
+     * This method triggers the `onYamlParserRegistered` event when the Symfony
+     * YAML parser wasn't initiated yet.
+     *
      * @return \Symfony\Component\Yaml\Parser Symfony YAML parser
      */
     public function getYamlParser()
     {
         if ($this->yamlParser === null) {
             $this->yamlParser = new \Symfony\Component\Yaml\Parser();
+            $this->triggerEvent('onYamlParserRegistered', array(&$this->yamlParser));
         }
 
         return $this->yamlParser;
@@ -1194,6 +1191,9 @@ class Pico
     /**
      * Returns the Parsedown Extra markdown parser
      *
+     * This method triggers the `onParsedownRegistered` event when the
+     * Parsedown Extra parser wasn't initiated yet.
+     *
      * @return ParsedownExtra Parsedown Extra markdown parser
      */
     public function getParsedown()
@@ -1205,6 +1205,8 @@ class Pico
             $this->parsedown->setBreaksEnabled((bool) $this->config['content_config']['breaks']);
             $this->parsedown->setMarkupEscaped((bool) $this->config['content_config']['escape']);
             $this->parsedown->setUrlsLinked((bool) $this->config['content_config']['auto_urls']);
+
+            $this->triggerEvent('onParsedownRegistered', array(&$this->parsedown));
         }
 
         return $this->parsedown;
@@ -1333,6 +1335,10 @@ class Pico
             // trigger onSinglePageLoading event
             $this->triggerEvent('onSinglePageLoading', array(&$id));
 
+            if ($id === null) {
+                continue;
+            }
+
             // drop inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists)
             $conflictFile = $contentDir . $id . '/index' . $contentExt;
             if (in_array($conflictFile, $files, true)) {
@@ -1557,6 +1563,9 @@ class Pico
      * This method also registers Pico's core Twig filters `link` and `content`
      * as well as Pico's {@link PicoTwigExtension} Twig extension.
      *
+     * This method triggers the `onTwigRegistered` event when the Twig template
+     * engine wasn't initiated yet.
+     *
      * @see    Pico::getTwig()
      * @see    http://twig.sensiolabs.org/ Twig website
      * @see    https://github.com/twigphp/Twig Twig on GitHub
@@ -1590,6 +1599,9 @@ class Pico
             }
             return null;
         }));
+
+        // trigger onTwigRegistration event
+        $this->triggerEvent('onTwigRegistered', array(&$this->twig));
     }
 
     /**
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 4cd0210..47d2571 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -230,6 +230,7 @@ class DummyPlugin extends AbstractPicoPlugin
      * @see    Pico::readPages()
      * @see    DummyPlugin::onSinglePageLoading()
      * @see    DummyPlugin::onSinglePageLoaded()
+     * @see    DummyPlugin::onPagesDiscovered()
      * @see    DummyPlugin::onPagesLoaded()
      * @return void
      */
@@ -241,8 +242,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico loads a single page
      *
-     * @see    Pico::readPages()
+     * Set `$id` to `null` to remove this page from the pages array.
+     *
      * @see    DummyPlugin::onSinglePageLoaded()
+     * @see    DummyPlugin::onPagesDiscovered()
      * @see    DummyPlugin::onPagesLoaded()
      * @param  string &$id relative path to the content file
      * @return void
@@ -272,6 +275,7 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * Set `$pageData` to `null` to remove this page from the pages array.
      *
+     * @see    DummyPlugin::onPagesDiscovered()
      * @see    DummyPlugin::onPagesLoaded()
      * @param  array &$pageData data of the loaded page
      * @return void
@@ -282,23 +286,54 @@ class DummyPlugin extends AbstractPicoPlugin
     }
 
     /**
-     * Triggered after Pico has read all known pages
+     * Triggered after Pico has discovered all known pages
+     *
+     * See {@link DummyPlugin::onSinglePageLoaded()} for details about the
+     * structure of the page data. Please note that the pages array isn't
+     * sorted yet.
+     *
+     * @see    Pico::sortPages()
+     * @see    DummyPlugin::onPagesLoaded()
+     * @param  array[]    &$pages        data of all known pages
+     * @return void
+     */
+    public function onPagesDiscovered(array &$pages)
+    {
+        // your code
+    }
+
+    /**
+     * Triggered after Pico has sorted the pages array
      *
      * See {@link DummyPlugin::onSinglePageLoaded()} for details about the
      * structure of the page data.
      *
      * @see    Pico::getPages()
+     * @param  array[]    &$pages        data of all known pages
+     * @return void
+     */
+    public function onPagesLoaded(array &$pages)
+    {
+        // your code
+    }
+
+    /**
+     * Triggered when Pico discovered the current, previous and next pages
+     *
+     * See {@link DummyPlugin::onSinglePageLoaded()} for details about the
+     * structure of the page data.
+     *
+     * @see    Pico::discoverPageSiblings()
+     * @see    Pico::discoverCurrentPage()
      * @see    Pico::getCurrentPage()
      * @see    Pico::getPreviousPage()
      * @see    Pico::getNextPage()
-     * @param  array[]    &$pages        data of all known pages
      * @param  array|null &$currentPage  data of the page being served
      * @param  array|null &$previousPage data of the previous page
      * @param  array|null &$nextPage     data of the next page
      * @return void
      */
-    public function onPagesLoaded(
-        array &$pages,
+    public function onCurrentPageDiscovered(
         array &$currentPage = null,
         array &$previousPage = null,
         array &$nextPage = null
@@ -306,27 +341,17 @@ class DummyPlugin extends AbstractPicoPlugin
         // your code
     }
 
-    /**
-     * Triggered before Pico registers the twig template engine
-     *
-     * @return void
-     */
-    public function onTwigRegistration()
-    {
-        // your code
-    }
-
     /**
      * Triggered before Pico renders the page
      *
-     * @see    Pico::getTwig()
+     * @see    Pico::getTwigTemplate()
+     * @see    Pico::getTwigVariables()
      * @see    DummyPlugin::onPageRendered()
-     * @param  Twig_Environment $twig           twig template engine
-     * @param  array            &$twigVariables template variables
      * @param  string           &$templateName  file name of the template
+     * @param  array            &$twigVariables template variables
      * @return void
      */
-    public function onPageRendering(Twig_Environment $twig, array &$twigVariables, &$templateName)
+    public function onPageRendering(&$templateName, array &$twigVariables)
     {
         // your code
     }
@@ -341,4 +366,40 @@ class DummyPlugin extends AbstractPicoPlugin
     {
         // your code
     }
+
+    /**
+     * Triggered when Pico registers the YAML parser
+     *
+     * @see    Pico::getYamlParser()
+     * @param  \Symfony\Component\Yaml\Parser &$yamlParser YAML parser instance
+     * @return void
+     */
+    public function onYamlParserRegistered(\Symfony\Component\Yaml\Parser &$yamlParser)
+    {
+        // your code
+    }
+
+    /**
+     * Triggered when Pico registers the Parsedown parser
+     *
+     * @see    Pico::getParsedown()
+     * @param  Parsedown &$parsedown Parsedown instance
+     * @return void
+     */
+    public function onParsedownRegistered(Parsedown &$parsedown)
+    {
+        // your code
+    }
+
+    /**
+     * Triggered when Pico registers the twig template engine
+     *
+     * @see    Pico::getTwig()
+     * @param  Twig_Environment &$twig Twig instance
+     * @return void
+     */
+    public function onTwigRegistered(Twig_Environment &$twig)
+    {
+        // your code
+    }
 }

From 191f6edbe97208a24e23424d62812e38505357f8 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 13 May 2017 18:17:19 +0200
Subject: [PATCH 092/188] Don't pass the $plugins argument of the
 onPluginsLoaded event by reference

This is a BC breaking change!

Manipulating Pico's $plugins array is a really bad idea. We've introduced the Pico::loadPlugin() method to safely load plugins at any time, however, Pico might do unexpected things when loading plugins too late. See the class docs of Pico::loadPlugin() for more details. Nevertheless, this change breaks BC to Pico 1.0. However, I don't know a single plugin that relies on manipulating the $plugins array. If you just want to load a plugin manually, use Pico::loadPlugin() instead.
---
 lib/Pico.php            | 24 ++++++++++++++++++++++--
 plugins/DummyPlugin.php | 17 +++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 7cb18bd..7d54f9a 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -363,7 +363,7 @@ class Pico
         // load plugins
         $this->loadPlugins();
         $this->sortPlugins();
-        $this->triggerEvent('onPluginsLoaded', array(&$this->plugins));
+        $this->triggerEvent('onPluginsLoaded', array($this->plugins));
 
         // load config
         $this->loadConfig();
@@ -548,7 +548,23 @@ class Pico
     /**
      * Manually loads a plugin
      *
-     * Manually loaded plugins must implement {@see PicoPluginInterface}.
+     * Manually loaded plugins MUST implement {@see PicoPluginInterface}. They
+     * are simply appended to the plugins array without any additional checks,
+     * so you might get unexpected results, depending on *when* you're loading
+     * a plugin. You SHOULD NOT load plugins after a event has been triggered
+     * by Pico. In-depth knowledge of Pico's inner workings is strongly advised
+     * otherwise, and you MUST NOT rely on {@see PicoDeprecated} to maintain
+     * backward compatibility in such cases.
+     *
+     * If you e.g. load a plugin after the `onPluginsLoaded` event, Pico
+     * doesn't guarantee the plugin's order ({@see Pico::sortPlugins()}).
+     * Already triggered events won't get triggered on the manually loaded
+     * plugin. Thus you SHOULD load plugins either before {@see Pico::run()}
+     * is called, or via the constructor of another plugin (i.e. the plugin's
+     * `__construct()` method; plugins are instanced in
+     * {@see Pico::loadPlugins()}).
+     *
+     * This method triggers the `onPluginManuallyLoaded` event.
      *
      * @see    Pico::loadPlugins()
      * @see    Pico::getPlugin()
@@ -584,6 +600,10 @@ class Pico
             $this->nativePlugins[$className] = $plugin;
         }
 
+        // trigger onPluginManuallyLoaded event
+        // the event is also called on the newly loaded plugin, allowing you to distinguish manual and auto loading
+        $this->triggerEvent('onPluginManuallyLoaded', array($this->plugins[$className]));
+
         return $plugin;
     }
 
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 47d2571..d2e76e8 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -50,10 +50,23 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @see    Pico::getPlugin()
      * @see    Pico::getPlugins()
-     * @param  object[] &$plugins loaded plugin instances
+     * @param  object[] $plugins loaded plugin instances
      * @return void
      */
-    public function onPluginsLoaded(array &$plugins)
+    public function onPluginsLoaded(array $plugins)
+    {
+        // your code
+    }
+
+    /**
+     * Triggered when Pico manually loads a plugin
+     *
+     * @see    Pico::getPlugin()
+     * @see    Pico::getPlugins()
+     * @param  object $plugin loaded plugin instance
+     * @return void
+     */
+    public function onPluginManuallyLoaded($plugin)
     {
         // your code
     }

From 624310bbe704ac0ca4bbb53479f01640fe5666a0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 13 May 2017 18:17:58 +0200
Subject: [PATCH 093/188] Various small improvements

---
 lib/AbstractPicoPlugin.php  |  6 ++--
 lib/Pico.php                | 61 ++++++++++++++++++++-----------------
 lib/PicoPluginInterface.php |  8 ++---
 plugins/DummyPlugin.php     | 61 +++++++++++++++++++++----------------
 4 files changed, 74 insertions(+), 62 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index d767579..7c8b5f8 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -154,7 +154,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      *     config variable, null if the config variable doesn't exist or the
      *     plugin's config array if no config name was supplied
      */
-    protected function getPluginConfig($configName = null)
+    public function getPluginConfig($configName = null)
     {
         $pluginConfig = $this->getConfig(get_called_class());
         if ($pluginConfig) {
@@ -263,8 +263,8 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
                     }
                 }
             } else {
-                $dependantsList = 'plugin' . ((count($dependants) > 1) ? 's' : '') . ' ';
-                $dependantsList .= "'" . implode("', '", array_keys($dependants)) . "'";
+                $dependantsList = 'plugin' . ((count($dependants) > 1) ? 's' : '') . ' '
+                    . "'" . implode("', '", array_keys($dependants)) . "'";
                 throw new RuntimeException(
                     "Unable to disable plugin '" . get_called_class() . "': "
                     . "Required by " . $dependantsList
diff --git a/lib/Pico.php b/lib/Pico.php
index 7d54f9a..69be0bd 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -274,7 +274,7 @@ class Pico
     /**
      * Constructs a new Pico instance
      *
-     * To carry out all the processing in Pico, call {@link Pico::run()}.
+     * To carry out all the processing in Pico, call {@see Pico::run()}.
      *
      * @param string $rootDir    root directory of this Pico instance
      * @param string $configDir  config directory of this Pico instance
@@ -677,8 +677,8 @@ class Pico
     /**
      * Returns the instance of a named plugin
      *
-     * Plugins SHOULD implement {@link PicoPluginInterface}, but you MUST NOT
-     * rely on it. For more information see {@link PicoPluginInterface}.
+     * Plugins SHOULD implement {@see PicoPluginInterface}, but you MUST NOT
+     * rely on it. For more information see {@see PicoPluginInterface}.
      *
      * @see    Pico::loadPlugins()
      * @see    Pico::getPlugins()
@@ -824,8 +824,8 @@ class Pico
      * {@path "config/config.yml"} or changing some of its variables before
      * Pico starts processing.
      *
-     * You can call this method between {@link Pico::__construct()} and
-     * {@link Pico::run()} only. Options set with this method cannot be
+     * You can call this method between {@see Pico::__construct()} and
+     * {@see Pico::run()} only. Options set with this method cannot be
      * overwritten by {@path "config/config.yml"}.
      *
      * @see    Pico::loadConfig()
@@ -1314,20 +1314,25 @@ class Pico
      *
      * The page data will be an array containing the following values:
      *
-     * | Array key      | Type   | Description                              |
-     * | -------------- | ------ | ---------------------------------------- |
-     * | id             | string | relative path to the content file        |
-     * | url            | string | URL to the page                          |
-     * | title          | string | title of the page (YAML header)          |
-     * | description    | string | description of the page (YAML header)    |
-     * | author         | string | author of the page (YAML header)         |
-     * | time           | string | timestamp derived from the Date header   |
-     * | date           | string | date of the page (YAML header)           |
-     * | date_formatted | string | formatted date of the page               |
-     * | raw_content    | string | raw, not yet parsed contents of the page |
-     * | meta           | string | parsed meta data of the page             |
-     * | previous_page  | &array | reference to the previous page           |
-     * | next_page      | &array | reference to the next page               |
+     * | Array key      | Type    | Description                                |
+     * | -------------- | ------- | ------------------------------------------ |
+     * | id             | string  | relative path to the content file          |
+     * | url            | string  | URL to the page                            |
+     * | title          | string  | title of the page (YAML header)            |
+     * | description    | string  | description of the page (YAML header)      |
+     * | author         | string  | author of the page (YAML header)           |
+     * | time           | string  | timestamp derived from the Date header     |
+     * | date           | string  | date of the page (YAML header)             |
+     * | date_formatted | string  | formatted date of the page                 |
+     * | hidden         | boolean | this page shouldn't be visible to the user |
+     * | raw_content    | string  | raw, not yet parsed contents of the page   |
+     * | meta           | string  | parsed meta data of the page               |
+     * | previous_page  | &array  | reference to the previous page             |
+     * | next_page      | &array  | reference to the next page                 |
+     *
+     * Please note that the `previous_page` and `next_page` keys won't be
+     * available until the `onPagesLoaded` event ({@see Pico::sortPages()})
+     * was triggered.
      *
      * @see    Pico::sortPages()
      * @see    Pico::discoverPageSiblings()
@@ -1578,10 +1583,10 @@ class Pico
     }
 
     /**
-     * Registers the twig template engine
+     * Registers the Twig template engine
      *
      * This method also registers Pico's core Twig filters `link` and `content`
-     * as well as Pico's {@link PicoTwigExtension} Twig extension.
+     * as well as Pico's {@see PicoTwigExtension} Twig extension.
      *
      * This method triggers the `onTwigRegistered` event when the Twig template
      * engine wasn't initiated yet.
@@ -1800,10 +1805,10 @@ class Pico
      * We assume that the themes folder is a arbitrary deep sub folder of the
      * script's base path (i.e. the directory {@path "index.php"} is in resp.
      * the `httpdocs` directory). Usually the script's base path is identical
-     * to {@link Pico::$rootDir}, but this may aberrate when Pico got installed
+     * to {@see Pico::$rootDir}, but this may aberrate when Pico got installed
      * as a composer dependency. However, ultimately it allows us to use
-     * {@link Pico::getBaseUrl()} as origin of the theme URL. Otherwise Pico
-     * falls back to the basename of {@link Pico::$themesDir} (i.e. assuming
+     * {@see Pico::getBaseUrl()} as origin of the theme URL. Otherwise Pico
+     * falls back to the basename of {@see Pico::$themesDir} (i.e. assuming
      * that `Pico::$themesDir` is `foo/bar/baz`, the base URL of the themes
      * folder will be `baz/`; this ensures BC to Pico < 2.0). Pico's base URL
      * always gets prepended appropriately.
@@ -1831,8 +1836,8 @@ class Pico
     /**
      * Filters a URL GET parameter with a specified filter
      *
-     * This method is just an alias for {@link Pico::filterVariable()}, see
-     * {@link Pico::filterVariable()} for a detailed description. It can be
+     * This method is just an alias for {@see Pico::filterVariable()}, see
+     * {@see Pico::filterVariable()} for a detailed description. It can be
      * used in Twig templates by calling the `url_param` function.
      *
      * @see    Pico::filterVariable()
@@ -1856,8 +1861,8 @@ class Pico
     /**
      * Filters a HTTP POST parameter with a specified filter
      *
-     * This method is just an alias for {@link Pico::filterVariable()}, see
-     * {@link Pico::filterVariable()} for a detailed description. It can be
+     * This method is just an alias for {@see Pico::filterVariable()}, see
+     * {@see Pico::filterVariable()} for a detailed description. It can be
      * used in Twig templates by calling the `form_param` function.
      *
      * @see    Pico::filterVariable()
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index 337a8ba..1bba28e 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -3,12 +3,12 @@
 /**
  * Common interface for Pico plugins
  *
- * For a list of supported events see {@link DummyPlugin}; you can use
- * {@link DummyPlugin} as template for new plugins. For a list of deprecated
- * events see {@link PicoDeprecated}.
+ * For a list of supported events see {@see DummyPlugin}; you can use
+ * {@see DummyPlugin} as template for new plugins. For a list of deprecated
+ * events see {@see PicoDeprecated}.
  *
  * You SHOULD NOT use deprecated events when implementing this interface.
- * Deprecated events are triggered by the {@link PicoDeprecated} plugin, if
+ * Deprecated events are triggered by the {@see PicoDeprecated} plugin, if
  * plugins which don't implement this interface are loaded. You can take
  * advantage from this behaviour if you want to do something only when old
  * plugins are loaded. Consequently the old events are never triggered when
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index d2e76e8..d06d17f 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -121,18 +121,6 @@ class DummyPlugin extends AbstractPicoPlugin
         // your code
     }
 
-    /**
-     * Triggered after Pico has read the contents of the file to serve
-     *
-     * @see    Pico::getRawContent()
-     * @param  string &$rawContent raw file contents
-     * @return void
-     */
-    public function onContentLoaded(&$rawContent)
-    {
-        // your code
-    }
-
     /**
      * Triggered before Pico reads the contents of a 404 file
      *
@@ -158,6 +146,22 @@ class DummyPlugin extends AbstractPicoPlugin
         // your code
     }
 
+    /**
+     * Triggered after Pico has read the contents of the file to serve
+     *
+     * If Pico serves a 404 file, this event is triggered with the raw contents
+     * of said 404 file. Use {@see Pico::is404Content()} to check for this
+     * case when necessary.
+     *
+     * @see    Pico::getRawContent()
+     * @param  string &$rawContent raw file contents
+     * @return void
+     */
+    public function onContentLoaded(&$rawContent)
+    {
+        // your code
+    }
+
     /**
      * Triggered when Pico reads its known meta header fields
      *
@@ -273,18 +277,21 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * The `$pageData` parameter consists of the following values:
      *
-     * | Array key      | Type   | Description                              |
-     * | -------------- | ------ | ---------------------------------------- |
-     * | id             | string | relative path to the content file        |
-     * | url            | string | URL to the page                          |
-     * | title          | string | title of the page (YAML header)          |
-     * | description    | string | description of the page (YAML header)    |
-     * | author         | string | author of the page (YAML header)         |
-     * | time           | string | timestamp derived from the Date header   |
-     * | date           | string | date of the page (YAML header)           |
-     * | date_formatted | string | formatted date of the page               |
-     * | raw_content    | string | raw, not yet parsed contents of the page |
-     * | meta           | string | parsed meta data of the page             |
+     * | Array key      | Type    | Description                                |
+     * | -------------- | ------- | ------------------------------------------ |
+     * | id             | string  | relative path to the content file          |
+     * | url            | string  | URL to the page                            |
+     * | title          | string  | title of the page (YAML header)            |
+     * | description    | string  | description of the page (YAML header)      |
+     * | author         | string  | author of the page (YAML header)           |
+     * | time           | string  | timestamp derived from the Date header     |
+     * | date           | string  | date of the page (YAML header)             |
+     * | date_formatted | string  | formatted date of the page                 |
+     * | hidden         | boolean | this page shouldn't be visible to the user |
+     * | raw_content    | string  | raw, not yet parsed contents of the page   |
+     * | meta           | string  | parsed meta data of the page               |
+     * | previous_page  | &array  | reference to the previous page             |
+     * | next_page      | &array  | reference to the next page                 |
      *
      * Set `$pageData` to `null` to remove this page from the pages array.
      *
@@ -301,7 +308,7 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has discovered all known pages
      *
-     * See {@link DummyPlugin::onSinglePageLoaded()} for details about the
+     * See {@see DummyPlugin::onSinglePageLoaded()} for details about the
      * structure of the page data. Please note that the pages array isn't
      * sorted yet.
      *
@@ -318,7 +325,7 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has sorted the pages array
      *
-     * See {@link DummyPlugin::onSinglePageLoaded()} for details about the
+     * See {@see DummyPlugin::onSinglePageLoaded()} for details about the
      * structure of the page data.
      *
      * @see    Pico::getPages()
@@ -333,7 +340,7 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico discovered the current, previous and next pages
      *
-     * See {@link DummyPlugin::onSinglePageLoaded()} for details about the
+     * See {@see DummyPlugin::onSinglePageLoaded()} for details about the
      * structure of the page data.
      *
      * @see    Pico::discoverPageSiblings()

From f4332a247cfae4447731993ad5925351f9502d6d Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 14 May 2017 01:11:16 +0200
Subject: [PATCH 094/188] Force PicoDeprecated to be first plugin in the
 plugins array

---
 lib/Pico.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index 69be0bd..34ce43d 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -667,6 +667,10 @@ class Pico
             }
         };
 
+        if (isset($this->plugins['PicoDeprecated'])) {
+            $visitPlugin($this->plugins['PicoDeprecated']);
+        }
+
         foreach ($this->plugins as $plugin) {
             $visitPlugin($plugin);
         }

From 80c88f2a7de9d2e92921ea21d9e23210768d27c3 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 14 May 2017 01:25:10 +0200
Subject: [PATCH 095/188] Refactor onMetaHeaders event

---
 lib/Pico.php            | 32 +++++++++++++++++---------------
 plugins/DummyPlugin.php | 28 ++++++++++++++--------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 34ce43d..3eab8df 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -401,11 +401,8 @@ class Pico
         $this->triggerEvent('onContentLoaded', array(&$this->rawContent));
 
         // parse file meta
-        $this->metaHeaders = $this->getMetaHeaders();
-        $this->triggerEvent('onMetaHeaders', array(&$this->metaHeaders));
-
-        $this->triggerEvent('onMetaParsing', array(&$this->rawContent, &$this->metaHeaders));
-        $this->meta = $this->parseFileMeta($this->rawContent, $this->metaHeaders);
+        $this->triggerEvent('onMetaParsing', array(&$this->rawContent));
+        $this->meta = $this->parseFileMeta($this->rawContent, $this->getMetaHeaders());
         $this->triggerEvent('onMetaParsed', array(&$this->meta));
 
         // parse file content
@@ -1091,24 +1088,29 @@ class Pico
     /**
      * Returns known meta headers
      *
+     * This method triggers the `onMetaHeaders` event when the known meta
+     * headers weren't assembled yet.
+     *
      * @return string[] known meta headers; the array value specifies the
      *     YAML key to search for, the array key is later used to access the
      *     found value
      */
     public function getMetaHeaders()
     {
-        if ($this->metaHeaders !== null) {
-            return $this->metaHeaders;
+        if ($this->metaHeaders === null) {
+            $this->metaHeaders = array(
+                'title' => 'Title',
+                'description' => 'Description',
+                'author' => 'Author',
+                'date' => 'Date',
+                'robots' => 'Robots',
+                'template' => 'Template'
+            );
+
+            $this->triggerEvent('onMetaHeaders', array(&$this->metaHeaders));
         }
 
-        return array(
-            'title' => 'Title',
-            'description' => 'Description',
-            'author' => 'Author',
-            'date' => 'Date',
-            'robots' => 'Robots',
-            'template' => 'Template'
-        );
+        return $this->metaHeaders;
     }
 
     /**
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index d06d17f..928ae2a 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -162,20 +162,6 @@ class DummyPlugin extends AbstractPicoPlugin
         // your code
     }
 
-    /**
-     * Triggered when Pico reads its known meta header fields
-     *
-     * @see    Pico::getMetaHeaders()
-     * @param  string[] &$headers list of known meta header
-     *     fields; the array value specifies the YAML key to search for, the
-     *     array key is later used to access the found value
-     * @return void
-     */
-    public function onMetaHeaders(array &$headers)
-    {
-        // your code
-    }
-
     /**
      * Triggered before Pico parses the meta header
      *
@@ -387,6 +373,20 @@ class DummyPlugin extends AbstractPicoPlugin
         // your code
     }
 
+    /**
+     * Triggered when Pico reads its known meta header fields
+     *
+     * @see    Pico::getMetaHeaders()
+     * @param  string[] &$headers list of known meta header
+     *     fields; the array value specifies the YAML key to search for, the
+     *     array key is later used to access the found value
+     * @return void
+     */
+    public function onMetaHeaders(array &$headers)
+    {
+        // your code
+    }
+
     /**
      * Triggered when Pico registers the YAML parser
      *

From 773f4795f7dda54fe587355a607133e5ef86260f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 14 May 2017 01:26:07 +0200
Subject: [PATCH 096/188] Remove Pico::registerTwig(), use Pico::getTwig()
 instead

---
 lib/Pico.php | 85 ++++++++++++++++++----------------------------------
 1 file changed, 29 insertions(+), 56 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 3eab8df..74e7f30 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -431,13 +431,11 @@ class Pico
         );
 
         // render template
-        $this->registerTwig();
-
         $this->twigVariables = $this->getTwigVariables();
         $this->twigTemplate = $this->getTwigTemplate();
         $this->triggerEvent('onPageRendering', array(&$this->twigTemplate, &$this->twigVariables));
 
-        $output = $this->twig->render($this->twigTemplate, $this->twigVariables);
+        $output = $this->getTwig()->render($this->twigTemplate, $this->twigVariables);
         $this->triggerEvent('onPageRendered', array(&$output));
 
         return $output;
@@ -1589,62 +1587,45 @@ class Pico
     }
 
     /**
-     * Registers the Twig template engine
-     *
-     * This method also registers Pico's core Twig filters `link` and `content`
-     * as well as Pico's {@see PicoTwigExtension} Twig extension.
+     * Returns the Twig template engine
      *
      * This method triggers the `onTwigRegistered` event when the Twig template
-     * engine wasn't initiated yet.
+     * engine wasn't initiated yet. When initiating Twig, this method also
+     * registers Pico's core Twig filters `link` and `content` as well as
+     * Pico's {@see PicoTwigExtension} Twig extension.
      *
      * @see    Pico::getTwig()
      * @see    http://twig.sensiolabs.org/ Twig website
      * @see    https://github.com/twigphp/Twig Twig on GitHub
-     * @return void
-     */
-    protected function registerTwig()
-    {
-        if ($this->twig !== null) {
-            // nothing to do
-            return;
-        }
-
-        $twigLoader = new Twig_Loader_Filesystem($this->getThemesDir() . $this->getConfig('theme'));
-        $this->twig = new Twig_Environment($twigLoader, $this->getConfig('twig_config'));
-        $this->twig->addExtension(new Twig_Extension_Debug());
-        $this->twig->addExtension(new PicoTwigExtension($this));
-
-        // register content filter
-        // we pass the $pages array by reference to prevent multiple parser runs for the same page
-        // this is the reason why we can't register this filter as part of PicoTwigExtension
-        $pico = $this;
-        $pages = &$this->pages;
-        $this->twig->addFilter(new Twig_SimpleFilter('content', function ($page) use ($pico, &$pages) {
-            if (isset($pages[$page])) {
-                $pageData = &$pages[$page];
-                if (!isset($pageData['content'])) {
-                    $pageData['content'] = $pico->prepareFileContent($pageData['raw_content'], $pageData['meta']);
-                    $pageData['content'] = $pico->parseFileContent($pageData['content']);
-                }
-                return $pageData['content'];
-            }
-            return null;
-        }));
-
-        // trigger onTwigRegistration event
-        $this->triggerEvent('onTwigRegistered', array(&$this->twig));
-    }
-
-    /**
-     * Returns the twig template engine
-     *
-     * @see    Pico::registerTwig()
      * @return Twig_Environment|null Twig template engine
      */
     public function getTwig()
     {
         if ($this->twig === null) {
-            $this->registerTwig();
+            $twigLoader = new Twig_Loader_Filesystem($this->getThemesDir() . $this->getConfig('theme'));
+            $this->twig = new Twig_Environment($twigLoader, $this->getConfig('twig_config'));
+            $this->twig->addExtension(new Twig_Extension_Debug());
+            $this->twig->addExtension(new PicoTwigExtension($this));
+
+            // register content filter
+            // we pass the $pages array by reference to prevent multiple parser runs for the same page
+            // this is the reason why we can't register this filter as part of PicoTwigExtension
+            $pico = $this;
+            $pages = &$this->pages;
+            $this->twig->addFilter(new Twig_SimpleFilter('content', function ($page) use ($pico, &$pages) {
+                if (isset($pages[$page])) {
+                    $pageData = &$pages[$page];
+                    if (!isset($pageData['content'])) {
+                        $pageData['content'] = $pico->prepareFileContent($pageData['raw_content'], $pageData['meta']);
+                        $pageData['content'] = $pico->parseFileContent($pageData['content']);
+                    }
+                    return $pageData['content'];
+                }
+                return null;
+            }));
+
+            // trigger onTwigRegistration event
+            $this->triggerEvent('onTwigRegistered', array(&$this->twig));
         }
 
         return $this->twig;
@@ -1660,10 +1641,6 @@ class Pico
      */
     protected function getTwigVariables()
     {
-        if ($this->twigVariables !== null) {
-            return $this->twigVariables;
-        }
-
         return array(
             'config' => $this->getConfig(),
             'base_dir' => rtrim($this->getRootDir(), '/'),
@@ -1688,10 +1665,6 @@ class Pico
      */
     protected function getTwigTemplate()
     {
-        if ($this->twigTemplate !== null) {
-            return $this->twigTemplate;
-        }
-
         $templateName = $this->meta['template'] ?: 'index';
 
         if (file_exists($this->getThemesDir() . $this->getConfig('theme') . '/' . $templateName . '.twig')) {

From d26da62bf1195e78116e268cf4711bc7abfa01a6 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 14 May 2017 01:26:29 +0200
Subject: [PATCH 097/188] Add onSinglePageContent event

---
 lib/Pico.php            |  3 +++
 plugins/DummyPlugin.php | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index 74e7f30..d95a6ff 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1378,6 +1378,9 @@ class Pico
             if ($file !== $this->requestFile) {
                 $rawContent = $this->loadFileContent($file);
 
+                // trigger onSinglePageContent event
+                $this->triggerEvent('onSinglePageContent', array($id, &$rawContent));
+
                 $headers = $this->getMetaHeaders();
                 try {
                     $meta = $this->parseFileMeta($rawContent, $headers);
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 928ae2a..cecd632 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -232,6 +232,7 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @see    Pico::readPages()
      * @see    DummyPlugin::onSinglePageLoading()
+     * @see    DummyPlugin::onSinglePageContent()
      * @see    DummyPlugin::onSinglePageLoaded()
      * @see    DummyPlugin::onPagesDiscovered()
      * @see    DummyPlugin::onPagesLoaded()
@@ -247,6 +248,7 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * Set `$id` to `null` to remove this page from the pages array.
      *
+     * @see    DummyPlugin::onSinglePageContent()
      * @see    DummyPlugin::onSinglePageLoaded()
      * @see    DummyPlugin::onPagesDiscovered()
      * @see    DummyPlugin::onPagesLoaded()
@@ -258,6 +260,25 @@ class DummyPlugin extends AbstractPicoPlugin
         // your code
     }
 
+    /**
+     * Triggered when Pico loads the raw contents of a single page
+     *
+     * Please note that this event isn't triggered when the currently processed
+     * page is the requested page. The reason for this exception is that the
+     * raw contents of this page were loaded already.
+     *
+     * @see    DummyPlugin::onSinglePageLoaded()
+     * @see    DummyPlugin::onPagesDiscovered()
+     * @see    DummyPlugin::onPagesLoaded()
+     * @param  string $id          relative path to the content file
+     * @param  string &$rawContent raw file contents
+     * @return void
+     */
+    public function onSinglePageContent($id, &$rawContent)
+    {
+        // your code
+    }
+
     /**
      * Triggered when Pico loads a single page
      *

From b098e22033a802f9a2fb1f9266fc2ec5ad896bfa Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 14 May 2017 01:26:38 +0200
Subject: [PATCH 098/188] Various small improvements

---
 lib/Pico.php            | 9 +++------
 plugins/DummyPlugin.php | 3 +++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index d95a6ff..18817ce 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -532,10 +532,7 @@ class Pico
                     }
                 }
             } else {
-                throw new RuntimeException(
-                    "Unable to load plugin '" . $className . "' "
-                    . "from '" . $pluginFile . "'"
-                );
+                throw new RuntimeException("Unable to load plugin '" . $className . "' from '" . $pluginFile . "'");
             }
         }
     }
@@ -1335,8 +1332,8 @@ class Pico
      * | next_page      | &array  | reference to the next page                 |
      *
      * Please note that the `previous_page` and `next_page` keys won't be
-     * available until the `onPagesLoaded` event ({@see Pico::sortPages()})
-     * was triggered.
+     * available until the `onCurrentPageDiscovered` event
+     * ({@see Pico::discoverPageSiblings()}) was triggered.
      *
      * @see    Pico::sortPages()
      * @see    Pico::discoverPageSiblings()
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index cecd632..c083059 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -300,6 +300,9 @@ class DummyPlugin extends AbstractPicoPlugin
      * | previous_page  | &array  | reference to the previous page             |
      * | next_page      | &array  | reference to the next page                 |
      *
+     * Please note that the `previous_page` and `next_page` keys won't be
+     * available until the `onCurrentPageDiscovered` event was triggered.
+     *
      * Set `$pageData` to `null` to remove this page from the pages array.
      *
      * @see    DummyPlugin::onPagesDiscovered()

From cd2cc60ef645264500dce3c9264438372bddcdfc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 12 Jun 2017 19:36:49 +0200
Subject: [PATCH 099/188] Sync versions of pico-deprecated and pico-theme with
 Pico

... by using composer's special version constraint "self.version"
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6134c6e..575bfe4 100644
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,8 @@
         "twig/twig": "^1.18",
         "symfony/yaml" : "^2.3",
         "erusev/parsedown-extra": "^0.7",
-        "picocms/pico-theme": "~2.0.0@dev",
-        "picocms/pico-deprecated": "~2.0.0@dev"
+        "picocms/pico-theme": "self.version",
+        "picocms/pico-deprecated": "self.version"
     },
     "require-dev" : {
         "phpdocumentor/phpdocumentor": "^2.8",

From 66cc087b6e2c4568528f760f7591f81b863df18d Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 14 Jun 2017 01:44:09 +0200
Subject: [PATCH 100/188] Travis CI: Explicitly set root package version for
 branches

Due to the fact that Travis uses a shallow clone of Pico's Git repo, composer has no chance to detect on which branch it currently is. This was no big deal with Pico 1.0, however, Pico 2.0 depends on picocms/pico-deprecated and picocms/pico-theme. We use composer's `self.version` version constraint to sync the version numbers of these separate Git repos. Thus composer must know Pico's current version to resolve these dependencies. We try to guess the current version either using known branch aliases in Pico's `composer.json`, or using the `Pico::VERSION` constant (see `_build/install.sh`).
---
 .travis.yml       |  7 +++++--
 _build/install.sh | 30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100755 _build/install.sh

diff --git a/.travis.yml b/.travis.yml
index fd14373..7fdc791 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,11 +21,14 @@ matrix:
 notifications:
   irc: "chat.freenode.net#picocms"
 
+before_install:
+  - export PATH="$TRAVIS_BUILD_DIR/_build:$PATH"
+
 install:
-  - composer install
+  - install.sh
 
 before_script:
-  - export PATH="$TRAVIS_BUILD_DIR/_build:$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
+  - export PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
 
 script:
   - phpcs --standard=.phpcs.xml "$TRAVIS_BUILD_DIR"
diff --git a/_build/install.sh b/_build/install.sh
new file mode 100755
index 0000000..b40f7e8
--- /dev/null
+++ b/_build/install.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -e
+
+# set COMPOSER_ROOT_VERSION when necessary
+if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+    PICO_VERSION_PATTERN="$(php -r "
+        \$json = json_decode(file_get_contents('$TRAVIS_BUILD_DIR/composer.json'), true);
+        if (\$json !== null) {
+            if (isset(\$json['extra']['branch-alias']['dev-$TRAVIS_BRANCH'])) {
+                echo 'dev-$TRAVIS_BRANCH';
+            }
+        }
+    ")"
+
+    if [ -z "$PICO_VERSION_PATTERN" ]; then
+        PICO_VERSION_PATTERN="$(php -r "
+            require_once('$TRAVIS_BUILD_DIR/lib/Pico.php');
+            echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
+        ")"
+    fi
+
+    if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -n "$PICO_VERSION_PATTERN" ]; then
+        export COMPOSER_ROOT_VERSION="$PICO_VERSION_PATTERN"
+    fi
+fi
+
+# install dependencies
+echo "Running \`composer install\`$([ -n "$COMPOSER_ROOT_VERSION" ] && echo -n " ($COMPOSER_ROOT_VERSION)")..."
+composer install

From 91771e67af8a001d368fa296d3c9416b0a495d89 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 14 Jun 2017 12:03:30 +0200
Subject: [PATCH 101/188] Update .htaccess

---
 .htaccess | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index ac2c3b8..651f2ee 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,8 +4,8 @@
     #RewriteBase /
 
     # Deny access to internal dirs and files by passing the URL to Pico
-    RewriteRule ^(\.git|config|content|content-sample|lib|vendor)(/|$) index.php [L]
-    RewriteRule ^(CHANGELOG\.md|composer\.(json|lock)) index.php [L]
+    RewriteRule ^(\.git|_build|config|content|content-sample|lib|vendor)(/|$) index.php [L]
+    RewriteRule ^(\.git(attributes|ignore)|CHANGELOG\.md|composer\.(json|lock))$ index.php [L]
 
     # Enable URL rewriting
     RewriteCond %{REQUEST_FILENAME} !-f

From 23ad80b98a4eb49a24b9a2217c6ebda713722955 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 14 Jun 2017 17:08:33 +0200
Subject: [PATCH 102/188] Let Pico load plugins from vendor/pico-plugin.php

Split the Pico::loadPlugins() method to Pico::loadLocalPlugins() and Pico::loadComposerPlugins()
---
 lib/Pico.php | 79 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 67 insertions(+), 12 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 18817ce..08edde4 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -441,6 +441,29 @@ class Pico
         return $output;
     }
 
+    /**
+     * Loads plugins from vendor/pico-plugin.php and Pico::$pluginsDir
+     *
+     * See {@see Pico::loadLocalPlugins()} for details about plugins installed
+     * to {@see Pico::$pluginsDir}, and {@see Pico::loadComposerPlugins()} for
+     * details about plugins installed using `composer`.
+     *
+     * Please note that Pico will change the processing order when needed to
+     * incorporate plugin dependencies. See {@see Pico::sortPlugins()} for
+     * details.
+     *
+     * @see    Pico::loadPlugin()
+     * @see    Pico::getPlugin()
+     * @see    Pico::getPlugins()
+     * @return void
+     * @throws RuntimeException thrown when a plugin couldn't be loaded
+     */
+    protected function loadPlugins()
+    {
+        $this->loadLocalPlugins();
+        $this->loadComposerPlugins();
+    }
+
     /**
      * Loads plugins from Pico::$pluginsDir in alphabetical order
      *
@@ -459,19 +482,13 @@ class Pico
      * - 60 to 79: Plugins hooking into template or markdown parsing
      * - 80 to 99: Plugins using the `onPageRendered` event
      *
-     * Please note that Pico will change the processing order when needed to
-     * incorporate plugin dependencies. See {@see Pico::sortPlugins()} for
-     * details.
-     *
-     * @see    Pico::loadPlugin()
-     * @see    Pico::getPlugin()
-     * @see    Pico::getPlugins()
+     * @see    Pico::loadPlugins()
+     * @see    Pico::loadComposerPlugins()
      * @return void
      * @throws RuntimeException thrown when a plugin couldn't be loaded
      */
-    protected function loadPlugins()
+    protected function loadLocalPlugins()
     {
-        // discover plugin files
         $pluginFiles = array();
         $files = scandir($this->getPluginsDir());
         if ($files !== false) {
@@ -504,9 +521,9 @@ class Pico
             }
         }
 
-        // scope isolated require_once()
+        // scope isolated require()
         $includeClosure = function ($pluginFile) {
-            require_once($pluginFile);
+            require($pluginFile);
         };
         if (PHP_VERSION_ID >= 50400) {
             $includeClosure = $includeClosure->bindTo(null);
@@ -537,6 +554,44 @@ class Pico
         }
     }
 
+    /**
+     * Loads plugins from vendor/pico-plugin.php
+     *
+     * This method loads all plugins installed using `composer` and Pico's
+     * `picocms/pico-composer` installer by reading the `pico-plugin.php` in
+     * composer's `vendor` dir. Using composer enables plugin developers to
+     * load multiple plugins and their dependencies using a single composer
+     * package.
+     *
+     * @see    Pico::loadPlugins()
+     * @see    Pico::loadLocalPlugins()
+     * @return void
+     */
+    protected function loadComposerPlugins()
+    {
+        $composerPlugins = array();
+        if (file_exists($this->vendorDir . 'vendor/pico-plugin.php')) {
+            // composer root package
+            $composerPlugins = require($this->vendorDir . 'vendor/pico-plugin.php') ?: array();
+        } elseif (file_exists($this->vendorDir . '../../../vendor/pico-plugin.php')) {
+            // composer dependency package
+            $composerPlugins = require($this->vendorDir . '../../../vendor/pico-plugin.php') ?: array();
+        }
+
+        foreach ($composerPlugins as $package => $classNames) {
+            foreach ($classNames as $className) {
+                $plugin = new $className($this);
+                $this->plugins[$className] = $plugin;
+
+                if ($plugin instanceof PicoPluginInterface) {
+                    if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
+                        $this->nativePlugins[$className] = $plugin;
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Manually loads a plugin
      *
@@ -2043,7 +2098,7 @@ class Pico
      * Please note that {@see PicoDeprecated} also triggers custom events on
      * plugins using older API versions, thus you can safely use this method
      * to trigger custom events on all loaded plugins, no matter what API
-     * version - the event will be triggered in any case
+     * version - the event will be triggered in any case.
      *
      * You MUST NOT trigger events of Pico's core with a plugin!
      *

From 21051fe08b9cd9b535b76355dbd71109ebe4eb34 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 14 Jun 2017 17:43:23 +0200
Subject: [PATCH 103/188] Pico::loadComposerPlugins(): Use Pico::getVendorDir()
 instead of Pico::$vendorDir

---
 lib/Pico.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 08edde4..bffd9fe 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -570,12 +570,12 @@ class Pico
     protected function loadComposerPlugins()
     {
         $composerPlugins = array();
-        if (file_exists($this->vendorDir . 'vendor/pico-plugin.php')) {
+        if (file_exists($this->getVendorDir() . 'vendor/pico-plugin.php')) {
             // composer root package
-            $composerPlugins = require($this->vendorDir . 'vendor/pico-plugin.php') ?: array();
-        } elseif (file_exists($this->vendorDir . '../../../vendor/pico-plugin.php')) {
+            $composerPlugins = require($this->getVendorDir() . 'vendor/pico-plugin.php') ?: array();
+        } elseif (file_exists($this->getVendorDir() . '../../../vendor/pico-plugin.php')) {
             // composer dependency package
-            $composerPlugins = require($this->vendorDir . '../../../vendor/pico-plugin.php') ?: array();
+            $composerPlugins = require($this->getVendorDir() . '../../../vendor/pico-plugin.php') ?: array();
         }
 
         foreach ($composerPlugins as $package => $classNames) {

From 793fcdb4e1d471574a7423ee4f8f0e1e8ff6b734 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 20 Jun 2017 17:31:49 +0200
Subject: [PATCH 104/188] Add "remove" fallback to Twig's "sort_by" filter

---
 lib/PicoTwigExtension.php | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index d5490e7..b1a993c 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -143,8 +143,9 @@ class PicoTwigExtension extends Twig_Extension
      *     will sort $var by $item['foo']['bar'])
      * @param  string            $fallback    specify what to do with items
      *     which don't contain the specified sort key; use "bottom" (default)
-     *     to move those items to the end of the sorted array, "top" to rank
-     *     them first, or "keep" to keep the original order of those items
+     *     to move these items to the end of the sorted array, "top" to rank
+     *     them first, "keep" to keep the original order, or "remove" to remove
+     *     these items
      * @return array                          sorted array
      */
     public function sortByFilter($var, $sortKeyPath, $fallback = 'bottom')
@@ -157,12 +158,15 @@ class PicoTwigExtension extends Twig_Extension
                 is_object($var) ? get_class($var) : gettype($var)
             ));
         }
-        if (($fallback !== 'top') && ($fallback !== 'bottom') && ($fallback !== 'keep')) {
-            throw new Twig_Error_Runtime('The sort_by filter only supports the "top", "bottom" and "keep" fallbacks');
+        if (($fallback !== 'top') && ($fallback !== 'bottom') && ($fallback !== 'keep') && ($fallback !== "remove")) {
+            throw new Twig_Error_Runtime(
+                'The sort_by filter only supports the "top", "bottom", "keep" and "remove" fallbacks'
+            );
         }
 
         $twigExtension = $this;
         $varKeys = array_keys($var);
+        $removeItems = [];
         uksort($var, function ($a, $b) use ($twigExtension, $var, $varKeys, $sortKeyPath, $fallback, &$removeItems) {
             $aSortValue = $twigExtension->getKeyOfVar($var[$a], $sortKeyPath);
             $aSortValueNull = ($aSortValue === null);
@@ -170,7 +174,15 @@ class PicoTwigExtension extends Twig_Extension
             $bSortValue = $twigExtension->getKeyOfVar($var[$b], $sortKeyPath);
             $bSortValueNull = ($bSortValue === null);
 
-            if ($aSortValueNull xor $bSortValueNull) {
+            if (($fallback === 'remove') && ($aSortValueNull || $bSortValueNull)) {
+                if ($aSortValueNull) {
+                    $removeItems[$a] = $var[$a];
+                }
+                if ($bSortValueNull) {
+                    $removeItems[$b] = $var[$b];
+                }
+                return ($aSortValueNull - $bSortValueNull);
+            } elseif ($aSortValueNull xor $bSortValueNull) {
                 if ($fallback === 'top') {
                     return ($aSortValueNull - $bSortValueNull) * -1;
                 } elseif ($fallback === 'bottom') {
@@ -188,6 +200,10 @@ class PicoTwigExtension extends Twig_Extension
             return ($aIndex > $bIndex) ? 1 : -1;
         });
 
+        if ($removeItems) {
+            $var = array_diff_key($var, $removeItems);
+        }
+
         return $var;
     }
 

From fd78ec38c72ca2786a755a5a57d0afb1b7057698 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 20 Jun 2017 17:32:09 +0200
Subject: [PATCH 105/188] Various small improvements

---
 CONTRIBUTING.md           | 2 +-
 _build/install.sh         | 4 ++--
 lib/PicoTwigExtension.php | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index afa1948..0b5c38a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -94,7 +94,7 @@ Version 1.0.0
 * [Removed] ...
 ```
 
-Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico::VERSION_ID` constants. If you've simultaneously developed a new version of Pico's official [default theme](https://github.com/picocms/pico-theme) and/or the [`PicoDeprecated` plugin](https://github.com/picocms/pico-deprecated), make sure to remove a previously added `@dev` suffix from the corresponding dependencies in Pico's [`composer.json`](https://github.com/picocms/Pico/blob/master/composer.json).
+Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico::VERSION_ID` constants. If you've simultaneously developed a new version of Pico's official [default theme](https://github.com/picocms/pico-theme) and/or the [`PicoDeprecated` plugin](https://github.com/picocms/pico-deprecated), make sure to create releases for them first, otherwise automatic deployment will fail.
 
 Travis CI will draft the new [release on GitHub](https://github.com/picocms/Pico/releases) automatically, but will require you to manually amend the descriptions formatting. The latest Pico version is always available at https://github.com/picocms/Pico/releases/latest, so please make sure to publish this URL rather than version-specific URLs. [Packagist](http://packagist.org/packages/picocms/pico) will be updated automatically.
 
diff --git a/_build/install.sh b/_build/install.sh
index b40f7e8..aaa50a2 100755
--- a/_build/install.sh
+++ b/_build/install.sh
@@ -3,7 +3,7 @@
 set -e
 
 # set COMPOSER_ROOT_VERSION when necessary
-if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     PICO_VERSION_PATTERN="$(php -r "
         \$json = json_decode(file_get_contents('$TRAVIS_BUILD_DIR/composer.json'), true);
         if (\$json !== null) {
@@ -20,7 +20,7 @@ if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
         ")"
     fi
 
-    if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -n "$PICO_VERSION_PATTERN" ]; then
+    if [ -n "$PICO_VERSION_PATTERN" ]; then
         export COMPOSER_ROOT_VERSION="$PICO_VERSION_PATTERN"
     fi
 fi
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index b1a993c..086fca0 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -130,10 +130,9 @@ class PicoTwigExtension extends Twig_Extension
      *
      * This method is registered as the Twig `sort_by` filter. You can use this
      * filter to e.g. sort the pages array by a arbitrary meta value. Calling
-     * `{{ pages|sort_by("meta:nav"|split(":")) }}` returns all pages sorted by
-     * the meta value `nav`. Please note the `"meta:nav"|split(":")` part of
-     * the example. The sorting algorithm will never assume equality of two
-     * values, it will then fall back to the original order. The result is
+     * `{{ pages|sort_by([ "meta", "nav" ]) }}` returns all pages sorted by the
+     * meta value `nav`. The sorting algorithm will never assume equality of
+     * two values, it will then fall back to the original order. The result is
      * always sorted in ascending order, apply Twigs `reverse` filter to
      * achieve a descending order.
      *

From 4cd993c50ae2bc11c9e721c46e0d98b440d9aeae Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 20 Jun 2017 18:02:32 +0200
Subject: [PATCH 106/188] Fix PHP Syntax Error

---
 lib/PicoTwigExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 086fca0..dd68959 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -165,7 +165,7 @@ class PicoTwigExtension extends Twig_Extension
 
         $twigExtension = $this;
         $varKeys = array_keys($var);
-        $removeItems = [];
+        $removeItems = array();
         uksort($var, function ($a, $b) use ($twigExtension, $var, $varKeys, $sortKeyPath, $fallback, &$removeItems) {
             $aSortValue = $twigExtension->getKeyOfVar($var[$a], $sortKeyPath);
             $aSortValueNull = ($aSortValue === null);

From 05c8d95b3f9bae41819fe89295b7b3ec12b47891 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 20 Jun 2017 23:34:07 +0200
Subject: [PATCH 107/188] Only load Twig_Extension_Debug when Twig's debug mode
 is enabled

---
 lib/Pico.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index bffd9fe..8f989d7 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1657,11 +1657,16 @@ class Pico
     public function getTwig()
     {
         if ($this->twig === null) {
+            $twigConfig = $this->getConfig('twig_config');
+
             $twigLoader = new Twig_Loader_Filesystem($this->getThemesDir() . $this->getConfig('theme'));
-            $this->twig = new Twig_Environment($twigLoader, $this->getConfig('twig_config'));
-            $this->twig->addExtension(new Twig_Extension_Debug());
+            $this->twig = new Twig_Environment($twigLoader, $twigConfig);
             $this->twig->addExtension(new PicoTwigExtension($this));
 
+            if (!empty($twigConfig['debug'])) {
+                $this->twig->addExtension(new Twig_Extension_Debug());
+            }
+
             // register content filter
             // we pass the $pages array by reference to prevent multiple parser runs for the same page
             // this is the reason why we can't register this filter as part of PicoTwigExtension

From df532e45bbd67d35061054f6efe409ec81c794f8 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 21 Jun 2017 02:23:13 +0200
Subject: [PATCH 108/188] Travis CI: Use Build Stages

See https://docs.travis-ci.com/user/build-stages
---
 .travis.yml                      | 78 +++++++++++++++++++-------------
 _build/create-release-archive.sh | 15 +-----
 _build/deploy-phpdoc-branch.sh   | 17 +------
 _build/deploy-phpdoc-release.sh  |  2 +-
 _build/github-deploy.sh          |  9 ++--
 _build/install.sh                | 17 ++++++-
 6 files changed, 71 insertions(+), 67 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7fdc791..6732b1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,56 @@
-language: php
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - nightly
-  - hhvm
-  - hhvm-nightly
+dist: trusty
+sudo: false
 
-matrix:
+language: php
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
+jobs:
   include:
+    # Test stage
     - php: 5.3
       dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: nightly
+    - php: hhvm
+    - php: hhvm-nightly
+
+    # Deployment stage
+    - stage: deploy
+      install:
+        - '[ "$TRAVIS_PULL_REQUEST" == "false" ] || travis_terminate 0'
+        - '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
+        - install.sh
+      script:
+        - deploy-phpdoc-branch.sh
+
+    # Release stage
+    - stage: release
+      install:
+        - '[ -n "$TRAVIS_TAG" ] || travis_terminate 0'
+        - install.sh --release
+      script:
+        - deploy-phpdoc-release.sh
+      before_deploy:
+        - create-release-archive.sh "pico-release-$TRAVIS_TAG.tar.gz"
+      deploy:
+        provider: releases
+        api_key: ${GITHUB_OAUTH_TOKEN}
+        file: pico-release-$TRAVIS_TAG.tar.gz
+        skip_cleanup: true
+
+  # Ignore nightly build failures
   allow_failures:
     - php: nightly
     - php: hhvm-nightly
   fast-finish: true
 
-notifications:
-  irc: "chat.freenode.net#picocms"
-
 before_install:
   - export PATH="$TRAVIS_BUILD_DIR/_build:$PATH"
 
@@ -33,21 +63,5 @@ before_script:
 script:
   - phpcs --standard=.phpcs.xml "$TRAVIS_BUILD_DIR"
 
-after_success:
-  - deploy-phpdoc-branch.sh
-
-before_deploy:
-  - deploy-phpdoc-release.sh
-  - create-release-archive.sh "$TRAVIS_TAG"
-
-deploy:
-  provider: releases
-  api_key: ${GITHUB_OAUTH_TOKEN}
-  file: pico-release-$TRAVIS_TAG.tar.gz
-  skip_cleanup: true
-  on:
-    tags: true
-    php: 5.3
-
-dist: trusty
-sudo: false
+notifications:
+  irc: "chat.freenode.net#picocms"
diff --git a/_build/create-release-archive.sh b/_build/create-release-archive.sh
index 62737d6..d5c2cd4 100755
--- a/_build/create-release-archive.sh
+++ b/_build/create-release-archive.sh
@@ -1,19 +1,6 @@
 #!/usr/bin/env bash
 
-RELEASE="$1"
-ARCHIVE="pico-release.tar.gz"
-[ -n "$RELEASE" ] && ARCHIVE="pico-release-$RELEASE.tar.gz"
-
-# install dependencies
-echo "Running \`composer install\`..."
-composer install --no-dev --optimize-autoloader
-[ $? -eq 0 ] || exit 1
-echo
-
-# remove .git dirs
-echo "Removing '.git' directories of dependencies..."
-find vendor/ -type d -path 'vendor/*/*/.git' -print0 | xargs -0 rm -rf
-echo
+ARCHIVE="$1"
 
 # create release archive
 echo "Creating release archive '$ARCHIVE'..."
diff --git a/_build/deploy-phpdoc-branch.sh b/_build/deploy-phpdoc-branch.sh
index 0364c4f..31b4486 100755
--- a/_build/deploy-phpdoc-branch.sh
+++ b/_build/deploy-phpdoc-branch.sh
@@ -1,20 +1,5 @@
 #!/usr/bin/env bash
 
-if [ "$TRAVIS_PHP_VERSION" != "5.3" ]; then
-    echo "Skipping branch deployment because this is not on the required runtime"
-    exit 0
-fi
-
-if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-    echo "Skipping branch deployment because this pull request (#$TRAVIS_PULL_REQUEST) is not permitted to deploy"
-    exit 0
-fi
-
-if [[ ",$DEPLOY_PHPDOC_BRANCHES," != *,"$TRAVIS_BRANCH",* ]]; then
-    echo "Skipping phpDoc branch deployment because this branch ($TRAVIS_BRANCH) is not permitted to deploy"
-    exit 0
-fi
-
 DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
 DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 
@@ -51,7 +36,7 @@ update-phpdoc-list.sh \
 
 # commit phpDocs
 echo "Committing changes..."
-git add \
+git add --all \
     "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
     "$DEPLOYMENT_DIR/_data/phpDoc.yml"
 git commit \
diff --git a/_build/deploy-phpdoc-release.sh b/_build/deploy-phpdoc-release.sh
index a56bb64..8188911 100755
--- a/_build/deploy-phpdoc-release.sh
+++ b/_build/deploy-phpdoc-release.sh
@@ -50,7 +50,7 @@ if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
 
         # commit phpDocs
         echo "Committing phpDoc changes..."
-        git add "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" "$DEPLOYMENT_DIR/_data/phpDoc.yml"
+        git add --all "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" "$DEPLOYMENT_DIR/_data/phpDoc.yml"
         git commit \
             --message="Update phpDocumentor class docs for $TRAVIS_TAG" \
             "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" "$DEPLOYMENT_DIR/_data/phpDoc.yml"
diff --git a/_build/github-deploy.sh b/_build/github-deploy.sh
index 3734f20..b7ec649 100755
--- a/_build/github-deploy.sh
+++ b/_build/github-deploy.sh
@@ -16,6 +16,9 @@ CHECK_REPO_SLUG="$1"        # optional GitHub repo (e.g. picocms/Pico) to check
 CHECK_REMOTE_REF="$2"       # optional remote Git reference (e.g. heads/master)
 CHECK_LOCAL_COMMIT="$3"     # optional local commit SHA1
 
+# environment variables
+# GITHUB_OAUTH_TOKEN    GitHub authentication token, see https://github.com/settings/tokens
+
 # print parameters
 echo "Deploying repo..."
 printf 'CHECK_REPO_SLUG="%s"\n' "$CHECK_REPO_SLUG"
@@ -34,12 +37,12 @@ fi
 # but it should give a basic protection without disabling concurrent builds completely
 if [ -n "$CHECK_REPO_SLUG" ] && [ -n "$CHECK_REMOTE_REF" ] && [ -n "$CHECK_LOCAL_COMMIT" ]; then
     # retrieve information using GitHub APIv3
-    printf 'Checking latest commit...\n'
+    echo "Checking latest commit$([ -n "$GITHUB_OAUTH_TOKEN" ] && echo " (authorized)")..."
     CHECK_API_URL="https://api.github.com/repos/$CHECK_REPO_SLUG/git/refs/$CHECK_REMOTE_REF"
     if [ -n "$GITHUB_OAUTH_TOKEN" ]; then
-        CHECK_API_RESPONSE="$(wget -O- --header="Authorization: token $GITHUB_OAUTH_TOKEN" "$CHECK_API_URL" 2> /dev/null)"
+        CHECK_API_RESPONSE="$(curl --fail --silent --show-error --header "Authorization: token $GITHUB_OAUTH_TOKEN" "$CHECK_API_URL")"
     else
-        CHECK_API_RESPONSE="$(wget -O- "$CHECK_API_URL" 2> /dev/null)"
+        CHECK_API_RESPONSE="$(curl --fail --silent --show-error "$CHECK_API_URL")"
     fi
 
     # evaluate JSON response
diff --git a/_build/install.sh b/_build/install.sh
index aaa50a2..b469994 100755
--- a/_build/install.sh
+++ b/_build/install.sh
@@ -1,6 +1,19 @@
 #!/usr/bin/env bash
 
-set -e
+if [ "$1" == "--release" ]; then
+    # install dependencies
+    echo "Running \`composer install\`..."
+    composer install --no-dev --optimize-autoloader
+    [ $? -eq 0 ] || exit 1
+    echo
+
+    # remove .git dirs
+    echo "Removing '.git' directories of dependencies..."
+    find vendor/ -type d -path 'vendor/*/*/.git' -print0 | xargs -0 rm -rf
+    echo
+
+    exit 0
+fi
 
 # set COMPOSER_ROOT_VERSION when necessary
 if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
@@ -28,3 +41,5 @@ fi
 # install dependencies
 echo "Running \`composer install\`$([ -n "$COMPOSER_ROOT_VERSION" ] && echo -n " ($COMPOSER_ROOT_VERSION)")..."
 composer install
+
+exit $?

From 55a0a5bc919163e5956507e7760e935077b487dc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 21 Jun 2017 14:27:34 +0200
Subject: [PATCH 109/188] Add Pico::substituteFileContent() method

---
 lib/Pico.php | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 8f989d7..31e01da 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1290,22 +1290,40 @@ class Pico
 
     /**
      * Applies some static preparations to the raw contents of a page,
-     * e.g. removing the meta header and replacing %base_url%
+     * e.g. removing the meta header and replacing %...% placehodlers
      *
+     * This method calls the {@see Pico::substituteFileContent()} method.
+     *
+     * @see    Pico::substituteFileContent()
      * @see    Pico::parseFileContent()
      * @see    Pico::getFileContent()
      * @param  string $rawContent raw contents of a page
      * @param  array  $meta       meta data to use for %meta.*% replacement
-     * @return string             contents prepared for parsing
+     * @return string             prepared Markdown contents
      */
     public function prepareFileContent($rawContent, array $meta)
     {
-        $variables = array();
-
         // remove meta header
         $metaHeaderPattern = "/^(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
             . "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s";
-        $content = preg_replace($metaHeaderPattern, '', $rawContent, 1);
+        $markdown = preg_replace($metaHeaderPattern, '', $rawContent, 1);
+
+        // replace placeholders
+        $markdown = $this->substituteFileContent($markdown, $meta);
+
+        return $markdown;
+    }
+
+    /**
+     * Replaces all %...% placeholders in a page's contents
+     *
+     * @param  string $markdown Markdown contents of a page
+     * @param  array  $meta     meta data to use for %meta.*% replacement
+     * @return string           substituted Markdown contents
+     */
+    public function substituteFileContent($markdown, array $meta = array())
+    {
+        $variables = array();
 
         // replace %version%
         $variables['%version%'] = static::VERSION;
@@ -1336,27 +1354,28 @@ class Pico
             }
         }
 
-        $content = str_replace(array_keys($variables), $variables, $content);
-        return $content;
+        return str_replace(array_keys($variables), $variables, $markdown);
     }
 
     /**
      * Parses the contents of a page using ParsedownExtra
      *
      * @see    Pico::prepareFileContent()
+     * @see    Pico::substituteFileContent()
      * @see    Pico::getFileContent()
-     * @param  string $content raw contents of a page (Markdown)
-     * @return string          parsed contents (HTML)
+     * @param  string $markdown Markdown contents of a page
+     * @return string           parsed contents (HTML)
      */
-    public function parseFileContent($content)
+    public function parseFileContent($markdown)
     {
-        return $this->getParsedown()->text($content);
+        return $this->getParsedown()->text($markdown);
     }
 
     /**
      * Returns the cached contents of the requested page
      *
      * @see    Pico::prepareFileContent()
+     * @see    Pico::substituteFileContent()
      * @see    Pico::parseFileContent()
      * @return string|null parsed contents
      */

From b626782b87a0afef3b1bea1ac59d943bcb1f21f6 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 21 Jun 2017 14:27:50 +0200
Subject: [PATCH 110/188] Use Pico::substituteFileContent() for Twig's
 "markdown" filter

---
 lib/PicoTwigExtension.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index dd68959..02312e9 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -88,12 +88,16 @@ class PicoTwigExtension extends Twig_Extension
      * Don't use it to parse the contents of a page, use the `content` filter
      * instead, what ensures the proper preparation of the contents.
      *
+     * @see    Pico::substituteFileContent()
+     * @see    Pico::parseFileContent()
      * @param  string $markdown markdown to parse
+     * @param  array  $meta     meta data to use for %meta.*% replacement
      * @return string           parsed HTML
      */
-    public function markdownFilter($markdown)
+    public function markdownFilter($markdown, array $meta = array())
     {
-        return $this->getPico()->getParsedown()->text($markdown);
+        $markdown = $this->getPico()->substituteFileContent($markdown, $meta);
+        return $this->getPico()->parseFileContent($markdown);
     }
 
     /**

From 414f5ac18e8d2ae9833f004a523f697eef1a6de4 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 14 Jul 2017 20:37:05 +0200
Subject: [PATCH 111/188] Allow pages to be sorted by arbitrary meta values

This basically works like Pico's `sort_by` Twig filter
---
 config/config.yml.template |  3 ++-
 lib/Pico.php               | 28 ++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/config/config.yml.template b/config/config.yml.template
index c40dc4c..081a8f9 100644
--- a/config/config.yml.template
+++ b/config/config.yml.template
@@ -25,7 +25,8 @@ twig_config:
 #
 date_format: %D %T                  # Pico's default date format
                                     #     See http://php.net/manual/en/function.strftime.php for more info
-pages_order_by: alpha               # Change how Pico sorts pages ("alpha" for alphabetical order, or "date")
+pages_order_by_meta: author         # Sort pages by meta value "author" (set "pages_order_by" to "meta")
+pages_order_by: alpha               # Change how Pico sorts pages ("alpha" for alphabetical order, "date", or "meta")
 pages_order: asc                    # Sort pages in ascending ("asc") or descending ("desc") order
 content_dir: content/               # The path to Pico's content directory
 content_ext: .md                    # The file extension of your Markdown files
diff --git a/lib/Pico.php b/lib/Pico.php
index 31e01da..0615217 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1509,7 +1509,7 @@ class Pico
         $order = strtolower($this->getConfig('pages_order'));
         $orderBy = strtolower($this->getConfig('pages_order_by'));
 
-        if (($orderBy !== 'date') && ($orderBy !== 'alpha')) {
+        if (($orderBy !== 'alpha') && ($orderBy !== 'date') && ($orderBy !== 'meta')) {
             return;
         }
 
@@ -1525,7 +1525,31 @@ class Pico
             return $cmp * (($order === 'desc') ? -1 : 1);
         };
 
-        if ($orderBy === 'date') {
+        if ($orderBy === 'meta') {
+            // sort by arbitrary meta value
+            $orderByMeta = $this->getConfig('pages_order_by_meta');
+            uasort($this->pages, function ($a, $b) use ($alphaSortClosure, $order, $orderByMeta) {
+                $aSortValue = isset($a['meta'][$orderByMeta]) ? $a['meta'][$orderByMeta] : null;
+                $aSortValueNull = ($aSortValue === null);
+
+                $bSortValue = isset($b['meta'][$orderByMeta]) ? $b['meta'][$orderByMeta] : null;
+                $bSortValueNull = ($bSortValue === null);
+
+                $cmp = 0;
+                if ($aSortValueNull || $bSortValueNull) {
+                    $cmp = ($aSortValueNull - $bSortValueNull);
+                } elseif ($aSortValue != $bSortValue) {
+                    $cmp = ($aSortValue > $bSortValue) ? 1 : -1;
+                }
+
+                if ($cmp === 0) {
+                    // never assume equality; fallback to alphabetical order
+                    return $alphaSortClosure($a, $b);
+                }
+
+                return $cmp * (($order === 'desc') ? -1 : 1);
+            });
+        } elseif ($orderBy === 'date') {
             // sort by date
             uasort($this->pages, function ($a, $b) use ($alphaSortClosure, $order) {
                 if ($a['hidden'] xor $b['hidden']) {

From de74e7d8675d0a97f562bd00f599cffc8a74eeeb Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 14 Jul 2017 20:50:38 +0200
Subject: [PATCH 112/188] Improve class docs

---
 plugins/DummyPlugin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index c083059..c201628 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -194,7 +194,7 @@ class DummyPlugin extends AbstractPicoPlugin
      * @see    Pico::prepareFileContent()
      * @see    DummyPlugin::prepareFileContent()
      * @see    DummyPlugin::onContentParsed()
-     * @param  string &$rawContent raw file contents
+     * @param  string &$rawContent raw file contents of the requested page
      * @return void
      */
     public function onContentParsing(&$rawContent)
@@ -207,10 +207,10 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @see    Pico::parseFileContent()
      * @see    DummyPlugin::onContentParsed()
-     * @param  string &$content prepared file contents for parsing
+     * @param  string &$markdown Markdown contents of the requested page
      * @return void
      */
-    public function onContentPrepared(&$content)
+    public function onContentPrepared(&$markdown)
     {
         // your code
     }
@@ -219,7 +219,7 @@ class DummyPlugin extends AbstractPicoPlugin
      * Triggered after Pico has parsed the contents of the file to serve
      *
      * @see    Pico::getFileContent()
-     * @param  string &$content parsed contents
+     * @param  string &$content parsed contents (HTML) of the requested page
      * @return void
      */
     public function onContentParsed(&$content)

From 53e9eaa5e438e721da1b8fd3cb06aa1248442879 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 18 Jul 2017 21:31:14 +0200
Subject: [PATCH 113/188] Fix Pico's REQUEST_URI routing method when installed
 to /

---
 lib/Pico.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 0615217..e15f1e8 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -965,7 +965,8 @@ class Pico
 
         // use REQUEST_URI (requires URL rewriting); e.g. /pico/sub/page
         if (($this->requestUrl === null) && $this->isUrlRewritingEnabled()) {
-            $basePath = dirname($_SERVER['SCRIPT_NAME']) . '/';
+            $basePath = dirname($_SERVER['SCRIPT_NAME']);
+            $basePath = !in_array($basePath, array('.', '/')) ? $basePath . '/' : '/';
             $basePathLength = strlen($basePath);
 
             $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';

From b73e197ccb77557c7d5824faf83ddc97de70cb65 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 28 Jul 2017 12:16:26 +0200
Subject: [PATCH 114/188] Refactor YAML frontmatter date parsing

You can now explicitly specify both the `date_formatted` and `time` meta values to overwrite Pico's page date handling. Specifying `time` doesn't make much sense in general, however, specifying `date_formatted` allows you to use `{{ meta.date_formatted }}` on all systems, even those where `strftime()` doesn't work as wished
---
 lib/Pico.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index b1e71eb..327f7ac 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1229,21 +1229,28 @@ class Pico
                 }
             }
 
-            if (!empty($meta['date'])) {
+            if (!empty($meta['date']) || !empty($meta['time'])) {
                 // workaround for issue #336
                 // Symfony YAML interprets ISO-8601 datetime strings and returns timestamps instead of the string
                 // this behavior conforms to the YAML standard, i.e. this is no bug of Symfony YAML
                 if (is_int($meta['date'])) {
                     $meta['time'] = $meta['date'];
+                    $meta['date'] = '';
+                }
 
+                if (empty($meta['time'])) {
+                    $meta['time'] = strtotime($meta['date']) ?: '';
+                } elseif (empty($meta['date'])) {
                     $rawDateFormat = (date('H:i:s', $meta['time']) === '00:00:00') ? 'Y-m-d' : 'Y-m-d H:i:s';
                     $meta['date'] = date($rawDateFormat, $meta['time']);
-                } else {
-                    $meta['time'] = strtotime($meta['date']);
                 }
-                $meta['date_formatted'] = utf8_encode(strftime($this->getConfig('date_format'), $meta['time']));
             } else {
-                $meta['date'] = $meta['time'] = $meta['date_formatted'] = '';
+                $meta['date'] = $meta['time'] = '';
+            }
+
+            if (empty($meta['date_formatted'])) {
+                $dateFormat = $this->getConfig('date_format');
+                $meta['date_formatted'] = $meta['time'] ? utf8_encode(strftime($dateFormat, $meta['time'])) : '';
             }
         } else {
             // guarantee array key existance

From 8138212a27c4d572dc6f797626e6b0f92d5995bb Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 3 Aug 2017 22:17:48 +0200
Subject: [PATCH 115/188] Pico::evaluateRequestUrl(): Improve REQUEST_URI
 handling

Don't 404 "/index.php" requests
---
 lib/Pico.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 327f7ac..f936de1 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -972,8 +972,12 @@ class Pico
             $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
             if ($requestUri && (substr($requestUri, 0, $basePathLength) === $basePath)) {
                 $requestUri = substr($requestUri, $basePathLength);
-                $requestUri = strstr($requestUri, '?', true) ?: $requestUri;
-                $this->requestUrl = rtrim(rawurldecode($requestUri), '/');
+                if ($requestUri && (($queryStringPos = strpos($requestUri, '?')) !== false)) {
+                    $requestUri = substr($requestUri, 0, $queryStringPos);
+                }
+                if ($requestUri && ($requestUri !== basename($_SERVER['SCRIPT_NAME']))) {
+                    $this->requestUrl = rtrim(rawurldecode($requestUri), '/');
+                }
             }
         }
     }

From 32ae70f3981f7888db9c56e137ee65dcea4af89b Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 5 Aug 2017 00:19:03 +0200
Subject: [PATCH 116/188] Add $default param to getConfig() method

- Pico::getConfig()
- AbstractPicoPlugin::getPluginCongif()
---
 lib/AbstractPicoPlugin.php | 25 +++++++++++++------------
 lib/Pico.php               | 13 ++++++++-----
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 7c8b5f8..d01033a 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -150,22 +150,23 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      * the config array
      *
      * @param  string $configName optional name of a config variable
-     * @return mixed              returns either the value of the named plugin
-     *     config variable, null if the config variable doesn't exist or the
-     *     plugin's config array if no config name was supplied
+     * @param  mixed  $default    optional default value to return when the
+     *     named config variable doesn't exist
+     * @return mixed              if no name of a config variable has been
+     *     supplied, the plugin's config array is returned; otherwise it
+     *     returns either the value of the named config variable, or, if the
+     *     named config variable doesn't exist, the provided default value
+     *     or NULL
      */
-    public function getPluginConfig($configName = null)
+    public function getPluginConfig($configName = null, $default = null)
     {
-        $pluginConfig = $this->getConfig(get_called_class());
-        if ($pluginConfig) {
-            if ($configName === null) {
-                return $pluginConfig;
-            } elseif (isset($pluginConfig[$configName])) {
-                return $pluginConfig[$configName];
-            }
+        $pluginConfig = $this->getConfig(get_called_class(), array());
+
+        if ($configName === null) {
+            return $pluginConfig;
         }
 
-        return null;
+        return isset($pluginConfig[$configName]) ? $pluginConfig[$configName] : $default;
     }
 
     /**
diff --git a/lib/Pico.php b/lib/Pico.php
index f936de1..f1ddfb9 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -901,14 +901,17 @@ class Pico
      * @see    Pico::setConfig()
      * @see    Pico::loadConfig()
      * @param  string $configName optional name of a config variable
-     * @return mixed              returns either the value of the named config
-     *     variable, null if the config variable doesn't exist or the config
-     *     array if no config name was supplied
+     * @param  mixed  $default    optional default value to return when the
+     *     named config variable doesn't exist
+     * @return mixed              if no name of a config variable has been
+     *     supplied, the config array is returned; otherwise it returns either
+     *     the value of the named config variable, or, if the named config
+     *     variable doesn't exist, the provided default value or NULL
      */
-    public function getConfig($configName = null)
+    public function getConfig($configName = null, $default = null)
     {
         if ($configName !== null) {
-            return isset($this->config[$configName]) ? $this->config[$configName] : null;
+            return isset($this->config[$configName]) ? $this->config[$configName] : $default;
         } else {
             return $this->config;
         }

From fc76d37dbca70c7e6aefa3807f005860d73bbb0b Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 5 Aug 2017 02:49:58 +0200
Subject: [PATCH 117/188] Improve class docs

---
 lib/AbstractPicoPlugin.php  |  3 +++
 lib/PicoPluginInterface.php | 17 +++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index d01033a..a189f84 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -3,6 +3,9 @@
 /**
  * Abstract class to extend from when implementing a Pico plugin
  *
+ * Please refer to {@see PicoPluginInterface} for more information about how
+ * to develop a plugin for Pico.
+ *
  * @see PicoPluginInterface
  *
  * @author  Daniel Rudolf
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index 1bba28e..13ca9d2 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -7,18 +7,11 @@
  * {@see DummyPlugin} as template for new plugins. For a list of deprecated
  * events see {@see PicoDeprecated}.
  *
- * You SHOULD NOT use deprecated events when implementing this interface.
- * Deprecated events are triggered by the {@see PicoDeprecated} plugin, if
- * plugins which don't implement this interface are loaded. You can take
- * advantage from this behaviour if you want to do something only when old
- * plugins are loaded. Consequently the old events are never triggered when
- * your plugin is implementing this interface and no old plugins are present.
- *
- * If you're developing a new plugin, you MUST implement this interface. If
- * you're the developer of an old plugin, it is STRONGLY RECOMMENDED to use
- * the events introduced in Pico 1.0 when releasing a new version of your
- * plugin. If you want to use any of the new events, you MUST implement
- * this interface and update all other events you use.
+ * If you're developing a new plugin, you MUST both implement this interface
+ * and define the class constant `API_VERSION`. You SHOULD always use the
+ * API version of Pico's latest milestone when releasing a plugin. If you're
+ * developing a new version of an existing plugin, it is strongly recommended
+ * to update your plugin to use Pico's latest API version.
  *
  * @author  Daniel Rudolf
  * @link    http://picocms.org

From 7087573aedfc16ce2aa94eee0ad05ae79b3e2d39 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 8 Oct 2017 00:35:36 +0200
Subject: [PATCH 118/188] Pico::loadPlugins(): Load composer-plugins first and
 skip conflicting plugins in the plugins/ dir

---
 lib/Pico.php | 223 +++++++++++++++++++++++++++++----------------------
 1 file changed, 125 insertions(+), 98 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index f1ddfb9..89e799b 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -444,9 +444,13 @@ class Pico
     /**
      * Loads plugins from vendor/pico-plugin.php and Pico::$pluginsDir
      *
-     * See {@see Pico::loadLocalPlugins()} for details about plugins installed
-     * to {@see Pico::$pluginsDir}, and {@see Pico::loadComposerPlugins()} for
-     * details about plugins installed using `composer`.
+     * See {@see Pico::loadComposerPlugins()} for details about plugins loaded
+     * from `vendor/pico-plugin.php` (i.e. plugins that were installed using
+     * `composer`), and {@see Pico::loadLocalPlugins()} for details about
+     * plugins installed to {@see Pico::$pluginsDir}.
+     *
+     * Pico always loads plugins from `vendor/pico-plugin.php` first and
+     * ignores conflicting plugins in {@see Pico::$pluginsDir}.
      *
      * Please note that Pico will change the processing order when needed to
      * incorporate plugin dependencies. See {@see Pico::sortPlugins()} for
@@ -460,108 +464,16 @@ class Pico
      */
     protected function loadPlugins()
     {
-        $this->loadLocalPlugins();
         $this->loadComposerPlugins();
-    }
-
-    /**
-     * Loads plugins from Pico::$pluginsDir in alphabetical order
-     *
-     * Pico tries to load plugins from `<plugin name>/<plugin name>.php` and
-     * `<plugin name>.php` only. Plugin names are treated case insensitive.
-     * Pico will throw a RuntimeException if it can't load a plugin.
-     *
-     * Plugin files MAY be prefixed by a number (e.g. 00-PicoDeprecated.php)
-     * to indicate their processing order. Plugins without a prefix will be
-     * loaded last. If you want to use a prefix, you MUST NOT use the reserved
-     * prefixes `00` to `09`. Prefixes are completely optional, however, you
-     * SHOULD take the following prefix classification into consideration:
-     * - 10 to 19: Reserved
-     * - 20 to 39: Low level code helper plugins
-     * - 40 to 59: Plugins manipulating routing or the pages array
-     * - 60 to 79: Plugins hooking into template or markdown parsing
-     * - 80 to 99: Plugins using the `onPageRendered` event
-     *
-     * @see    Pico::loadPlugins()
-     * @see    Pico::loadComposerPlugins()
-     * @return void
-     * @throws RuntimeException thrown when a plugin couldn't be loaded
-     */
-    protected function loadLocalPlugins()
-    {
-        $pluginFiles = array();
-        $files = scandir($this->getPluginsDir());
-        if ($files !== false) {
-            foreach ($files as $file) {
-                if ($file[0] === '.') {
-                    continue;
-                }
-
-                if (is_dir($this->getPluginsDir() . $file)) {
-                    $className = preg_replace('/^[0-9]+-/', '', $file);
-
-                    $subdirFiles = $this->getFilesGlob($this->getPluginsDir() . $file . '/?*.php', self::SORT_NONE);
-                    foreach ($subdirFiles as $subdirFile) {
-                        $subdirFile = basename($subdirFile, '.php');
-                        if (strcasecmp($className, $subdirFile) === 0) {
-                            $pluginFiles[$className] = $file . '/' . $subdirFile . '.php';
-                        }
-                    }
-
-                    if (!isset($pluginFiles[$className])) {
-                        throw new RuntimeException(
-                            "Unable to load plugin '" . $className . "' from "
-                            . "'" . $file . "/" . $className . ".php': File not found"
-                        );
-                    }
-                } elseif (substr($file, -4) === '.php') {
-                    $className = preg_replace('/^[0-9]+-/', '', substr($file, 0, -4));
-                    $pluginFiles[$className] = $file;
-                }
-            }
-        }
-
-        // scope isolated require()
-        $includeClosure = function ($pluginFile) {
-            require($pluginFile);
-        };
-        if (PHP_VERSION_ID >= 50400) {
-            $includeClosure = $includeClosure->bindTo(null);
-        }
-
-        foreach ($pluginFiles as $className => $pluginFile) {
-            $includeClosure($this->getPluginsDir() . $pluginFile);
-
-            if (class_exists($className, false)) {
-                // class name and file name can differ regarding case sensitivity
-                $plugin = new $className($this);
-                $className = get_class($plugin);
-
-                if (isset($this->plugins[$className])) {
-                    continue;
-                }
-
-                $this->plugins[$className] = $plugin;
-
-                if ($plugin instanceof PicoPluginInterface) {
-                    if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
-                        $this->nativePlugins[$className] = $plugin;
-                    }
-                }
-            } else {
-                throw new RuntimeException("Unable to load plugin '" . $className . "' from '" . $pluginFile . "'");
-            }
-        }
+        $this->loadLocalPlugins();
     }
 
     /**
      * Loads plugins from vendor/pico-plugin.php
      *
      * This method loads all plugins installed using `composer` and Pico's
-     * `picocms/pico-composer` installer by reading the `pico-plugin.php` in
-     * composer's `vendor` dir. Using composer enables plugin developers to
-     * load multiple plugins and their dependencies using a single composer
-     * package.
+     * `picocms/pico-installer` installer by reading the `pico-plugin.php` in
+     * composer's `vendor` dir.
      *
      * @see    Pico::loadPlugins()
      * @see    Pico::loadLocalPlugins()
@@ -581,6 +493,119 @@ class Pico
         foreach ($composerPlugins as $package => $classNames) {
             foreach ($classNames as $className) {
                 $plugin = new $className($this);
+                $className = get_class($plugin);
+
+                if (isset($this->plugins[$className])) {
+                    continue;
+                }
+
+                if (!($plugin instanceof PicoPluginInterface)) {
+                    throw new RuntimeException(
+                        "Unable to load plugin '" . $className . "' via 'vendor/pico-plugin.php': "
+                        . "Plugins installed by composer must implement 'PicoPluginInterface'"
+                    );
+                }
+
+                $this->plugins[$className] = $plugin;
+
+                if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
+                    $this->nativePlugins[$className] = $plugin;
+                }
+            }
+        }
+    }
+
+    /**
+     * Loads plugins from Pico::$pluginsDir in alphabetical order
+     *
+     * Pico tries to load plugins from `<plugin name>/<plugin name>.php` and
+     * `<plugin name>.php` only. Plugin names are treated case insensitive.
+     * Pico will throw a RuntimeException if it can't load a plugin.
+     *
+     * Plugin files MAY be prefixed by a number (e.g. `00-PicoDeprecated.php`)
+     * to indicate their processing order. Plugins without a prefix will be
+     * loaded last. If you want to use a prefix, you MUST NOT use the reserved
+     * prefixes `00` to `09`. Prefixes are completely optional, however, you
+     * SHOULD take the following prefix classification into consideration:
+     * - 10 to 19: Reserved
+     * - 20 to 39: Low level code helper plugins
+     * - 40 to 59: Plugins manipulating routing or the pages array
+     * - 60 to 79: Plugins hooking into template or markdown parsing
+     * - 80 to 99: Plugins using the `onPageRendered` event
+     *
+     * @see    Pico::loadPlugins()
+     * @see    Pico::loadComposerPlugins()
+     * @return void
+     * @throws RuntimeException thrown when a plugin couldn't be loaded
+     */
+    protected function loadLocalPlugins()
+    {
+        $pluginsLowered = array_change_key_case($this->plugins, CASE_LOWER);
+
+        $pluginFiles = array();
+        $files = scandir($this->getPluginsDir()) ?: array();
+        foreach ($files as $file) {
+            if ($file[0] === '.') {
+                continue;
+            }
+
+            if (is_dir($this->getPluginsDir() . $file)) {
+                $className = preg_replace('/^[0-9]+-/', '', $file);
+                $classNameLowered = strtolower($className);
+
+                if (isset($pluginsLowered[$classNameLowered])) {
+                    continue;
+                }
+
+                if (file_exists($this->getPluginsDir() . $file . '/' . $className . '.php')) {
+                    $pluginFiles[$className] = $file . '/' . $className . '.php';
+                } else {
+                    $subdirFiles = $this->getFilesGlob($this->getPluginsDir() . $file . '/?*.php', self::SORT_NONE);
+                    foreach ($subdirFiles as $subdirFile) {
+                        $subdirFile = basename($subdirFile, '.php');
+                        if ($classNameLowered === strtolower($subdirFile)) {
+                            $pluginFiles[$className] = $file . '/' . $subdirFile . '.php';
+                            break;
+                        }
+                    }
+                }
+
+                if (!isset($pluginFiles[$className])) {
+                    throw new RuntimeException(
+                        "Unable to load plugin '" . $className . "' from "
+                        . "'" . $file . "/" . $className . ".php': File not found"
+                    );
+                }
+            } elseif (substr($file, -4) === '.php') {
+                $className = preg_replace('/^[0-9]+-/', '', substr($file, 0, -4));
+                $classNameLowered = strtolower($className);
+
+                if (isset($pluginsLowered[$classNameLowered])) {
+                    continue;
+                }
+
+                $pluginFiles[$className] = $file;
+            } else {
+                throw new RuntimeException("Unable to load plugin from '" . $file . "': Not a valid plugin file");
+            }
+        }
+
+        // scope isolated require()
+        $includeClosure = function ($pluginFile) {
+            require($pluginFile);
+        };
+        if (PHP_VERSION_ID >= 50400) {
+            $includeClosure = $includeClosure->bindTo(null);
+        }
+
+        foreach ($pluginFiles as $className => $pluginFile) {
+            $includeClosure($this->getPluginsDir() . $pluginFile);
+
+            if (class_exists($className, false)) {
+                // class name and file name can differ regarding case sensitivity
+                $plugin = new $className($this);
+                $className = get_class($plugin);
+
                 $this->plugins[$className] = $plugin;
 
                 if ($plugin instanceof PicoPluginInterface) {
@@ -588,6 +613,8 @@ class Pico
                         $this->nativePlugins[$className] = $plugin;
                     }
                 }
+            } else {
+                throw new RuntimeException("Unable to load plugin '" . $className . "' from '" . $pluginFile . "'");
             }
         }
     }

From 9a9872fe8e321747f09f5e64f38d613242745529 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 8 Oct 2017 00:36:14 +0200
Subject: [PATCH 119/188] Add Pico::getPageId()

---
 lib/Pico.php | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 89e799b..24a82c8 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1676,17 +1676,8 @@ class Pico
      */
     protected function discoverCurrentPage()
     {
-        $contentDir = $this->getConfig('content_dir');
-        $contentDirLength = strlen($contentDir);
-
-        // the requested file is not in the regular content directory, therefore its ID
-        // isn't specified and it's impossible to determine the current page automatically
-        if (substr($this->requestFile, 0, $contentDirLength) !== $contentDir) {
-            return;
-        }
-
-        $currentPageId = substr($this->requestFile, $contentDirLength, -strlen($this->getConfig('content_ext')));
-        if (isset($this->pages[$currentPageId])) {
+        $currentPageId = $this->getPageId($this->requestFile);
+        if ($currentPageId && isset($this->pages[$currentPageId])) {
             $this->currentPage = &$this->pages[$currentPageId];
             $this->previousPage = &$this->pages[$currentPageId]['previous_page'];
             $this->nextPage = &$this->pages[$currentPageId]['next_page'];
@@ -1930,6 +1921,30 @@ class Pico
         }
     }
 
+    /**
+     * Returns the page ID of a given content file
+     *
+     * @param  string      $path path to the content file
+     * @return string|null       either the corresponding page ID or null
+     */
+    public function getPageId($path)
+    {
+        $contentDir = $this->getConfig('content_dir');
+        $contentDirLength = strlen($contentDir);
+
+        $contentExt = $this->getConfig('content_ext');
+        $contentExtLength = strlen($contentExt);
+
+        if (substr($path, 0, $contentDirLength) !== $contentDir) {
+            return null;
+        }
+        if (substr($path, -$contentExtLength) !== $contentExt) {
+            return null;
+        }
+
+        return substr($path, $contentDirLength, -$contentExtLength) ?: null;
+    }
+
     /**
      * Returns the URL of the themes folder of this Pico instance
      *

From b6468ca215d56e3abff879306645fb54b438519a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 8 Oct 2017 00:36:29 +0200
Subject: [PATCH 120/188] Various small improvements

---
 index.php    | 2 +-
 lib/Pico.php | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index e582694..4fb0d55 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@ if (is_file(__DIR__ . '/vendor/autoload.php')) {
     // composer dependency package
     require_once(__DIR__ . '/../../../vendor/autoload.php');
 } else {
-    die("Cannot find `vendor/autoload.php`. Run `composer install`.");
+    die("Cannot find 'vendor/autoload.php'. Run `composer install`.");
 }
 
 // instance Pico
diff --git a/lib/Pico.php b/lib/Pico.php
index 24a82c8..829d749 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -131,7 +131,7 @@ class Pico
     /**
      * List of loaded plugins using the current API version
      *
-     * @var object[]
+     * @var PicoPluginInterface[]
      */
     protected $nativePlugins = array();
 
@@ -661,6 +661,7 @@ class Pico
         }
 
         $className = get_class($plugin);
+
         if (!($plugin instanceof PicoPluginInterface)) {
             throw new RuntimeException(
                 "Unable to load plugin '" . $className . "': "
@@ -676,7 +677,7 @@ class Pico
 
         // trigger onPluginManuallyLoaded event
         // the event is also called on the newly loaded plugin, allowing you to distinguish manual and auto loading
-        $this->triggerEvent('onPluginManuallyLoaded', array($this->plugins[$className]));
+        $this->triggerEvent('onPluginManuallyLoaded', array($plugin));
 
         return $plugin;
     }
@@ -2192,7 +2193,7 @@ class Pico
     public function getAbsolutePath($path)
     {
         if (DIRECTORY_SEPARATOR === '\\') {
-            if (preg_match('/^([a-zA-Z]:\\\\|\\\\\\\\)/', $path) !== 1) {
+            if (preg_match('/^(?>[a-zA-Z]:\\\\|\\\\\\\\)/', $path) !== 1) {
                 $path = $this->getRootDir() . $path;
             }
         } else {

From 20297deaec5edc393688be36787ad188a6a1fc99 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 12 Oct 2017 12:11:55 +0200
Subject: [PATCH 121/188] Pico::loadLocalPlugins(): Don't load plugins
 case-insensitive

The performance vs. error-proneness trade-off doesn't justify this additional complexity. This is Pico 2.0, we always try to minimize BC-breaking changes, but we're breaking BC anyway by loading plugins from plugins/<plugin name>/<plugin name>.php only...
---
 lib/Pico.php | 83 ++++++++++++++++++++--------------------------------
 1 file changed, 31 insertions(+), 52 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 829d749..6ffd810 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -540,56 +540,6 @@ class Pico
      */
     protected function loadLocalPlugins()
     {
-        $pluginsLowered = array_change_key_case($this->plugins, CASE_LOWER);
-
-        $pluginFiles = array();
-        $files = scandir($this->getPluginsDir()) ?: array();
-        foreach ($files as $file) {
-            if ($file[0] === '.') {
-                continue;
-            }
-
-            if (is_dir($this->getPluginsDir() . $file)) {
-                $className = preg_replace('/^[0-9]+-/', '', $file);
-                $classNameLowered = strtolower($className);
-
-                if (isset($pluginsLowered[$classNameLowered])) {
-                    continue;
-                }
-
-                if (file_exists($this->getPluginsDir() . $file . '/' . $className . '.php')) {
-                    $pluginFiles[$className] = $file . '/' . $className . '.php';
-                } else {
-                    $subdirFiles = $this->getFilesGlob($this->getPluginsDir() . $file . '/?*.php', self::SORT_NONE);
-                    foreach ($subdirFiles as $subdirFile) {
-                        $subdirFile = basename($subdirFile, '.php');
-                        if ($classNameLowered === strtolower($subdirFile)) {
-                            $pluginFiles[$className] = $file . '/' . $subdirFile . '.php';
-                            break;
-                        }
-                    }
-                }
-
-                if (!isset($pluginFiles[$className])) {
-                    throw new RuntimeException(
-                        "Unable to load plugin '" . $className . "' from "
-                        . "'" . $file . "/" . $className . ".php': File not found"
-                    );
-                }
-            } elseif (substr($file, -4) === '.php') {
-                $className = preg_replace('/^[0-9]+-/', '', substr($file, 0, -4));
-                $classNameLowered = strtolower($className);
-
-                if (isset($pluginsLowered[$classNameLowered])) {
-                    continue;
-                }
-
-                $pluginFiles[$className] = $file;
-            } else {
-                throw new RuntimeException("Unable to load plugin from '" . $file . "': Not a valid plugin file");
-            }
-        }
-
         // scope isolated require()
         $includeClosure = function ($pluginFile) {
             require($pluginFile);
@@ -598,7 +548,34 @@ class Pico
             $includeClosure = $includeClosure->bindTo(null);
         }
 
-        foreach ($pluginFiles as $className => $pluginFile) {
+        $pluginFiles = array();
+        $files = scandir($this->getPluginsDir()) ?: array();
+        foreach ($files as $file) {
+            if ($file[0] === '.') {
+                continue;
+            }
+
+            $className = $pluginFile = null;
+            if (is_dir($this->getPluginsDir() . $file)) {
+                $className = preg_replace('/^[0-9]+-/', '', $file);
+                $pluginFile = $file . '/' . $className . '.php';
+
+                if (!file_exists($this->getPluginsDir() . $pluginFile)) {
+                    throw new RuntimeException(
+                        "Unable to load plugin '" . $className . "' from '" . $pluginFile . "': File not found"
+                    );
+                }
+            } elseif (substr($file, -4) === '.php') {
+                $className = preg_replace('/^[0-9]+-/', '', substr($file, 0, -4));
+                $pluginFile = $file;
+            } else {
+                throw new RuntimeException("Unable to load plugin from '" . $file . "': Not a valid plugin file");
+            }
+
+            if (isset($this->plugins[$className])) {
+                continue;
+            }
+
             $includeClosure($this->getPluginsDir() . $pluginFile);
 
             if (class_exists($className, false)) {
@@ -614,7 +591,9 @@ class Pico
                     }
                 }
             } else {
-                throw new RuntimeException("Unable to load plugin '" . $className . "' from '" . $pluginFile . "'");
+                throw new RuntimeException(
+                    "Unable to load plugin '" . $className . "' from '" . $pluginFile . "': Plugin class not found"
+                );
             }
         }
     }

From 9dcb06c258bc43db4946f1ca45aee0d6cb52981b Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 12 Oct 2017 12:12:37 +0200
Subject: [PATCH 122/188] Pico::sortPlugins(): Fix sorting of non-native
 plugins

---
 lib/Pico.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 6ffd810..9f116e4 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -692,9 +692,17 @@ class Pico
     protected function sortPlugins()
     {
         $plugins = $this->plugins;
+        $nativePlugins = $this->nativePlugins;
         $sortedPlugins = array();
         $visitedPlugins = array();
-        $visitPlugin = function ($plugin) use ($plugins, &$sortedPlugins, &$visitedPlugins, &$visitPlugin) {
+
+        $visitPlugin = function ($plugin) use (
+            $plugins,
+            $nativePlugins,
+            &$sortedPlugins,
+            &$visitedPlugins,
+            &$visitPlugin
+        ) {
             $pluginName = get_class($plugin);
 
             // skip already visited plugins and ignore circular dependencies
@@ -705,7 +713,7 @@ class Pico
                 if ($plugin instanceof PicoPluginInterface) {
                     $dependencies = $plugin->getDependencies();
                 }
-                if (!isset($this->nativePlugins[$pluginName])) {
+                if (!isset($nativePlugins[$pluginName])) {
                     $dependencies[] = 'PicoDeprecated';
                 }
 

From ee013f98ee12ac284daa7e57063f8d82564b017e Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 12 Oct 2017 15:06:22 +0200
Subject: [PATCH 123/188] Build system: Fix _build/create-release-archive.sh

---
 _build/create-release-archive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_build/create-release-archive.sh b/_build/create-release-archive.sh
index d5c2cd4..a1fd763 100755
--- a/_build/create-release-archive.sh
+++ b/_build/create-release-archive.sh
@@ -17,7 +17,7 @@ mv index.php.dist index.php
 tar -czf "$ARCHIVE" \
     README.md LICENSE.md CONTRIBUTING.md CHANGELOG.md \
     composer.json composer.lock \
-    config content-sample lib plugins themes vendor \
+    assets config content content-sample lib plugins themes vendor \
     .htaccess index.php
 EXIT=$?
 

From 0318cc25d78481dba5a6ecb88951f6fe5f0dfdf5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 12 Oct 2017 15:07:11 +0200
Subject: [PATCH 124/188] Build system: Add cloc statistics to release
 deployment

---
 _build/deploy-phpdoc-release.sh |  21 ++++++-
 _build/update-cloc-stats.sh     | 104 ++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100755 _build/update-cloc-stats.sh

diff --git a/_build/deploy-phpdoc-release.sh b/_build/deploy-phpdoc-release.sh
index 8188911..0ff50d1 100755
--- a/_build/deploy-phpdoc-release.sh
+++ b/_build/deploy-phpdoc-release.sh
@@ -9,8 +9,8 @@ fi
 if [ "$DEPLOY_VERSION_FILE" != "true" ]; then
     echo "Skipping version file deployment because it has been disabled"
 fi
-if [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] || [ "$DEPLOY_VERSION_BADGE" != "true" ] || [ "$DEPLOY_VERSION_FILE" != "true" ]; then
-    [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] && [ "$DEPLOY_VERSION_BADGE" != "true" ] && [ "$DEPLOY_VERSION_FILE" != "true" ] && exit 0 || echo
+if [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] || [ "$DEPLOY_VERSION_BADGE" != "true" ] || [ "$DEPLOY_VERSION_FILE" != "true" ] || [ "$DEPLOY_CLOC_STATS" != "true" ]; then
+    [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] && [ "$DEPLOY_VERSION_BADGE" != "true" ] && [ "$DEPLOY_VERSION_FILE" != "true" ] && [ "$DEPLOY_CLOC_STATS" != "true" ] && exit 0 || echo
 fi
 
 DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
@@ -93,6 +93,23 @@ if [ "$DEPLOY_VERSION_FILE" == "true" ]; then
     echo
 fi
 
+# update cloc statistics
+if [ "$DEPLOY_CLOC_STATS" == "true" ]; then
+    update-cloc-stats.sh \
+        "$DEPLOYMENT_DIR/_data/clocCore.yml" \
+        "$DEPLOYMENT_DIR/_data/clocRelease.yml"
+    [ $? -eq 0 ] || exit 1
+
+    # commit cloc statistics
+    echo "Commiting cloc statistics..."
+    git add "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
+    git commit \
+        --message="Update cloc statistics for $TRAVIS_TAG" \
+        "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
+    [ $? -eq 0 ] || exit 1
+    echo
+fi
+
 # deploy
 github-deploy.sh "$TRAVIS_REPO_SLUG" "tags/$TRAVIS_TAG" "$TRAVIS_COMMIT"
 [ $? -eq 0 ] || exit 1
diff --git a/_build/update-cloc-stats.sh b/_build/update-cloc-stats.sh
new file mode 100755
index 0000000..04a133c
--- /dev/null
+++ b/_build/update-cloc-stats.sh
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+
+##
+# Updates the cloc statistics files
+#
+# @author  Daniel Rudolf
+# @link    http://picocms.org
+# @license http://opensource.org/licenses/MIT
+#
+
+set -e
+
+# parameters
+CORE_TARGET_FILE="$1"     # target file path for core statistics
+RELEASE_TARGET_FILE="$2"  # target file path for release package statistics
+
+# print parameters
+echo "Updating cloc statistics..."
+printf 'CORE_TARGET_FILE="%s"\n' "$CORE_TARGET_FILE"
+printf 'RELEASE_TARGET_FILE="%s"\n' "$RELEASE_TARGET_FILE"
+echo
+
+# create cloc statistics
+create_cloc_stats() {
+    local CLOC_FILE="$1"
+    shift
+
+    cloc --yaml --report-file "$CLOC_FILE" \
+        --progress-rate 0 \
+        --read-lang-def <(
+            echo "JSON"
+            echo "    filter remove_matches ^\s*$"
+            echo "    extension json"
+            echo "    3rd_gen_scale 2.50"
+            echo "Twig"
+            echo "    filter remove_between_general {# #}"
+            echo "    extension twig"
+            echo "    3rd_gen_scale 2.00"
+            echo "Markdown"
+            echo "    filter remove_html_comments"
+            echo "    extension md"
+            echo "    3rd_gen_scale 1.00"
+            echo "Apache config"
+            echo "    filter remove_matches ^\s*#"
+            echo "    filter remove_inline #.*$"
+            echo "    extension htaccess"
+            echo "    3rd_gen_scale 1.90"
+        ) \
+        --force-lang PHP,php.dist \
+        --force-lang YAML,yml.template \
+        "$@"
+}
+
+# remove header from cloc statistics
+clean_cloc_stats() {
+    local LINE=""
+    local IS_HEADER="no"
+    while IFS='' read -r LINE || [[ -n "$LINE" ]]; do
+        if [ "$IS_HEADER" == "yes" ]; then
+            # skip lines until next entry is reached
+            [ "${LINE:0:2}" != "  " ] || continue
+            IS_HEADER="no"
+        elif [ "$LINE" == "header :" ]; then
+            # header detected
+            IS_HEADER="yes"
+            continue
+        fi
+
+        echo "$LINE"
+    done < <(tail -n +3 "$1")
+}
+
+# create temporary files
+printf 'Creating temporary files...\n'
+CORE_TMP_FILE="$(mktemp)"
+RELEASE_TMP_FILE="$(mktemp)"
+[ -n "$CORE_TMP_FILE" ] && [ -n "$RELEASE_TMP_FILE" ] || exit 1
+echo
+
+# create core statistics
+printf 'Creating core statistics...\n'
+create_cloc_stats "$CORE_TMP_FILE" \
+    lib index.php
+echo
+
+printf 'Creating release package statistics...\n'
+create_cloc_stats "$RELEASE_TMP_FILE" \
+    README.md LICENSE.md CONTRIBUTING.md CHANGELOG.md \
+    assets config content content-sample lib plugins themes \
+    .htaccess index.php.dist composer.json
+echo
+
+# remove headers from cloc statistics
+printf 'Writing core statistics file without header...\n'
+clean_cloc_stats "$CORE_TMP_FILE" > "$CORE_TARGET_FILE"
+
+printf 'Writing release package statistics file without header...\n'
+clean_cloc_stats "$RELEASE_TMP_FILE" > "$RELEASE_TARGET_FILE"
+echo
+
+# remove temporary files
+printf 'Removing temporary files...\n'
+rm "$CORE_TMP_FILE" "$RELEASE_TMP_FILE"
+echo

From 867f81a443dd4578a59f3f437f0d3d1adbd6cc47 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 12 Oct 2017 16:03:41 +0200
Subject: [PATCH 125/188] Various small improvements

---
 _build/update-phpdoc-list.sh |  2 +-
 lib/Pico.php                 | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/_build/update-phpdoc-list.sh b/_build/update-phpdoc-list.sh
index c6f48c2..06cfba6 100755
--- a/_build/update-phpdoc-list.sh
+++ b/_build/update-phpdoc-list.sh
@@ -41,7 +41,7 @@ DID_REPLACE="no"
 while IFS='' read -r LINE || [[ -n "$LINE" ]]; do
     if [ "$DO_REPLACE" == "yes" ]; then
         # skip lines until next entry is reached
-        [ "${LINE:0:2}" == "  " ] && continue
+        [ "${LINE:0:2}" != "  " ] || continue
         DO_REPLACE="no"
 
     elif [ "$LINE" == "- id: $LIST_ID" ]; then
diff --git a/lib/Pico.php b/lib/Pico.php
index 9f116e4..c0405c8 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1789,7 +1789,7 @@ class Pico
      */
     protected function getTwigTemplate()
     {
-        $templateName = $this->meta['template'] ?: 'index';
+        $templateName = !empty($this->meta['template']) ? $this->meta['template'] : 'index';
 
         if (file_exists($this->getThemesDir() . $this->getConfig('theme') . '/' . $templateName . '.twig')) {
             $templateName .= '.twig';
@@ -1839,9 +1839,9 @@ class Pico
     }
 
     /**
-     * Returns true if URL rewriting is enabled
+     * Returns TRUE if URL rewriting is enabled
      *
-     * @return boolean true if URL rewriting is enabled, false otherwise
+     * @return boolean TRUE if URL rewriting is enabled, FALSE otherwise
      */
     public function isUrlRewritingEnabled()
     {
@@ -1913,19 +1913,20 @@ class Pico
      * Returns the page ID of a given content file
      *
      * @param  string      $path path to the content file
-     * @return string|null       either the corresponding page ID or null
+     * @return string|null       either the corresponding page ID or NULL
      */
     public function getPageId($path)
     {
         $contentDir = $this->getConfig('content_dir');
         $contentDirLength = strlen($contentDir);
 
-        $contentExt = $this->getConfig('content_ext');
-        $contentExtLength = strlen($contentExt);
-
         if (substr($path, 0, $contentDirLength) !== $contentDir) {
             return null;
         }
+
+        $contentExt = $this->getConfig('content_ext');
+        $contentExtLength = strlen($contentExt);
+
         if (substr($path, -$contentExtLength) !== $contentExt) {
             return null;
         }

From 709416328a24733bcf2fa7568e0d8cd834018835 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 13 Oct 2017 21:02:51 +0200
Subject: [PATCH 126/188] Pico::loadPlugins(): Add plugin blacklist and allow
 disabling local plugins

---
 lib/Pico.php | 59 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index c0405c8..e74b49c 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -135,6 +135,15 @@ class Pico
      */
     protected $nativePlugins = array();
 
+    /**
+     * Boolean indicating whether Pico loads plugins from the filesystem
+     *
+     * @see Pico::loadPlugins()
+     * @see Pico::loadLocalPlugins()
+     * @var bool
+     */
+    protected $enableLocalPlugins = true;
+
     /**
      * Current configuration of this Pico instance
      *
@@ -276,18 +285,21 @@ class Pico
      *
      * To carry out all the processing in Pico, call {@see Pico::run()}.
      *
-     * @param string $rootDir    root directory of this Pico instance
-     * @param string $configDir  config directory of this Pico instance
-     * @param string $pluginsDir plugins directory of this Pico instance
-     * @param string $themesDir  themes directory of this Pico instance
+     * @param string $rootDir            root dir of this Pico instance
+     * @param string $configDir          config dir of this Pico instance
+     * @param string $pluginsDir         plugins dir of this Pico instance
+     * @param string $themesDir          themes dir of this Pico instance
+     * @param bool   $enableLocalPlugins enables (TRUE; default) or disables
+     *     (FALSE) loading plugins from the filesystem
      */
-    public function __construct($rootDir, $configDir, $pluginsDir, $themesDir)
+    public function __construct($rootDir, $configDir, $pluginsDir, $themesDir, $enableLocalPlugins = true)
     {
         $this->rootDir = rtrim($rootDir, '/\\') . '/';
         $this->vendorDir = dirname(__DIR__) . '/';
         $this->configDir = $this->getAbsolutePath($configDir);
         $this->pluginsDir = $this->getAbsolutePath($pluginsDir);
         $this->themesDir = $this->getAbsolutePath($themesDir);
+        $this->enableLocalPlugins = (bool) $enableLocalPlugins;
     }
 
     /**
@@ -447,7 +459,9 @@ class Pico
      * See {@see Pico::loadComposerPlugins()} for details about plugins loaded
      * from `vendor/pico-plugin.php` (i.e. plugins that were installed using
      * `composer`), and {@see Pico::loadLocalPlugins()} for details about
-     * plugins installed to {@see Pico::$pluginsDir}.
+     * plugins installed to {@see Pico::$pluginsDir}. Pico loads plugins from
+     * the filesystem only if {@see Pico::$enableLocalPlugins} is set to TRUE
+     * (this is the default).
      *
      * Pico always loads plugins from `vendor/pico-plugin.php` first and
      * ignores conflicting plugins in {@see Pico::$pluginsDir}.
@@ -464,8 +478,11 @@ class Pico
      */
     protected function loadPlugins()
     {
-        $this->loadComposerPlugins();
-        $this->loadLocalPlugins();
+        $composerPlugins = $this->loadComposerPlugins();
+
+        if ($this->enableLocalPlugins) {
+            $this->loadLocalPlugins($composerPlugins);
+        }
     }
 
     /**
@@ -477,9 +494,10 @@ class Pico
      *
      * @see    Pico::loadPlugins()
      * @see    Pico::loadLocalPlugins()
-     * @return void
+     * @param  string[] $pluginBlacklist class names of plugins not to load
+     * @return string[]                  installer names of the loaded plugins
      */
-    protected function loadComposerPlugins()
+    protected function loadComposerPlugins(array $pluginBlacklist = array())
     {
         $composerPlugins = array();
         if (file_exists($this->getVendorDir() . 'vendor/pico-plugin.php')) {
@@ -490,12 +508,17 @@ class Pico
             $composerPlugins = require($this->getVendorDir() . '../../../vendor/pico-plugin.php') ?: array();
         }
 
-        foreach ($composerPlugins as $package => $classNames) {
-            foreach ($classNames as $className) {
+        $pluginBlacklist = array_fill_keys($pluginBlacklist, true);
+
+        $loadedPlugins = array();
+        foreach ($composerPlugins as $package => $pluginData) {
+            $loadedPlugins[] = $pluginData['installerName'];
+
+            foreach ($pluginData['classNames'] as $className) {
                 $plugin = new $className($this);
                 $className = get_class($plugin);
 
-                if (isset($this->plugins[$className])) {
+                if (isset($this->plugins[$className]) || isset($pluginBlacklist[$className])) {
                     continue;
                 }
 
@@ -513,6 +536,8 @@ class Pico
                 }
             }
         }
+
+        return $loadedPlugins;
     }
 
     /**
@@ -535,10 +560,11 @@ class Pico
      *
      * @see    Pico::loadPlugins()
      * @see    Pico::loadComposerPlugins()
+     * @param  string[] $pluginBlacklist class names of plugins not to load
      * @return void
      * @throws RuntimeException thrown when a plugin couldn't be loaded
      */
-    protected function loadLocalPlugins()
+    protected function loadLocalPlugins(array $pluginBlacklist = array())
     {
         // scope isolated require()
         $includeClosure = function ($pluginFile) {
@@ -548,7 +574,8 @@ class Pico
             $includeClosure = $includeClosure->bindTo(null);
         }
 
-        $pluginFiles = array();
+        $pluginBlacklist = array_fill_keys($pluginBlacklist, true);
+
         $files = scandir($this->getPluginsDir()) ?: array();
         foreach ($files as $file) {
             if ($file[0] === '.') {
@@ -572,7 +599,7 @@ class Pico
                 throw new RuntimeException("Unable to load plugin from '" . $file . "': Not a valid plugin file");
             }
 
-            if (isset($this->plugins[$className])) {
+            if (isset($this->plugins[$className]) || isset($pluginBlacklist[$className])) {
                 continue;
             }
 

From a231abc4c1f3954c4b60bdc5166b9893638dc863 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 13 Oct 2017 22:06:02 +0200
Subject: [PATCH 127/188] Remove picocms/pico-deprecated and picocms/pico-theme
 dependencies

In the future we'll use picocms/pico-composer to create Pico's release packages (and picocms/pico-composer depends on picocms/pico-deprecated and picocms/pico-theme by default). Installing picocms/pico-deprecated and picocms/pico-theme is no longer required, but rather suggested. You simply don't need them in any case. You need picocms/pico-deprecated only if you're using old plugins, and picocms/pico-theme is obsolete when using a 3rd-party theme.
---
 composer.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index f9b90a2..37e0d80 100644
--- a/composer.json
+++ b/composer.json
@@ -28,9 +28,12 @@
         "ext-mbstring": "*",
         "twig/twig": "^1.18",
         "symfony/yaml" : "^2.3",
-        "erusev/parsedown-extra": "^0.7",
-        "picocms/pico-theme": "self.version",
-        "picocms/pico-deprecated": "self.version"
+        "erusev/parsedown-extra": "^0.7"
+    },
+    "suggest": {
+        "picocms/pico-theme": "Pico requires a theme to actually display the contents of your website. This is Pico's official default theme.",
+        "picocms/pico-deprecated": "PicoDeprecated's purpose is to maintain backward compatibility to older versions of Pico.",
+        "picocms/composer-installer": "This Composer plugin is responsible for installing Pico plugins and themes using the Composer package manager."
     },
     "require-dev" : {
         "phpdocumentor/phpdocumentor": "^2.8",

From 151908fbad1c582b127f9f29adef1f5d872c9214 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 14 Oct 2017 22:08:11 +0200
Subject: [PATCH 128/188] Remove various event params that are a bit out of
 place

---
 lib/Pico.php            | 27 ++++++++++++---------------
 plugins/DummyPlugin.php | 25 +++++++++++++------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index e74b49c..37c6a27 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -395,13 +395,13 @@ class Pico
         $this->triggerEvent('onRequestFile', array(&$this->requestFile));
 
         // load raw file content
-        $this->triggerEvent('onContentLoading', array(&$this->requestFile));
+        $this->triggerEvent('onContentLoading');
 
         $hiddenFileRegex = '/(?:^|\/)(?:_|404' . preg_quote($this->getConfig('content_ext'), '/') . '$)/';
         if (file_exists($this->requestFile) && !preg_match($hiddenFileRegex, $this->requestFile)) {
             $this->rawContent = $this->loadFileContent($this->requestFile);
         } else {
-            $this->triggerEvent('on404ContentLoading', array(&$this->requestFile));
+            $this->triggerEvent('on404ContentLoading');
 
             header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
             $this->rawContent = $this->load404Content($this->requestFile);
@@ -413,17 +413,17 @@ class Pico
         $this->triggerEvent('onContentLoaded', array(&$this->rawContent));
 
         // parse file meta
-        $this->triggerEvent('onMetaParsing', array(&$this->rawContent));
+        $this->triggerEvent('onMetaParsing');
         $this->meta = $this->parseFileMeta($this->rawContent, $this->getMetaHeaders());
         $this->triggerEvent('onMetaParsed', array(&$this->meta));
 
         // parse file content
-        $this->triggerEvent('onContentParsing', array(&$this->rawContent));
+        $this->triggerEvent('onContentParsing');
 
-        $this->content = $this->prepareFileContent($this->rawContent, $this->meta);
-        $this->triggerEvent('onContentPrepared', array(&$this->content));
+        $markdown = $this->prepareFileContent($this->rawContent, $this->meta);
+        $this->triggerEvent('onContentPrepared', array(&$markdown));
 
-        $this->content = $this->parseFileContent($this->content);
+        $this->content = $this->parseFileContent($markdown);
         $this->triggerEvent('onContentParsed', array(&$this->content));
 
         // read pages
@@ -1490,15 +1490,12 @@ class Pico
             $id = substr($file, $contentDirLength, -$contentExtLength);
 
             // trigger onSinglePageLoading event
-            $this->triggerEvent('onSinglePageLoading', array(&$id));
-
-            if ($id === null) {
-                continue;
-            }
-
-            // drop inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists)
+            // skip inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists) by default
             $conflictFile = $contentDir . $id . '/index' . $contentExt;
-            if (in_array($conflictFile, $files, true)) {
+            $skipFile = in_array($conflictFile, $files, true) ?: null;
+            $this->triggerEvent('onSinglePageLoading', array($id, &$skipFile));
+
+            if ($skipFile) {
                 continue;
             }
 
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index c201628..00877bd 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -113,10 +113,9 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @see    Pico::loadFileContent()
      * @see    DummyPlugin::onContentLoaded()
-     * @param  string &$file path to the file which contents will be read
      * @return void
      */
-    public function onContentLoading(&$file)
+    public function onContentLoading()
     {
         // your code
     }
@@ -126,10 +125,9 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @see    Pico::load404Content()
      * @see    DummyPlugin::on404ContentLoaded()
-     * @param  string &$file path to the file which contents were requested
      * @return void
      */
-    public function on404ContentLoading(&$file)
+    public function on404ContentLoading()
     {
         // your code
     }
@@ -167,11 +165,9 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @see    Pico::parseFileMeta()
      * @see    DummyPlugin::onMetaParsed()
-     * @param  string   &$rawContent raw file contents
-     * @param  string[] &$headers    known meta header fields
      * @return void
      */
-    public function onMetaParsing(&$rawContent, array &$headers)
+    public function onMetaParsing()
     {
         // your code
     }
@@ -194,10 +190,9 @@ class DummyPlugin extends AbstractPicoPlugin
      * @see    Pico::prepareFileContent()
      * @see    DummyPlugin::prepareFileContent()
      * @see    DummyPlugin::onContentParsed()
-     * @param  string &$rawContent raw file contents of the requested page
      * @return void
      */
-    public function onContentParsing(&$rawContent)
+    public function onContentParsing()
     {
         // your code
     }
@@ -246,16 +241,22 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico loads a single page
      *
-     * Set `$id` to `null` to remove this page from the pages array.
+     * Set the `$skipFile` parameter to TRUE to remove this page from the pages
+     * array. Pico usually passes NULL by default, unless it is a conflicting
+     * page (i.e. `content/sub.md`, but there's also a `content/sub/index.md`),
+     * then it passes TRUE. Don't change this value incautiously if it isn't
+     * NULL! Someone likely set it to TRUE or FALSE on purpose...
      *
      * @see    DummyPlugin::onSinglePageContent()
      * @see    DummyPlugin::onSinglePageLoaded()
      * @see    DummyPlugin::onPagesDiscovered()
      * @see    DummyPlugin::onPagesLoaded()
-     * @param  string &$id relative path to the content file
+     * @param  string    $id       relative path to the content file
+     * @param  bool|null $skipPage set this to TRUE to remove this page from
+     *     the pages array, otherwise leave it unchanged
      * @return void
      */
-    public function onSinglePageLoading(&$id)
+    public function onSinglePageLoading($id, &$skipPage)
     {
         // your code
     }

From d8a649e6f7f86f49898604b88aa043cb049739f4 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 14 Oct 2017 23:12:16 +0200
Subject: [PATCH 129/188] Don't lower meta data unsolicited and flip meta
 headers array

Don't lower unregistered meta headers on the first level unsolicited (e.g. `SomeNotRegisteredKey: foobar` in the YAML Frontmatter should result in `['SomeNotRegisteredKey']`, not `['somenotregisteredkey']`). Furthermore, Pico no longer compares registered meta headers in a case-insensitive manner. However, you can now register multiple search strings that are used to find a registered meta header. This is achieved by flipping the meta headers array: Pico 2.0 uses the array key to search for a meta value and the array value to store the found meta value. Previously it was the other way round (what didn't make much sense...).
---
 lib/Pico.php            | 38 +++++++++++++++-----------------------
 plugins/DummyPlugin.php |  4 ++--
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 37c6a27..4a32354 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1199,12 +1199,12 @@ class Pico
     {
         if ($this->metaHeaders === null) {
             $this->metaHeaders = array(
-                'title' => 'Title',
-                'description' => 'Description',
-                'author' => 'Author',
-                'date' => 'Date',
-                'robots' => 'Robots',
-                'template' => 'Template'
+                'Title' => 'title',
+                'Description' => 'description',
+                'Author' => 'author',
+                'Date' => 'date',
+                'Robots' => 'robots',
+                'Template' => 'template'
             );
 
             $this->triggerEvent('onMetaHeaders', array(&$this->metaHeaders));
@@ -1254,27 +1254,19 @@ class Pico
         $pattern = "/^(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
             . "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s";
         if (preg_match($pattern, $rawContent, $rawMetaMatches) && isset($rawMetaMatches[3])) {
-            $meta = $this->getYamlParser()->parse($rawMetaMatches[3]);
+            $meta = $this->getYamlParser()->parse($rawMetaMatches[3]) ?: array();
+            $meta = is_array($meta) ? $meta : array('title' => $meta);
 
-            if ($meta !== null) {
-                // the parser may return a string for non-YAML 1-liners
-                // assume that this string is the page title
-                $meta = is_array($meta) ? array_change_key_case($meta, CASE_LOWER) : array('title' => $meta);
-            } else {
-                $meta = array();
-            }
-
-            foreach ($headers as $fieldId => $fieldName) {
-                $fieldName = strtolower($fieldName);
-                if (isset($meta[$fieldName])) {
+            foreach ($headers as $name => $key) {
+                if (isset($meta[$name])) {
                     // rename field (e.g. remove whitespaces)
-                    if ($fieldId != $fieldName) {
-                        $meta[$fieldId] = $meta[$fieldName];
-                        unset($meta[$fieldName]);
+                    if ($key != $name) {
+                        $meta[$key] = $meta[$name];
+                        unset($meta[$name]);
                     }
-                } elseif (!isset($meta[$fieldId])) {
+                } elseif (!isset($meta[$key])) {
                     // guarantee array key existance
-                    $meta[$fieldId] = '';
+                    $meta[$key] = '';
                 }
             }
 
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 00877bd..e53ad00 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -403,8 +403,8 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @see    Pico::getMetaHeaders()
      * @param  string[] &$headers list of known meta header
-     *     fields; the array value specifies the YAML key to search for, the
-     *     array key is later used to access the found value
+     *     fields; the array key specifies the YAML key to search for, the
+     *     array value is later used to access the found value
      * @return void
      */
     public function onMetaHeaders(array &$headers)

From 61319b011eb3566374149f779018df60d163e6be Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 19 Oct 2017 21:55:41 +0200
Subject: [PATCH 130/188] Add license/copyright file header; improve phpDoc
 class docs

---
 composer.json               |   7 +-
 lib/AbstractPicoPlugin.php  |  65 +++---
 lib/Pico.php                | 398 ++++++++++++++++++++++--------------
 lib/PicoPluginInterface.php |  51 +++--
 lib/PicoTwigExtension.php   |  61 ++++--
 plugins/DummyPlugin.php     | 258 ++++++++++++++---------
 6 files changed, 518 insertions(+), 322 deletions(-)

diff --git a/composer.json b/composer.json
index 37e0d80..82cbc89 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,11 @@
         },
         {
             "name": "The Pico Community",
-            "homepage": "https://github.com/picocms/Pico/graphs/contributors",
-            "role": "Contributors"
+            "homepage": "http://picocms.org/"
+        },
+        {
+            "name": "Contributors",
+            "homepage": "https://github.com/picocms/Pico/graphs/contributors"
         }
     ],
     "support": {
diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index a189f84..d361bba 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Pico. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from the following
+ * original location:
+ *
+ * <https://github.com/picocms/Pico/blob/master/lib/AbstractPicoPlugin.php>
+ *
+ * SPDX-License-Identifier: MIT
+ * License-Filename: LICENSE
+ */
 
 /**
  * Abstract class to extend from when implementing a Pico plugin
@@ -24,11 +34,11 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     private $pico;
 
     /**
-     * Boolean indicating if this plugin is enabled (true) or disabled (false)
+     * Boolean indicating if this plugin is enabled (TRUE) or disabled (FALSE)
      *
      * @see PicoPluginInterface::isEnabled()
      * @see PicoPluginInterface::setEnabled()
-     * @var boolean
+     * @var bool
      */
     protected $enabled = true;
 
@@ -36,7 +46,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      * Boolean indicating if this plugin was ever enabled/disabled manually
      *
      * @see PicoPluginInterface::isStatusChanged()
-     * @var boolean
+     * @var bool
      */
     protected $statusChanged = false;
 
@@ -44,7 +54,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      * Boolean indicating whether this plugin matches Pico's API version
      *
      * @see AbstractPicoPlugin::checkCompatibility()
-     * @var boolean|null
+     * @var bool|null
      */
     protected $nativePlugin;
 
@@ -152,14 +162,14 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      * Returns either the value of the specified plugin config variable or
      * the config array
      *
-     * @param  string $configName optional name of a config variable
-     * @param  mixed  $default    optional default value to return when the
+     * @param string $configName optional name of a config variable
+     * @param mixed  $default    optional default value to return when the
      *     named config variable doesn't exist
-     * @return mixed              if no name of a config variable has been
-     *     supplied, the plugin's config array is returned; otherwise it
-     *     returns either the value of the named config variable, or, if the
-     *     named config variable doesn't exist, the provided default value
-     *     or NULL
+     *
+     * @return mixed if no name of a config variable has been supplied, the
+     *     plugin's config array is returned; otherwise it returns either the
+     *     value of the named config variable, or, if the named config variable
+     *     doesn't exist, the provided default value or NULL
      */
     public function getPluginConfig($configName = null, $default = null)
     {
@@ -175,10 +185,12 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     /**
      * Passes all not satisfiable method calls to Pico
      *
-     * @see    Pico
-     * @param  string $methodName name of the method to call
-     * @param  array  $params     parameters to pass
-     * @return mixed              return value of the called method
+     * @see Pico
+     *
+     * @param string $methodName name of the method to call
+     * @param array  $params     parameters to pass
+     *
+     * @return mixed return value of the called method
      */
     public function __call($methodName, array $params)
     {
@@ -195,10 +207,13 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     /**
      * Enables all plugins which this plugin depends on
      *
-     * @see    PicoPluginInterface::getDependencies()
-     * @param  boolean $recursive enable required plugins automatically
+     * @see PicoPluginInterface::getDependencies()
+     *
+     * @param bool $recursive enable required plugins automatically
+     *
      * @return void
-     * @throws RuntimeException   thrown when a dependency fails
+     *
+     * @throws RuntimeException thrown when a dependency fails
      */
     protected function checkDependencies($recursive)
     {
@@ -244,10 +259,13 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     /**
      * Disables all plugins which depend on this plugin
      *
-     * @see    PicoPluginInterface::getDependants()
-     * @param  boolean $recursive disabled dependant plugins automatically
+     * @see PicoPluginInterface::getDependants()
+     *
+     * @param bool $recursive disabled dependant plugins automatically
+     *
      * @return void
-     * @throws RuntimeException   thrown when a dependency fails
+     *
+     * @throws RuntimeException thrown when a dependency fails
      */
     protected function checkDependants($recursive)
     {
@@ -308,8 +326,9 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      * newer API versions, what defaults to "no" by default.
      *
      * @return void
-     * @throws RuntimeException thrown when the plugin's and Pico's API
-     *     aren't compatible
+     *
+     * @throws RuntimeException thrown when the plugin's and Pico's API aren't
+     *     compatible
      */
     protected function checkCompatibility()
     {
diff --git a/lib/Pico.php b/lib/Pico.php
index 4a32354..c33a9ab 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * This file is part of Pico. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from the following
+ * original location:
+ *
+ * <https://github.com/picocms/Pico/blob/master/lib/Pico.php>
+ *
+ * The file has been renamed in the past; the version control history of the
+ * original file applies accordingly, available from the following original
+ * location:
+ *
+ * <https://github.com/picocms/Pico/blob/adc356251ecd79689935ec1446c7c846db167d46/lib/pico.php>
+ *
+ * SPDX-License-Identifier: MIT
+ * License-Filename: LICENSE
+ */
 
 /**
  * Pico
@@ -116,7 +132,7 @@ class Pico
     /**
      * Boolean indicating whether Pico started processing yet
      *
-     * @var boolean
+     * @var bool
      */
     protected $locked = false;
 
@@ -180,7 +196,7 @@ class Pico
      * Boolean indicating whether Pico is serving a 404 page
      *
      * @see Pico::is404Content()
-     * @var boolean
+     * @var bool
      */
     protected $is404Content = false;
 
@@ -359,8 +375,9 @@ class Pico
      * meta headers, processes Markdown, does Twig processing and returns
      * the rendered contents.
      *
-     * @return string    rendered Pico contents
-     * @throws Exception thrown when a not recoverable error occurs
+     * @return string rendered Pico contents
+     *
+     * @throws Exception thrown when a irrecoverable error occurs
      */
     public function run()
     {
@@ -470,10 +487,12 @@ class Pico
      * incorporate plugin dependencies. See {@see Pico::sortPlugins()} for
      * details.
      *
-     * @see    Pico::loadPlugin()
-     * @see    Pico::getPlugin()
-     * @see    Pico::getPlugins()
+     * @see Pico::loadPlugin()
+     * @see Pico::getPlugin()
+     * @see Pico::getPlugins()
+     *
      * @return void
+     *
      * @throws RuntimeException thrown when a plugin couldn't be loaded
      */
     protected function loadPlugins()
@@ -492,10 +511,12 @@ class Pico
      * `picocms/pico-installer` installer by reading the `pico-plugin.php` in
      * composer's `vendor` dir.
      *
-     * @see    Pico::loadPlugins()
-     * @see    Pico::loadLocalPlugins()
-     * @param  string[] $pluginBlacklist class names of plugins not to load
-     * @return string[]                  installer names of the loaded plugins
+     * @see Pico::loadPlugins()
+     * @see Pico::loadLocalPlugins()
+     *
+     * @param string[] $pluginBlacklist class names of plugins not to load
+     *
+     * @return string[] installer names of the loaded plugins
      */
     protected function loadComposerPlugins(array $pluginBlacklist = array())
     {
@@ -558,10 +579,13 @@ class Pico
      * - 60 to 79: Plugins hooking into template or markdown parsing
      * - 80 to 99: Plugins using the `onPageRendered` event
      *
-     * @see    Pico::loadPlugins()
-     * @see    Pico::loadComposerPlugins()
-     * @param  string[] $pluginBlacklist class names of plugins not to load
+     * @see Pico::loadPlugins()
+     * @see Pico::loadComposerPlugins()
+     *
+     * @param string[] $pluginBlacklist class names of plugins not to load
+     *
      * @return void
+     *
      * @throws RuntimeException thrown when a plugin couldn't be loaded
      */
     protected function loadLocalPlugins(array $pluginBlacklist = array())
@@ -646,14 +670,16 @@ class Pico
      *
      * This method triggers the `onPluginManuallyLoaded` event.
      *
-     * @see    Pico::loadPlugins()
-     * @see    Pico::getPlugin()
-     * @see    Pico::getPlugins()
-     * @param  PicoPluginInterface|string $plugin either the class name of a
+     * @see Pico::loadPlugins()
+     * @see Pico::getPlugin()
+     * @see Pico::getPlugins()
+     *
+     * @param PicoPluginInterface|string $plugin either the class name of a
      *     plugin to instantiate or a plugin instance
-     * @return PicoPluginInterface                instance of the loaded plugin
-     * @throws RuntimeException                   thrown when a plugin couldn't
-     *     be loaded
+     *
+     * @return PicoPluginInterface instance of the loaded plugin
+     *
+     * @throws RuntimeException thrown when a plugin couldn't be loaded
      */
     public function loadPlugin($plugin)
     {
@@ -708,12 +734,13 @@ class Pico
      * version 1.1.0, licensed under the MIT license. It uses the `ArraySort`
      * implementation (class `\MJS\TopSort\Implementations\ArraySort`).
      *
-     * @see    Pico::loadPlugins()
-     * @see    Pico::getPlugins()
-     * @see    https://github.com/marcj/topsort.php
+     * @see Pico::loadPlugins()
+     * @see Pico::getPlugins()
+     * @see https://github.com/marcj/topsort.php
      *     Marc J. Schmidt's Topological Sort / Dependency resolver in PHP
-     * @see    https://github.com/marcj/topsort.php/blob/1.1.0/src/Implementations/ArraySort.php
+     * @see https://github.com/marcj/topsort.php/blob/1.1.0/src/Implementations/ArraySort.php
      *     \MJS\TopSort\Implementations\ArraySort class
+     *
      * @return void
      */
     protected function sortPlugins()
@@ -773,11 +800,14 @@ class Pico
      * Plugins SHOULD implement {@see PicoPluginInterface}, but you MUST NOT
      * rely on it. For more information see {@see PicoPluginInterface}.
      *
-     * @see    Pico::loadPlugins()
-     * @see    Pico::getPlugins()
-     * @param  string           $pluginName name of the plugin
-     * @return object                       instance of the plugin
-     * @throws RuntimeException             thrown when the plugin wasn't found
+     * @see Pico::loadPlugins()
+     * @see Pico::getPlugins()
+     *
+     * @param string $pluginName name of the plugin
+     *
+     * @return object instance of the plugin
+     *
+     * @throws RuntimeException thrown when the plugin wasn't found
      */
     public function getPlugin($pluginName)
     {
@@ -791,8 +821,9 @@ class Pico
     /**
      * Returns all loaded plugins
      *
-     * @see    Pico::loadPlugins()
-     * @see    Pico::getPlugin()
+     * @see Pico::loadPlugins()
+     * @see Pico::getPlugin()
+     *
      * @return object[]|null
      */
     public function getPlugins()
@@ -811,8 +842,9 @@ class Pico
      * `test: { baz: 42 }` in `config/b.yml`, `{{ config.test.baz }}` will be
      * undefined!
      *
-     * @see    Pico::setConfig()
-     * @see    Pico::getConfig()
+     * @see Pico::setConfig()
+     * @see Pico::getConfig()
+     *
      * @return void
      */
     protected function loadConfig()
@@ -921,10 +953,13 @@ class Pico
      * {@see Pico::run()} only. Options set with this method cannot be
      * overwritten by {@path "config/config.yml"}.
      *
-     * @see    Pico::loadConfig()
-     * @see    Pico::getConfig()
-     * @param  array $config  array with config variables
+     * @see Pico::loadConfig()
+     * @see Pico::getConfig()
+     *
+     * @param array $config array with config variables
+     *
      * @return void
+     *
      * @throws LogicException thrown if Pico already started processing
      */
     public function setConfig(array $config)
@@ -940,15 +975,17 @@ class Pico
      * Returns either the value of the specified config variable or
      * the config array
      *
-     * @see    Pico::setConfig()
-     * @see    Pico::loadConfig()
-     * @param  string $configName optional name of a config variable
-     * @param  mixed  $default    optional default value to return when the
+     * @see Pico::setConfig()
+     * @see Pico::loadConfig()
+     *
+     * @param string $configName optional name of a config variable
+     * @param mixed  $default    optional default value to return when the
      *     named config variable doesn't exist
-     * @return mixed              if no name of a config variable has been
-     *     supplied, the config array is returned; otherwise it returns either
-     *     the value of the named config variable, or, if the named config
-     *     variable doesn't exist, the provided default value or NULL
+     *
+     * @return mixed if no name of a config variable has been supplied, the
+     *     config array is returned; otherwise it returns either the value of
+     *     the named config variable, or, if the named config variable doesn't
+     *     exist, the provided default value or NULL
      */
     public function getConfig($configName = null, $default = null)
     {
@@ -994,7 +1031,8 @@ class Pico
      * Pico interprets `someBooleanParam` as name of the requested page. Use
      * `/pico/?someBooleanParam=` or `/pico/?index&someBooleanParam` instead.
      *
-     * @see    Pico::getRequestUrl()
+     * @see Pico::getRequestUrl()
+     *
      * @return void
      */
     protected function evaluateRequestUrl()
@@ -1030,7 +1068,8 @@ class Pico
     /**
      * Returns the URL where a user requested the page
      *
-     * @see    Pico::evaluateRequestUrl()
+     * @see Pico::evaluateRequestUrl()
+     *
      * @return string|null request URL
      */
     public function getRequestUrl()
@@ -1048,9 +1087,11 @@ class Pico
      * RECOMMENDED to use PHP's `open_basedir` feature - always, not just
      * with Pico!
      *
-     * @see    Pico::getRequestFile()
-     * @param  string $requestUrl path name (likely from a URL) to resolve
-     * @return string             path to the resolved content file
+     * @see Pico::getRequestFile()
+     *
+     * @param string $requestUrl path name (likely from a URL) to resolve
+     *
+     * @return string path to the resolved content file
      */
     public function resolveFilePath($requestUrl)
     {
@@ -1099,8 +1140,9 @@ class Pico
     /**
      * Returns the absolute path to the content file to serve
      *
-     * @see    Pico::resolveFilePath()
-     * @return string|null file path
+     * @see Pico::resolveFilePath()
+     *
+     * @return string|null file pat
      */
     public function getRequestFile()
     {
@@ -1110,9 +1152,11 @@ class Pico
     /**
      * Returns the raw contents of a file
      *
-     * @see    Pico::getRawContent()
-     * @param  string $file file path
-     * @return string       raw contents of the file
+     * @see Pico::getRawContent()
+     *
+     * @param string $file file path
+     *
+     * @return string raw contents of the file
      */
     public function loadFileContent($file)
     {
@@ -1125,9 +1169,11 @@ class Pico
      *
      * If no suitable `404.md` is found, fallback to a built-in error message.
      *
-     * @see    Pico::getRawContent()
-     * @param  string $file     path to requested (but not existing) file
-     * @return string           raw contents of the 404 file
+     * @see Pico::getRawContent()
+     *
+     * @param string $file path to requested (but not existing) file
+     *
+     * @return string raw contents of the 404 file
      */
     public function load404Content($file)
     {
@@ -1165,8 +1211,9 @@ class Pico
     /**
      * Returns the raw contents, either of the requested or the 404 file
      *
-     * @see    Pico::loadFileContent()
-     * @see    Pico::load404Content()
+     * @see Pico::loadFileContent()
+     * @see Pico::load404Content()
+     *
      * @return string|null raw contents
      */
     public function getRawContent()
@@ -1177,8 +1224,9 @@ class Pico
     /**
      * Returns TRUE when Pico is serving a 404 page
      *
-     * @see    Pico::load404Content()
-     * @return boolean TRUE if Pico is serving a 404 page, FALSE otherwise
+     * @see Pico::load404Content()
+     *
+     * @return bool TRUE if Pico is serving a 404 page, FALSE otherwise
      */
     public function is404Content()
     {
@@ -1191,8 +1239,8 @@ class Pico
      * This method triggers the `onMetaHeaders` event when the known meta
      * headers weren't assembled yet.
      *
-     * @return string[] known meta headers; the array value specifies the
-     *     YAML key to search for, the array key is later used to access the
+     * @return string[] known meta headers; the array key specifies the YAML
+     *     key to search for, the array value is later used to access the
      *     found value
      */
     public function getMetaHeaders()
@@ -1241,10 +1289,13 @@ class Pico
      * `onMetaHeaders` event first. The implicit availability of headers is
      * for users and pure (!) theme developers ONLY.
      *
-     * @see    Pico::getFileMeta()
-     * @param  string   $rawContent the raw file contents
-     * @param  string[] $headers    known meta headers
-     * @return array                parsed meta data
+     * @see Pico::getFileMeta()
+     *
+     * @param string   $rawContent the raw file contents
+     * @param string[] $headers    known meta headers
+     *
+     * @return array parsed meta data
+     *
      * @throws \Symfony\Component\Yaml\Exception\ParseException thrown when the
      *     meta data is invalid
      */
@@ -1305,7 +1356,8 @@ class Pico
     /**
      * Returns the parsed meta data of the requested page
      *
-     * @see    Pico::parseFileMeta()
+     * @see Pico::parseFileMeta()
+     *
      * @return array|null parsed meta data
      */
     public function getFileMeta()
@@ -1343,12 +1395,14 @@ class Pico
      *
      * This method calls the {@see Pico::substituteFileContent()} method.
      *
-     * @see    Pico::substituteFileContent()
-     * @see    Pico::parseFileContent()
-     * @see    Pico::getFileContent()
-     * @param  string $rawContent raw contents of a page
-     * @param  array  $meta       meta data to use for %meta.*% replacement
-     * @return string             prepared Markdown contents
+     * @see Pico::substituteFileContent()
+     * @see Pico::parseFileContent()
+     * @see Pico::getFileContent()
+     *
+     * @param string $rawContent raw contents of a page
+     * @param array  $meta       meta data to use for %meta.*% replacement
+     *
+     * @return string prepared Markdown contents
      */
     public function prepareFileContent($rawContent, array $meta)
     {
@@ -1366,9 +1420,10 @@ class Pico
     /**
      * Replaces all %...% placeholders in a page's contents
      *
-     * @param  string $markdown Markdown contents of a page
-     * @param  array  $meta     meta data to use for %meta.*% replacement
-     * @return string           substituted Markdown contents
+     * @param string $markdown Markdown contents of a page
+     * @param array  $meta     meta data to use for %meta.*% replacement
+     *
+     * @return string substituted Markdown contents
      */
     public function substituteFileContent($markdown, array $meta = array())
     {
@@ -1409,11 +1464,13 @@ class Pico
     /**
      * Parses the contents of a page using ParsedownExtra
      *
-     * @see    Pico::prepareFileContent()
-     * @see    Pico::substituteFileContent()
-     * @see    Pico::getFileContent()
-     * @param  string $markdown Markdown contents of a page
-     * @return string           parsed contents (HTML)
+     * @see Pico::prepareFileContent()
+     * @see Pico::substituteFileContent()
+     * @see Pico::getFileContent()
+     *
+     * @param string $markdown Markdown contents of a page
+     *
+     * @return string parsed contents (HTML)
      */
     public function parseFileContent($markdown)
     {
@@ -1423,9 +1480,10 @@ class Pico
     /**
      * Returns the cached contents of the requested page
      *
-     * @see    Pico::prepareFileContent()
-     * @see    Pico::substituteFileContent()
-     * @see    Pico::parseFileContent()
+     * @see Pico::prepareFileContent()
+     * @see Pico::substituteFileContent()
+     * @see Pico::parseFileContent()
+     *
      * @return string|null parsed contents
      */
     public function getFileContent()
@@ -1448,19 +1506,20 @@ class Pico
      * | time           | string  | timestamp derived from the Date header     |
      * | date           | string  | date of the page (YAML header)             |
      * | date_formatted | string  | formatted date of the page                 |
-     * | hidden         | boolean | this page shouldn't be visible to the user |
+     * | hidden         | bool    | this page shouldn't be visible to the user |
      * | raw_content    | string  | raw, not yet parsed contents of the page   |
      * | meta           | string  | parsed meta data of the page               |
      * | previous_page  | &array  | reference to the previous page             |
      * | next_page      | &array  | reference to the next page                 |
      *
      * Please note that the `previous_page` and `next_page` keys won't be
-     * available until the `onCurrentPageDiscovered` event
-     * ({@see Pico::discoverPageSiblings()}) was triggered.
+     * available until the `onCurrentPageDiscovered` event was triggered
+     * ({@see Pico::discoverPageSiblings()}).
+     *
+     * @see Pico::sortPages()
+     * @see Pico::discoverPageSiblings()
+     * @see Pico::getPages()
      *
-     * @see    Pico::sortPages()
-     * @see    Pico::discoverPageSiblings()
-     * @see    Pico::getPages()
      * @return void
      */
     protected function readPages()
@@ -1545,8 +1604,9 @@ class Pico
     /**
      * Sorts all pages known to Pico
      *
-     * @see    Pico::readPages()
-     * @see    Pico::getPages()
+     * @see Pico::readPages()
+     * @see Pico::getPages()
+     *
      * @return void
      */
     protected function sortPages()
@@ -1625,8 +1685,9 @@ class Pico
      * Walks through the list of all known pages and discovers the previous and
      * next page respectively
      *
-     * @see    Pico::readPages()
-     * @see    Pico::getPages()
+     * @see Pico::readPages()
+     * @see Pico::getPages()
+     *
      * @return void
      */
     protected function discoverPageSiblings()
@@ -1661,7 +1722,8 @@ class Pico
     /**
      * Returns the list of known pages
      *
-     * @see    Pico::readPages()
+     * @see Pico::readPages()
+     *
      * @return array[]|null the data of all pages
      */
     public function getPages()
@@ -1673,9 +1735,10 @@ class Pico
      * Discovers the page data of the requested page as well as the previous
      * and next page relative to it
      *
-     * @see    Pico::getCurrentPage()
-     * @see    Pico::getPreviousPage()
-     * @see    Pico::getNextPage()
+     * @see Pico::getCurrentPage()
+     * @see Pico::getPreviousPage()
+     * @see Pico::getNextPage()
+     *
      * @return void
      */
     protected function discoverCurrentPage()
@@ -1691,7 +1754,8 @@ class Pico
     /**
      * Returns the data of the requested page
      *
-     * @see    Pico::discoverCurrentPage()
+     * @see Pico::discoverCurrentPage()
+     *
      * @return array|null page data
      */
     public function getCurrentPage()
@@ -1702,7 +1766,8 @@ class Pico
     /**
      * Returns the data of the previous page relative to the page being served
      *
-     * @see    Pico::discoverCurrentPage()
+     * @see Pico::discoverCurrentPage()
+     *
      * @return array|null page data
      */
     public function getPreviousPage()
@@ -1713,7 +1778,8 @@ class Pico
     /**
      * Returns the data of the next page relative to the page being served
      *
-     * @see    Pico::discoverCurrentPage()
+     * @see Pico::discoverCurrentPage()
+     *
      * @return array|null page data
      */
     public function getNextPage()
@@ -1729,9 +1795,10 @@ class Pico
      * registers Pico's core Twig filters `link` and `content` as well as
      * Pico's {@see PicoTwigExtension} Twig extension.
      *
-     * @see    Pico::getTwig()
-     * @see    http://twig.sensiolabs.org/ Twig website
-     * @see    https://github.com/twigphp/Twig Twig on GitHub
+     * @see Pico::getTwig()
+     * @see http://twig.sensiolabs.org/ Twig website
+     * @see https://github.com/twigphp/Twig Twig on GitHub
+     *
      * @return Twig_Environment|null Twig template engine
      */
     public function getTwig()
@@ -1857,7 +1924,7 @@ class Pico
     /**
      * Returns TRUE if URL rewriting is enabled
      *
-     * @return boolean TRUE if URL rewriting is enabled, FALSE otherwise
+     * @return bool TRUE if URL rewriting is enabled, FALSE otherwise
      */
     public function isUrlRewritingEnabled()
     {
@@ -1883,12 +1950,13 @@ class Pico
      * This method can be used in Twig templates by applying the `link` filter
      * to a string representing a page identifier.
      *
-     * @param  string       $page      identifier of the page to link to
-     * @param  array|string $queryData either an array containing properties to
+     * @param string       $page      identifier of the page to link to
+     * @param array|string $queryData either an array containing properties to
      *     create a URL-encoded query string from, or a already encoded string
-     * @param  boolean      $dropIndex when the last path component is "index",
+     * @param bool         $dropIndex when the last path component is "index",
      *     then passing TRUE (default) leads to removing this path component
-     * @return string                  URL
+     *
+     * @return string URL
      */
     public function getPageUrl($page, $queryData = null, $dropIndex = true)
     {
@@ -1928,8 +1996,9 @@ class Pico
     /**
      * Returns the page ID of a given content file
      *
-     * @param  string      $path path to the content file
-     * @return string|null       either the corresponding page ID or NULL
+     * @param string $path path to the content file
+     *
+     * @return string|null either the corresponding page ID or NULL
      */
     public function getPageId($path)
     {
@@ -1991,17 +2060,19 @@ class Pico
      * {@see Pico::filterVariable()} for a detailed description. It can be
      * used in Twig templates by calling the `url_param` function.
      *
-     * @see    Pico::filterVariable()
-     * @param  string                    $name    name of the URL GET parameter
+     * @see Pico::filterVariable()
+     *
+     * @param string                    $name    name of the URL GET parameter
      *     to filter
-     * @param  int|string                $filter  the filter to apply
-     * @param  mixed|array               $options either a associative options
+     * @param int|string                $filter  the filter to apply
+     * @param mixed|array               $options either a associative options
      *     array to be used by the filter or a scalar default value
-     * @param  int|string|int[]|string[] $flags   flags and flag strings to
-     *     be used by the filter
-     * @return mixed                              either the filtered data,
-     *     FALSE if the filter fails, or NULL if the URL GET parameter doesn't
-     *     exist and no default value is given
+     * @param int|string|int[]|string[] $flags   flags and flag strings to be
+     *     used by the filter
+     *
+     * @return mixed either the filtered data, FALSE if the filter fails, or
+     *     NULL if the URL GET parameter doesn't exist and no default value is
+     *     given
      */
     public function getUrlParameter($name, $filter = '', $options = null, $flags = null)
     {
@@ -2016,17 +2087,19 @@ class Pico
      * {@see Pico::filterVariable()} for a detailed description. It can be
      * used in Twig templates by calling the `form_param` function.
      *
-     * @see    Pico::filterVariable()
-     * @param  string                    $name    name of the HTTP POST
+     * @see Pico::filterVariable()
+     *
+     * @param string                    $name    name of the HTTP POST
      *     parameter to filter
-     * @param  int|string                $filter  the filter to apply
-     * @param  mixed|array               $options either a associative options
+     * @param int|string                $filter  the filter to apply
+     * @param mixed|array               $options either a associative options
      *     array to be used by the filter or a scalar default value
-     * @param  int|string|int[]|string[] $flags   flags and flag strings to
-     *     be used by the filter
-     * @return mixed                              either the filtered data,
-     *     FALSE if the filter fails, or NULL if the HTTP POST parameter
-     *     doesn't exist and no default value is given
+     * @param int|string|int[]|string[] $flags   flags and flag strings to be
+     *     used by the filter
+     *
+     * @return mixed either the filtered data, FALSE if the filter fails, or
+     *     NULL if the HTTP POST parameter doesn't exist and no default value
+     *     is given
      */
     public function getFormParameter($name, $filter = '', $options = null, $flags = null)
     {
@@ -2051,30 +2124,31 @@ class Pico
      * sanitization filters; be very careful with sanitization filters, you
      * might create cross-site scripting vulnerabilities!
      *
-     * @see    https://secure.php.net/manual/en/function.filter-var.php
+     * @see https://secure.php.net/manual/en/function.filter-var.php
      *     PHP's `filter_var()` function
-     * @see    https://secure.php.net/manual/en/filter.filters.validate.php
+     * @see https://secure.php.net/manual/en/filter.filters.validate.php
      *     Validate filters
-     * @see    https://secure.php.net/manual/en/filter.filters.sanitize.php
+     * @see https://secure.php.net/manual/en/filter.filters.sanitize.php
      *     Sanitize filters
-     * @param  mixed                     $variable value to filter
-     * @param  int|string                $filter   ID (int) or name (string) of
+     *
+     * @param mixed                     $variable value to filter
+     * @param int|string                $filter   ID (int) or name (string) of
      *     the filter to apply; if omitted, the method will return FALSE
-     * @param  mixed|array               $options  either a associative array
+     * @param mixed|array               $options  either a associative array
      *     of options to be used by the filter (e.g. `array('default' => 42)`),
      *     or a scalar default value that will be returned when the passed
      *     value is NULL (optional)
-     * @param  int|string|int[]|string[] $flags    either a bitwise disjunction
+     * @param int|string|int[]|string[] $flags    either a bitwise disjunction
      *     of flags or a string with the significant part of a flag constant
      *     (the constant name is the result of "FILTER_FLAG_" and the given
      *     string in ASCII-only uppercase); you may also pass an array of flags
      *     and flag strings (optional)
-     * @return mixed                               with a validation filter,
-     *     the method either returns the validated value or, provided that the
-     *     value wasn't valid, the given default value or FALSE; with a
-     *     sanitization filter, the method returns the sanitized value; if no
-     *     value (i.e. NULL) was given, the method always returns either the
-     *     provided default value or NULL
+     *
+     * @return mixed with a validation filter, the method either returns the
+     *     validated value or, provided that the value wasn't valid, the given
+     *     default value or FALSE; with a sanitization filter, the method
+     *     returns the sanitized value; if no value (i.e. NULL) was given, the
+     *     method always returns either the provided default value or NULL
      */
     protected function filterVariable($variable, $filter = '', $options = null, $flags = null)
     {
@@ -2116,14 +2190,15 @@ class Pico
      * Recursively walks through a directory and returns all containing files
      * matching the specified file extension
      *
-     * @param  string $directory     start directory
-     * @param  string $fileExtension return files with the given file extension
+     * @param string $directory     start directory
+     * @param string $fileExtension return files with the given file extension
      *     only (optional)
-     * @param  int    $order         specify whether and how files should be
+     * @param int    $order         specify whether and how files should be
      *     sorted; use Pico::SORT_ASC for a alphabetical ascending order (this
      *     is the default behaviour), Pico::SORT_DESC for a descending order
      *     or Pico::SORT_NONE to leave the result unsorted
-     * @return array                 list of found files
+     *
+     * @return array list of found files
      */
     public function getFiles($directory, $fileExtension = '', $order = self::SORT_ASC)
     {
@@ -2156,15 +2231,17 @@ class Pico
     /**
      * Returns all files in a directory matching a libc glob() pattern
      *
-     * @see    https://secure.php.net/manual/en/function.glob.php
+     * @see https://secure.php.net/manual/en/function.glob.php
      *     PHP's glob() function
-     * @param  string $pattern the pattern to search for; see PHP's glob()
+     *
+     * @param string $pattern the pattern to search for; see PHP's glob()
      *     function for details
-     * @param  int    $order   specify whether and how files should be sorted;
+     * @param int    $order   specify whether and how files should be sorted;
      *     use Pico::SORT_ASC for a alphabetical ascending order (this is the
      *     default behaviour), Pico::SORT_DESC for a descending order or
      *     Pico::SORT_NONE to leave the result unsorted
-     * @return array           list of found files
+     *
+     * @return array list of found files
      */
     public function getFilesGlob($pattern, $order = self::SORT_ASC)
     {
@@ -2191,8 +2268,9 @@ class Pico
      *
      * This method also guarantees a trailing slash.
      *
-     * @param  string $path relative or absolute path
-     * @return string       absolute path
+     * @param string $path relative or absolute path
+     *
+     * @return string absolute path
      */
     public function getAbsolutePath($path)
     {
@@ -2219,11 +2297,13 @@ class Pico
      *
      * You MUST NOT trigger events of Pico's core with a plugin!
      *
-     * @see    PicoPluginInterface
-     * @see    AbstractPicoPlugin
-     * @see    DummyPlugin
-     * @param  string $eventName name of the event to trigger
-     * @param  array  $params    optional parameters to pass
+     * @see PicoPluginInterface
+     * @see AbstractPicoPlugin
+     * @see DummyPlugin
+     *
+     * @param string $eventName name of the event to trigger
+     * @param array  $params    optional parameters to pass
+     *
      * @return void
      */
     public function triggerEvent($eventName, array $params = array())
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index 13ca9d2..ff7de1d 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Pico. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from the following
+ * original location:
+ *
+ * <https://github.com/picocms/Pico/blob/master/lib/PicoPluginInterface.php>
+ *
+ * SPDX-License-Identifier: MIT
+ * License-Filename: LICENSE
+ */
 
 /**
  * Common interface for Pico plugins
@@ -30,8 +40,9 @@ interface PicoPluginInterface
     /**
      * Handles a event that was triggered by Pico
      *
-     * @param  string $eventName name of the triggered event
-     * @param  array  $params    passed parameters
+     * @param string $eventName name of the triggered event
+     * @param array  $params    passed parameters
+     *
      * @return void
      */
     public function handleEvent($eventName, array $params);
@@ -39,35 +50,40 @@ interface PicoPluginInterface
     /**
      * Enables or disables this plugin
      *
-     * @see    PicoPluginInterface::isEnabled()
-     * @see    PicoPluginInterface::isStatusChanged()
-     * @param  boolean $enabled     enable (true) or disable (false) this plugin
-     * @param  boolean $recursive   when true, enable or disable recursively
+     * @see PicoPluginInterface::isEnabled()
+     * @see PicoPluginInterface::isStatusChanged()
+     *
+     * @param bool $enabled   enable (TRUE) or disable (FALSE) this plugin
+     * @param bool $recursive when TRUE, enable or disable recursively.
      *     In other words, if you enable a plugin, all required plugins are
      *     enabled, too. When disabling a plugin, all depending plugins are
      *     disabled likewise. Recursive operations are only performed as long
      *     as a plugin wasn't enabled/disabled manually. This parameter is
-     *     optional and defaults to true.
-     * @param  boolean $auto        enable or disable to fulfill a dependency
-     *     This parameter is optional and defaults to false.
+     *     optional and defaults to TRUE.
+     * @param bool $auto      enable or disable to fulfill a dependency. This
+     *     parameter is optional and defaults to FALSE.
+     *
      * @return void
-     * @throws RuntimeException     thrown when a dependency fails
+     *
+     * @throws RuntimeException thrown when a dependency fails
      */
     public function setEnabled($enabled, $recursive = true, $auto = false);
 
     /**
-     * Returns true if this plugin is enabled, false otherwise
+     * Returns TRUE if this plugin is enabled, FALSE otherwise
      *
-     * @see    PicoPluginInterface::setEnabled()
-     * @return boolean plugin is enabled (true) or disabled (false)
+     * @see PicoPluginInterface::setEnabled()
+     *
+     * @return bool plugin is enabled (TRUE) or disabled (FALSE)
      */
     public function isEnabled();
 
     /**
-     * Returns true if the plugin was ever enabled/disabled manually
+     * Returns TRUE if the plugin was ever enabled/disabled manually
      *
-     * @see    PicoPluginInterface::setEnabled()
-     * @return boolean plugin is in its default state (true), false otherwise
+     * @see PicoPluginInterface::setEnabled()
+     *
+     * @return bool plugin is in its default state (TRUE), FALSE otherwise
      */
     public function isStatusChanged();
 
@@ -88,7 +104,8 @@ interface PicoPluginInterface
     /**
      * Returns the plugins instance of Pico
      *
-     * @see    Pico
+     * @see Pico
+     *
      * @return Pico the plugins instance of Pico
      */
     public function getPico();
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 02312e9..f4662b2 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Pico. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from the following
+ * original location:
+ *
+ * <https://github.com/picocms/Pico/blob/master/lib/PicoTwigExtension.php>
+ *
+ * SPDX-License-Identifier: MIT
+ * License-Filename: LICENSE
+ */
 
 /**
  * Pico's Twig extension to implement additional filters
@@ -31,8 +41,9 @@ class PicoTwigExtension extends Twig_Extension
     /**
      * Returns the extensions instance of Pico
      *
-     * @see    Pico
-     * @return Pico the extensions instance of Pico
+     * @see Pico
+     *
+     * @return Pico the extension's instance of Pico
      */
     public function getPico()
     {
@@ -42,7 +53,8 @@ class PicoTwigExtension extends Twig_Extension
     /**
      * Returns the name of the extension
      *
-     * @see    Twig_ExtensionInterface::getName()
+     * @see Twig_ExtensionInterface::getName()
+     *
      * @return string the extension name
      */
     public function getName()
@@ -53,7 +65,8 @@ class PicoTwigExtension extends Twig_Extension
     /**
      * Returns a list of Pico-specific Twig filters
      *
-     * @see    Twig_ExtensionInterface::getFilters()
+     * @see Twig_ExtensionInterface::getFilters()
+     *
      * @return Twig_SimpleFilter[] array of Pico's Twig filters
      */
     public function getFilters()
@@ -69,7 +82,8 @@ class PicoTwigExtension extends Twig_Extension
     /**
      * Returns a list of Pico-specific Twig functions
      *
-     * @see    Twig_ExtensionInterface::getFunctions()
+     * @see Twig_ExtensionInterface::getFunctions()
+     *
      * @return Twig_SimpleFunction[] array of Pico's Twig functions
      */
     public function getFunctions()
@@ -88,11 +102,13 @@ class PicoTwigExtension extends Twig_Extension
      * Don't use it to parse the contents of a page, use the `content` filter
      * instead, what ensures the proper preparation of the contents.
      *
-     * @see    Pico::substituteFileContent()
-     * @see    Pico::parseFileContent()
-     * @param  string $markdown markdown to parse
-     * @param  array  $meta     meta data to use for %meta.*% replacement
-     * @return string           parsed HTML
+     * @see Pico::substituteFileContent()
+     * @see Pico::parseFileContent()
+     *
+     * @param string $markdown markdown to parse
+     * @param array  $meta     meta data to use for %meta.*% replacement
+     *
+     * @return string parsed HTML
      */
     public function markdownFilter($markdown, array $meta = array())
     {
@@ -106,11 +122,12 @@ class PicoTwigExtension extends Twig_Extension
      * This method is registered as the Twig `map` filter. You can use this
      * filter to e.g. get all page titles (`{{ pages|map("title") }}`).
      *
-     * @param  array|Traversable $var        variable to map
-     * @param  mixed             $mapKeyPath key to map; either a scalar or a
+     * @param array|Traversable $var        variable to map
+     * @param mixed             $mapKeyPath key to map; either a scalar or a
      *     array interpreted as key path (i.e. ['foo', 'bar'] will return all
      *     $item['foo']['bar'] values)
-     * @return array                         mapped values
+     *
+     * @return array mapped values
      */
     public function mapFilter($var, $mapKeyPath)
     {
@@ -140,16 +157,17 @@ class PicoTwigExtension extends Twig_Extension
      * always sorted in ascending order, apply Twigs `reverse` filter to
      * achieve a descending order.
      *
-     * @param  array|Traversable $var         variable to sort
-     * @param  mixed             $sortKeyPath key to use for sorting; either
+     * @param array|Traversable $var         variable to sort
+     * @param mixed             $sortKeyPath key to use for sorting; either
      *     a scalar or a array interpreted as key path (i.e. ['foo', 'bar']
      *     will sort $var by $item['foo']['bar'])
-     * @param  string            $fallback    specify what to do with items
+     * @param string            $fallback    specify what to do with items
      *     which don't contain the specified sort key; use "bottom" (default)
      *     to move these items to the end of the sorted array, "top" to rank
      *     them first, "keep" to keep the original order, or "remove" to remove
      *     these items
-     * @return array                          sorted array
+     *
+     * @return array sorted array
      */
     public function sortByFilter($var, $sortKeyPath, $fallback = 'bottom')
     {
@@ -214,12 +232,13 @@ class PicoTwigExtension extends Twig_Extension
      * Returns the value of a variable item specified by a scalar key or a
      * arbitrary deep sub-key using a key path
      *
-     * @param  array|Traversable|ArrayAccess|object $var     base variable
-     * @param  mixed                                $keyPath scalar key or a
+     * @param array|Traversable|ArrayAccess|object $var     base variable
+     * @param mixed                                $keyPath scalar key or a
      *     array interpreted as key path (when passing e.g. ['foo', 'bar'],
      *     the method will return $var['foo']['bar']) specifying the value
-     * @return mixed                                         the requested
-     *     value or NULL when the given key or key path didn't match
+     *
+     * @return mixed the requested value or NULL when the given key or key path
+     *     didn't match
      */
     public static function getKeyOfVar($var, $keyPath)
     {
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index e53ad00..2d81818 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Pico. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from the following
+ * original location:
+ *
+ * <https://github.com/picocms/Pico/blob/master/plugins/DummyPlugin.php>
+ *
+ * SPDX-License-Identifier: MIT
+ * License-Filename: LICENSE
+ */
 
 /**
  * Pico dummy plugin - a template for plugins
@@ -27,7 +37,7 @@ class DummyPlugin extends AbstractPicoPlugin
      * property.
      *
      * @see AbstractPicoPlugin::$enabled
-     * @var boolean
+     * @var bool
      */
     protected $enabled = false;
 
@@ -48,9 +58,11 @@ class DummyPlugin extends AbstractPicoPlugin
      * This event is triggered nevertheless the plugin is enabled or not.
      * It is NOT guaranteed that plugin dependencies are fulfilled!
      *
-     * @see    Pico::getPlugin()
-     * @see    Pico::getPlugins()
-     * @param  object[] $plugins loaded plugin instances
+     * @see Pico::getPlugin()
+     * @see Pico::getPlugins()
+     *
+     * @param object[] $plugins loaded plugin instances
+     *
      * @return void
      */
     public function onPluginsLoaded(array $plugins)
@@ -61,9 +73,11 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico manually loads a plugin
      *
-     * @see    Pico::getPlugin()
-     * @see    Pico::getPlugins()
-     * @param  object $plugin loaded plugin instance
+     * @see Pico::getPlugin()
+     * @see Pico::getPlugins()
+     *
+     * @param object $plugin loaded plugin instance
+     *
      * @return void
      */
     public function onPluginManuallyLoaded($plugin)
@@ -74,8 +88,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has read its configuration
      *
-     * @see    Pico::getConfig()
-     * @param  array &$config array of config variables
+     * @see Pico::getConfig()
+     *
+     * @param array &$config array of config variables
+     *
      * @return void
      */
     public function onConfigLoaded(array &$config)
@@ -86,8 +102,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has evaluated the request URL
      *
-     * @see    Pico::getRequestUrl()
-     * @param  string &$url part of the URL describing the requested contents
+     * @see Pico::getRequestUrl()
+     *
+     * @param string &$url part of the URL describing the requested contents
+     *
      * @return void
      */
     public function onRequestUrl(&$url)
@@ -98,9 +116,11 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has discovered the content file to serve
      *
-     * @see    Pico::getBaseUrl()
-     * @see    Pico::getRequestFile()
-     * @param  string &$file absolute path to the content file to serve
+     * @see Pico::getBaseUrl()
+     * @see Pico::getRequestFile()
+     *
+     * @param string &$file absolute path to the content file to serve
+     *
      * @return void
      */
     public function onRequestFile(&$file)
@@ -111,8 +131,9 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico reads the contents of the file to serve
      *
-     * @see    Pico::loadFileContent()
-     * @see    DummyPlugin::onContentLoaded()
+     * @see Pico::loadFileContent()
+     * @see DummyPlugin::onContentLoaded()
+     *
      * @return void
      */
     public function onContentLoading()
@@ -123,8 +144,9 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico reads the contents of a 404 file
      *
-     * @see    Pico::load404Content()
-     * @see    DummyPlugin::on404ContentLoaded()
+     * @see Pico::load404Content()
+     * @see DummyPlugin::on404ContentLoaded()
+     *
      * @return void
      */
     public function on404ContentLoading()
@@ -135,8 +157,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has read the contents of the 404 file
      *
-     * @see    Pico::getRawContent()
-     * @param  string &$rawContent raw file contents
+     * @see Pico::getRawContent()
+     *
+     * @param string &$rawContent raw file contents
+     *
      * @return void
      */
     public function on404ContentLoaded(&$rawContent)
@@ -151,8 +175,10 @@ class DummyPlugin extends AbstractPicoPlugin
      * of said 404 file. Use {@see Pico::is404Content()} to check for this
      * case when necessary.
      *
-     * @see    Pico::getRawContent()
-     * @param  string &$rawContent raw file contents
+     * @see Pico::getRawContent()
+     *
+     * @param string &$rawContent raw file contents
+     *
      * @return void
      */
     public function onContentLoaded(&$rawContent)
@@ -163,8 +189,9 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico parses the meta header
      *
-     * @see    Pico::parseFileMeta()
-     * @see    DummyPlugin::onMetaParsed()
+     * @see Pico::parseFileMeta()
+     * @see DummyPlugin::onMetaParsed()
+     *
      * @return void
      */
     public function onMetaParsing()
@@ -175,8 +202,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has parsed the meta header
      *
-     * @see    Pico::getFileMeta()
-     * @param  string[] &$meta parsed meta data
+     * @see Pico::getFileMeta()
+     *
+     * @param string[] &$meta parsed meta data
+     *
      * @return void
      */
     public function onMetaParsed(array &$meta)
@@ -187,9 +216,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico parses the pages content
      *
-     * @see    Pico::prepareFileContent()
-     * @see    DummyPlugin::prepareFileContent()
-     * @see    DummyPlugin::onContentParsed()
+     * @see Pico::prepareFileContent()
+     * @see DummyPlugin::prepareFileContent()
+     * @see DummyPlugin::onContentParsed()
+     *
      * @return void
      */
     public function onContentParsing()
@@ -200,9 +230,11 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has prepared the raw file contents for parsing
      *
-     * @see    Pico::parseFileContent()
-     * @see    DummyPlugin::onContentParsed()
-     * @param  string &$markdown Markdown contents of the requested page
+     * @see Pico::parseFileContent()
+     * @see DummyPlugin::onContentParsed()
+     *
+     * @param string &$markdown Markdown contents of the requested page
+     *
      * @return void
      */
     public function onContentPrepared(&$markdown)
@@ -213,8 +245,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has parsed the contents of the file to serve
      *
-     * @see    Pico::getFileContent()
-     * @param  string &$content parsed contents (HTML) of the requested page
+     * @see Pico::getFileContent()
+     *
+     * @param string &$content parsed contents (HTML) of the requested page
+     *
      * @return void
      */
     public function onContentParsed(&$content)
@@ -225,12 +259,13 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico reads all known pages
      *
-     * @see    Pico::readPages()
-     * @see    DummyPlugin::onSinglePageLoading()
-     * @see    DummyPlugin::onSinglePageContent()
-     * @see    DummyPlugin::onSinglePageLoaded()
-     * @see    DummyPlugin::onPagesDiscovered()
-     * @see    DummyPlugin::onPagesLoaded()
+     * @see Pico::readPages()
+     * @see DummyPlugin::onSinglePageLoading()
+     * @see DummyPlugin::onSinglePageContent()
+     * @see DummyPlugin::onSinglePageLoaded()
+     * @see DummyPlugin::onPagesDiscovered()
+     * @see DummyPlugin::onPagesLoaded()
+     *
      * @return void
      */
     public function onPagesLoading()
@@ -247,13 +282,15 @@ class DummyPlugin extends AbstractPicoPlugin
      * then it passes TRUE. Don't change this value incautiously if it isn't
      * NULL! Someone likely set it to TRUE or FALSE on purpose...
      *
-     * @see    DummyPlugin::onSinglePageContent()
-     * @see    DummyPlugin::onSinglePageLoaded()
-     * @see    DummyPlugin::onPagesDiscovered()
-     * @see    DummyPlugin::onPagesLoaded()
-     * @param  string    $id       relative path to the content file
-     * @param  bool|null $skipPage set this to TRUE to remove this page from
-     *     the pages array, otherwise leave it unchanged
+     * @see DummyPlugin::onSinglePageContent()
+     * @see DummyPlugin::onSinglePageLoaded()
+     * @see DummyPlugin::onPagesDiscovered()
+     * @see DummyPlugin::onPagesLoaded()
+     *
+     * @param string    $id       relative path to the content file
+     * @param bool|null $skipPage set this to TRUE to remove this page from the
+     *     pages array, otherwise leave it unchanged
+     *
      * @return void
      */
     public function onSinglePageLoading($id, &$skipPage)
@@ -268,11 +305,13 @@ class DummyPlugin extends AbstractPicoPlugin
      * page is the requested page. The reason for this exception is that the
      * raw contents of this page were loaded already.
      *
-     * @see    DummyPlugin::onSinglePageLoaded()
-     * @see    DummyPlugin::onPagesDiscovered()
-     * @see    DummyPlugin::onPagesLoaded()
-     * @param  string $id          relative path to the content file
-     * @param  string &$rawContent raw file contents
+     * @see DummyPlugin::onSinglePageLoaded()
+     * @see DummyPlugin::onPagesDiscovered()
+     * @see DummyPlugin::onPagesLoaded()
+     *
+     * @param string $id          relative path to the content file
+     * @param string &$rawContent raw file contents
+     *
      * @return void
      */
     public function onSinglePageContent($id, &$rawContent)
@@ -285,30 +324,32 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * The `$pageData` parameter consists of the following values:
      *
-     * | Array key      | Type    | Description                                |
-     * | -------------- | ------- | ------------------------------------------ |
-     * | id             | string  | relative path to the content file          |
-     * | url            | string  | URL to the page                            |
-     * | title          | string  | title of the page (YAML header)            |
-     * | description    | string  | description of the page (YAML header)      |
-     * | author         | string  | author of the page (YAML header)           |
-     * | time           | string  | timestamp derived from the Date header     |
-     * | date           | string  | date of the page (YAML header)             |
-     * | date_formatted | string  | formatted date of the page                 |
-     * | hidden         | boolean | this page shouldn't be visible to the user |
-     * | raw_content    | string  | raw, not yet parsed contents of the page   |
-     * | meta           | string  | parsed meta data of the page               |
-     * | previous_page  | &array  | reference to the previous page             |
-     * | next_page      | &array  | reference to the next page                 |
+     * | Array key      | Type   | Description                                |
+     * | -------------- | ------ | ------------------------------------------ |
+     * | id             | string | relative path to the content file          |
+     * | url            | string | URL to the page                            |
+     * | title          | string | title of the page (YAML header)            |
+     * | description    | string | description of the page (YAML header)      |
+     * | author         | string | author of the page (YAML header)           |
+     * | time           | string | timestamp derived from the Date header     |
+     * | date           | string | date of the page (YAML header)             |
+     * | date_formatted | string | formatted date of the page                 |
+     * | hidden         | bool   | this page shouldn't be visible to the user |
+     * | raw_content    | string | raw, not yet parsed contents of the page   |
+     * | meta           | string | parsed meta data of the page               |
+     * | previous_page  | &array | reference to the previous page             |
+     * | next_page      | &array | reference to the next page                 |
      *
      * Please note that the `previous_page` and `next_page` keys won't be
      * available until the `onCurrentPageDiscovered` event was triggered.
      *
-     * Set `$pageData` to `null` to remove this page from the pages array.
+     * Set `$pageData` to NULL to remove this page from the pages array.
+     *
+     * @see DummyPlugin::onPagesDiscovered()
+     * @see DummyPlugin::onPagesLoaded()
+     *
+     * @param array &$pageData data of the loaded page
      *
-     * @see    DummyPlugin::onPagesDiscovered()
-     * @see    DummyPlugin::onPagesLoaded()
-     * @param  array &$pageData data of the loaded page
      * @return void
      */
     public function onSinglePageLoaded(array &$pageData)
@@ -323,9 +364,11 @@ class DummyPlugin extends AbstractPicoPlugin
      * structure of the page data. Please note that the pages array isn't
      * sorted yet.
      *
-     * @see    Pico::sortPages()
-     * @see    DummyPlugin::onPagesLoaded()
-     * @param  array[]    &$pages        data of all known pages
+     * @see Pico::sortPages()
+     * @see DummyPlugin::onPagesLoaded()
+     *
+     * @param array[] &$pages data of all known pages
+     *
      * @return void
      */
     public function onPagesDiscovered(array &$pages)
@@ -339,8 +382,10 @@ class DummyPlugin extends AbstractPicoPlugin
      * See {@see DummyPlugin::onSinglePageLoaded()} for details about the
      * structure of the page data.
      *
-     * @see    Pico::getPages()
-     * @param  array[]    &$pages        data of all known pages
+     * @see Pico::getPages()
+     *
+     * @param array[] &$pages data of all known pages
+     *
      * @return void
      */
     public function onPagesLoaded(array &$pages)
@@ -354,14 +399,16 @@ class DummyPlugin extends AbstractPicoPlugin
      * See {@see DummyPlugin::onSinglePageLoaded()} for details about the
      * structure of the page data.
      *
-     * @see    Pico::discoverPageSiblings()
-     * @see    Pico::discoverCurrentPage()
-     * @see    Pico::getCurrentPage()
-     * @see    Pico::getPreviousPage()
-     * @see    Pico::getNextPage()
-     * @param  array|null &$currentPage  data of the page being served
-     * @param  array|null &$previousPage data of the previous page
-     * @param  array|null &$nextPage     data of the next page
+     * @see Pico::discoverPageSiblings()
+     * @see Pico::discoverCurrentPage()
+     * @see Pico::getCurrentPage()
+     * @see Pico::getPreviousPage()
+     * @see Pico::getNextPage()
+     *
+     * @param array|null &$currentPage  data of the page being served
+     * @param array|null &$previousPage data of the previous page
+     * @param array|null &$nextPage     data of the next page
+     *
      * @return void
      */
     public function onCurrentPageDiscovered(
@@ -375,11 +422,13 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico renders the page
      *
-     * @see    Pico::getTwigTemplate()
-     * @see    Pico::getTwigVariables()
-     * @see    DummyPlugin::onPageRendered()
-     * @param  string           &$templateName  file name of the template
-     * @param  array            &$twigVariables template variables
+     * @see Pico::getTwigTemplate()
+     * @see Pico::getTwigVariables()
+     * @see DummyPlugin::onPageRendered()
+     *
+     * @param string &$templateName  file name of the template
+     * @param array  &$twigVariables template variables
+     *
      * @return void
      */
     public function onPageRendering(&$templateName, array &$twigVariables)
@@ -390,7 +439,8 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has rendered the page
      *
-     * @param  string &$output contents which will be sent to the user
+     * @param string &$output contents which will be sent to the user
+     *
      * @return void
      */
     public function onPageRendered(&$output)
@@ -401,10 +451,12 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico reads its known meta header fields
      *
-     * @see    Pico::getMetaHeaders()
-     * @param  string[] &$headers list of known meta header
-     *     fields; the array key specifies the YAML key to search for, the
-     *     array value is later used to access the found value
+     * @see Pico::getMetaHeaders()
+     *
+     * @param string[] &$headers list of known meta header fields; the array
+     *     key specifies the YAML key to search for, the array value is later
+     *     used to access the found value
+     *
      * @return void
      */
     public function onMetaHeaders(array &$headers)
@@ -415,8 +467,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico registers the YAML parser
      *
-     * @see    Pico::getYamlParser()
-     * @param  \Symfony\Component\Yaml\Parser &$yamlParser YAML parser instance
+     * @see Pico::getYamlParser()
+     *
+     * @param \Symfony\Component\Yaml\Parser &$yamlParser YAML parser instance
+     *
      * @return void
      */
     public function onYamlParserRegistered(\Symfony\Component\Yaml\Parser &$yamlParser)
@@ -427,8 +481,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico registers the Parsedown parser
      *
-     * @see    Pico::getParsedown()
-     * @param  Parsedown &$parsedown Parsedown instance
+     * @see Pico::getParsedown()
+     *
+     * @param Parsedown &$parsedown Parsedown instance
+     *
      * @return void
      */
     public function onParsedownRegistered(Parsedown &$parsedown)
@@ -439,8 +495,10 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico registers the twig template engine
      *
-     * @see    Pico::getTwig()
-     * @param  Twig_Environment &$twig Twig instance
+     * @see Pico::getTwig()
+     *
+     * @param Twig_Environment &$twig Twig instance
+     *
      * @return void
      */
     public function onTwigRegistered(Twig_Environment &$twig)

From 63616b5888283b2f8e4648088485f266a31c827a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 19 Oct 2017 22:26:43 +0200
Subject: [PATCH 131/188] Add license/copyright file headers to index.php and
 index.php.dist

---
 index.php      | 10 ++++++++++
 index.php.dist | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/index.php b/index.php
index 4fb0d55..45ecdd2 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,14 @@
 <?php // @codingStandardsIgnoreFile
+/**
+ * This file is part of Pico. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from the following
+ * original location:
+ *
+ * <https://github.com/picocms/Pico/blob/master/index.php>
+ *
+ * SPDX-License-Identifier: MIT
+ * License-Filename: LICENSE
+ */
 
 // load dependencies
 if (is_file(__DIR__ . '/vendor/autoload.php')) {
diff --git a/index.php.dist b/index.php.dist
index 78125ad..59639ad 100644
--- a/index.php.dist
+++ b/index.php.dist
@@ -1,4 +1,14 @@
 <?php // @codingStandardsIgnoreFile
+/**
+ * This file is part of Pico. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from the following
+ * original location:
+ *
+ * <https://github.com/picocms/Pico/blob/master/index.php.dist>
+ *
+ * SPDX-License-Identifier: MIT
+ * License-Filename: LICENSE
+ */
 
 // check PHP platform requirements
 if (PHP_VERSION_ID < 50306) {

From 81ebc4c33eaf99643db2065a1df033490ca5d119 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 22 Oct 2017 21:15:29 +0200
Subject: [PATCH 132/188] Build system: Move helper scripts to _build/tools dir

---
 .travis.yml                                            | 4 ++--
 _build/{deploy-phpdoc-branch.sh => deploy-branch.sh}   | 2 ++
 _build/{deploy-phpdoc-release.sh => deploy-release.sh} | 2 ++
 _build/{ => tools}/generate-badge.sh                   | 0
 _build/{ => tools}/generate-phpdoc.sh                  | 0
 _build/{ => tools}/github-clone.sh                     | 0
 _build/{ => tools}/github-deploy.sh                    | 0
 _build/{ => tools}/github-setup.sh                     | 0
 _build/{ => tools}/update-cloc-stats.sh                | 0
 _build/{ => tools}/update-phpdoc-list.sh               | 0
 _build/{ => tools}/update-version-file.sh              | 0
 11 files changed, 6 insertions(+), 2 deletions(-)
 rename _build/{deploy-phpdoc-branch.sh => deploy-branch.sh} (97%)
 rename _build/{deploy-phpdoc-release.sh => deploy-release.sh} (98%)
 rename _build/{ => tools}/generate-badge.sh (100%)
 rename _build/{ => tools}/generate-phpdoc.sh (100%)
 rename _build/{ => tools}/github-clone.sh (100%)
 rename _build/{ => tools}/github-deploy.sh (100%)
 rename _build/{ => tools}/github-setup.sh (100%)
 rename _build/{ => tools}/update-cloc-stats.sh (100%)
 rename _build/{ => tools}/update-phpdoc-list.sh (100%)
 rename _build/{ => tools}/update-version-file.sh (100%)

diff --git a/.travis.yml b/.travis.yml
index 6732b1e..9b6f8e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ jobs:
         - '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
         - install.sh
       script:
-        - deploy-phpdoc-branch.sh
+        - deploy-branch.sh
 
     # Release stage
     - stage: release
@@ -36,7 +36,7 @@ jobs:
         - '[ -n "$TRAVIS_TAG" ] || travis_terminate 0'
         - install.sh --release
       script:
-        - deploy-phpdoc-release.sh
+        - deploy-release.sh
       before_deploy:
         - create-release-archive.sh "pico-release-$TRAVIS_TAG.tar.gz"
       deploy:
diff --git a/_build/deploy-phpdoc-branch.sh b/_build/deploy-branch.sh
similarity index 97%
rename from _build/deploy-phpdoc-branch.sh
rename to _build/deploy-branch.sh
index 31b4486..a3ac6fd 100755
--- a/_build/deploy-phpdoc-branch.sh
+++ b/_build/deploy-branch.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+export PATH="$(dirname "$0")/tools:$PATH"
+
 DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
 DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 
diff --git a/_build/deploy-phpdoc-release.sh b/_build/deploy-release.sh
similarity index 98%
rename from _build/deploy-phpdoc-release.sh
rename to _build/deploy-release.sh
index 0ff50d1..1c994ab 100755
--- a/_build/deploy-phpdoc-release.sh
+++ b/_build/deploy-release.sh
@@ -13,6 +13,8 @@ if [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] || [ "$DEPLOY_VERSION_BADGE" != "true
     [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] && [ "$DEPLOY_VERSION_BADGE" != "true" ] && [ "$DEPLOY_VERSION_FILE" != "true" ] && [ "$DEPLOY_CLOC_STATS" != "true" ] && exit 0 || echo
 fi
 
+export PATH="$(dirname "$0")/tools:$PATH"
+
 DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
 DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 
diff --git a/_build/generate-badge.sh b/_build/tools/generate-badge.sh
similarity index 100%
rename from _build/generate-badge.sh
rename to _build/tools/generate-badge.sh
diff --git a/_build/generate-phpdoc.sh b/_build/tools/generate-phpdoc.sh
similarity index 100%
rename from _build/generate-phpdoc.sh
rename to _build/tools/generate-phpdoc.sh
diff --git a/_build/github-clone.sh b/_build/tools/github-clone.sh
similarity index 100%
rename from _build/github-clone.sh
rename to _build/tools/github-clone.sh
diff --git a/_build/github-deploy.sh b/_build/tools/github-deploy.sh
similarity index 100%
rename from _build/github-deploy.sh
rename to _build/tools/github-deploy.sh
diff --git a/_build/github-setup.sh b/_build/tools/github-setup.sh
similarity index 100%
rename from _build/github-setup.sh
rename to _build/tools/github-setup.sh
diff --git a/_build/update-cloc-stats.sh b/_build/tools/update-cloc-stats.sh
similarity index 100%
rename from _build/update-cloc-stats.sh
rename to _build/tools/update-cloc-stats.sh
diff --git a/_build/update-phpdoc-list.sh b/_build/tools/update-phpdoc-list.sh
similarity index 100%
rename from _build/update-phpdoc-list.sh
rename to _build/tools/update-phpdoc-list.sh
diff --git a/_build/update-version-file.sh b/_build/tools/update-version-file.sh
similarity index 100%
rename from _build/update-version-file.sh
rename to _build/tools/update-version-file.sh

From 498961b0c6b8bd6085a0dc1b14994f074388e8a5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 22 Oct 2017 21:22:11 +0200
Subject: [PATCH 133/188] Build system: Various small improvements

---
 _build/deploy-branch.sh  | 13 ++++++-------
 _build/deploy-release.sh | 36 +++++++++++++++++++++---------------
 _build/install.sh        |  7 ++++++-
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/_build/deploy-branch.sh b/_build/deploy-branch.sh
index a3ac6fd..d3be5be 100755
--- a/_build/deploy-branch.sh
+++ b/_build/deploy-branch.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 export PATH="$(dirname "$0")/tools:$PATH"
 
@@ -14,27 +15,27 @@ MILESTONE="Pico$([[ "$VERSION" =~ ^([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATC
 
 # clone repo
 github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
-[ $? -eq 0 ] || exit 1
 
 cd "$DEPLOYMENT_DIR"
 
 # setup repo
 github-setup.sh
-[ $? -eq 0 ] || exit 1
 
 # generate phpDocs
 generate-phpdoc.sh \
     "$TRAVIS_BUILD_DIR/.phpdoc.xml" \
     "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
     "$MILESTONE API Documentation ($TRAVIS_BRANCH branch)"
-[ $? -eq 0 ] || exit 1
-[ -n "$(git status --porcelain "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache")" ] || exit 0
+
+if [ -z "$(git status --porcelain "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache")" ]; then
+    # nothing to do
+    exit 0
+fi
 
 # update phpDoc list
 update-phpdoc-list.sh \
     "$DEPLOYMENT_DIR/_data/phpDoc.yml" \
     "$TRAVIS_BRANCH" "branch" "<code>$TRAVIS_BRANCH</code> branch" "$(date +%s)"
-[ $? -eq 0 ] || exit 1
 
 # commit phpDocs
 echo "Committing changes..."
@@ -45,9 +46,7 @@ git commit \
     --message="Update phpDocumentor class docs for $TRAVIS_BRANCH branch @ $TRAVIS_COMMIT" \
     "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
     "$DEPLOYMENT_DIR/_data/phpDoc.yml"
-[ $? -eq 0 ] || exit 1
 echo
 
 # deploy phpDocs
 github-deploy.sh "$TRAVIS_REPO_SLUG" "heads/$TRAVIS_BRANCH" "$TRAVIS_COMMIT"
-[ $? -eq 0 ] || exit 1
diff --git a/_build/deploy-release.sh b/_build/deploy-release.sh
index 1c994ab..e441914 100755
--- a/_build/deploy-release.sh
+++ b/_build/deploy-release.sh
@@ -1,21 +1,39 @@
 #!/usr/bin/env bash
+set -e
 
+DEPLOY_FULL="true"
 if [ "$DEPLOY_PHPDOC_RELEASES" != "true" ]; then
     echo "Skipping phpDoc release deployment because it has been disabled"
+    DEPLOY_FULL="false"
 fi
 if [ "$DEPLOY_VERSION_BADGE" != "true" ]; then
     echo "Skipping version badge deployment because it has been disabled"
+    DEPLOY_FULL="false"
 fi
 if [ "$DEPLOY_VERSION_FILE" != "true" ]; then
     echo "Skipping version file deployment because it has been disabled"
+    DEPLOY_FULL="false"
 fi
-if [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] || [ "$DEPLOY_VERSION_BADGE" != "true" ] || [ "$DEPLOY_VERSION_FILE" != "true" ] || [ "$DEPLOY_CLOC_STATS" != "true" ]; then
-    [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] && [ "$DEPLOY_VERSION_BADGE" != "true" ] && [ "$DEPLOY_VERSION_FILE" != "true" ] && [ "$DEPLOY_CLOC_STATS" != "true" ] && exit 0 || echo
+if [ "$DEPLOY_CLOC_STATS" != "true" ]; then
+    echo "Skipping cloc statistics deployment because it has been disabled"
+    DEPLOY_FULL="false"
+fi
+
+if [ "$DEPLOY_FULL" != "true" ]; then
+    if [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] \
+        && [ "$DEPLOY_VERSION_BADGE" != "true" ] \
+        && [ "$DEPLOY_VERSION_FILE" != "true" ] \
+        && [ "$DEPLOY_CLOC_STATS" != "true" ]
+    then
+        # nothing to do
+        exit 0
+    fi
+    echo
 fi
 
 export PATH="$(dirname "$0")/tools:$PATH"
 
-DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
+DEPLOYMENT_ID="${TRAVIS_TAG//\//_}"
 DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 
 [ -n "$DEPLOY_REPO_SLUG" ] || export DEPLOY_REPO_SLUG="$TRAVIS_REPO_SLUG"
@@ -23,13 +41,11 @@ DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 
 # clone repo
 github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
-[ $? -eq 0 ] || exit 1
 
 cd "$DEPLOYMENT_DIR"
 
 # setup repo
 github-setup.sh
-[ $? -eq 0 ] || exit 1
 
 # generate phpDocs
 if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
@@ -41,14 +57,12 @@ if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
         "$TRAVIS_BUILD_DIR/.phpdoc.xml" \
         "-" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
         "$MILESTONE API Documentation ($TRAVIS_TAG)"
-    [ $? -eq 0 ] || exit 1
 
     if [ -n "$(git status --porcelain "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID")" ]; then
         # update phpDoc list
         update-phpdoc-list.sh \
             "$DEPLOYMENT_DIR/_data/phpDoc.yml" \
             "$TRAVIS_TAG" "version" "Pico ${TRAVIS_TAG#v}" "$(date +%s)"
-        [ $? -eq 0 ] || exit 1
 
         # commit phpDocs
         echo "Committing phpDoc changes..."
@@ -56,7 +70,6 @@ if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
         git commit \
             --message="Update phpDocumentor class docs for $TRAVIS_TAG" \
             "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" "$DEPLOYMENT_DIR/_data/phpDoc.yml"
-        [ $? -eq 0 ] || exit 1
         echo
     fi
 fi
@@ -66,7 +79,6 @@ if [ "$DEPLOY_VERSION_BADGE" == "true" ]; then
     generate-badge.sh \
         "$DEPLOYMENT_DIR/badges/pico-version.svg" \
         "release" "$TRAVIS_TAG" "blue"
-    [ $? -eq 0 ] || exit 1
 
     # commit version badge
     echo "Committing version badge..."
@@ -74,7 +86,6 @@ if [ "$DEPLOY_VERSION_BADGE" == "true" ]; then
     git commit \
         --message="Update version badge for $TRAVIS_TAG" \
         "$DEPLOYMENT_DIR/badges/pico-version.svg"
-    [ $? -eq 0 ] || exit 1
     echo
 fi
 
@@ -83,7 +94,6 @@ if [ "$DEPLOY_VERSION_FILE" == "true" ]; then
     update-version-file.sh \
         "$DEPLOYMENT_DIR/_data/version.yml" \
         "${TRAVIS_TAG#v}"
-    [ $? -eq 0 ] || exit 1
 
     # commit version file
     echo "Committing version file..."
@@ -91,7 +101,6 @@ if [ "$DEPLOY_VERSION_FILE" == "true" ]; then
     git commit \
         --message="Update version file for $TRAVIS_TAG" \
         "$DEPLOYMENT_DIR/_data/version.yml"
-    [ $? -eq 0 ] || exit 1
     echo
 fi
 
@@ -100,7 +109,6 @@ if [ "$DEPLOY_CLOC_STATS" == "true" ]; then
     update-cloc-stats.sh \
         "$DEPLOYMENT_DIR/_data/clocCore.yml" \
         "$DEPLOYMENT_DIR/_data/clocRelease.yml"
-    [ $? -eq 0 ] || exit 1
 
     # commit cloc statistics
     echo "Commiting cloc statistics..."
@@ -108,10 +116,8 @@ if [ "$DEPLOY_CLOC_STATS" == "true" ]; then
     git commit \
         --message="Update cloc statistics for $TRAVIS_TAG" \
         "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
-    [ $? -eq 0 ] || exit 1
     echo
 fi
 
 # deploy
 github-deploy.sh "$TRAVIS_REPO_SLUG" "tags/$TRAVIS_TAG" "$TRAVIS_COMMIT"
-[ $? -eq 0 ] || exit 1
diff --git a/_build/install.sh b/_build/install.sh
index b469994..a345371 100755
--- a/_build/install.sh
+++ b/_build/install.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+# let composer use our GITHUB_OAUTH_TOKEN
+if [ -n "$GITHUB_OAUTH_TOKEN" ]; then
+    composer config --global github-oauth.github.com "$GITHUB_OAUTH_TOKEN"
+fi
+
 if [ "$1" == "--release" ]; then
     # install dependencies
     echo "Running \`composer install\`..."
@@ -40,6 +45,6 @@ fi
 
 # install dependencies
 echo "Running \`composer install\`$([ -n "$COMPOSER_ROOT_VERSION" ] && echo -n " ($COMPOSER_ROOT_VERSION)")..."
-composer install
+composer install --no-suggest
 
 exit $?

From 448fff4702d0e23a2bd61d5d8ff2fb9c2a7a3d82 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 22 Oct 2017 21:24:28 +0200
Subject: [PATCH 134/188] Build system: Add version parser, handle pre-releases
 differently

---
 _build/create-release-archive.sh            | 29 -------
 _build/deploy-release.sh                    | 88 ++++++++++++---------
 _build/tools/functions/parse-version.sh.inc | 44 +++++++++++
 _build/tools/update-version-file.sh         | 25 +++---
 4 files changed, 102 insertions(+), 84 deletions(-)
 delete mode 100755 _build/create-release-archive.sh
 create mode 100644 _build/tools/functions/parse-version.sh.inc

diff --git a/_build/create-release-archive.sh b/_build/create-release-archive.sh
deleted file mode 100755
index a1fd763..0000000
--- a/_build/create-release-archive.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-ARCHIVE="$1"
-
-# create release archive
-echo "Creating release archive '$ARCHIVE'..."
-
-if [ -e "$ARCHIVE" ]; then
-    echo "Unable to create archive: File exists" >&2
-    exit 1
-fi
-
-INDEX_BACKUP="$(mktemp -u)"
-mv index.php "$INDEX_BACKUP"
-mv index.php.dist index.php
-
-tar -czf "$ARCHIVE" \
-    README.md LICENSE.md CONTRIBUTING.md CHANGELOG.md \
-    composer.json composer.lock \
-    assets config content content-sample lib plugins themes vendor \
-    .htaccess index.php
-EXIT=$?
-
-mv index.php index.php.dist
-mv "$INDEX_BACKUP" index.php
-
-echo
-
-[ $EXIT -eq 0 ] || exit 1
diff --git a/_build/deploy-release.sh b/_build/deploy-release.sh
index e441914..ef3f8e7 100755
--- a/_build/deploy-release.sh
+++ b/_build/deploy-release.sh
@@ -31,6 +31,7 @@ if [ "$DEPLOY_FULL" != "true" ]; then
     echo
 fi
 
+. "$(dirname "$0")/functions/parse-version.sh.inc"
 export PATH="$(dirname "$0")/tools:$PATH"
 
 DEPLOYMENT_ID="${TRAVIS_TAG//\//_}"
@@ -39,6 +40,12 @@ DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 [ -n "$DEPLOY_REPO_SLUG" ] || export DEPLOY_REPO_SLUG="$TRAVIS_REPO_SLUG"
 [ -n "$DEPLOY_REPO_BRANCH" ] || export DEPLOY_REPO_BRANCH="gh-pages"
 
+# parse version
+if ! parse_version "$TRAVIS_TAG"; then
+    echo "Invalid version '$TRAVIS_TAG'; aborting..." >&2
+    exit 1
+fi
+
 # clone repo
 github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
 
@@ -50,7 +57,7 @@ github-setup.sh
 # generate phpDocs
 if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
     # get current Pico milestone
-    MILESTONE="Pico$([[ "$TRAVIS_TAG" =~ ^v([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATCH[1]}")"
+    MILESTONE="Pico $VERSION_MILESTONE"
 
     # generate phpDocs
     generate-phpdoc.sh \
@@ -74,49 +81,52 @@ if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
     fi
 fi
 
-# update version badge
-if [ "$DEPLOY_VERSION_BADGE" == "true" ]; then
-    generate-badge.sh \
-        "$DEPLOYMENT_DIR/badges/pico-version.svg" \
-        "release" "$TRAVIS_TAG" "blue"
+# don't update version badge, version file and cloc statistics for pre-releases
+if [ "$VERSION_STABILITY" != "stable" ]; then
+    # update version badge
+    if [ "$DEPLOY_VERSION_BADGE" == "true" ]; then
+        generate-badge.sh \
+            "$DEPLOYMENT_DIR/badges/pico-version.svg" \
+            "release" "$TRAVIS_TAG" "blue"
 
-    # commit version badge
-    echo "Committing version badge..."
-    git add "$DEPLOYMENT_DIR/badges/pico-version.svg"
-    git commit \
-        --message="Update version badge for $TRAVIS_TAG" \
-        "$DEPLOYMENT_DIR/badges/pico-version.svg"
-    echo
-fi
+        # commit version badge
+        echo "Committing version badge..."
+        git add "$DEPLOYMENT_DIR/badges/pico-version.svg"
+        git commit \
+            --message="Update version badge for $TRAVIS_TAG" \
+            "$DEPLOYMENT_DIR/badges/pico-version.svg"
+        echo
+    fi
 
-# update version file
-if [ "$DEPLOY_VERSION_FILE" == "true" ]; then
-    update-version-file.sh \
-        "$DEPLOYMENT_DIR/_data/version.yml" \
-        "${TRAVIS_TAG#v}"
+    # update version file
+    if [ "$DEPLOY_VERSION_FILE" == "true" ]; then
+        update-version-file.sh \
+            "$DEPLOYMENT_DIR/_data/version.yml" \
+            "$VERSION_FULL"
 
-    # commit version file
-    echo "Committing version file..."
-    git add "$DEPLOYMENT_DIR/_data/version.yml"
-    git commit \
-        --message="Update version file for $TRAVIS_TAG" \
-        "$DEPLOYMENT_DIR/_data/version.yml"
-    echo
-fi
+        # commit version file
+        echo "Committing version file..."
+        git add "$DEPLOYMENT_DIR/_data/version.yml"
+        git commit \
+            --message="Update version file for $TRAVIS_TAG" \
+            "$DEPLOYMENT_DIR/_data/version.yml"
+        echo
+    fi
 
-# update cloc statistics
-if [ "$DEPLOY_CLOC_STATS" == "true" ]; then
-    update-cloc-stats.sh \
-        "$DEPLOYMENT_DIR/_data/clocCore.yml" \
-        "$DEPLOYMENT_DIR/_data/clocRelease.yml"
+    # update cloc statistics
+    if [ "$DEPLOY_CLOC_STATS" == "true" ]; then
+        update-cloc-stats.sh \
+            "$DEPLOYMENT_DIR/_data/clocCore.yml" \
+            "$DEPLOYMENT_DIR/_data/clocRelease.yml"
 
-    # commit cloc statistics
-    echo "Commiting cloc statistics..."
-    git add "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
-    git commit \
-        --message="Update cloc statistics for $TRAVIS_TAG" \
-        "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
-    echo
+        # commit cloc statistics
+        echo "Commiting cloc statistics..."
+        git add "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
+        git commit \
+            --message="Update cloc statistics for $TRAVIS_TAG" \
+            "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
+        echo
+    fi
 fi
 
 # deploy
diff --git a/_build/tools/functions/parse-version.sh.inc b/_build/tools/functions/parse-version.sh.inc
new file mode 100644
index 0000000..1b6dcce
--- /dev/null
+++ b/_build/tools/functions/parse-version.sh.inc
@@ -0,0 +1,44 @@
+##
+# Evaluates a version string
+#
+# @author  Daniel Rudolf
+# @link    http://picocms.org
+# @license http://opensource.org/licenses/MIT
+#
+
+parse_version() {
+    VERSION_FULL="$1"
+
+    if [ "${VERSION_FULL:0:1}" == "v" ]; then
+        VERSION_FULL="${VERSION_FULL:1}"
+    fi
+
+    if [[ "$VERSION_FULL" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9A-Za-z\.\-]+))?(\+([0-9A-Za-z\.\-]+))?$ ]]; then
+        VERSION_MAJOR="${BASH_REMATCH[1]}"
+        VERSION_MINOR="${BASH_REMATCH[2]}"
+        VERSION_PATCH="${BASH_REMATCH[3]}"
+        VERSION_SUFFIX="${BASH_REMATCH[5]}"
+        VERSION_BUILD="${BASH_REMATCH[7]}"
+
+        VERSION_STABILITY="stable"
+        if [[ "$VERSION_SUFFIX" =~ ^(dev|a|alpha|b|beta|RC)?([.-]?[0-9]+)?([.-](dev))?$ ]]; then
+            if [ "${BASH_REMATCH[1]}" == "dev" ] || [ "${BASH_REMATCH[4]}" == "dev" ]; then
+                VERSION_STABILITY="dev"
+            elif [ "${BASH_REMATCH[1]}" == "a" ] || [ "${BASH_REMATCH[1]}" == "alpha" ]; then
+                VERSION_STABILITY="alpha"
+            elif [ "${BASH_REMATCH[1]}" == "b" ] || [ "${BASH_REMATCH[1]}" == "beta" ]; then
+                VERSION_STABILITY="beta"
+            elif [ "${BASH_REMATCH[1]}" == "RC" ]; then
+                VERSION_STABILITY="RC"
+            fi
+        fi
+
+        VERSION_MILESTONE="$VERSION_MAJOR.$VERSION_MINOR"
+        VERSION_NAME="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+        VERSION_ID="$VERSION_MAJOR$(printf '%02d' "$VERSION_MINOR")$(printf '%02d' "$VERSION_PATCH")"
+
+        return 0
+    else
+        return 1
+    fi
+}
diff --git a/_build/tools/update-version-file.sh b/_build/tools/update-version-file.sh
index 4a3ec8b..79afa36 100755
--- a/_build/tools/update-version-file.sh
+++ b/_build/tools/update-version-file.sh
@@ -10,30 +10,22 @@
 
 set -e
 
+. "$(dirname "$0")/functions/parse-version.sh.inc"
+
 # parameters
 VERSION_FILE_PATH="$1"  # target file path
-VERSION_FULL="$2"       # full version string (e.g. 1.0.0-beta.1+7b4ad7f)
+VERSION_STRING="$2"     # version string (e.g. 1.0.0-beta.1+7b4ad7f)
 
 # print parameters
 echo "Generating version file..."
 printf 'VERSION_FILE_PATH="%s"\n' "$VERSION_FILE_PATH"
-printf 'VERSION_FULL="%s"\n' "$VERSION_FULL"
+printf 'VERSION_STRING="%s"\n' "$VERSION_STRING"
 echo
 
-# evaluate version constraint (see http://semver.org/)
-printf 'Evaluating version constraint...\n'
-if [[ "$VERSION_FULL" =~ ^([0-9]+)\.([0-9]{1,2})\.([0-9]{1,2})(-([0-9A-Za-z\.\-]+))?(\+([0-9A-Za-z\.\-]+))?$ ]]; then
-    VERSION_MAJOR="${BASH_REMATCH[1]}"
-    VERSION_MINOR="${BASH_REMATCH[2]}"
-    VERSION_PATCH="${BASH_REMATCH[3]}"
-    VERSION_SUFFIX="${BASH_REMATCH[5]}"
-    VERSION_BUILD="${BASH_REMATCH[7]}"
-
-    VERSION_MILESTONE="$VERSION_MAJOR.$VERSION_MINOR"
-    VERSION_NAME="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
-    VERSION_ID="$VERSION_MAJOR$(printf '%02d' "$VERSION_MINOR")$(printf '%02d' "$VERSION_PATCH")"
-else
-    echo "Invalid version constraint; skipping..." >&2
+# evaluate version string (see http://semver.org/)
+printf 'Evaluating version string...\n'
+if ! parse_version "$VERSION_STRING"; then
+    echo "Invalid version string; skipping..." >&2
     exit 1
 fi
 
@@ -45,6 +37,7 @@ exec 3> "$VERSION_FILE_PATH"
 printf 'full: %s\n' "$VERSION_FULL" >&3
 printf 'name: %s\n' "$VERSION_NAME" >&3
 printf 'milestone: %s\n' "$VERSION_MILESTONE" >&3
+printf 'stability: %s\n' "$VERSION_STABILITY" >&3
 printf 'id: %d\n' "$VERSION_ID" >&3
 printf 'major: %d\n' "$VERSION_MAJOR" >&3
 printf 'minor: %d\n' "$VERSION_MINOR" >&3

From 1dee2c1cf685552308b88ca6274865fffb01c1dc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 22 Oct 2017 21:27:19 +0200
Subject: [PATCH 135/188] Build system: Use 'picocms/pico-composer' to create
 release archives

---
 .travis.yml              |  4 +--
 _build/create-release.sh | 76 ++++++++++++++++++++++++++++++++++++++++
 _build/install.sh        | 15 --------
 3 files changed, 78 insertions(+), 17 deletions(-)
 create mode 100755 _build/create-release.sh

diff --git a/.travis.yml b/.travis.yml
index 9b6f8e4..ce4c2bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,11 +34,11 @@ jobs:
     - stage: release
       install:
         - '[ -n "$TRAVIS_TAG" ] || travis_terminate 0'
-        - install.sh --release
+        - install.sh
       script:
         - deploy-release.sh
       before_deploy:
-        - create-release-archive.sh "pico-release-$TRAVIS_TAG.tar.gz"
+        - create-release.sh "pico-release-$TRAVIS_TAG.tar.gz"
       deploy:
         provider: releases
         api_key: ${GITHUB_OAUTH_TOKEN}
diff --git a/_build/create-release.sh b/_build/create-release.sh
new file mode 100755
index 0000000..41acc3a
--- /dev/null
+++ b/_build/create-release.sh
@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+set -e
+
+. "$(dirname "$0")/functions/parse-version.sh.inc"
+export PATH="$(dirname "$0")/tools:$PATH"
+
+DEPLOYMENT_ID="${TRAVIS_TAG//\//_}"
+DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/release-$DEPLOYMENT_ID.git"
+
+[ -n "$RELEASE_REPO_SLUG" ] || export RELEASE_REPO_SLUG="$TRAVIS_REPO_SLUG"
+[ -n "$RELEASE_REPO_BRANCH" ] || export RELEASE_REPO_BRANCH="master"
+
+# parameters
+ARCHIVE="$1"    # release archive file name
+
+if [ -z "$ARCHIVE" ]; then
+    echo "Unable to create release archive: No file name specified" >&2
+    exit 1
+fi
+
+# parse version
+if ! parse_version "$TRAVIS_TAG"; then
+    echo "Unable to create release archive: Invalid version '$TRAVIS_TAG'" >&2
+    exit 1
+fi
+
+# clone repo
+github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$RELEASE_REPO_SLUG.git" "$RELEASE_REPO_BRANCH"
+
+cd "$DEPLOYMENT_DIR"
+
+# force Pico version
+echo "Updating composer dependencies..."
+composer require --no-update \
+    "picocms/pico $VERSION_FULL@$VERSION_STABILITY" \
+    "picocms/pico-theme $VERSION_FULL@$VERSION_STABILITY" \
+    "picocms/pico-deprecated $VERSION_FULL@$VERSION_STABILITY"
+echo
+
+# install dependencies
+echo "Running \`composer install\`..."
+composer install --no-suggest --prefer-dist --no-dev --optimize-autoloader
+echo
+
+# prepare release
+echo "Replacing 'index.php'..."
+cp vendor/picocms/pico/index.php.dist index.php
+
+echo "Preparing 'composer.json' for release..."
+composer require --no-update \
+    "picocms/pico ^$VERSION_MILESTONE" \
+    "picocms/pico-theme ^$VERSION_MILESTONE" \
+    "picocms/pico-deprecated ^$VERSION_MILESTONE"
+
+echo "Removing '.git' directory and '.gitignore' file..."
+rm -f .gitignore
+rm -rf .git
+
+echo "Removing '.git' directories of dependencies..."
+find vendor/ -type d -path 'vendor/*/*/.git' -print0 | xargs -0 rm -rf
+find themes/ -type d -path 'themes/*/.git' -print0 | xargs -0 rm -rf
+find plugins/ -type d -path 'plugins/*/.git' -print0 | xargs -0 rm -rf
+
+echo
+
+# create release archive
+echo "Creating release archive '$ARCHIVE'..."
+
+if [ -e "$ARCHIVE" ]; then
+    echo "Unable to create release archive: File exists" >&2
+    exit 1
+fi
+
+find . -mindepth 1 -maxdepth 1 -printf '%f\0' \
+    | xargs -0 -- tar -czf "$ARCHIVE" --
+echo
diff --git a/_build/install.sh b/_build/install.sh
index a345371..f352c89 100755
--- a/_build/install.sh
+++ b/_build/install.sh
@@ -5,21 +5,6 @@ if [ -n "$GITHUB_OAUTH_TOKEN" ]; then
     composer config --global github-oauth.github.com "$GITHUB_OAUTH_TOKEN"
 fi
 
-if [ "$1" == "--release" ]; then
-    # install dependencies
-    echo "Running \`composer install\`..."
-    composer install --no-dev --optimize-autoloader
-    [ $? -eq 0 ] || exit 1
-    echo
-
-    # remove .git dirs
-    echo "Removing '.git' directories of dependencies..."
-    find vendor/ -type d -path 'vendor/*/*/.git' -print0 | xargs -0 rm -rf
-    echo
-
-    exit 0
-fi
-
 # set COMPOSER_ROOT_VERSION when necessary
 if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     PICO_VERSION_PATTERN="$(php -r "

From 0532fef5fe67d5ff01f87cf6563f6cb17882a0df Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 28 Oct 2017 22:52:18 +0200
Subject: [PATCH 136/188] Update composer dependencies

---
 composer.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 82cbc89..20adc12 100644
--- a/composer.json
+++ b/composer.json
@@ -29,8 +29,9 @@
         "php": ">=5.3.6",
         "ext-dom": "*",
         "ext-mbstring": "*",
-        "twig/twig": "^1.18",
-        "symfony/yaml" : "^2.3",
+        "twig/twig": "^1.34",
+        "symfony/yaml" : "^2.8",
+        "erusev/parsedown": "^1.6",
         "erusev/parsedown-extra": "^0.7"
     },
     "suggest": {

From c71169adbe199892db15a9ab34df7d7a77a397b9 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 28 Oct 2017 22:52:47 +0200
Subject: [PATCH 137/188] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0b5c38a..ece171e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -75,12 +75,12 @@ Pico's actual development happens in separate development branches. Development
 - `enhancement/` for smaller improvements, and
 - `bugfix/` for non-trivial bug fixes.
 
-As soon as development reaches a point where feedback is appreciated, a pull request is opened. After some time (very soon for bug fixes, and other improvements should have a reasonable feedback phase) the pull request is merged and the development branch will be deleted. Trivial bug fixes which will be part of the next `PATCH` version will be merged directly into `master`.
+As soon as development reaches a point where feedback is appreciated, a pull request is opened. After some time (very soon for bug fixes, and other improvements should have a reasonable feedback phase) the pull request is merged and the development branch will be deleted. Trivial bug fixes that will be part of the next `PATCH` version will be merged directly into `master`.
 
 Build & Release process
 -----------------------
 
-We're using [Travis CI](https://travis-ci.com) to automate the build & release process of Pico. It generates and deploys [phpDoc](http://phpdoc.org) class docs for new releases and on every commit to the `master` branch. Travis also prepares new releases by generating Pico's pre-built packages, a version badge and pushing both to our website (the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io)). Please refer to our [`.travis.yml`](https://github.com/picocms/Pico/blob/master/.travis.yml) and the [`_build` directory](https://github.com/picocms/Pico/tree/master/_build) for details.
+We're using [Travis CI](https://travis-ci.com) to automate the build & release process of Pico. It generates and deploys a [PHP class documentation](http://picocms.org/phpDoc/) (powered by [phpDoc](http://phpdoc.org)) for new releases and on every commit to the `master` branch. Travis also prepares new releases by generating Pico's pre-built release packages, a version badge, code statistics (powered by [cloc](https://github.com/AlDanial/cloc)) and updates our website (the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io)). Please refer to our [`.travis.yml`](https://github.com/picocms/Pico/blob/master/.travis.yml) and the [`_build` directory](https://github.com/picocms/Pico/tree/master/_build) for details.
 
 As insinuated above, it is important that each commit to `master` is deployable. Once development of a new Pico release is finished, trigger Pico's build & release process by pushing a new Git tag. This tag should reference a (usually empty) commit on `master`, which message should adhere to the following template:
 
@@ -94,7 +94,9 @@ Version 1.0.0
 * [Removed] ...
 ```
 
-Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico::VERSION_ID` constants. If you've simultaneously developed a new version of Pico's official [default theme](https://github.com/picocms/pico-theme) and/or the [`PicoDeprecated` plugin](https://github.com/picocms/pico-deprecated), make sure to create releases for them first, otherwise automatic deployment will fail.
+Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico::VERSION_ID` constants. The versions of Pico's official [default theme](https://github.com/picocms/pico-theme) and the [`PicoDeprecated` plugin](https://github.com/picocms/pico-deprecated) both strictly follow Pico's version. Since Pico's pre-built release package contains them, you must always create a new release of them (even though nothing has changed) before creating a new Pico release.
+
+If you're pushing a new major or minor release of Pico, you should also update Pico's `composer.json` to require the latest minor releases of Pico's dependencies. Besides, don't forget to update the `@version` tags in the PHP class docs.
 
 Travis CI will draft the new [release on GitHub](https://github.com/picocms/Pico/releases) automatically, but will require you to manually amend the descriptions formatting. The latest Pico version is always available at https://github.com/picocms/Pico/releases/latest, so please make sure to publish this URL rather than version-specific URLs. [Packagist](http://packagist.org/packages/picocms/pico) will be updated automatically.
 
@@ -123,7 +125,7 @@ Issues and pull requests labeled with `info: Feedback Needed` indicate that feed
 
 - The `type: Invalid` label is used for everything else, e.g. issues or pull requests not related to Pico, or invalid bug reports.
 
-The `status: Deferred` label might get added to any open issue or pull request to indicate that it still open and will be resolved later.
+The `status: Deferred` label might get added to any open issue or pull request to indicate that it is still unresolved and will be resolved later.
 
 Issues and pull requests, which are rather related to upstream projects (i.e. projects Pico depends on, like Twig), are additionally labeled with `info: Upstream`.
 

From dfed9cc51f92ed661d4f6ea9a5101b1b1318a4f9 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 28 Oct 2017 22:53:25 +0200
Subject: [PATCH 138/188] Build system: Create GitHub releases as draft

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ce4c2bf..722c2b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,7 @@ jobs:
         api_key: ${GITHUB_OAUTH_TOKEN}
         file: pico-release-$TRAVIS_TAG.tar.gz
         skip_cleanup: true
+        draft: true
 
   # Ignore nightly build failures
   allow_failures:

From 2a30c4664fcf2b9f5868124fd1a514ceab65aa7d Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 4 Nov 2017 18:41:05 +0100
Subject: [PATCH 139/188] Build system: Add config/config.yml.template to
 release archives

---
 _build/create-release.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/_build/create-release.sh b/_build/create-release.sh
index 41acc3a..f3e49e5 100755
--- a/_build/create-release.sh
+++ b/_build/create-release.sh
@@ -46,6 +46,9 @@ echo
 echo "Replacing 'index.php'..."
 cp vendor/picocms/pico/index.php.dist index.php
 
+echo "Adding 'config/config.yml.template'..."
+cp vendor/picocms/pico/config/config.yml.template config/config.yml.template
+
 echo "Preparing 'composer.json' for release..."
 composer require --no-update \
     "picocms/pico ^$VERSION_MILESTONE" \

From cc47043570de77c12d50826a52ab8e4f26dcefde Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 4 Nov 2017 18:41:17 +0100
Subject: [PATCH 140/188] Update README.md screenshot

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

diff --git a/README.md b/README.md
index a62808e..8b1c32e 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Visit us at http://picocms.org/ and see http://picocms.org/about/ for more info.
 Screenshot
 ----------
 
-![Pico Screenshot](https://picocms.github.io/screenshot.png)
+![Pico Screenshot](https://picocms.github.io/screenshots/pico-20.png)
 
 Install
 -------

From e8a19cb2f9018a05a13dcdc1cc36376b0c5c20a9 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 4 Nov 2017 20:49:41 +0100
Subject: [PATCH 141/188] Fix Pico::parseFileMeta()

---
 lib/Pico.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index c33a9ab..e805205 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1346,7 +1346,7 @@ class Pico
             }
         } else {
             // guarantee array key existance
-            $meta = array_fill_keys(array_keys($headers), '');
+            $meta = array_fill_keys(array_values($headers), '');
             $meta['time'] = $meta['date_formatted'] = '';
         }
 

From da0d4c3054923e706f4d22fce8e071e457f1efa6 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 4 Nov 2017 22:47:47 +0100
Subject: [PATCH 142/188] Build system: Add tools/github-commit.sh

---
 _build/deploy-branch.sh       |  9 ++-----
 _build/deploy-release.sh      | 28 +++++++---------------
 _build/tools/github-commit.sh | 45 +++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 27 deletions(-)
 create mode 100755 _build/tools/github-commit.sh

diff --git a/_build/deploy-branch.sh b/_build/deploy-branch.sh
index d3be5be..a5ce2ca 100755
--- a/_build/deploy-branch.sh
+++ b/_build/deploy-branch.sh
@@ -38,15 +38,10 @@ update-phpdoc-list.sh \
     "$TRAVIS_BRANCH" "branch" "<code>$TRAVIS_BRANCH</code> branch" "$(date +%s)"
 
 # commit phpDocs
-echo "Committing changes..."
-git add --all \
+github-commit.sh \
+    "Update phpDocumentor class docs for $TRAVIS_BRANCH branch @ $TRAVIS_COMMIT" \
     "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
     "$DEPLOYMENT_DIR/_data/phpDoc.yml"
-git commit \
-    --message="Update phpDocumentor class docs for $TRAVIS_BRANCH branch @ $TRAVIS_COMMIT" \
-    "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
-    "$DEPLOYMENT_DIR/_data/phpDoc.yml"
-echo
 
 # deploy phpDocs
 github-deploy.sh "$TRAVIS_REPO_SLUG" "heads/$TRAVIS_BRANCH" "$TRAVIS_COMMIT"
diff --git a/_build/deploy-release.sh b/_build/deploy-release.sh
index ef3f8e7..564c699 100755
--- a/_build/deploy-release.sh
+++ b/_build/deploy-release.sh
@@ -72,12 +72,9 @@ if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
             "$TRAVIS_TAG" "version" "Pico ${TRAVIS_TAG#v}" "$(date +%s)"
 
         # commit phpDocs
-        echo "Committing phpDoc changes..."
-        git add --all "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" "$DEPLOYMENT_DIR/_data/phpDoc.yml"
-        git commit \
-            --message="Update phpDocumentor class docs for $TRAVIS_TAG" \
+        github-commit.sh \
+            "Update phpDocumentor class docs for $TRAVIS_TAG" \
             "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" "$DEPLOYMENT_DIR/_data/phpDoc.yml"
-        echo
     fi
 fi
 
@@ -90,12 +87,9 @@ if [ "$VERSION_STABILITY" != "stable" ]; then
             "release" "$TRAVIS_TAG" "blue"
 
         # commit version badge
-        echo "Committing version badge..."
-        git add "$DEPLOYMENT_DIR/badges/pico-version.svg"
-        git commit \
-            --message="Update version badge for $TRAVIS_TAG" \
+        github-commit.sh \
+            "Update version badge for $TRAVIS_TAG" \
             "$DEPLOYMENT_DIR/badges/pico-version.svg"
-        echo
     fi
 
     # update version file
@@ -105,12 +99,9 @@ if [ "$VERSION_STABILITY" != "stable" ]; then
             "$VERSION_FULL"
 
         # commit version file
-        echo "Committing version file..."
-        git add "$DEPLOYMENT_DIR/_data/version.yml"
-        git commit \
-            --message="Update version file for $TRAVIS_TAG" \
+        github-commit.sh \
+            "Update version file for $TRAVIS_TAG" \
             "$DEPLOYMENT_DIR/_data/version.yml"
-        echo
     fi
 
     # update cloc statistics
@@ -120,12 +111,9 @@ if [ "$VERSION_STABILITY" != "stable" ]; then
             "$DEPLOYMENT_DIR/_data/clocRelease.yml"
 
         # commit cloc statistics
-        echo "Commiting cloc statistics..."
-        git add "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
-        git commit \
-            --message="Update cloc statistics for $TRAVIS_TAG" \
+        github-commit.sh \
+            "Update cloc statistics for $TRAVIS_TAG" \
             "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
-        echo
     fi
 fi
 
diff --git a/_build/tools/github-commit.sh b/_build/tools/github-commit.sh
new file mode 100755
index 0000000..6521160
--- /dev/null
+++ b/_build/tools/github-commit.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+##
+# Commits changes to a Git repo
+#
+# @author  Daniel Rudolf
+# @link    http://picocms.org
+# @license http://opensource.org/licenses/MIT
+#
+
+set -e
+
+# parameters
+COMMIT_MESSAGE="$1"     # commit message
+shift 1
+
+# print parameters
+echo "Commiting changes..."
+printf 'COMMIT_MESSAGE="%s"\n' "$COMMIT_MESSAGE"
+echo
+
+# stage changes
+COMMIT_FILES=()
+while [ $# -gt 0 ]; do
+    if [ -n "$(git status --porcelain "$1")" ]; then
+        if [ -d "$1" ]; then
+            git add --all "$1"
+        elif [ -f "$1" ] || [ -h "$1" ]; then
+            git add "$1"
+        else
+            echo "Unable to commit '$1': No such file, symbolic link or directory" >&2
+            exit 1
+        fi
+
+        COMMIT_FILES+=( "$1" )
+        shift
+    fi
+done
+
+# commit changes
+if [ ${#COMMIT_FILES[@]} -gt 0 ]; then
+    git commit --message="$COMMIT_MESSAGE" "${COMMIT_FILES[@]}"
+fi
+
+echo

From 1afc49558426b47272087ef8cf65f4d4e257b236 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 4 Nov 2017 22:49:02 +0100
Subject: [PATCH 143/188] Build system: Remove cloc release statistics

---
 _build/deploy-release.sh          |  6 ++---
 _build/tools/update-cloc-stats.sh | 41 +++++++++++--------------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/_build/deploy-release.sh b/_build/deploy-release.sh
index 564c699..4305ea9 100755
--- a/_build/deploy-release.sh
+++ b/_build/deploy-release.sh
@@ -106,14 +106,12 @@ if [ "$VERSION_STABILITY" != "stable" ]; then
 
     # update cloc statistics
     if [ "$DEPLOY_CLOC_STATS" == "true" ]; then
-        update-cloc-stats.sh \
-            "$DEPLOYMENT_DIR/_data/clocCore.yml" \
-            "$DEPLOYMENT_DIR/_data/clocRelease.yml"
+        update-cloc-stats.sh "$DEPLOYMENT_DIR/_data/cloc.yml"
 
         # commit cloc statistics
         github-commit.sh \
             "Update cloc statistics for $TRAVIS_TAG" \
-            "$DEPLOYMENT_DIR/_data/clocCore.yml" "$DEPLOYMENT_DIR/_data/clocRelease.yml"
+            "$DEPLOYMENT_DIR/_data/cloc.yml"
     fi
 fi
 
diff --git a/_build/tools/update-cloc-stats.sh b/_build/tools/update-cloc-stats.sh
index 04a133c..7c3396a 100755
--- a/_build/tools/update-cloc-stats.sh
+++ b/_build/tools/update-cloc-stats.sh
@@ -11,13 +11,11 @@
 set -e
 
 # parameters
-CORE_TARGET_FILE="$1"     # target file path for core statistics
-RELEASE_TARGET_FILE="$2"  # target file path for release package statistics
+TARGET_FILE="$1"     # statistics target file path
 
 # print parameters
 echo "Updating cloc statistics..."
-printf 'CORE_TARGET_FILE="%s"\n' "$CORE_TARGET_FILE"
-printf 'RELEASE_TARGET_FILE="%s"\n' "$RELEASE_TARGET_FILE"
+printf 'TARGET_FILE="%s"\n' "$TARGET_FILE"
 echo
 
 # create cloc statistics
@@ -70,35 +68,24 @@ clean_cloc_stats() {
     done < <(tail -n +3 "$1")
 }
 
-# create temporary files
-printf 'Creating temporary files...\n'
-CORE_TMP_FILE="$(mktemp)"
-RELEASE_TMP_FILE="$(mktemp)"
-[ -n "$CORE_TMP_FILE" ] && [ -n "$RELEASE_TMP_FILE" ] || exit 1
+# create temporary file
+printf 'Creating temporary file...\n'
+TMP_FILE="$(mktemp)"
+[ -n "$TMP_FILE" ] || exit 1
 echo
 
-# create core statistics
-printf 'Creating core statistics...\n'
-create_cloc_stats "$CORE_TMP_FILE" \
+# create statistics
+printf 'Creating statistics...\n'
+create_cloc_stats "$TMP_FILE" \
     lib index.php
 echo
 
-printf 'Creating release package statistics...\n'
-create_cloc_stats "$RELEASE_TMP_FILE" \
-    README.md LICENSE.md CONTRIBUTING.md CHANGELOG.md \
-    assets config content content-sample lib plugins themes \
-    .htaccess index.php.dist composer.json
-echo
-
 # remove headers from cloc statistics
-printf 'Writing core statistics file without header...\n'
-clean_cloc_stats "$CORE_TMP_FILE" > "$CORE_TARGET_FILE"
-
-printf 'Writing release package statistics file without header...\n'
-clean_cloc_stats "$RELEASE_TMP_FILE" > "$RELEASE_TARGET_FILE"
+printf 'Writing statistics file without header...\n'
+clean_cloc_stats "$TMP_FILE" > "$TARGET_FILE"
 echo
 
-# remove temporary files
-printf 'Removing temporary files...\n'
-rm "$CORE_TMP_FILE" "$RELEASE_TMP_FILE"
+# remove temporary file
+printf 'Removing temporary file...\n'
+rm "$TMP_FILE"
 echo

From 6e88e7ffbb0b22141474829d3d0014de6b4a7564 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 4 Nov 2017 23:52:20 +0100
Subject: [PATCH 144/188] Build system: Disable Travis IRC notifications

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 722c2b6..ef06156 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,3 @@ before_script:
 
 script:
   - phpcs --standard=.phpcs.xml "$TRAVIS_BUILD_DIR"
-
-notifications:
-  irc: "chat.freenode.net#picocms"

From 4fb0b408e2b2c4ba1f47dd5015c39703204b284a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Nov 2017 02:36:50 +0100
Subject: [PATCH 145/188] Build system: Improve and fix deployment

---
 .travis.yml              | 17 ++++++-----------
 _build/create-release.sh |  2 +-
 _build/deploy-branch.sh  |  3 +++
 _build/deploy-release.sh | 15 +++++++++------
 _build/deploy.sh         |  6 ++++++
 _build/install.sh        | 19 +++++++++++++++++--
 6 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100755 _build/deploy.sh

diff --git a/.travis.yml b/.travis.yml
index ef06156..8e0aa0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,20 +23,13 @@ jobs:
 
     # Deployment stage
     - stage: deploy
+      sudo: required
       install:
         - '[ "$TRAVIS_PULL_REQUEST" == "false" ] || travis_terminate 0'
-        - '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
-        - install.sh
+        - '[ -n "$TRAVIS_TAG" ] || [[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
+        - install.sh --deploy
       script:
-        - deploy-branch.sh
-
-    # Release stage
-    - stage: release
-      install:
-        - '[ -n "$TRAVIS_TAG" ] || travis_terminate 0'
-        - install.sh
-      script:
-        - deploy-release.sh
+        - deploy.sh
       before_deploy:
         - create-release.sh "pico-release-$TRAVIS_TAG.tar.gz"
       deploy:
@@ -45,6 +38,8 @@ jobs:
         file: pico-release-$TRAVIS_TAG.tar.gz
         skip_cleanup: true
         draft: true
+        on:
+          tags: true
 
   # Ignore nightly build failures
   allow_failures:
diff --git a/_build/create-release.sh b/_build/create-release.sh
index f3e49e5..d9f21d6 100755
--- a/_build/create-release.sh
+++ b/_build/create-release.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-. "$(dirname "$0")/functions/parse-version.sh.inc"
+. "$(dirname "$0")/tools/functions/parse-version.sh.inc"
 export PATH="$(dirname "$0")/tools:$PATH"
 
 DEPLOYMENT_ID="${TRAVIS_TAG//\//_}"
diff --git a/_build/deploy-branch.sh b/_build/deploy-branch.sh
index a5ce2ca..8301932 100755
--- a/_build/deploy-branch.sh
+++ b/_build/deploy-branch.sh
@@ -13,6 +13,9 @@ DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 VERSION="$(php -r 'require_once(__DIR__ . "/lib/Pico.php"); echo Pico::VERSION;')"
 MILESTONE="Pico$([[ "$VERSION" =~ ^([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATCH[1]}")"
 
+echo "Deploying $TRAVIS_BRANCH branch ($MILESTONE)..."
+echo
+
 # clone repo
 github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
 
diff --git a/_build/deploy-release.sh b/_build/deploy-release.sh
index 4305ea9..48f3209 100755
--- a/_build/deploy-release.sh
+++ b/_build/deploy-release.sh
@@ -31,7 +31,7 @@ if [ "$DEPLOY_FULL" != "true" ]; then
     echo
 fi
 
-. "$(dirname "$0")/functions/parse-version.sh.inc"
+. "$(dirname "$0")/tools/functions/parse-version.sh.inc"
 export PATH="$(dirname "$0")/tools:$PATH"
 
 DEPLOYMENT_ID="${TRAVIS_TAG//\//_}"
@@ -46,6 +46,12 @@ if ! parse_version "$TRAVIS_TAG"; then
     exit 1
 fi
 
+echo "Deploying Pico $VERSION_MILESTONE ($VERSION_STABILITY)..."
+printf 'VERSION_FULL="%s"\n' "$VERSION_FULL"
+printf 'VERSION_NAME="%s"\n' "$VERSION_NAME"
+printf 'VERSION_ID="%s"\n' "$VERSION_ID"
+echo
+
 # clone repo
 github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
 
@@ -56,14 +62,11 @@ github-setup.sh
 
 # generate phpDocs
 if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
-    # get current Pico milestone
-    MILESTONE="Pico $VERSION_MILESTONE"
-
     # generate phpDocs
     generate-phpdoc.sh \
         "$TRAVIS_BUILD_DIR/.phpdoc.xml" \
         "-" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
-        "$MILESTONE API Documentation ($TRAVIS_TAG)"
+        "Pico $VERSION_MILESTONE API Documentation ($TRAVIS_TAG)"
 
     if [ -n "$(git status --porcelain "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID")" ]; then
         # update phpDoc list
@@ -79,7 +82,7 @@ if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
 fi
 
 # don't update version badge, version file and cloc statistics for pre-releases
-if [ "$VERSION_STABILITY" != "stable" ]; then
+if [ "$VERSION_STABILITY" == "stable" ]; then
     # update version badge
     if [ "$DEPLOY_VERSION_BADGE" == "true" ]; then
         generate-badge.sh \
diff --git a/_build/deploy.sh b/_build/deploy.sh
new file mode 100755
index 0000000..3d5e4b5
--- /dev/null
+++ b/_build/deploy.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+if [ -n "$TRAVIS_TAG" ]; then
+    exec "$(dirname "$0")/deploy-release.sh"
+else
+    exec "$(dirname "$0")/deploy-branch.sh"
+fi
diff --git a/_build/install.sh b/_build/install.sh
index f352c89..dee3ee5 100755
--- a/_build/install.sh
+++ b/_build/install.sh
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+set -e
+
+# setup build system
+echo "Installing build dependencies..."
+
+case "$1" in
+    "--deploy")
+        sudo apt-get install -y cloc
+        ;;
+esac
+
+echo
+
+# setup composer
+echo "Setup Composer..."
 
 # let composer use our GITHUB_OAUTH_TOKEN
 if [ -n "$GITHUB_OAUTH_TOKEN" ]; then
@@ -28,8 +43,8 @@ if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_RE
     fi
 fi
 
+echo
+
 # install dependencies
 echo "Running \`composer install\`$([ -n "$COMPOSER_ROOT_VERSION" ] && echo -n " ($COMPOSER_ROOT_VERSION)")..."
 composer install --no-suggest
-
-exit $?

From 619ae9d0d09e6fb810e51153921d5e4a64ab3eb2 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Nov 2017 14:08:56 +0100
Subject: [PATCH 146/188] Add Developer Certificate of Origin to
 CONTRIBUTING.md

---
 CONTRIBUTING.md | 81 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ece171e..97d6642 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,9 +3,9 @@ Contributing to Pico
 
 Pico aims to be a high quality Content Management System (CMS) but at the same time wants to give contributors freedom when submitting fixes or improvements.
 
-As such we want to *encourage* but not obligate you, the contributor, to follow these guidelines. The only exception to this are the guidelines elucidated in the *Prevent `merge-hell`* section.
+By contributing to Pico, you accept and agree to the *Developer Certificate of Origin* for your present and future contributions submitted to Pico. Please refer to the *Developer Certificate of Origin* section below.
 
-Having said that: we really appreciate it when you apply the guidelines in part or wholly as that will save us time which, in turn, we can spend on bugfixes and new features.
+Aside from this, we want to *encourage*, but not obligate you, the contributor, to follow the following guidelines. The only exception to this are the guidelines elucidated in the *Prevent `merge-hell`* section. Having said that: we really appreciate it when you apply the guidelines in part or wholly as that will save us time which, in turn, we can spend on bugfixes and new features.
 
 Issues
 ------
@@ -16,11 +16,84 @@ Before creating a [new Issue on GitHub](https://github.com/picocms/Pico/issues/n
 
 Please describe your issue as clear as possible and always include the *Pico version* you're using. Provided that you're using *plugins*, include a list of them too. We need information about the *actual and expected behavior*, the *steps to reproduce* the problem, and what steps you have taken to resolve the problem by yourself (i.e. *your own troubleshooting*).
 
-Contributing code
------------------
+Contributing
+------------
 
 Once you decide you want to contribute to *Pico's core* (which we really appreciate!) you can fork the project from https://github.com/picocms/Pico. If you're interested in developing a *plugin* or *theme* for Pico, please refer to the [development section](http://picocms.org/development/) of our website.
 
+### Developer Certificate of Origin
+
+By contributing to Pico, you accept and agree to the following terms and conditions for your present and future contributions submitted to Pico. Except for the license granted herein to Pico and recipients of software distributed by Pico, you reserve all right, title, and interest in and to your contributions. All contributions are subject to the following DCO + license terms.
+
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+All contributions to this project are licensed under the following MIT License:
+
+```
+Copyright (c) <YEAR> <COPYRIGHT HOLDER>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+```
+
+Please note that developing a *plugin* or *theme* for Pico is *not* assumed to be a contribution to Pico itself. By developing a plugin or theme you rather create a 3rd-party project that just uses Pico. Following the spirit of open source, we want to *encourage* you to release your plugin or theme under the terms of a [OSI-approved open source license](https://opensource.org/licenses). After all, Pico is open source, too!
+
 ### Prevent `merge-hell`
 
 Please do *not* develop your contribution on the `master` branch of your fork, but create a separate feature branch, that is based off the `master` branch, for each feature that you want to contribute.

From 46a6ff183d9765ff53ea48d6d9e60ea33006d936 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Nov 2017 18:01:27 +0100
Subject: [PATCH 147/188] Don't ignore index.php.dist when exporting Git repo

We need this file to create Pico's pre-built release archives
---
 .gitattributes | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index e641f50..0d8d494 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,4 +9,3 @@
 /.phpcs.xml         export-ignore
 /.phpdoc.xml        export-ignore
 /.travis.yml        export-ignore
-/index.php.dist     export-ignore

From 66bb17a419bf84f92e29783ffe5adcc55c66b7c8 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Nov 2017 18:27:43 +0100
Subject: [PATCH 148/188] Build system: Make sure to create release archive in
 $TRAVIS_BUILD_DIR

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8e0aa0a..e7df153 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ jobs:
       script:
         - deploy.sh
       before_deploy:
-        - create-release.sh "pico-release-$TRAVIS_TAG.tar.gz"
+        - create-release.sh "$TRAVIS_BUILD_DIR/pico-release-$TRAVIS_TAG.tar.gz"
       deploy:
         provider: releases
         api_key: ${GITHUB_OAUTH_TOKEN}

From 1cd6e241f0b399b2855cd200098c69b09b10552d Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 5 Nov 2017 17:32:41 +0100
Subject: [PATCH 149/188] Prepare v2.0.0-beta.1

---
 CHANGELOG.md | 3 +++
 lib/Pico.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a66c202..ca077d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Pico Changelog
 ==============
 
+### Version 2.0.0-beta.1
+Released: 2017-11-05
+
 ### Version 1.0.6
 Released: 2017-07-25
 
diff --git a/lib/Pico.php b/lib/Pico.php
index e805205..f455b58 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -49,7 +49,7 @@ class Pico
      *
      * @var string
      */
-    const VERSION = '2.0.0-dev';
+    const VERSION = '2.0.0-beta.1';
 
     /**
      * Pico version ID

From f5f38a7b0b669c851e11621f694e394f40911b72 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 18 Nov 2017 18:27:20 +0100
Subject: [PATCH 151/188] DummyPlugin: Improve phpDoc class docs

---
 plugins/DummyPlugin.php | 87 ++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 48 deletions(-)

diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 2d81818..26b828d 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -58,6 +58,7 @@ class DummyPlugin extends AbstractPicoPlugin
      * This event is triggered nevertheless the plugin is enabled or not.
      * It is NOT guaranteed that plugin dependencies are fulfilled!
      *
+     * @see Pico::loadPlugin()
      * @see Pico::getPlugin()
      * @see Pico::getPlugins()
      *
@@ -73,6 +74,7 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico manually loads a plugin
      *
+     * @see Pico::loadPlugin()
      * @see Pico::getPlugin()
      * @see Pico::getPlugins()
      *
@@ -89,6 +91,9 @@ class DummyPlugin extends AbstractPicoPlugin
      * Triggered after Pico has read its configuration
      *
      * @see Pico::getConfig()
+     * @see Pico::getBaseUrl()
+     * @see Pico::getBaseThemeUrl()
+     * @see Pico::isUrlRewritingEnabled()
      *
      * @param array &$config array of config variables
      *
@@ -116,7 +121,7 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has discovered the content file to serve
      *
-     * @see Pico::getBaseUrl()
+     * @see Pico::resolveFilePath()
      * @see Pico::getRequestFile()
      *
      * @param string &$file absolute path to the content file to serve
@@ -157,7 +162,9 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has read the contents of the 404 file
      *
+     * @see DummyPlugin::on404ContentLoading()
      * @see Pico::getRawContent()
+     * @see Pico::is404Content()
      *
      * @param string &$rawContent raw file contents
      *
@@ -175,7 +182,9 @@ class DummyPlugin extends AbstractPicoPlugin
      * of said 404 file. Use {@see Pico::is404Content()} to check for this
      * case when necessary.
      *
+     * @see DummyPlugin::onContentLoading()
      * @see Pico::getRawContent()
+     * @see Pico::is404Content()
      *
      * @param string &$rawContent raw file contents
      *
@@ -202,6 +211,7 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has parsed the meta header
      *
+     * @see DummyPlugin::onMetaParsing()
      * @see Pico::getFileMeta()
      *
      * @param string[] &$meta parsed meta data
@@ -217,7 +227,8 @@ class DummyPlugin extends AbstractPicoPlugin
      * Triggered before Pico parses the pages content
      *
      * @see Pico::prepareFileContent()
-     * @see DummyPlugin::prepareFileContent()
+     * @see Pico::substituteFileContent()
+     * @see DummyPlugin::onContentPrepared()
      * @see DummyPlugin::onContentParsed()
      *
      * @return void
@@ -230,6 +241,7 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has prepared the raw file contents for parsing
      *
+     * @see DummyPlugin::onContentParsing()
      * @see Pico::parseFileContent()
      * @see DummyPlugin::onContentParsed()
      *
@@ -245,6 +257,8 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has parsed the contents of the file to serve
      *
+     * @see DummyPlugin::onContentParsing()
+     * @see DummyPlugin::onContentPrepared()
      * @see Pico::getFileContent()
      *
      * @param string &$content parsed contents (HTML) of the requested page
@@ -259,10 +273,6 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico reads all known pages
      *
-     * @see Pico::readPages()
-     * @see DummyPlugin::onSinglePageLoading()
-     * @see DummyPlugin::onSinglePageContent()
-     * @see DummyPlugin::onSinglePageLoaded()
      * @see DummyPlugin::onPagesDiscovered()
      * @see DummyPlugin::onPagesLoaded()
      *
@@ -284,8 +294,6 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @see DummyPlugin::onSinglePageContent()
      * @see DummyPlugin::onSinglePageLoaded()
-     * @see DummyPlugin::onPagesDiscovered()
-     * @see DummyPlugin::onPagesLoaded()
      *
      * @param string    $id       relative path to the content file
      * @param bool|null $skipPage set this to TRUE to remove this page from the
@@ -305,9 +313,8 @@ class DummyPlugin extends AbstractPicoPlugin
      * page is the requested page. The reason for this exception is that the
      * raw contents of this page were loaded already.
      *
+     * @see DummyPlugin::onSinglePageLoading()
      * @see DummyPlugin::onSinglePageLoaded()
-     * @see DummyPlugin::onPagesDiscovered()
-     * @see DummyPlugin::onPagesLoaded()
      *
      * @param string $id          relative path to the content file
      * @param string &$rawContent raw file contents
@@ -322,31 +329,11 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico loads a single page
      *
-     * The `$pageData` parameter consists of the following values:
+     * Please refer to {@see Pico::readPages()} for information about the
+     * structure of a single page's data.
      *
-     * | Array key      | Type   | Description                                |
-     * | -------------- | ------ | ------------------------------------------ |
-     * | id             | string | relative path to the content file          |
-     * | url            | string | URL to the page                            |
-     * | title          | string | title of the page (YAML header)            |
-     * | description    | string | description of the page (YAML header)      |
-     * | author         | string | author of the page (YAML header)           |
-     * | time           | string | timestamp derived from the Date header     |
-     * | date           | string | date of the page (YAML header)             |
-     * | date_formatted | string | formatted date of the page                 |
-     * | hidden         | bool   | this page shouldn't be visible to the user |
-     * | raw_content    | string | raw, not yet parsed contents of the page   |
-     * | meta           | string | parsed meta data of the page               |
-     * | previous_page  | &array | reference to the previous page             |
-     * | next_page      | &array | reference to the next page                 |
-     *
-     * Please note that the `previous_page` and `next_page` keys won't be
-     * available until the `onCurrentPageDiscovered` event was triggered.
-     *
-     * Set `$pageData` to NULL to remove this page from the pages array.
-     *
-     * @see DummyPlugin::onPagesDiscovered()
-     * @see DummyPlugin::onPagesLoaded()
+     * @see DummyPlugin::onSinglePageLoading()
+     * @see DummyPlugin::onSinglePageContent()
      *
      * @param array &$pageData data of the loaded page
      *
@@ -360,14 +347,15 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has discovered all known pages
      *
-     * See {@see DummyPlugin::onSinglePageLoaded()} for details about the
-     * structure of the page data. Please note that the pages array isn't
-     * sorted yet.
+     * Pico's pages array isn't sorted until the `onPagesLoaded` event is
+     * triggered. Please refer to {@see Pico::readPages()} for information
+     * about the structure of Pico's pages array and the structure of a single
+     * page's data.
      *
-     * @see Pico::sortPages()
+     * @see DummyPlugin::onPagesLoading()
      * @see DummyPlugin::onPagesLoaded()
      *
-     * @param array[] &$pages data of all known pages
+     * @param array[] &$pages list of all known pages
      *
      * @return void
      */
@@ -379,12 +367,15 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has sorted the pages array
      *
-     * See {@see DummyPlugin::onSinglePageLoaded()} for details about the
-     * structure of the page data.
+     * Please refer to {@see Pico::readPages()} for information about the
+     * structure of Pico's pages array and the structure of a single page's
+     * data.
      *
+     * @see DummyPlugin::onPagesLoading()
+     * @see DummyPlugin::onPagesDiscovered()
      * @see Pico::getPages()
      *
-     * @param array[] &$pages data of all known pages
+     * @param array[] &$pages sorted list of all known pages
      *
      * @return void
      */
@@ -396,11 +387,11 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered when Pico discovered the current, previous and next pages
      *
-     * See {@see DummyPlugin::onSinglePageLoaded()} for details about the
-     * structure of the page data.
+     * If Pico isn't serving a regular page, but a plugin's virtual page, there
+     * will neither be a current, nor previous or next pages. Please refer to
+     * {@see Pico::readPages()} for information about the structure of a single
+     * page's data.
      *
-     * @see Pico::discoverPageSiblings()
-     * @see Pico::discoverCurrentPage()
      * @see Pico::getCurrentPage()
      * @see Pico::getPreviousPage()
      * @see Pico::getNextPage()
@@ -422,8 +413,6 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered before Pico renders the page
      *
-     * @see Pico::getTwigTemplate()
-     * @see Pico::getTwigVariables()
      * @see DummyPlugin::onPageRendered()
      *
      * @param string &$templateName  file name of the template
@@ -439,6 +428,8 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * Triggered after Pico has rendered the page
      *
+     * @see DummyPlugin::onPageRendering()
+     *
      * @param string &$output contents which will be sent to the user
      *
      * @return void

From 3846d3b68522e924d3da9ef4f86d5b5f5067c440 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 18 Nov 2017 18:28:02 +0100
Subject: [PATCH 152/188] Various small improvements

---
 lib/Pico.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index f455b58..cbd74a0 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1049,7 +1049,7 @@ class Pico
         // use REQUEST_URI (requires URL rewriting); e.g. /pico/sub/page
         if (($this->requestUrl === null) && $this->isUrlRewritingEnabled()) {
             $basePath = dirname($_SERVER['SCRIPT_NAME']);
-            $basePath = !in_array($basePath, array('.', '/')) ? $basePath . '/' : '/';
+            $basePath = !in_array($basePath, array('.', '/'), true) ? $basePath . '/' : '/';
             $basePathLength = strlen($basePath);
 
             $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
@@ -1620,8 +1620,8 @@ class Pico
         }
 
         $alphaSortClosure = function ($a, $b) use ($order) {
-            if ($a['hidden'] xor $b['hidden']) {
-                return (!!$a['hidden'] - !!$b['hidden']) * (($order === 'desc') ? -1 : 1);
+            if (!empty($a['hidden']) xor !empty($b['hidden'])) {
+                return (!empty($a['hidden']) - !empty($b['hidden'])) * (($order === 'desc') ? -1 : 1);
             }
 
             $aSortKey = (basename($a['id']) === 'index') ? dirname($a['id']) : $a['id'];
@@ -1658,7 +1658,7 @@ class Pico
         } elseif ($orderBy === 'date') {
             // sort by date
             uasort($this->pages, function ($a, $b) use ($alphaSortClosure, $order) {
-                if ($a['hidden'] xor $b['hidden']) {
+                if (!empty($a['hidden']) xor !empty($b['hidden'])) {
                     return $alphaSortClosure($a, $b);
                 }
 
@@ -1705,7 +1705,7 @@ class Pico
             $pageData[$precedingPageKey] = null;
             $pageData[$succeedingPageKey] = null;
 
-            if ($pageData['hidden']) {
+            if (!empty($pageData['hidden'])) {
                 continue;
             }
 
@@ -1902,7 +1902,7 @@ class Pico
         $protocol = 'http';
         if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
             $secureProxyHeader = strtolower(current(explode(',', $_SERVER['HTTP_X_FORWARDED_PROTO'])));
-            $protocol = in_array($secureProxyHeader, array('https', 'on', 'ssl', '1')) ? 'https' : 'http';
+            $protocol = in_array($secureProxyHeader, array('https', 'on', 'ssl', '1'), true) ? 'https' : 'http';
         } elseif (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] !== 'off')) {
             $protocol = 'https';
         } elseif ($_SERVER['SERVER_PORT'] == 443) {
@@ -2212,7 +2212,7 @@ class Pico
             foreach ($files as $file) {
                 // exclude hidden files/dirs starting with a .; this also excludes the special dirs . and ..
                 // exclude files ending with a ~ (vim/nano backup) or # (emacs backup)
-                if (($file[0] === '.') || in_array(substr($file, -1), array('~', '#'))) {
+                if (($file[0] === '.') || in_array(substr($file, -1), array('~', '#'), true)) {
                     continue;
                 }
 
@@ -2252,7 +2252,7 @@ class Pico
         if ($files) {
             foreach ($files as $file) {
                 // exclude dirs and files ending with a ~ (vim/nano backup) or # (emacs backup)
-                if (in_array(substr($file, -1), array('/', '~', '#'))) {
+                if (in_array(substr($file, -1), array('/', '~', '#'), true)) {
                     continue;
                 }
 

From 28d2648ba0798f8a92496cb9b28a2d1cc01ce894 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 18 Nov 2017 18:34:57 +0100
Subject: [PATCH 153/188] Add Pico::buildPageTree()

Pico's page tree is a list of all the tree's branches (no matter the depth). Thus, by iterating a array element, you get the nodes of a given branch. All leaf nodes do represent a page, but inner nodes may or may not represent a page (e.g. if there's a `sub/page.md`, but neither a `sub/index.md` nor a `sub.md`, the inner node `sub`, that is the parent of the `sub/page` node, represents no page itself).

A page's file path describes its node's path in the tree (e.g. the page `sub/page.md` is represented by the `sub/page` node, thus a child of the `sub` node and a element of the `sub` branch). However, the index page of a folder (e.g. `sub/index.md`), is *not* a node of the `sub` branch, but rather of the `/` branch. The page's node is not `sub/index`, but `sub`. If two pages are described by the same node (e.g. if both a `sub/index.md` and a `sub.md` exist), the index page takes precedence. Pico's main index page (i.e. `index.md`) is represented by the tree's root node `/` and a special case: it is the only node of the `` (i.e. the empty string) branch.

A node is represented by an array with the keys `id`, `page` and `children`. The `id` key contains a string with the node's name. If the node represents a page, the `page` key is a reference to the page's data array. If the node is a inner node, the `children` key is a reference to its matching branch (i.e. a list of the node's children). The order of a node's children matches the order in Pico's pages array.

If you want to walk the whole page tree, start with the tree's root node at `$pageTree[""]["/"]`. The root node's `children` key is a reference to the `/` branch at `$pageTree["/"]`, that is a list of the root node's direct child nodes and their siblings.

You MUST NOT iterate the page tree itself (i.e. the list of the tree's branches), its order is undefined and the array will be replaced by a non-iterable data structure with Pico 3.0.
---
 lib/Pico.php            | 124 +++++++++++++++++++++++++++++++++++++++-
 plugins/DummyPlugin.php |  17 ++++++
 2 files changed, 138 insertions(+), 3 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index cbd74a0..a03a627 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -272,6 +272,14 @@ class Pico
      */
     protected $nextPage;
 
+    /**
+     * Tree structure of known pages
+     *
+     * @see Pico::getPageTree()
+     * @var array[]|null
+     */
+    protected $pageTree;
+
     /**
      * Twig instance used for template parsing
      *
@@ -459,6 +467,9 @@ class Pico
             array(&$this->currentPage, &$this->previousPage, &$this->nextPage)
         );
 
+        $this->buildPageTree();
+        $this->triggerEvent('onPageTreeBuilt', array(&$this->pageTree));
+
         // render template
         $this->twigVariables = $this->getTwigVariables();
         $this->twigTemplate = $this->getTwigTemplate();
@@ -1511,10 +1522,13 @@ class Pico
      * | meta           | string  | parsed meta data of the page               |
      * | previous_page  | &array  | reference to the previous page             |
      * | next_page      | &array  | reference to the next page                 |
+     * | tree_node      | &array  | reference to the page's tree node          |
      *
-     * Please note that the `previous_page` and `next_page` keys won't be
-     * available until the `onCurrentPageDiscovered` event was triggered
-     * ({@see Pico::discoverPageSiblings()}).
+     * Please note that the `previous_page` and `next_page` keys aren't
+     * available until the `onCurrentPageDiscovered` event is triggered
+     * ({@see Pico::discoverPageSiblings()}). The `tree_node` key isn't
+     * available until the `onPageTreeBuilt` event is triggered
+     * ({@see Pico::buildPageTree()}).
      *
      * @see Pico::sortPages()
      * @see Pico::discoverPageSiblings()
@@ -1787,6 +1801,110 @@ class Pico
         return $this->nextPage;
     }
 
+    /**
+     * Builds a tree structure containing all known pages
+     *
+     * Pico's page tree is a list of all the tree's branches (no matter the
+     * depth). Thus, by iterating a array element, you get the nodes of a given
+     * branch. All leaf nodes do represent a page, but inner nodes may or may
+     * not represent a page (e.g. if there's a `sub/page.md`, but neither a
+     * `sub/index.md` nor a `sub.md`, the inner node `sub`, that is the parent
+     * of the `sub/page` node, represents no page itself).
+     *
+     * A page's file path describes its node's path in the tree (e.g. the page
+     * `sub/page.md` is represented by the `sub/page` node, thus a child of the
+     * `sub` node and a element of the `sub` branch). However, the index page
+     * of a folder (e.g. `sub/index.md`), is *not* a node of the `sub` branch,
+     * but rather of the `/` branch. The page's node is not `sub/index`, but
+     * `sub`. If two pages are described by the same node (e.g. if both a
+     * `sub/index.md` and a `sub.md` exist), the index page takes precedence.
+     * Pico's main index page (i.e. `index.md`) is represented by the tree's
+     * root node `/` and a special case: it is the only node of the `` (i.e.
+     * the empty string) branch.
+     *
+     * A node is represented by an array with the keys `id`, `page` and
+     * `children`. The `id` key contains a string with the node's name. If the
+     * node represents a page, the `page` key is a reference to the page's
+     * data array. If the node is a inner node, the `children` key is a
+     * reference to its matching branch (i.e. a list of the node's children).
+     * The order of a node's children matches the order in Pico's pages array.
+     *
+     * If you want to walk the whole page tree, start with the tree's root node
+     * at `$pageTree[""]["/"]`. The root node's `children` key is a reference
+     * to the `/` branch at `$pageTree["/"]`, that is a list of the root node's
+     * direct child nodes and their siblings.
+     *
+     * You MUST NOT iterate the page tree itself (i.e. the list of the tree's
+     * branches), its order is undefined and the array will be replaced by a
+     * non-iterable data structure with Pico 3.0.
+     *
+     * @see Pico::getPageTree()
+     *
+     * @return void
+     */
+    protected function buildPageTree()
+    {
+        $this->pageTree = array();
+        foreach ($this->pages as $id => &$pageData) {
+            // main index page
+            if ($id === 'index') {
+                $this->pageTree['']['/'] = array('id' => '/', 'page' => &$pageData);
+                $pageData['tree_node'] = &$this->pageTree['']['/'];
+                continue;
+            }
+
+            // get a page's node and branch
+            $basename = basename($id);
+            $branch = dirname($id);
+
+            $isIndexPage = ($basename === 'index');
+            if ($isIndexPage) {
+                $basename = basename($branch);
+                $branch = dirname($branch);
+            }
+
+            $branch = ($branch !== '.') ? $branch : '/';
+            $node = ($branch !== '/') ? $branch . '/' . $basename : $basename;
+
+            // skip inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists)
+            if (isset($this->pageTree[$branch][$node]['page']) && !$isIndexPage) {
+                continue;
+            }
+
+            // add node to page tree
+            $isNewBranch = !isset($this->pageTree[$branch]);
+            $this->pageTree[$branch][$node]['id'] = $node;
+            $this->pageTree[$branch][$node]['page'] = &$pageData;
+
+            $pageData['tree_node'] = &$this->pageTree[$branch][$node];
+
+            // add parent nodes to page tree, if necessary
+            while ($isNewBranch && $branch) {
+                $parentNode = $branch;
+                $parentBranch = ($branch !== '/') ? dirname($parentNode) : '';
+                $parentBranch = ($parentBranch !== '.') ? $parentBranch : '/';
+
+                $isNewBranch = !isset($this->pageTree[$parentBranch]);
+                $this->pageTree[$parentBranch][$parentNode]['id'] = $parentNode;
+                $this->pageTree[$parentBranch][$parentNode]['children'] = &$this->pageTree[$branch];
+
+                $branch = $parentBranch;
+            }
+        }
+    }
+
+    /**
+     * Returns a tree structure of known pages
+     *
+     * @see Pico::buildPageTree()
+     *
+     * @return array[]|null the tree structure of all pages
+     */
+    public function getPageTree()
+    {
+        return $this->pageTree;
+    }
+
     /**
      * Returns the Twig template engine
      *
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 26b828d..b6b83fe 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -410,6 +410,23 @@ class DummyPlugin extends AbstractPicoPlugin
         // your code
     }
 
+    /**
+     * Triggered after Pico built the page tree
+     *
+     * Please refer to {@see Pico::buildPageTree()} for information about
+     * the structure of Pico's page tree array.
+     *
+     * @see Pico::getPageTree()
+     *
+     * @param  array  &$pageTree page tree
+     *
+     * @return void
+     */
+    public function onPageTreeBuilt(array &$pageTree)
+    {
+        // your code
+    }
+
     /**
      * Triggered before Pico renders the page
      *

From a192a42de5911a6b9f53b8eeef4d3c0af6514113 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 25 Nov 2017 21:47:20 +0100
Subject: [PATCH 154/188] Travis CI: Add PHP 7.2

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e7df153..9b2f71d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ jobs:
     - php: 5.6
     - php: 7.0
     - php: 7.1
+    - php: 7.2
     - php: nightly
     - php: hhvm
     - php: hhvm-nightly

From 37dfe0e6efd29ef12284d7431aa7d16c8786ab19 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 25 Nov 2017 21:52:03 +0100
Subject: [PATCH 155/188] Force themes to use .twig as file extension

We recommend plugin developers to use templates when serving HTML contents (like the UI of PicoAdmin), however, by supporting multiple file extensions for themes, we make it pretty hard to overwrite a plugin's template with a theme. As always, we preserve BC using PicoDeprecated.
---
 lib/Pico.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index a03a627..f2ae45a 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1991,14 +1991,7 @@ class Pico
     protected function getTwigTemplate()
     {
         $templateName = !empty($this->meta['template']) ? $this->meta['template'] : 'index';
-
-        if (file_exists($this->getThemesDir() . $this->getConfig('theme') . '/' . $templateName . '.twig')) {
-            $templateName .= '.twig';
-        } else {
-            $templateName .= '.html';
-        }
-
-        return $templateName;
+        return $templateName . '.twig';
     }
 
     /**

From 0c83f360a8a22a218ca2d814e50f8aebb0ef6272 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 2 Dec 2017 17:03:25 +0100
Subject: [PATCH 156/188] Build system: Move _build/tools directory to a
 separate repo

See https://github.com/picocms/ci-tools
---
 _build/tools/functions/parse-version.sh.inc | 44 ----------
 _build/tools/generate-badge.sh              | 55 -------------
 _build/tools/generate-phpdoc.sh             | 57 -------------
 _build/tools/github-clone.sh                | 29 -------
 _build/tools/github-commit.sh               | 45 ----------
 _build/tools/github-deploy.sh               | 73 -----------------
 _build/tools/github-setup.sh                | 37 ---------
 _build/tools/update-cloc-stats.sh           | 91 ---------------------
 _build/tools/update-phpdoc-list.sh          | 78 ------------------
 _build/tools/update-version-file.sh         | 50 -----------
 10 files changed, 559 deletions(-)
 delete mode 100644 _build/tools/functions/parse-version.sh.inc
 delete mode 100755 _build/tools/generate-badge.sh
 delete mode 100755 _build/tools/generate-phpdoc.sh
 delete mode 100755 _build/tools/github-clone.sh
 delete mode 100755 _build/tools/github-commit.sh
 delete mode 100755 _build/tools/github-deploy.sh
 delete mode 100755 _build/tools/github-setup.sh
 delete mode 100755 _build/tools/update-cloc-stats.sh
 delete mode 100755 _build/tools/update-phpdoc-list.sh
 delete mode 100755 _build/tools/update-version-file.sh

diff --git a/_build/tools/functions/parse-version.sh.inc b/_build/tools/functions/parse-version.sh.inc
deleted file mode 100644
index 1b6dcce..0000000
--- a/_build/tools/functions/parse-version.sh.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-##
-# Evaluates a version string
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-parse_version() {
-    VERSION_FULL="$1"
-
-    if [ "${VERSION_FULL:0:1}" == "v" ]; then
-        VERSION_FULL="${VERSION_FULL:1}"
-    fi
-
-    if [[ "$VERSION_FULL" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9A-Za-z\.\-]+))?(\+([0-9A-Za-z\.\-]+))?$ ]]; then
-        VERSION_MAJOR="${BASH_REMATCH[1]}"
-        VERSION_MINOR="${BASH_REMATCH[2]}"
-        VERSION_PATCH="${BASH_REMATCH[3]}"
-        VERSION_SUFFIX="${BASH_REMATCH[5]}"
-        VERSION_BUILD="${BASH_REMATCH[7]}"
-
-        VERSION_STABILITY="stable"
-        if [[ "$VERSION_SUFFIX" =~ ^(dev|a|alpha|b|beta|RC)?([.-]?[0-9]+)?([.-](dev))?$ ]]; then
-            if [ "${BASH_REMATCH[1]}" == "dev" ] || [ "${BASH_REMATCH[4]}" == "dev" ]; then
-                VERSION_STABILITY="dev"
-            elif [ "${BASH_REMATCH[1]}" == "a" ] || [ "${BASH_REMATCH[1]}" == "alpha" ]; then
-                VERSION_STABILITY="alpha"
-            elif [ "${BASH_REMATCH[1]}" == "b" ] || [ "${BASH_REMATCH[1]}" == "beta" ]; then
-                VERSION_STABILITY="beta"
-            elif [ "${BASH_REMATCH[1]}" == "RC" ]; then
-                VERSION_STABILITY="RC"
-            fi
-        fi
-
-        VERSION_MILESTONE="$VERSION_MAJOR.$VERSION_MINOR"
-        VERSION_NAME="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
-        VERSION_ID="$VERSION_MAJOR$(printf '%02d' "$VERSION_MINOR")$(printf '%02d' "$VERSION_PATCH")"
-
-        return 0
-    else
-        return 1
-    fi
-}
diff --git a/_build/tools/generate-badge.sh b/_build/tools/generate-badge.sh
deleted file mode 100755
index 5727e74..0000000
--- a/_build/tools/generate-badge.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Downloads a custom badge from shields.io
-#
-# All credit goes to the awesome guys at shields.io!
-#
-# @see     http://shields.io/
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-# parameters
-BADGE_FILE_PATH="$1"    # target file path
-BADGE_SUBJECT="$2"      # subject (left half) of the badge
-BADGE_STATUS="$3"       # status (right half) of the badge
-BADGE_COLOR="$4"        # color of the badge
-
-# print parameters
-echo "Generating badge..."
-printf 'BADGE_FILE_PATH="%s"\n' "$BADGE_FILE_PATH"
-printf 'BADGE_SUBJECT="%s"\n' "$BADGE_SUBJECT"
-printf 'BADGE_STATUS="%s"\n' "$BADGE_STATUS"
-printf 'BADGE_COLOR="%s"\n' "$BADGE_COLOR"
-echo
-
-# download badge from shields.io
-printf 'Downloading badge...\n'
-TMP_BADGE="$(mktemp -u)"
-
-curl --location --output "$TMP_BADGE" \
-    "https://img.shields.io/badge/$BADGE_SUBJECT-$BADGE_STATUS-$BADGE_COLOR.svg"
-
-# validate badge
-if [ ! -f "$TMP_BADGE" ] || [ ! -s "$TMP_BADGE" ]; then
-    echo "Unable to generate badge; skipping..." >&2
-    exit 1
-fi
-
-# MIME type image/svg+xml isn't supported at the moment
-#
-#TMP_BADGE_MIME="$(file --mime-type "$TMP_BADGE" | cut -d ' ' -f 2)"
-#if [ "$TMP_BADGE_MIME" != "image/svg+xml" ]; then
-#    echo "Generated badge should be of type 'image/svg+xml', '$TMP_BADGE_MIME' given; aborting...\n" >&2
-#    exit 1
-#fi
-
-# deploy badge
-mv "$TMP_BADGE" "$BADGE_FILE_PATH"
-
-echo
diff --git a/_build/tools/generate-phpdoc.sh b/_build/tools/generate-phpdoc.sh
deleted file mode 100755
index f22432a..0000000
--- a/_build/tools/generate-phpdoc.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Generates phpDoc class documentation
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-# parameters
-PHPDOC_CONFIG="$1"          # phpDoc config file
-PHPDOC_CACHE_DIR="$2"       # phpDoc cache dir
-PHPDOC_TARGET_DIR="$3"      # phpDoc output dir
-PHPDOC_TITLE="$4"           # API docs title
-
-# print parameters
-echo "Generating phpDocs..."
-printf 'PHPDOC_CONFIG="%s"\n' "$PHPDOC_CONFIG"
-printf 'PHPDOC_CACHE_DIR="%s"\n' "$PHPDOC_CACHE_DIR"
-printf 'PHPDOC_TARGET_DIR="%s"\n' "$PHPDOC_TARGET_DIR"
-printf 'PHPDOC_TITLE="%s"\n' "$PHPDOC_TITLE"
-echo
-
-# update a separate phpDoc cache
-if [ "$PHPDOC_CACHE_DIR" != "-" ]; then
-    # parse phpDoc files (i.e. update cache)
-    printf "Update phpDoc cache...\n"
-    phpdoc project:parse --config "$PHPDOC_CONFIG" \
-        --target "$PHPDOC_CACHE_DIR"
-
-    # check for changes
-    printf '\nCheck for phpDoc cache changes...\n'
-    if [ -z "$(git status --porcelain "$PHPDOC_CACHE_DIR")" ]; then
-        printf 'No changes detected; skipping phpDocs renewal...\n\n'
-        exit 0
-    fi
-
-    # NOTE: actually the following command should be `phpdoc project:transform`
-    #       instead of `phpdoc project:run`, but the command seems to be broken...
-    echo
-else
-    # create temporary cache files in PHPDOC_TARGET_DIR
-    PHPDOC_CACHE_DIR="$PHPDOC_TARGET_DIR"
-fi
-
-# transform phpDoc files (i.e. rewrite API docs)
-printf 'Rewrite phpDocs...\n'
-rm -rf "$PHPDOC_TARGET_DIR"
-phpdoc project:run --config "$PHPDOC_CONFIG" \
-    --cache-folder "$PHPDOC_CACHE_DIR" \
-    --target "$PHPDOC_TARGET_DIR" \
-    --title "$PHPDOC_TITLE"
-
-echo
diff --git a/_build/tools/github-clone.sh b/_build/tools/github-clone.sh
deleted file mode 100755
index e8cb1de..0000000
--- a/_build/tools/github-clone.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Clones a Git repo
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-# parameters
-CLONE_TARGET_DIR="$1"   # target directory
-CLONE_REPO_URL="$2"     # URL of the git repo to clone
-CLONE_REPO_BRANCH="$3"  # optional branch to checkout
-
-# print parameters
-echo "Cloning repo..."
-printf 'CLONE_TARGET_DIR="%s"\n' "$CLONE_TARGET_DIR"
-printf 'CLONE_REPO_URL="%s"\n' "$CLONE_REPO_URL"
-printf 'CLONE_REPO_BRANCH="%s"\n' "$CLONE_REPO_BRANCH"
-echo
-
-# clone repo
-[ -n "$CLONE_REPO_BRANCH" ] || CLONE_REPO_BRANCH="master"
-git clone --branch="$CLONE_REPO_BRANCH" "$CLONE_REPO_URL" "$CLONE_TARGET_DIR"
-
-echo
diff --git a/_build/tools/github-commit.sh b/_build/tools/github-commit.sh
deleted file mode 100755
index 6521160..0000000
--- a/_build/tools/github-commit.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Commits changes to a Git repo
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-# parameters
-COMMIT_MESSAGE="$1"     # commit message
-shift 1
-
-# print parameters
-echo "Commiting changes..."
-printf 'COMMIT_MESSAGE="%s"\n' "$COMMIT_MESSAGE"
-echo
-
-# stage changes
-COMMIT_FILES=()
-while [ $# -gt 0 ]; do
-    if [ -n "$(git status --porcelain "$1")" ]; then
-        if [ -d "$1" ]; then
-            git add --all "$1"
-        elif [ -f "$1" ] || [ -h "$1" ]; then
-            git add "$1"
-        else
-            echo "Unable to commit '$1': No such file, symbolic link or directory" >&2
-            exit 1
-        fi
-
-        COMMIT_FILES+=( "$1" )
-        shift
-    fi
-done
-
-# commit changes
-if [ ${#COMMIT_FILES[@]} -gt 0 ]; then
-    git commit --message="$COMMIT_MESSAGE" "${COMMIT_FILES[@]}"
-fi
-
-echo
diff --git a/_build/tools/github-deploy.sh b/_build/tools/github-deploy.sh
deleted file mode 100755
index b7ec649..0000000
--- a/_build/tools/github-deploy.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Pushes commits to a GitHub repo
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-# parameters
-CHECK_REPO_SLUG="$1"        # optional GitHub repo (e.g. picocms/Pico) to check
-                            # its latest commit as basic race condition protection
-CHECK_REMOTE_REF="$2"       # optional remote Git reference (e.g. heads/master)
-CHECK_LOCAL_COMMIT="$3"     # optional local commit SHA1
-
-# environment variables
-# GITHUB_OAUTH_TOKEN    GitHub authentication token, see https://github.com/settings/tokens
-
-# print parameters
-echo "Deploying repo..."
-printf 'CHECK_REPO_SLUG="%s"\n' "$CHECK_REPO_SLUG"
-printf 'CHECK_REMOTE_REF="%s"\n' "$CHECK_REMOTE_REF"
-printf 'CHECK_LOCAL_COMMIT="%s"\n' "$CHECK_LOCAL_COMMIT"
-echo
-
-# check for changes
-if [ -z "$(git log --oneline '@{upstream}..')" ]; then
-    printf 'Nothing to deploy; skipping...\n\n'
-    exit 0
-fi
-
-# race condition protection for concurrent Travis builds
-# this is no definite protection (race conditions are still possible during `git push`),
-# but it should give a basic protection without disabling concurrent builds completely
-if [ -n "$CHECK_REPO_SLUG" ] && [ -n "$CHECK_REMOTE_REF" ] && [ -n "$CHECK_LOCAL_COMMIT" ]; then
-    # retrieve information using GitHub APIv3
-    echo "Checking latest commit$([ -n "$GITHUB_OAUTH_TOKEN" ] && echo " (authorized)")..."
-    CHECK_API_URL="https://api.github.com/repos/$CHECK_REPO_SLUG/git/refs/$CHECK_REMOTE_REF"
-    if [ -n "$GITHUB_OAUTH_TOKEN" ]; then
-        CHECK_API_RESPONSE="$(curl --fail --silent --show-error --header "Authorization: token $GITHUB_OAUTH_TOKEN" "$CHECK_API_URL")"
-    else
-        CHECK_API_RESPONSE="$(curl --fail --silent --show-error "$CHECK_API_URL")"
-    fi
-
-    # evaluate JSON response
-    CHECK_REMOTE_COMMIT="$(echo "$CHECK_API_RESPONSE" | php -r "
-        \$json = json_decode(stream_get_contents(STDIN), true);
-        if (\$json !== null) {
-            if (isset(\$json['ref']) && (\$json['ref'] === 'refs/$CHECK_REMOTE_REF')) {
-                if (isset(\$json['object']) && isset(\$json['object']['sha'])) {
-                    echo \$json['object']['sha'];
-                }
-            }
-        }
-    ")"
-
-    # compare source reference against the latest commit
-    if [ "$CHECK_REMOTE_COMMIT" != "$CHECK_LOCAL_COMMIT" ]; then
-        echo "Latest local commit '$CHECK_LOCAL_COMMIT' doesn't match latest remote commit '$CHECK_REMOTE_COMMIT'; aborting..." >&2
-        exit 1
-    fi
-
-    echo
-fi
-
-# push changes
-printf 'Pushing changes...\n'
-git push
-
-echo
diff --git a/_build/tools/github-setup.sh b/_build/tools/github-setup.sh
deleted file mode 100755
index a9697cb..0000000
--- a/_build/tools/github-setup.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Prepares a GitHub repo for deployment
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-# environment variables
-# GITHUB_OAUTH_TOKEN    GitHub authentication token, see https://github.com/settings/tokens
-
-# print "parameters" (we don't have any)
-echo "Setup repo..."
-echo
-
-# check for git repo
-if ! git rev-parse --git-dir > /dev/null 2>&1; then
-    echo "Not a git repo; aborting..." >&2
-    exit 1
-fi
-
-# setup git
-printf 'Preparing repo...\n'
-git config push.default simple
-git config user.name "Travis CI"
-git config user.email "travis-ci@picocms.org"
-
-if [ -n "$GITHUB_OAUTH_TOKEN" ]; then
-    git config credential.helper 'store --file=.git/credentials'
-    (umask 077 && echo "https://GitHub:$GITHUB_OAUTH_TOKEN@github.com" > .git/credentials)
-fi
-
-echo
diff --git a/_build/tools/update-cloc-stats.sh b/_build/tools/update-cloc-stats.sh
deleted file mode 100755
index 7c3396a..0000000
--- a/_build/tools/update-cloc-stats.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Updates the cloc statistics files
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-# parameters
-TARGET_FILE="$1"     # statistics target file path
-
-# print parameters
-echo "Updating cloc statistics..."
-printf 'TARGET_FILE="%s"\n' "$TARGET_FILE"
-echo
-
-# create cloc statistics
-create_cloc_stats() {
-    local CLOC_FILE="$1"
-    shift
-
-    cloc --yaml --report-file "$CLOC_FILE" \
-        --progress-rate 0 \
-        --read-lang-def <(
-            echo "JSON"
-            echo "    filter remove_matches ^\s*$"
-            echo "    extension json"
-            echo "    3rd_gen_scale 2.50"
-            echo "Twig"
-            echo "    filter remove_between_general {# #}"
-            echo "    extension twig"
-            echo "    3rd_gen_scale 2.00"
-            echo "Markdown"
-            echo "    filter remove_html_comments"
-            echo "    extension md"
-            echo "    3rd_gen_scale 1.00"
-            echo "Apache config"
-            echo "    filter remove_matches ^\s*#"
-            echo "    filter remove_inline #.*$"
-            echo "    extension htaccess"
-            echo "    3rd_gen_scale 1.90"
-        ) \
-        --force-lang PHP,php.dist \
-        --force-lang YAML,yml.template \
-        "$@"
-}
-
-# remove header from cloc statistics
-clean_cloc_stats() {
-    local LINE=""
-    local IS_HEADER="no"
-    while IFS='' read -r LINE || [[ -n "$LINE" ]]; do
-        if [ "$IS_HEADER" == "yes" ]; then
-            # skip lines until next entry is reached
-            [ "${LINE:0:2}" != "  " ] || continue
-            IS_HEADER="no"
-        elif [ "$LINE" == "header :" ]; then
-            # header detected
-            IS_HEADER="yes"
-            continue
-        fi
-
-        echo "$LINE"
-    done < <(tail -n +3 "$1")
-}
-
-# create temporary file
-printf 'Creating temporary file...\n'
-TMP_FILE="$(mktemp)"
-[ -n "$TMP_FILE" ] || exit 1
-echo
-
-# create statistics
-printf 'Creating statistics...\n'
-create_cloc_stats "$TMP_FILE" \
-    lib index.php
-echo
-
-# remove headers from cloc statistics
-printf 'Writing statistics file without header...\n'
-clean_cloc_stats "$TMP_FILE" > "$TARGET_FILE"
-echo
-
-# remove temporary file
-printf 'Removing temporary file...\n'
-rm "$TMP_FILE"
-echo
diff --git a/_build/tools/update-phpdoc-list.sh b/_build/tools/update-phpdoc-list.sh
deleted file mode 100755
index 06cfba6..0000000
--- a/_build/tools/update-phpdoc-list.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Updates the phpDoc list
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-# parameters
-LIST_FILE_PATH="$1"      # target file path
-LIST_ID="$2"             # phpDoc ID
-LIST_TYPE="$3"           # phpDoc type
-LIST_TITLE="$4"          # phpDoc title
-LIST_LAST_UPDATE="$5"    # phpDoc last update
-
-# print parameters
-echo "Updating phpDoc list..."
-printf 'LIST_FILE_PATH="%s"\n' "$LIST_FILE_PATH"
-printf 'LIST_ID="%s"\n' "$LIST_ID"
-printf 'LIST_TYPE="%s"\n' "$LIST_TYPE"
-printf 'LIST_TITLE="%s"\n' "$LIST_TITLE"
-printf 'LIST_LAST_UPDATE="%s"\n' "$LIST_LAST_UPDATE"
-echo
-
-# create temporary file
-printf 'Creating temporary file...\n'
-LIST_TMP_FILE="$(mktemp)"
-[ -n "$LIST_TMP_FILE" ] || exit 1
-
-exec 3> "$LIST_TMP_FILE"
-
-# walk through phpDoc list
-printf 'Walking through phpDoc list...\n'
-
-DO_REPLACE="no"
-DID_REPLACE="no"
-while IFS='' read -r LINE || [[ -n "$LINE" ]]; do
-    if [ "$DO_REPLACE" == "yes" ]; then
-        # skip lines until next entry is reached
-        [ "${LINE:0:2}" != "  " ] || continue
-        DO_REPLACE="no"
-
-    elif [ "$LINE" == "- id: $LIST_ID" ]; then
-        # update existing entry
-        printf 'Updating existing entry...\n'
-        printf -- '- id: %s\n' "$LIST_ID" >&3
-        printf -- '  type: %s\n' "$LIST_TYPE" >&3
-        printf -- '  title: %s\n' "$LIST_TITLE" >&3
-        printf -- '  last_update: %s\n' "$LIST_LAST_UPDATE" >&3
-
-        DO_REPLACE="yes"
-        DID_REPLACE="yes"
-        continue
-    fi
-
-    echo "$LINE" >&3
-done < "$LIST_FILE_PATH"
-
-# add new entry
-if [ "$DID_REPLACE" == "no" ]; then
-    printf 'Adding new entry...\n'
-    printf -- '- id: %s\n' "$LIST_ID" >&3
-    printf -- '  type: %s\n' "$LIST_TYPE" >&3
-    printf -- '  title: %s\n' "$LIST_TITLE" >&3
-    printf -- '  last_update: %s\n' "$LIST_LAST_UPDATE" >&3
-fi
-
-exec 3>&-
-
-# move temporary file
-printf 'Replacing phpDoc list...\n'
-mv "$LIST_TMP_FILE" "$LIST_FILE_PATH"
-
-echo
diff --git a/_build/tools/update-version-file.sh b/_build/tools/update-version-file.sh
deleted file mode 100755
index 79afa36..0000000
--- a/_build/tools/update-version-file.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-##
-# Updates the version file
-#
-# @author  Daniel Rudolf
-# @link    http://picocms.org
-# @license http://opensource.org/licenses/MIT
-#
-
-set -e
-
-. "$(dirname "$0")/functions/parse-version.sh.inc"
-
-# parameters
-VERSION_FILE_PATH="$1"  # target file path
-VERSION_STRING="$2"     # version string (e.g. 1.0.0-beta.1+7b4ad7f)
-
-# print parameters
-echo "Generating version file..."
-printf 'VERSION_FILE_PATH="%s"\n' "$VERSION_FILE_PATH"
-printf 'VERSION_STRING="%s"\n' "$VERSION_STRING"
-echo
-
-# evaluate version string (see http://semver.org/)
-printf 'Evaluating version string...\n'
-if ! parse_version "$VERSION_STRING"; then
-    echo "Invalid version string; skipping..." >&2
-    exit 1
-fi
-
-# generate version file
-printf 'Updating version file...\n'
-echo -n "" > "$VERSION_FILE_PATH"
-exec 3> "$VERSION_FILE_PATH"
-
-printf 'full: %s\n' "$VERSION_FULL" >&3
-printf 'name: %s\n' "$VERSION_NAME" >&3
-printf 'milestone: %s\n' "$VERSION_MILESTONE" >&3
-printf 'stability: %s\n' "$VERSION_STABILITY" >&3
-printf 'id: %d\n' "$VERSION_ID" >&3
-printf 'major: %d\n' "$VERSION_MAJOR" >&3
-printf 'minor: %d\n' "$VERSION_MINOR" >&3
-printf 'patch: %d\n' "$VERSION_PATCH" >&3
-printf 'suffix: %s\n' "$VERSION_SUFFIX" >&3
-printf 'build: %s\n' "$VERSION_BUILD" >&3
-
-exec 3>&-
-
-echo

From 722de2a1e54518f96773fe34516c8aa140ce1a20 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 2 Dec 2017 17:17:41 +0100
Subject: [PATCH 157/188] Build system: Refactor scripts to use
 picocms/ci-tools

---
 {_build => .build}/create-release.sh | 16 +++------
 .build/deploy-branch.sh              | 44 +++++++++++++++++++++++
 {_build => .build}/deploy-release.sh | 54 +++++++++++++---------------
 {_build => .build}/deploy.sh         |  2 +-
 {_build => .build}/install.sh        | 10 +++---
 .gitattributes                       |  2 +-
 .travis.yml                          |  5 ++-
 _build/.gitignore                    |  4 ---
 _build/deploy-branch.sh              | 50 --------------------------
 9 files changed, 84 insertions(+), 103 deletions(-)
 rename {_build => .build}/create-release.sh (78%)
 create mode 100755 .build/deploy-branch.sh
 rename {_build => .build}/deploy-release.sh (57%)
 rename {_build => .build}/deploy.sh (76%)
 rename {_build => .build}/install.sh (74%)
 delete mode 100644 _build/.gitignore
 delete mode 100755 _build/deploy-branch.sh

diff --git a/_build/create-release.sh b/.build/create-release.sh
similarity index 78%
rename from _build/create-release.sh
rename to .build/create-release.sh
index d9f21d6..152825e 100755
--- a/_build/create-release.sh
+++ b/.build/create-release.sh
@@ -2,13 +2,7 @@
 set -e
 
 . "$(dirname "$0")/tools/functions/parse-version.sh.inc"
-export PATH="$(dirname "$0")/tools:$PATH"
-
-DEPLOYMENT_ID="${TRAVIS_TAG//\//_}"
-DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/release-$DEPLOYMENT_ID.git"
-
-[ -n "$RELEASE_REPO_SLUG" ] || export RELEASE_REPO_SLUG="$TRAVIS_REPO_SLUG"
-[ -n "$RELEASE_REPO_BRANCH" ] || export RELEASE_REPO_BRANCH="master"
+export PATH="$PICO_TOOLS_DIR:$PATH"
 
 # parameters
 ARCHIVE="$1"    # release archive file name
@@ -19,15 +13,15 @@ if [ -z "$ARCHIVE" ]; then
 fi
 
 # parse version
-if ! parse_version "$TRAVIS_TAG"; then
-    echo "Unable to create release archive: Invalid version '$TRAVIS_TAG'" >&2
+if ! parse_version "$PROJECT_REPO_TAG"; then
+    echo "Unable to create release archive: Invalid version '$PROJECT_REPO_TAG'" >&2
     exit 1
 fi
 
 # clone repo
-github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$RELEASE_REPO_SLUG.git" "$RELEASE_REPO_BRANCH"
+github-clone.sh "$PICO_BUILD_DIR" "https://github.com/$RELEASE_REPO_SLUG.git" "$RELEASE_REPO_BRANCH"
 
-cd "$DEPLOYMENT_DIR"
+cd "$PICO_BUILD_DIR"
 
 # force Pico version
 echo "Updating composer dependencies..."
diff --git a/.build/deploy-branch.sh b/.build/deploy-branch.sh
new file mode 100755
index 0000000..3917aa1
--- /dev/null
+++ b/.build/deploy-branch.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -e
+
+export PATH="$PICO_TOOLS_DIR:$PATH"
+
+# get current Pico milestone
+VERSION="$(php -r "require_once('$PICO_PROJECT_DIR/lib/Pico.php'); echo Pico::VERSION;")"
+MILESTONE="Pico$([[ "$VERSION" =~ ^([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATCH[1]}")"
+
+echo "Deploying $PROJECT_REPO_BRANCH branch ($MILESTONE)..."
+echo
+
+# clone repo
+github-clone.sh "$PICO_DEPLOY_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
+
+cd "$PICO_DEPLOY_DIR"
+
+# setup repo
+github-setup.sh
+
+# generate phpDocs
+generate-phpdoc.sh \
+    "$PICO_PROJECT_DIR/.phpdoc.xml" \
+    "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT.cache" "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT" \
+    "$MILESTONE API Documentation ($PROJECT_REPO_BRANCH branch)"
+
+if [ -z "$(git status --porcelain "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT.cache")" ]; then
+    # nothing to do
+    exit 0
+fi
+
+# update phpDoc list
+update-phpdoc-list.sh \
+    "$PICO_DEPLOY_DIR/_data/phpDoc.yml" \
+    "$PICO_DEPLOYMENT" "branch" "<code>$PROJECT_REPO_BRANCH</code> branch" "$(date +%s)"
+
+# commit phpDocs
+github-commit.sh \
+    "Update phpDocumentor class docs for $PROJECT_REPO_BRANCH branch @ $PROJECT_REPO_COMMIT" \
+    "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT.cache" "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT" \
+    "$PICO_DEPLOY_DIR/_data/phpDoc.yml"
+
+# deploy phpDocs
+github-deploy.sh "$PROJECT_REPO_SLUG" "heads/$PROJECT_REPO_BRANCH" "$PROJECT_REPO_COMMIT"
diff --git a/_build/deploy-release.sh b/.build/deploy-release.sh
similarity index 57%
rename from _build/deploy-release.sh
rename to .build/deploy-release.sh
index 48f3209..d2a61a1 100755
--- a/_build/deploy-release.sh
+++ b/.build/deploy-release.sh
@@ -32,17 +32,11 @@ if [ "$DEPLOY_FULL" != "true" ]; then
 fi
 
 . "$(dirname "$0")/tools/functions/parse-version.sh.inc"
-export PATH="$(dirname "$0")/tools:$PATH"
-
-DEPLOYMENT_ID="${TRAVIS_TAG//\//_}"
-DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
-
-[ -n "$DEPLOY_REPO_SLUG" ] || export DEPLOY_REPO_SLUG="$TRAVIS_REPO_SLUG"
-[ -n "$DEPLOY_REPO_BRANCH" ] || export DEPLOY_REPO_BRANCH="gh-pages"
+export PATH="$PICO_TOOLS_DIR:$PATH"
 
 # parse version
-if ! parse_version "$TRAVIS_TAG"; then
-    echo "Invalid version '$TRAVIS_TAG'; aborting..." >&2
+if ! parse_version "$PROJECT_REPO_TAG"; then
+    echo "Invalid version '$PROJECT_REPO_TAG'; aborting..." >&2
     exit 1
 fi
 
@@ -53,9 +47,9 @@ printf 'VERSION_ID="%s"\n' "$VERSION_ID"
 echo
 
 # clone repo
-github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
+github-clone.sh "$PICO_DEPLOY_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
 
-cd "$DEPLOYMENT_DIR"
+cd "$PICO_DEPLOY_DIR"
 
 # setup repo
 github-setup.sh
@@ -64,20 +58,20 @@ github-setup.sh
 if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
     # generate phpDocs
     generate-phpdoc.sh \
-        "$TRAVIS_BUILD_DIR/.phpdoc.xml" \
-        "-" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
-        "Pico $VERSION_MILESTONE API Documentation ($TRAVIS_TAG)"
+        "$PICO_PROJECT_DIR/.phpdoc.xml" \
+        "-" "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT" \
+        "Pico $VERSION_MILESTONE API Documentation (v$VERSION_FULL)"
 
-    if [ -n "$(git status --porcelain "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID")" ]; then
+    if [ -n "$(git status --porcelain "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT")" ]; then
         # update phpDoc list
         update-phpdoc-list.sh \
-            "$DEPLOYMENT_DIR/_data/phpDoc.yml" \
-            "$TRAVIS_TAG" "version" "Pico ${TRAVIS_TAG#v}" "$(date +%s)"
+            "$PICO_DEPLOY_DIR/_data/phpDoc.yml" \
+            "$PICO_DEPLOYMENT" "version" "Pico $VERSION_FULL" "$(date +%s)"
 
         # commit phpDocs
         github-commit.sh \
-            "Update phpDocumentor class docs for $TRAVIS_TAG" \
-            "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" "$DEPLOYMENT_DIR/_data/phpDoc.yml"
+            "Update phpDocumentor class docs for v$VERSION_FULL" \
+            "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT" "$PICO_DEPLOY_DIR/_data/phpDoc.yml"
     fi
 fi
 
@@ -86,37 +80,37 @@ if [ "$VERSION_STABILITY" == "stable" ]; then
     # update version badge
     if [ "$DEPLOY_VERSION_BADGE" == "true" ]; then
         generate-badge.sh \
-            "$DEPLOYMENT_DIR/badges/pico-version.svg" \
-            "release" "$TRAVIS_TAG" "blue"
+            "$PICO_DEPLOY_DIR/badges/pico-version.svg" \
+            "release" "$VERSION_FULL" "blue"
 
         # commit version badge
         github-commit.sh \
-            "Update version badge for $TRAVIS_TAG" \
-            "$DEPLOYMENT_DIR/badges/pico-version.svg"
+            "Update version badge for v$VERSION_FULL" \
+            "$PICO_DEPLOY_DIR/badges/pico-version.svg"
     fi
 
     # update version file
     if [ "$DEPLOY_VERSION_FILE" == "true" ]; then
         update-version-file.sh \
-            "$DEPLOYMENT_DIR/_data/version.yml" \
+            "$PICO_DEPLOY_DIR/_data/version.yml" \
             "$VERSION_FULL"
 
         # commit version file
         github-commit.sh \
-            "Update version file for $TRAVIS_TAG" \
-            "$DEPLOYMENT_DIR/_data/version.yml"
+            "Update version file for v$VERSION_FULL" \
+            "$PICO_DEPLOY_DIR/_data/version.yml"
     fi
 
     # update cloc statistics
     if [ "$DEPLOY_CLOC_STATS" == "true" ]; then
-        update-cloc-stats.sh "$DEPLOYMENT_DIR/_data/cloc.yml"
+        update-cloc-stats.sh "$PICO_DEPLOY_DIR/_data/cloc.yml"
 
         # commit cloc statistics
         github-commit.sh \
-            "Update cloc statistics for $TRAVIS_TAG" \
-            "$DEPLOYMENT_DIR/_data/cloc.yml"
+            "Update cloc statistics for v$VERSION_FULL" \
+            "$PICO_DEPLOY_DIR/_data/cloc.yml"
     fi
 fi
 
 # deploy
-github-deploy.sh "$TRAVIS_REPO_SLUG" "tags/$TRAVIS_TAG" "$TRAVIS_COMMIT"
+github-deploy.sh "$PROJECT_REPO_SLUG" "tags/$PROJECT_REPO_TAG" "$PROJECT_REPO_COMMIT"
diff --git a/_build/deploy.sh b/.build/deploy.sh
similarity index 76%
rename from _build/deploy.sh
rename to .build/deploy.sh
index 3d5e4b5..0ef0c10 100755
--- a/_build/deploy.sh
+++ b/.build/deploy.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-if [ -n "$TRAVIS_TAG" ]; then
+if [ -n "$PROJECT_REPO_TAG" ]; then
     exec "$(dirname "$0")/deploy-release.sh"
 else
     exec "$(dirname "$0")/deploy-branch.sh"
diff --git a/_build/install.sh b/.build/install.sh
similarity index 74%
rename from _build/install.sh
rename to .build/install.sh
index dee3ee5..713f521 100755
--- a/_build/install.sh
+++ b/.build/install.sh
@@ -21,19 +21,19 @@ if [ -n "$GITHUB_OAUTH_TOKEN" ]; then
 fi
 
 # set COMPOSER_ROOT_VERSION when necessary
-if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -n "$PROJECT_REPO_BRANCH" ]; then
     PICO_VERSION_PATTERN="$(php -r "
-        \$json = json_decode(file_get_contents('$TRAVIS_BUILD_DIR/composer.json'), true);
+        \$json = json_decode(file_get_contents('$PICO_PROJECT_DIR/composer.json'), true);
         if (\$json !== null) {
-            if (isset(\$json['extra']['branch-alias']['dev-$TRAVIS_BRANCH'])) {
-                echo 'dev-$TRAVIS_BRANCH';
+            if (isset(\$json['extra']['branch-alias']['dev-$PROJECT_REPO_BRANCH'])) {
+                echo 'dev-$PROJECT_REPO_BRANCH';
             }
         }
     ")"
 
     if [ -z "$PICO_VERSION_PATTERN" ]; then
         PICO_VERSION_PATTERN="$(php -r "
-            require_once('$TRAVIS_BUILD_DIR/lib/Pico.php');
+            require_once('$PICO_PROJECT_DIR/lib/Pico.php');
             echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
         ")"
     fi
diff --git a/.gitattributes b/.gitattributes
index 0d8d494..447d4c6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-/_build             export-ignore
+/.build             export-ignore
 /assets/.gitignore  export-ignore
 /config/.gitignore  export-ignore
 /content/.gitignore export-ignore
diff --git a/.travis.yml b/.travis.yml
index 9b2f71d..e2c041e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,10 @@ jobs:
   fast-finish: true
 
 before_install:
-  - export PATH="$TRAVIS_BUILD_DIR/_build:$PATH"
+  - export PATH="$TRAVIS_BUILD_DIR/.build:$PATH"
+  - export PICO_TOOLS_DIR="$HOME/__picocms_tools"
+  - git clone --branch="$TOOLS_REPO_BRANCH" "https://github.com/$TOOLS_REPO_SLUG.git" "$PICO_TOOLS_DIR"
+  - . "$PICO_TOOLS_DIR/init/travis.sh.inc"
 
 install:
   - install.sh
diff --git a/_build/.gitignore b/_build/.gitignore
deleted file mode 100644
index 41c43ff..0000000
--- a/_build/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore temporary directories created while building/deploying Pico
-/phpdoc
-/phpdoc.cache
-/deploy-*.git
diff --git a/_build/deploy-branch.sh b/_build/deploy-branch.sh
deleted file mode 100755
index 8301932..0000000
--- a/_build/deploy-branch.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-export PATH="$(dirname "$0")/tools:$PATH"
-
-DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
-DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
-
-[ -n "$DEPLOY_REPO_SLUG" ] || export DEPLOY_REPO_SLUG="$TRAVIS_REPO_SLUG"
-[ -n "$DEPLOY_REPO_BRANCH" ] || export DEPLOY_REPO_BRANCH="gh-pages"
-
-# get current Pico milestone
-VERSION="$(php -r 'require_once(__DIR__ . "/lib/Pico.php"); echo Pico::VERSION;')"
-MILESTONE="Pico$([[ "$VERSION" =~ ^([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATCH[1]}")"
-
-echo "Deploying $TRAVIS_BRANCH branch ($MILESTONE)..."
-echo
-
-# clone repo
-github-clone.sh "$DEPLOYMENT_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
-
-cd "$DEPLOYMENT_DIR"
-
-# setup repo
-github-setup.sh
-
-# generate phpDocs
-generate-phpdoc.sh \
-    "$TRAVIS_BUILD_DIR/.phpdoc.xml" \
-    "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
-    "$MILESTONE API Documentation ($TRAVIS_BRANCH branch)"
-
-if [ -z "$(git status --porcelain "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache")" ]; then
-    # nothing to do
-    exit 0
-fi
-
-# update phpDoc list
-update-phpdoc-list.sh \
-    "$DEPLOYMENT_DIR/_data/phpDoc.yml" \
-    "$TRAVIS_BRANCH" "branch" "<code>$TRAVIS_BRANCH</code> branch" "$(date +%s)"
-
-# commit phpDocs
-github-commit.sh \
-    "Update phpDocumentor class docs for $TRAVIS_BRANCH branch @ $TRAVIS_COMMIT" \
-    "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID.cache" "$DEPLOYMENT_DIR/phpDoc/$DEPLOYMENT_ID" \
-    "$DEPLOYMENT_DIR/_data/phpDoc.yml"
-
-# deploy phpDocs
-github-deploy.sh "$TRAVIS_REPO_SLUG" "heads/$TRAVIS_BRANCH" "$TRAVIS_COMMIT"

From a1dcf546830a84b421a4752b18d68b48c5def106 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 2 Dec 2017 17:55:29 +0100
Subject: [PATCH 158/188] Add .github/PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 48 ++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..ec08db4
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,48 @@
+<!--
+
+Developer Certificate of Origin
+===============================
+
+By contributing to Pico, you accept and agree to the following terms and conditions (the *Developer Certificate of Origin*) for your present and future contributions submitted to Pico. Please refer to the *Developer Certificate of Origin* section in Pico's [`CONTRIBUTING.md`](https://github.com/picocms/Pico/blob/master/CONTRIBUTING.md#developer-certificate-of-origin) for details.
+
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+-->

From e517eac396f8f54cc4d1560a27bd650f43349ad6 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 24 Dec 2017 13:58:42 +0100
Subject: [PATCH 159/188] Improve .htaccess regex

Deny access to all dot files and dirs by default (except .well-known)

Update nginx rules accordingly and pass denied requests to Pico rather than letting nginx send a 404 response
---
 .htaccess               | 5 +++--
 content-sample/index.md | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index 651f2ee..b6ca1bd 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,8 +4,9 @@
     #RewriteBase /
 
     # Deny access to internal dirs and files by passing the URL to Pico
-    RewriteRule ^(\.git|_build|config|content|content-sample|lib|vendor)(/|$) index.php [L]
-    RewriteRule ^(\.git(attributes|ignore)|CHANGELOG\.md|composer\.(json|lock))$ index.php [L]
+    RewriteRule ^(config|content|content-sample|lib|vendor)(/|$) index.php [L]
+    RewriteRule ^(CHANGELOG\.md|composer\.(json|lock))(/|$) index.php [L]
+    RewriteRule (^\.|/\.)(?!well-known(/|$)) index.php [L]
 
     # Enable URL rewriting
     RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/content-sample/index.md b/content-sample/index.md
index 4d70b45..ac30a17 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -285,16 +285,16 @@ still shows no rewritten URLs, force URL rewriting by setting
 
 If you're using Nginx, you can use the following configuration to enable URL
 rewriting (lines `5` to `8`) and denying access to Pico's internal files
-(lines `1` to `3`). You'll need to adjust the path (`/pico` on lines `1`, `5`
-and `7`) to match your installation directory. Additionally, you'll need to
+(lines `1` to `3`). You'll need to adjust the path (`/pico` on lines `1`, `2`,
+`5` and `7`) to match your installation directory. Additionally, you'll need to
 enable URL rewriting by setting `rewrite_url: true` in your
 `config/config.yml`. The Nginx configuration should provide the *bare minimum*
 you need for Pico. Nginx is a very extensive subject. If you have any trouble,
 please read through our [Nginx configuration docs][NginxConfig].
 
 ```
-location ~ /pico/(\.htaccess|\.git|config|content|content-sample|lib|vendor|CHANGELOG\.md|composer\.(json|lock)) {
-    return 404;
+location ~ ^/pico/((config|content|content-sample|lib|vendor|CHANGELOG\.md|composer\.(json|lock))(/|$)|(.+/)?\.(?!well-known(/|$))) {
+    try_files /pico/index.php$is_args$args;
 }
 
 location /pico/ {

From 1ce1780a8694b5c6d90efd6342ef4bb6f8e0db3d Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 24 Dec 2017 14:21:32 +0100
Subject: [PATCH 160/188] Build system: Fix release deployment

---
 .build/create-release.sh | 2 +-
 .build/deploy-release.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.build/create-release.sh b/.build/create-release.sh
index 152825e..74a94a8 100755
--- a/.build/create-release.sh
+++ b/.build/create-release.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
-. "$(dirname "$0")/tools/functions/parse-version.sh.inc"
 export PATH="$PICO_TOOLS_DIR:$PATH"
+. "$PICO_TOOLS_DIR/functions/parse-version.sh.inc"
 
 # parameters
 ARCHIVE="$1"    # release archive file name
diff --git a/.build/deploy-release.sh b/.build/deploy-release.sh
index d2a61a1..137d92e 100755
--- a/.build/deploy-release.sh
+++ b/.build/deploy-release.sh
@@ -31,8 +31,8 @@ if [ "$DEPLOY_FULL" != "true" ]; then
     echo
 fi
 
-. "$(dirname "$0")/tools/functions/parse-version.sh.inc"
 export PATH="$PICO_TOOLS_DIR:$PATH"
+. "$PICO_TOOLS_DIR/functions/parse-version.sh.inc"
 
 # parse version
 if ! parse_version "$PROJECT_REPO_TAG"; then

From afd0a4d7a3da6ff6748b4ac3f13431256ab35a8a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 27 Dec 2017 21:32:52 +0100
Subject: [PATCH 161/188] Change AbstractPicoPlugin::$enabled's behavior

AbstractPicoPlugin::$enabled now defaults to NULL what leaves the decision whether a plugin should be enabled or disabled by default up to Pico (precisely AbstractPicoPlugin::triggerEvent()). If all dependencies of a plugin are fulfilled, Pico enables the plugin by default. Otherwise the plugin is silently disabled (this was the behavior when AbstractPicoPlugin::$enabled was set to TRUE previously).

If a plugin should never be disabled *silently* (e.g. when dealing with security-relevant stuff like access control, or similar), set AbstractPicoPlugin::$enabled to TRUE. If Pico can't fulfill all the plugin's dependencies, it will throw an RuntimeException.

If a plugin rather does some "crazy stuff" a user should really be aware of before using it, you can set AbstractPicoPlugin::$enabled to FALSE. The user will then have to enable the plugin manually. However, if another plugin depends on this plugin, it might get enabled silently nevertheless.

No matter what, the user can always explicitly enable or disable a plugin in Pico's config.
---
 lib/AbstractPicoPlugin.php  |  9 +++++----
 lib/Pico.php                | 23 +++++++++++++++++------
 lib/PicoPluginInterface.php |  8 ++++++--
 plugins/DummyPlugin.php     | 22 +++++++++++++++++++---
 4 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index d361bba..eaa982a 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -38,9 +38,9 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      *
      * @see PicoPluginInterface::isEnabled()
      * @see PicoPluginInterface::setEnabled()
-     * @var bool
+     * @var bool|null
      */
-    protected $enabled = true;
+    protected $enabled;
 
     /**
      * Boolean indicating if this plugin was ever enabled/disabled manually
@@ -99,11 +99,12 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
                 if ($pluginEnabled !== null) {
                     $this->setEnabled($pluginEnabled);
                 } elseif ($this->enabled) {
+                    $this->setEnabled($this->enabled, true, true);
+                } elseif ($this->enabled === null) {
                     // make sure dependencies are already fulfilled,
                     // otherwise the plugin needs to be enabled manually
                     try {
-                        $this->checkCompatibility();
-                        $this->checkDependencies(false);
+                        $this->setEnabled(true, false, true);
                     } catch (RuntimeException $e) {
                         $this->enabled = false;
                     }
diff --git a/lib/Pico.php b/lib/Pico.php
index f2ae45a..e93306a 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -486,14 +486,18 @@ class Pico
      *
      * See {@see Pico::loadComposerPlugins()} for details about plugins loaded
      * from `vendor/pico-plugin.php` (i.e. plugins that were installed using
-     * `composer`), and {@see Pico::loadLocalPlugins()} for details about
-     * plugins installed to {@see Pico::$pluginsDir}. Pico loads plugins from
-     * the filesystem only if {@see Pico::$enableLocalPlugins} is set to TRUE
+     * composer), and {@see Pico::loadLocalPlugins()} for details about plugins
+     * installed to {@see Pico::$pluginsDir}. Pico loads plugins from the
+     * filesystem only if {@see Pico::$enableLocalPlugins} is set to TRUE
      * (this is the default).
      *
      * Pico always loads plugins from `vendor/pico-plugin.php` first and
      * ignores conflicting plugins in {@see Pico::$pluginsDir}.
      *
+     * The official PicoDeprecated plugin must be loaded when plugins that use
+     * an older API version than Pico's API version ({@see Pico::API_VERSION})
+     * are loaded.
+     *
      * Please note that Pico will change the processing order when needed to
      * incorporate plugin dependencies. See {@see Pico::sortPlugins()} for
      * details.
@@ -513,14 +517,21 @@ class Pico
         if ($this->enableLocalPlugins) {
             $this->loadLocalPlugins($composerPlugins);
         }
+
+        if (!isset($this->plugins['PicoDeprecated']) && (count($this->plugins) !== count($this->nativePlugins))) {
+            throw new RuntimeException(
+                "Plugins using an older API than version " . static::API_VERSION . " found, "
+                . "but PicoDeprecated isn't loaded"
+            );
+        }
     }
 
     /**
      * Loads plugins from vendor/pico-plugin.php
      *
-     * This method loads all plugins installed using `composer` and Pico's
-     * `picocms/pico-installer` installer by reading the `pico-plugin.php` in
-     * composer's `vendor` dir.
+     * This method loads all plugins installed using composer and Pico's
+     * `picocms/composer-installer` installer by reading the `pico-plugin.php`
+     * in composer's `vendor` dir.
      *
      * @see Pico::loadPlugins()
      * @see Pico::loadLocalPlugins()
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index ff7de1d..13a30dd 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -70,11 +70,15 @@ interface PicoPluginInterface
     public function setEnabled($enabled, $recursive = true, $auto = false);
 
     /**
-     * Returns TRUE if this plugin is enabled, FALSE otherwise
+     * Returns a boolean indicating whether this plugin is enabled or not
+     *
+     * You musn't rely on the return value when Pico's `onConfigLoaded` event
+     * wasn't triggered on all plugins yet. This method might even return NULL
+     * then. The plugin's status might change later.
      *
      * @see PicoPluginInterface::setEnabled()
      *
-     * @return bool plugin is enabled (TRUE) or disabled (FALSE)
+     * @return bool|null plugin is enabled (TRUE) or disabled (FALSE)
      */
     public function isEnabled();
 
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index b6b83fe..effc980 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -33,11 +33,27 @@ class DummyPlugin extends AbstractPicoPlugin
     /**
      * This plugin is disabled by default
      *
-     * If you want to enable your plugin by default, simply remove this class
-     * property.
+     * Usually you should remove this class property (or set it to NULL) to
+     * leave the decision whether this plugin should be enabled or disabled by
+     * default up to Pico. If all the plugin's dependenies are fulfilled (see
+     * {@see self::$dependsOn}), Pico enables the plugin by default. Otherwise
+     * the plugin is silently disabled.
+     *
+     * If this plugin should never be disabled *silently* (e.g. when dealing
+     * with security-relevant stuff like access control, or similar), set this
+     * to TRUE. If Pico can't fulfill all the plugin's dependencies, it will
+     * throw an RuntimeException.
+     *
+     * If this plugin rather does some "crazy stuff" a user should really be
+     * aware of before using it, you can set this to FALSE. The user will then
+     * have to enable the plugin manually. However, if another plugin depends
+     * on this plugin, it might get enabled silently nevertheless.
+     *
+     * No matter what, the user can always explicitly enable or disable this
+     * plugin in Pico's config.
      *
      * @see AbstractPicoPlugin::$enabled
-     * @var bool
+     * @var bool|null
      */
     protected $enabled = false;
 

From b129a4fb12600e8e064b4a9760df5e686604da25 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 27 Dec 2017 21:36:56 +0100
Subject: [PATCH 162/188] Various small improvements

---
 CONTRIBUTING.md |  2 +-
 composer.json   |  2 +-
 index.php.dist  |  4 +--
 lib/Pico.php    | 76 ++++++++++++++++++++++++-------------------------
 4 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6bef70c..44a184f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -122,7 +122,7 @@ With this command you can specify a file or folder to limit which files it will
 
 Pico accepts the problems of having redundant documentation on different places (concretely Pico's inline user docs, the `README.md` and the website) for the sake of a better user experience. When updating the docs, please make sure to keep them in sync.
 
-If you update the [`README.md`](https://github.com/picocms/Pico/blob/master/README.md) or [`content-sample/index.md`](https://github.com/picocms/Pico/blob/master/content-sample/index.md), please make sure to update the corresponding files in the [`_docs`](https://github.com/picocms/picocms.github.io/tree/master/_docs/) folder of the `picocms.github.io` repo (i.e. [Pico's website](http://picocms.org/docs/)) and vice versa. Unfortunately this involves three (!) different markdown parsers. If you're experiencing problems, use Pico's [`erusev/parsedown-extra`](https://github.com/erusev/parsedown-extra) as a reference. You can try to make the contents compatible to [Kramdown](http://kramdown.gettalong.org/) (Pico's website) and [Redcarpet](https://github.com/vmg/redcarpet) (`README.md`) by yourself, otherwise please address the issues in your pull request message and we'll take care of it.
+If you update the [`README.md`](https://github.com/picocms/Pico/blob/master/README.md) or [`content-sample/index.md`](https://github.com/picocms/Pico/blob/master/content-sample/index.md), please make sure to update the corresponding files in the [`_docs`](https://github.com/picocms/picocms.github.io/tree/master/_docs/) folder of the `picocms.github.io` repo (i.e. [Pico's website](http://picocms.org/docs/)) and vice versa. Unfortunately this involves three (!) different markdown parsers. If you're experiencing problems, use Pico's [`erusev/parsedown-extra`](https://github.com/erusev/parsedown-extra) as a reference. You can try to make the contents compatible to [Kramdown](http://kramdown.gettalong.org/) (Pico's website) and [CommonMarker](https://github.com/gjtorikian/commonmarker) (`README.md`) by yourself, otherwise please address the issues in your pull request message and we'll take care of it.
 
 Versioning
 ----------
diff --git a/composer.json b/composer.json
index 20adc12..a70ddbe 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "php": ">=5.3.6",
         "ext-dom": "*",
         "ext-mbstring": "*",
-        "twig/twig": "^1.34",
+        "twig/twig": "^1.35",
         "symfony/yaml" : "^2.8",
         "erusev/parsedown": "^1.6",
         "erusev/parsedown-extra": "^0.7"
diff --git a/index.php.dist b/index.php.dist
index 59639ad..cd391ad 100644
--- a/index.php.dist
+++ b/index.php.dist
@@ -15,10 +15,10 @@ if (PHP_VERSION_ID < 50306) {
     die('Pico requires PHP 5.3.6 or above to run');
 }
 if (!extension_loaded('dom')) {
-    die('Pico requires the PHP extension "dom" to run');
+    die("Pico requires the PHP extension 'dom' to run");
 }
 if (!extension_loaded('mbstring')) {
-    die('Pico requires the PHP extension "mbstring" to run');
+    die("Pico requires the PHP extension 'mbstring' to run");
 }
 
 // load dependencies
diff --git a/lib/Pico.php b/lib/Pico.php
index e93306a..a330ba5 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -730,7 +730,7 @@ class Pico
         }
 
         // trigger onPluginManuallyLoaded event
-        // the event is also called on the newly loaded plugin, allowing you to distinguish manual and auto loading
+        // the event is also triggered on the newly loaded plugin, allowing you to distinguish manual and auto loading
         $this->triggerEvent('onPluginManuallyLoaded', array($plugin));
 
         return $plugin;
@@ -921,9 +921,8 @@ class Pico
         }
 
         if (!$this->config['timezone']) {
-            // explicitly set a default timezone to prevent a E_NOTICE
-            // when no timezone is set; the `date_default_timezone_get()`
-            // function always returns a timezone, at least UTC
+            // explicitly set a default timezone to prevent a E_NOTICE when no timezone is set;
+            // the `date_default_timezone_get()` function always returns a timezone, at least UTC
             $this->config['timezone'] = @date_default_timezone_get();
         }
         date_default_timezone_set($this->config['timezone']);
@@ -1368,7 +1367,7 @@ class Pico
             }
         } else {
             // guarantee array key existance
-            $meta = array_fill_keys(array_values($headers), '');
+            $meta = array_fill_keys($headers, '');
             $meta['time'] = $meta['date_formatted'] = '';
         }
 
@@ -1412,10 +1411,10 @@ class Pico
     }
 
     /**
-     * Applies some static preparations to the raw contents of a page,
-     * e.g. removing the meta header and replacing %...% placehodlers
+     * Applies some static preparations to the raw contents of a page
      *
-     * This method calls the {@see Pico::substituteFileContent()} method.
+     * This method removes the meta header and replaces `%...%` placeholders
+     * by calling the {@see Pico::substituteFileContent()} method.
      *
      * @see Pico::substituteFileContent()
      * @see Pico::parseFileContent()
@@ -1475,7 +1474,7 @@ class Pico
         if ($meta) {
             foreach ($meta as $metaKey => $metaValue) {
                 if (is_scalar($metaValue) || ($metaValue === null)) {
-                    $variables['%meta.' . $metaKey . '%'] = strval($metaValue);
+                    $variables['%meta.' . $metaKey . '%'] = (string) $metaValue;
                 }
             }
         }
@@ -1518,27 +1517,27 @@ class Pico
      *
      * The page data will be an array containing the following values:
      *
-     * | Array key      | Type    | Description                                |
-     * | -------------- | ------- | ------------------------------------------ |
-     * | id             | string  | relative path to the content file          |
-     * | url            | string  | URL to the page                            |
-     * | title          | string  | title of the page (YAML header)            |
-     * | description    | string  | description of the page (YAML header)      |
-     * | author         | string  | author of the page (YAML header)           |
-     * | time           | string  | timestamp derived from the Date header     |
-     * | date           | string  | date of the page (YAML header)             |
-     * | date_formatted | string  | formatted date of the page                 |
-     * | hidden         | bool    | this page shouldn't be visible to the user |
-     * | raw_content    | string  | raw, not yet parsed contents of the page   |
-     * | meta           | string  | parsed meta data of the page               |
-     * | previous_page  | &array  | reference to the previous page             |
-     * | next_page      | &array  | reference to the next page                 |
-     * | tree_node      | &array  | reference to the page's tree node          |
+     * | Array key      | Type     | Description                              |
+     * | -------------- | -------  | ---------------------------------------- |
+     * | id             | string   | relative path to the content file        |
+     * | url            | string   | URL to the page                          |
+     * | title          | string   | title of the page (YAML header)          |
+     * | description    | string   | description of the page (YAML header)    |
+     * | author         | string   | author of the page (YAML header)         |
+     * | time           | int      | timestamp derived from the Date header   |
+     * | date           | string   | date of the page (YAML header)           |
+     * | date_formatted | string   | formatted date of the page               |
+     * | hidden         | bool     | this page shouldn't be visible           |
+     * | raw_content    | string   | raw, not yet parsed contents of the page |
+     * | meta           | string[] | parsed meta data of the page             |
+     * | previous_page  | &array[] | reference to the previous page           |
+     * | next_page      | &array[] | reference to the next page               |
+     * | tree_node      | &array[] | reference to the page's tree node        |
      *
-     * Please note that the `previous_page` and `next_page` keys aren't
-     * available until the `onCurrentPageDiscovered` event is triggered
-     * ({@see Pico::discoverPageSiblings()}). The `tree_node` key isn't
-     * available until the `onPageTreeBuilt` event is triggered
+     * Please note that the `previous_page` and `next_page` keys don't
+     * exist until the `onCurrentPageDiscovered` event is triggered
+     * ({@see Pico::discoverPageSiblings()}). The `tree_node` key doesn't
+     * exit until the `onPageTreeBuilt` event is triggered
      * ({@see Pico::buildPageTree()}).
      *
      * @see Pico::sortPages()
@@ -1841,9 +1840,10 @@ class Pico
      * The order of a node's children matches the order in Pico's pages array.
      *
      * If you want to walk the whole page tree, start with the tree's root node
-     * at `$pageTree[""]["/"]`. The root node's `children` key is a reference
-     * to the `/` branch at `$pageTree["/"]`, that is a list of the root node's
-     * direct child nodes and their siblings.
+     * at `$pageTree[""]["/"]`, or rather, use `$pages["index"]["tree_node"]`.
+     * The root node's `children` key is a reference to the `/` branch at
+     * `$pageTree["/"]`, that is a list of the root node's direct child nodes
+     * and their siblings.
      *
      * You MUST NOT iterate the page tree itself (i.e. the list of the tree's
      * branches), its order is undefined and the array will be replaced by a
@@ -1921,8 +1921,8 @@ class Pico
      *
      * This method triggers the `onTwigRegistered` event when the Twig template
      * engine wasn't initiated yet. When initiating Twig, this method also
-     * registers Pico's core Twig filters `link` and `content` as well as
-     * Pico's {@see PicoTwigExtension} Twig extension.
+     * registers Pico's core Twig filter `content` as well as Pico's
+     * {@see PicoTwigExtension} Twig extension.
      *
      * @see Pico::getTwig()
      * @see http://twig.sensiolabs.org/ Twig website
@@ -2070,13 +2070,13 @@ class Pico
      * Returns the URL to a given page
      *
      * This method can be used in Twig templates by applying the `link` filter
-     * to a string representing a page identifier.
+     * to a string representing a page ID.
      *
-     * @param string       $page      identifier of the page to link to
+     * @param string       $page      ID of the page to link to
      * @param array|string $queryData either an array containing properties to
      *     create a URL-encoded query string from, or a already encoded string
-     * @param bool         $dropIndex when the last path component is "index",
-     *     then passing TRUE (default) leads to removing this path component
+     * @param bool         $dropIndex if the last path component is "index",
+     *     passing TRUE (default) leads to removing this path component
      *
      * @return string URL
      */

From 888190f15a332f43518defc883a6b615cfcacdd4 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 21 Jan 2018 23:06:38 +0100
Subject: [PATCH 163/188] Various small improvements

---
 .gitignore                 | 7 ++++++-
 .phpcs.xml                 | 5 +++--
 .phpdoc.xml                | 9 +++++----
 CONTRIBUTING.md            | 2 +-
 README.md                  | 3 +++
 lib/AbstractPicoPlugin.php | 3 ++-
 lib/Pico.php               | 6 ++----
 7 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 768fc06..bccec62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,12 @@ desktop.ini
 .DS_Store
 ._*
 
-# Composer
+# composer
 /composer.lock
 /composer.phar
 /vendor
+
+# phpDocumentor
+/.build/phpdoc
+/.build/phpdoc.cache
+/phpDocumentor.phar
diff --git a/.phpcs.xml b/.phpcs.xml
index a0785b8..2592313 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -11,9 +11,10 @@
     <file>.</file>
 
     <!--
-        Exclude _build/ and vendor/ dirs as well as minified JavaScript files
+        Exclude .build/, .github/ and vendor/ dirs as well as minified JavaScript files
     -->
-    <exclude-pattern type="relative">^_build/</exclude-pattern>
+    <exclude-pattern type="relative">^.build/</exclude-pattern>
+    <exclude-pattern type="relative">^.github/</exclude-pattern>
     <exclude-pattern type="relative">^vendor/</exclude-pattern>
     <exclude-pattern>*.min.js</exclude-pattern>
 
diff --git a/.phpdoc.xml b/.phpdoc.xml
index 301f928..f924f31 100644
--- a/.phpdoc.xml
+++ b/.phpdoc.xml
@@ -2,10 +2,10 @@
 <phpdoc>
     <title><![CDATA[Pico API Documentation]]></title>
     <parser>
-        <target>_build/phpdoc.cache</target>
+        <target>.build/phpdoc.cache</target>
     </parser>
     <transformer>
-        <target>_build/phpdoc</target>
+        <target>.build/phpdoc</target>
     </transformer>
     <transformations>
         <template name="clean"/>
@@ -15,8 +15,9 @@
         <file>index.php</file>
         <file>index.php.dist</file>
 
-        <!-- exclude build environment -->
-        <ignore>_build/*</ignore>
+        <!-- exclude .build and .github directories -->
+        <ignore>.build/*</ignore>
+        <ignore>.github/*</ignore>
 
         <!-- exclude user config -->
         <ignore>config/*</ignore>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 44a184f..5abae72 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -153,7 +153,7 @@ As soon as development reaches a point where feedback is appreciated, a pull req
 Build & Release process
 -----------------------
 
-We're using [Travis CI](https://travis-ci.com) to automate the build & release process of Pico. It generates and deploys a [PHP class documentation](http://picocms.org/phpDoc/) (powered by [phpDoc](http://phpdoc.org)) for new releases and on every commit to the `master` branch. Travis also prepares new releases by generating Pico's pre-built release packages, a version badge, code statistics (powered by [cloc](https://github.com/AlDanial/cloc)) and updates our website (the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io)). Please refer to our [`.travis.yml`](https://github.com/picocms/Pico/blob/master/.travis.yml) and the [`_build` directory](https://github.com/picocms/Pico/tree/master/_build) for details.
+We're using [Travis CI](https://travis-ci.com) to automate the build & release process of Pico. It generates and deploys a [PHP class documentation](http://picocms.org/phpDoc/) (powered by [phpDoc](http://phpdoc.org)) for new releases and on every commit to the `master` branch. Travis also prepares new releases by generating Pico's pre-built release packages, a version badge, code statistics (powered by [cloc](https://github.com/AlDanial/cloc)) and updates our website (the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io)). Please refer to our [`.travis.yml`](https://github.com/picocms/Pico/blob/master/.travis.yml), the [`picocms/ci-tools` repo](https://github.com/picocms/ci-tools) and the [`.build` directory](https://github.com/picocms/Pico/tree/master/.build) for details.
 
 As insinuated above, it is important that each commit to `master` is deployable. Once development of a new Pico release is finished, trigger Pico's build & release process by pushing a new Git tag. This tag should reference a (usually empty) commit on `master`, which message should adhere to the following template:
 
diff --git a/README.md b/README.md
index 8b1c32e..209529e 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,8 @@ You want to contribute to Pico? We really appreciate that! You can help make Pic
 
 3. Pico's Core: The supreme discipline is to work on Pico's Core. Your contribution should help *every* Pico user to have a better experience with Pico. If this is the case, fork Pico from https://github.com/picocms/Pico and open a [pull request][PullRequests]. We look forward to your contribution!
 
+By contributing to Pico, you accept and agree to the *Developer Certificate of Origin* for your present and future contributions submitted to Pico. Please refer to the ["Developer Certificate of Origin" section in our `CONTRIBUTING.md`][ContributionGuidelinesDCO].
+
 [Packagist.org]: http://packagist.org/packages/picocms/pico
 [LatestRelease]: https://github.com/picocms/Pico/releases/latest
 [composer]: https://getcomposer.org/
@@ -133,6 +135,7 @@ You want to contribute to Pico? We really appreciate that! You can help make Pic
 [IssuesSearch]: https://github.com/picocms/Pico/search?type=Issues
 [PullRequests]: https://github.com/picocms/Pico/pulls
 [ContributionGuidelines]: https://github.com/picocms/Pico/blob/master/CONTRIBUTING.md
+[ContributionGuidelinesDCO]: https://github.com/picocms/Pico/blob/master/CONTRIBUTING.md#developer-certificate-of-origin
 [EditInlineDocs]: https://github.com/picocms/Pico/edit/master/content-sample/index.md
 [EditUserDocs]: https://github.com/picocms/picocms.github.io/tree/master/_docs
 [EditDevDocs]: https://github.com/picocms/picocms.github.io/tree/master/_development
diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index eaa982a..23302f2 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -324,7 +324,8 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
      * plugin's API is older than Pico's API. {@see PicoDeprecated} furthermore
      * throws a exception when it can't provide compatibility in such cases.
      * However, we still have to decide whether this plugin is compatible to
-     * newer API versions, what defaults to "no" by default.
+     * newer API versions, what requires some special (version specific)
+     * precaution and is therefore usually not the case.
      *
      * @return void
      *
diff --git a/lib/Pico.php b/lib/Pico.php
index a330ba5..a5cc61c 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1425,7 +1425,7 @@ class Pico
      *
      * @return string prepared Markdown contents
      */
-    public function prepareFileContent($rawContent, array $meta)
+    public function prepareFileContent($rawContent, array $meta = array())
     {
         // remove meta header
         $metaHeaderPattern = "/^(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
@@ -1549,9 +1549,7 @@ class Pico
     protected function readPages()
     {
         $contentDir = $this->getConfig('content_dir');
-        $contentDirLength = strlen($contentDir);
         $contentExt = $this->getConfig('content_ext');
-        $contentExtLength = strlen($contentExt);
 
         $this->pages = array();
         $files = $this->getFiles($contentDir, $contentExt, self::SORT_NONE);
@@ -1562,7 +1560,7 @@ class Pico
                 continue;
             }
 
-            $id = substr($file, $contentDirLength, -$contentExtLength);
+            $id = substr($file, strlen($contentDir), -strlen($contentExt));
 
             // trigger onSinglePageLoading event
             // skip inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists) by default

From c697ec2e5cd937bf0a8404a1b0c9b25234222768 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 21 Jan 2018 23:07:10 +0100
Subject: [PATCH 164/188] Update CHANGELOG.md for Pico v2.0.0-beta.1 and
 upcoming v2.0.0-beta.2

---
 CHANGELOG.md | 164 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 160 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca077d8..369bc52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,169 @@
 Pico Changelog
 ==============
 
+**Note:** This changelog only provides technical information about the changes
+          introduced with a particular Pico version, and is meant to supplement
+          the actual code changes. The information in this changelog are often
+          insufficient to understand the implications of larger changes. Please
+          refer to both the UPGRADE and NEWS sections of the docs for more
+          details.
+
+**Note:** Changes breaking backwards compatibility (BC) are marked with an `!`
+          (exclamation mark). This doesn't include changes for which BC is
+          preserved by Pico's official `PicoDeprecated` plugin. If a previously
+          deprecated feature is later removed in `PicoDeprecated`, this change
+          is going to be marked as BC-breaking change in both Pico's and
+          `PicoDeprecated`'s changelog. Please note that BC-breaking changes
+          are only possible with a new major version.
+
+### Version 2.0.0-beta.2
+Released: -
+
+```
+* [New] Improve release & build process and move most build tools to the new
+        `picocms/ci-tools` repo, allowing them to be used by other projects
+* [New] Add page tree; refer to the `Pico::buildPageTree()` method for more
+        details; also see the `onPageTreeBuilt` event
+* [Changed] Update dependencies: Twig 1.35
+* [Changed] ! Improve `.htaccess` and deny access to all dot files by default
+* [Changed] ! Throw a `RuntimeException` when non-native plugins are loaded,
+            but Pico's `PicoDeprecated` plugin is not loaded
+* [Changed] ! Change `AbstractPicoPlugin::$enabled`'s behavior: setting it to
+            TRUE now leads to throwing a `RuntimeException` when the plugin's
+            dependencies aren't fulfilled; use NULL to maintain old behavior
+* [Changed] ! Force themes to use `.twig` as file extension for Twig templates
+* [Changed] Improve PHP class docs
+```
+
 ### Version 2.0.0-beta.1
 Released: 2017-11-05
 
+```
+* [New] Pico is on its way to its second major release!
+* [New] Improve Pico's release & build process
+* [New] Add "Developer Certificate of Origin" to `CONTRIBUTING.md`
+* [New] Add license & copyright header to all relevant files
+* [New] Add Pico version constants (`Pico::VERSION` and `Pico::VERSION_ID`),
+        and add a `version` Twig variable and `%version%` Markdown placeholder
+* [New] Add Pico API versioning for plugins (see `Pico::API_VERSION` constant);
+        Pico now triggers events on plugins using the latest API version only
+        ("native" plugins), `PicoDeprecated` takes care of all other plugins;
+        as a result, old plugin's always depend on `PicoDeprecated` now
+* [New] Add a theme and plugin installer for composer; Pico now additionally
+        uses the new `vendor/pico-plugin.php` file to discover plugins
+        installed by composer and loads them using composer's autoloader;
+        see the `picocms/composer-installer` repo for more details; Pico
+        loads plugins installed by composer first and ignores conflicting
+        plugins in Pico's `plugins/` dir
+* [New] Add `$enableLocalPlugins` parameter to `Pico::__construct()` to allow
+        website developers to disable local plugin discovery by scanning the
+        `plugins/` dir (i.e. load plugins from `vendor/pico-plugin.php` only)
+* [New] Add public `AbstractPicoPlugin::getPluginConfig()` method
+* [New] Add public `Pico::loadPlugin()` method and the corresponding
+        `onPluginManuallyLoaded` event
+* [New] Add public `Pico::resolveFilePath()` method (replaces the protected
+        `Pico::discoverRequestFile()` method)
+* [New] Add public `Pico::is404Content()` method
+* [New] Add public `Pico::getYamlParser()` method and the corresponding
+        `onYamlParserRegistered` event
+* [New] Add public `Pico::substituteFileContent()` method
+* [New] Add public `Pico::getPageId()` method
+* [New] Add public `Pico::getFilesGlob()` method
+* [New] Add public `Pico::getVendorDir()` method, returning Pico's installation
+        directory (i.e. `/var/www/pico/vendor/picocms/pico`); don't confuse
+        this with composer's `vendor/` dir!
+* [New] Add `$default` parameter to `Pico::getConfig()` method
+* [New] Add empty `assets/` and `content/` dirs
+* [New] #305: Add `url_param` and `form_param` Twig functions, and the public
+        `Pico::getUrlParameter()` and `Pico::getFormParameter()` methods,
+        allowing theme developers to access URL GET and HTTP POST parameters
+* [New] Add `$meta` parameter to `markdown` Twig filter
+* [New] Add `remove` fallback to `sort_by` Twig filter
+* [New] Add `theme_url` config parameter
+* [New] Add public `Pico::getBaseThemeUrl()` method
+* [New] Add `REQUEST_URI` routing method, allowing one to simply rewrite all
+        requests to `index.php` (e.g. use `FallbackResource` or `mod_rewrite`
+        in your `.htaccess` for Apache, or use `try_files` for nginx)
+* [New] #299: Add built-in 404 page as fallback when no `404.md` is found
+* [New] Allow sorting pages by arbitrary meta values
+* [New] Add `onSinglePageLoading` event, allowing one to skip a page
+* [New] Add `onSinglePageContent` event
+* [New] Add some config parameters to change Parsedown's behavior
+* [Changed] ! Disallow running the same Pico instance multiple times by
+            throwing a `RuntimeException` when calling `Pico::run()`
+* [Changed] ! #203: Load plugins from `plugins/<plugin name>/<plugin name>.php`
+            and `plugins/<plugin name>.php` only (directory and file name must
+            match case-sensitive), and throw a `RuntimeException` when Pico is
+            unable to load a plugin; also throw a `RuntimeException` when
+            superfluous files or directories in `plugins/` are found; use a
+            scope-isolated `require()` to include plugin files
+* [Changed] ! Use a plugin dependency topology to sort `Pico::$plugins`,
+            changing the execution order of plugins so that plugins, on which
+            other plugins depend, are always executed before their dependants
+* [Changed] ! Don't pass `$plugins` parameter to `onPluginsLoaded` event by
+            reference anymore; use `Pico::loadPlugin()` instead
+* [Changed] ! Leave `Pico::$pages` unsorted when a unknown sort method was
+            configured; this usually means that a plugin wants to sort it
+* [Changed] Overhaul page discovery events: add `onPagesDiscovered` event which
+            is triggered right before `Pico::$pages` is sorted and move the
+            `$currentPage`, `$previousPage` and `$nextPage` parameters of the
+            `onPagesLoaded` event to the new `onCurrentPageDiscovered` event
+* [Changed] Move the `$twig` parameter of the `onPageRendering` event to the
+            `onTwigRegistered` event, replacing the `onTwigRegistration` event
+* [Changed] Unify the `onParsedownRegistration` event by renaming it to
+            `onParsedownRegistered` and add the `$parsedown` parameter
+* [Changed] #330: Replace `config/config.php` by a modular YAML-based approach;
+            you can now use a arbitrary number of `config/*.yml` files to
+            configure Pico
+* [Changed] ! When trying to auto-detect Pico's `content` dir, Pico no longer
+            searches just for a (possibly empty) directory, but rather checks
+            whether a `index.md` exists in this directory
+* [Changed] ! Use the relative path between `index.php` and `Pico::$themesDir`
+            for Pico's theme URL (also refer to the new `theme_url` config and
+            the public `Pico::getBaseThemeUrl()` method for more details)
+* [Changed] #347: Drop the superfluous trailing "/index" from Pico's URLs
+* [Changed] Flip registered meta headers array, so that the array key is used
+            to search for a meta value and the array value is used to store the
+            found meta value (previously it was the other way round)
+* [Changed] ! Add lazy loading for `Pico::$yamlParser`, `Pico::$parsedown` and
+            `Pico::$twig`; the corresponding events are no longer part of
+            Pico's event flow and are triggered on demand
+* [Changed] ! Trigger the `onMetaHeaders` event just once; the event is no
+            longer part of Pico's event flow and is triggered on demand
+* [Changed] Don't lower meta headers on the first level of a page's meta data
+            (i.e. `SomeKey: value` is accessible using `$meta['SomeKey']`)
+* [Changed] Don't compare registered meta headers case-insensitive, require
+            matching case
+* [Changed] Allow users to explicitly set values for the `date_formatted` and
+            `time` meta headers in a page's YAML front matter
+* [Changed] Add page siblings for all pages
+* [Changed] ! Treat pages or directories that are prefixed by `_` as hidden;
+            when requesting a hidden page, Pico responds with a 404 page;
+            hidden pages are still in `Pico::$pages`, but are moved to the end
+            of the pages array when sorted alphabetically or by date
+* [Changed] ! Don't treat explicit requests to a 404 page as successful request
+* [Changed] Change method visibility of `Pico::getFiles()` to public
+* [Changed] Change method visibility of `Pico::triggerEvent()` to public;
+            at first glance this method triggers events on native plugins only,
+            however, `PicoDeprecated` takes care of triggering events for other
+            plugins, thus you can use this method to trigger (custom) events on
+            all plugins; never use it to trigger Pico core events!
+* [Changed] Move Pico's default theme to the new `picocms/pico-theme` repo; the
+            theme was completely rewritten from scratch and is a much better
+            starting point for creating your own theme; refer to the theme's
+            `CHANGELOG.md` for more details
+* [Changed] Move `PicoDeprecated` plugin to the new `picocms/pico-deprecated`
+            repo; refer to the plugin's `CHANGELOG.md` for more details
+* [Changed] Update dependencies: Twig 1.34, Symfony YAML 2.8, Parsedown 1.6
+* [Changed] Improve Pico docs and PHP class docs
+* [Changed] A vast number of small improvements and changes...
+* [Removed] ! Remove `PicoParsePagesContent` plugin
+* [Removed] ! Remove `PicoExcerpt` plugin
+* [Removed] Remove `rewrite_url` and `is_front_page` Twig variables
+* [Removed] Remove superfluous parameters of various events to reduce Pico's
+            error-proneness (plugins hopefully interfere with each other less)
+```
+
 ### Version 1.0.6
 Released: 2017-07-25
 
@@ -127,10 +287,6 @@ Released: 2015-11-30
 ### Version 1.0.0-beta.1
 Released: 2015-11-06
 
-**Note:** This changelog only provides basic information about the enormous
-          changes introduced with Pico 1.0.0-beta.1. Please refer to the
-          UGPRADE section of the docs for details.
-
 ```
 * [Security] (9e2604a) Prevent content_dir breakouts using malicious URLs
 * [New] Pico is on its way to its first stable release!

From fb7d99d3da562576f9f332c3120287e4c41c0096 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 21 Jan 2018 23:19:23 +0100
Subject: [PATCH 165/188] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 369bc52..1d5a687 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ Pico Changelog
           are only possible with a new major version.
 
 ### Version 2.0.0-beta.2
-Released: -
+Released: 2018-01-21
 
 ```
 * [New] Improve release & build process and move most build tools to the new
@@ -33,6 +33,7 @@ Released: -
             dependencies aren't fulfilled; use NULL to maintain old behavior
 * [Changed] ! Force themes to use `.twig` as file extension for Twig templates
 * [Changed] Improve PHP class docs
+* [Changed] Various small improvements
 ```
 
 ### Version 2.0.0-beta.1

From e079946e6fd1323e6c050a74b0d3181c229a7012 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 27 Jan 2018 21:02:06 +0100
Subject: [PATCH 167/188] Build system: Don't delete .gitignore when creating
 release archives

It doesn't make much sense to remove all .gitignore files just to explain users that they should create those files if they want to manage their website using a Git repository.
---
 .build/create-release.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.build/create-release.sh b/.build/create-release.sh
index 74a94a8..ba8b053 100755
--- a/.build/create-release.sh
+++ b/.build/create-release.sh
@@ -49,8 +49,7 @@ composer require --no-update \
     "picocms/pico-theme ^$VERSION_MILESTONE" \
     "picocms/pico-deprecated ^$VERSION_MILESTONE"
 
-echo "Removing '.git' directory and '.gitignore' file..."
-rm -f .gitignore
+echo "Removing '.git' directory..."
 rm -rf .git
 
 echo "Removing '.git' directories of dependencies..."

From b6bd714e52caab5f841b33448b4d9cec58e34f95 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 27 Jan 2018 21:03:06 +0100
Subject: [PATCH 168/188] README.md: Add Pico 2.0 install/upgrade instructions

---
 README.md | 107 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 61 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 209529e..afae156 100644
--- a/README.md
+++ b/README.md
@@ -18,85 +18,97 @@ Screenshot
 Install
 -------
 
-You can install Pico either using a pre-bundled release or with composer. Pico is also available on [Packagist.org][] and may be included in other projects via `composer require picocms/pico`. Pico requires PHP 5.3.6+
+Installing Pico is dead simple - and done in seconds! If you have access to a shell on your server (i.e. SSH access), we recommend using [composer][]. If not, use a pre-bundled release. If you don't know what "SSH access" is, head over to the pre-bundled release. 😇
 
-#### Using a pre-bundled release
+Pico requires PHP 5.3.6+
 
-Just [download the latest Pico release][LatestRelease] and upload all files to the `httpdocs` directory (e.g. `/var/www/html`) of your server.
+### I want to use composer
 
-#### Composer
+Starting with Pico 2.0 we recommend installing Pico using composer whenever possible. Trust us, you won't regret it when it comes to upgrading Pico! Anyway, if you don't want to use composer, or if you simply can't use composer because you don't have access to a shell on your server, don't despair, installing Pico using a pre-bundled release is still easier than everything you know!
 
-###### Step 1 - for users
+###### Step 1
 
-[Download the *source code* of Pico's latest release][LatestRelease], upload all files to the `httpdocs` directory (e.g. `/var/www/html`) of your server and navigate to the upload directory using a shell.
-
-###### Step 1 - for developers
-
-Open a shell and navigate to the desired install directory of Pico within the `httpdocs` directory (e.g. `/var/www/html`) of your server. You can now clone Pico's Git repository as follows:
+Open a shell and navigate to the desired install directory of Pico within the `httpdocs` directory (e.g. `/var/www/html`) of your server. Download composer and run it with the `create-project` option:
 
 ```shell
-$ git clone https://github.com/picocms/Pico.git .
+$ curl -sSL https://getcomposer.org/installer | php
+$ php composer.phar create-project picocms/pico-composer .
 ```
-Please note that this gives you the current development version of Pico, what is likely *unstable* and *not ready for production use*!
 
 ###### Step 2
 
-Download [composer][] and run it with the `install` option:
+What second step? There's no second step. That's it! Open your favorite web browser and navigate to your brand new, stupidly simple, blazing fast, flat file CMS! Pico's default contents will explain how to create your own contents. 😊
+
+### I want to use a pre-bundled release
+
+Do you know the feeling: I want to install a new website, upload all files of my favorite CMS and run the setup script - just to find out that I forgot about creating the SQL database first? Later the setup script tells me that my file permissions are wrong. Heck, what does this even mean? Forget about it, Pico is different!
+
+###### Step 1
+
+[Download the latest Pico release][LatestRelease] and upload all files to the `httpdocs` directory (e.g. `/var/www/html`) of your server.
+
+###### Step 2
+
+Okay, here's the catch: There's no catch. That's it! Open your favorite web browser and navigate to your brand new, stupidly simple, blazing fast, flat file CMS! Pico's default contents will explain how to create your own contents. 😊
+
+### I'm a developer
+
+So, you're one of these amazing folks making all of this possible? We love you guys! As a developer we recommend you to clone [Pico's Git repository][PicoGit] and use composer to install its dependencies. You can find both [Pico][PicoPackagist] and [Pico's composer starter project][PicoComposerPackagist] on [Packagist.org][Packagist]. Using Pico's Git repository is different from using one of the installation methods elucidated above, because it uses Pico as the composer root package. Furthermore it gives you the current development version of Pico, what is likely *unstable* and *not ready for production use*!
+
+Open a shell and navigate to the desired install directory of Pico within the `httpdocs` directory (e.g. `/var/www/html`) of your server. You can now clone Pico's Git repository, download composer and install Pico's dependencies as follows:
 
 ```shell
-$ curl -sS https://getcomposer.org/installer | php
+$ git clone https://github.com/picocms/Pico.git .
+$ curl -sSL https://getcomposer.org/installer | php
 $ php composer.phar install
 ```
 
 Upgrade
 -------
 
-Upgrading Pico is very easy: You just have to replace all of Pico's files - that's it! Nevertheless you should *always* create a backup of your Pico installation before upgrading.
+Do you remember when you installed Pico? It was ingeniously simple, wasn't it? Upgrading Pico is no difference! The upgrade process differs depending on whether you used [composer][] or a pre-bundled release to install Pico. Please note that you should *always* create a backup of your Pico installation before upgrading!
 
-Pico follows [Semantic Versioning 2.0][SemVer] and uses version numbers like `MAJOR`.`MINOR`.`PATCH`. When we update...
+Pico follows [Semantic Versioning 2.0][SemVer] and uses version numbers like `MAJOR`.`MINOR`.`PATCH`. When we update the `PATCH` version (e.g. `2.0.0` to `2.0.1`), we made backwards-compatible bug fixes. If we change the `MINOR` version (e.g. `2.0` to `2.1`), we added functionality in a backwards-compatible manner. Upgrading Pico is dead simple in both cases. Simply head over to the appropiate Upgrade sections below.
 
-- the `PATCH` version (e.g. `1.0.0` to `1.0.1`), we made backwards-compatible bug fixes. It's then sufficient to extract [Pico's latest release][LatestRelease] to your existing installation directory and overwriting all files. Alternatively you can either use the [*source code* of Pico's latest release][LatestRelease] or pull from Pico's Git repository, but are then required to update Pico's [composer][] dependencies manually by running `php composer.phar update`.
+But wait, we forgot to mention what happens when we update the `MAJOR` version (e.g. `2.0` to `3.0`). In this case we made incompatible API changes. We will then provide a appropriate upgrade tutorial, so please head over to the ["Upgrade" page on our website][HelpUpgrade].
 
-- the `MINOR` version (e.g. `1.0` to `1.1`), we added functionality in a backwards-compatible manner, but anyway recommend you to "install" Pico newly. Backup all of your files, empty your installation directory and install Pico as elucidated above. You can then copy your `config/config.php` and `content` directory without any change. If applicable, you can also copy the folder of your custom theme within the `themes` directory. Provided that you're using plugins, also copy all of your plugins from the `plugins` directory.
+### I've used composer to install Pico
 
-- the `MAJOR` version (e.g. `1.0` to `2.0`), we made incompatible API changes. We will then provide a appropriate upgrade tutorial.
+Upgrading Pico is dead simple if you've used composer to install Pico. Simply open a shell and navigate to Pico's install directory within the `httpdocs` directory (e.g. `/var/www/html/pico`) of your server. You can now upgrade Pico using just a single command:
 
-Upgrading Pico 0.8 or 0.9 to Pico 1.0 is a special case. The new `PicoDeprecated` plugin ensures backwards compatibility, so you basically can follow the above upgrade instructions as if we updated the `MINOR` version. However, we recommend you to take some further steps to confine the necessity of `PicoDeprecated` as far as possible. For more information about what has changed with Pico 1.0 and a step-by-step upgrade tutorial, please refer to the [upgrade page of our website][HelpUpgrade].
-
-Run
----
-
-You have nothing to consider specially, simply navigate to your Pico install using your favorite web browser. Pico's default contents will explain how to use your brand new, stupidly simple, blazing fast, flat file CMS.
-
-#### You don't have a web server?
-
-Starting with PHP 5.4 the easiest way to try Pico is using [the built-in web server of PHP][PHPServer]. Please note that PHPs built-in web server is for development and testing purposes only!
-
-###### Step 1
-
-Navigate to Pico's installation directory using a shell.
-
-###### Step 2
-
-Start PHPs built-in web server:
 ```shell
-$ php -S 127.0.0.1:8080
+$ php composer.phar update
 ```
 
-###### Step 3
+That's it! composer will automatically update Pico and all plugins and themes you've installed using composer. Please make sure to manually update all plugins and themes you've installed manually.
 
-Access Pico from http://localhost:8080.
+### I've used a pre-bundled release to install Pico
+
+Okay, installing Pico was easy, but upgrading Pico is going to be hard, isn't it? I'm affraid I have to disappoint you... It's just as simple as installing Pico!
+
+First you'll have to delete the `vendor` directory of your Pico installation (e.g. if you've installed Pico to `/var/www/html/pico`, delete `/var/www/html/pico/vendor`). Then [download the latest Pico release][LatestRelease] and upload all files to your existing Pico installation directory. You will be prompted whether you want to overwrite files like `index.php`, `.htaccess`, ... - simply hit "Yes".
+
+That's it! Now that Pico is up-to-date, you need to update all plugins and themes you've installed.
+
+### I'm a developer
+
+As a developer you should be up-to-date already... 😉 For the sake of completeness, if you want to upgrade Pico, simply open a shell and navigate to Pico's install directory within the `httpdocs` directory (e.g. `/var/www/html/pico`) of your server. Then pull the latest commits from [Pico's Git repository][PicoGit] and let composer update your dependencies:
+
+```shell
+$ git pull
+$ php composer.phar update
+```
 
 Getting Help
 ------------
 
 #### Getting Help as a user
 
-If you want to get started using Pico, please refer to our [user docs][HelpUserDocs]. Please read the [upgrade notes][HelpUpgrade] if you want to upgrade from Pico 0.8 or 0.9 to Pico 1.0. You can find officially supported [plugins][OfficialPlugins] and [themes][OfficialThemes] on our website. A greater choice of third-party plugins and themes can be found in our [Wiki][] on the [plugins][WikiPlugins] or [themes][WikiThemes] pages respectively. If you want to create your own plugin or theme, please refer to the "Getting Help as a developer" section below.
+If you want to get started using Pico, please refer to our [user docs][HelpUserDocs]. Please read the [upgrade notes][HelpUpgrade] if you want to upgrade from Pico 1.0 to Pico 2.0. You can find officially supported [plugins][OfficialPlugins] and [themes][OfficialThemes] on our website. A greater choice of third-party plugins and themes can be found in our [Wiki][] on the [plugins][WikiPlugins] or [themes][WikiThemes] pages respectively. If you want to create your own plugin or theme, please refer to the "Getting Help as a developer" section below.
 
 #### Getting Help as a developer
 
-If you're a developer, please refer to the "Contributing" section below and our [contribution guidelines][ContributionGuidelines]. To get you started with creating a plugin or theme, please read the [dev docs on our website][HelpDevDocs].
+If you're a developer, please refer to the "Contributing" section below and our [contribution guidelines][ContributionGuidelines]. To get you started with creating a plugin or theme, please read the [developer docs on our website][HelpDevDocs].
 
 #### You still need help or experience a problem with Pico?
 
@@ -111,17 +123,19 @@ You want to contribute to Pico? We really appreciate that! You can help make Pic
 
 1. Plugins & Themes: You're a plugin developer or theme designer? We love you guys! You can find tons of information about how to develop plugins and themes at http://picocms.org/development/. If you have created a plugin or theme, please add it to our [Wiki][], either on the [plugins][WikiPlugins] or [themes][WikiThemes] page. You may also [Submit][] it to our website, where it'll be displayed on the official [plugin][OfficialPlugins] or [theme][OfficialThemes] pages!
 
-2. Documentation: We always appreciate people improving our documentation. You can either improve the [inline user docs][EditInlineDocs] or the more extensive [user docs on our website][EditUserDocs]. You can also improve the [docs for plugin and theme developers][EditDevDocs]. Simply fork Pico from https://github.com/picocms/Pico, change the Markdown files and open a [pull request][PullRequests].
+2. Documentation: We always appreciate people improving our documentation. You can either improve the [inline user docs][EditInlineDocs] or the more extensive [user docs on our website][EditUserDocs]. You can also improve the [docs for plugin and theme developers][EditDevDocs]. Simply fork our website's Git repository from https://github.com/picocms/picocms.github.io, change the Markdown files and open a [pull request][PullRequestsWebsite].
 
 3. Pico's Core: The supreme discipline is to work on Pico's Core. Your contribution should help *every* Pico user to have a better experience with Pico. If this is the case, fork Pico from https://github.com/picocms/Pico and open a [pull request][PullRequests]. We look forward to your contribution!
 
 By contributing to Pico, you accept and agree to the *Developer Certificate of Origin* for your present and future contributions submitted to Pico. Please refer to the ["Developer Certificate of Origin" section in our `CONTRIBUTING.md`][ContributionGuidelinesDCO].
 
-[Packagist.org]: http://packagist.org/packages/picocms/pico
-[LatestRelease]: https://github.com/picocms/Pico/releases/latest
 [composer]: https://getcomposer.org/
+[LatestRelease]: https://github.com/picocms/Pico/releases/latest
+[PicoGit]: https://github.com/picocms/Pico
+[PicoPackagist]: http://packagist.org/packages/picocms/pico
+[PicoComposerPackagist]: http://packagist.org/packages/picocms/pico-composer
+[Packagist]: http://packagist.org/
 [SemVer]: http://semver.org
-[PHPServer]: http://php.net/manual/en/features.commandline.webserver.php
 [HelpUpgrade]: http://picocms.org/in-depth/upgrade/
 [HelpUserDocs]: http://picocms.org/docs/
 [HelpDevDocs]: http://picocms.org/development/
@@ -134,6 +148,7 @@ By contributing to Pico, you accept and agree to the *Developer Certificate of O
 [Issues]: https://github.com/picocms/Pico/issues
 [IssuesSearch]: https://github.com/picocms/Pico/search?type=Issues
 [PullRequests]: https://github.com/picocms/Pico/pulls
+[PullRequestsWebsite]: https://github.com/picocms/picocms.github.io/pulls
 [ContributionGuidelines]: https://github.com/picocms/Pico/blob/master/CONTRIBUTING.md
 [ContributionGuidelinesDCO]: https://github.com/picocms/Pico/blob/master/CONTRIBUTING.md#developer-certificate-of-origin
 [EditInlineDocs]: https://github.com/picocms/Pico/edit/master/content-sample/index.md

From 6bb65fb12be30133a13bf807c6245002df6935b5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 27 Jan 2018 21:03:45 +0100
Subject: [PATCH 169/188] Deny access to composer.phar in .htaccess

This file might be present if users strictly follow our install instructions
 and don't delete it on their own after successfully installing Pico.
---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index b6ca1bd..b3e7685 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,7 +5,7 @@
 
     # Deny access to internal dirs and files by passing the URL to Pico
     RewriteRule ^(config|content|content-sample|lib|vendor)(/|$) index.php [L]
-    RewriteRule ^(CHANGELOG\.md|composer\.(json|lock))(/|$) index.php [L]
+    RewriteRule ^(CHANGELOG\.md|composer\.(json|lock|phar))(/|$) index.php [L]
     RewriteRule (^\.|/\.)(?!well-known(/|$)) index.php [L]
 
     # Enable URL rewriting

From 25bfa289cf8ffc4f755e28a6e1a8489f5d2c7763 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 27 Jan 2018 21:08:56 +0100
Subject: [PATCH 170/188] Inline docs: Update nginx rewrite rules to match
 .htaccess

nginx's rewrite rules don't have to match `picocms/Pico`'s `.htaccess`, but `picocms/pico-composer`'s `.htaccess` - because basically all installations of Pico 2.0 and later use `picocms/pico-composer`'s frame.
---
 content-sample/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content-sample/index.md b/content-sample/index.md
index ac30a17..ccdd9e7 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -293,7 +293,7 @@ you need for Pico. Nginx is a very extensive subject. If you have any trouble,
 please read through our [Nginx configuration docs][NginxConfig].
 
 ```
-location ~ ^/pico/((config|content|content-sample|lib|vendor|CHANGELOG\.md|composer\.(json|lock))(/|$)|(.+/)?\.(?!well-known(/|$))) {
+location ~ ^/pico/((config|content|vendor|composer\.(json|lock|phar))(/|$)|(.+/)?\.(?!well-known(/|$))) {
     try_files /pico/index.php$is_args$args;
 }
 

From a58bfc567eb5ea609513f3fa8d9f04f785fa483f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 28 Jan 2018 13:20:13 +0100
Subject: [PATCH 171/188] Improve inline docs

---
 content-sample/index.md | 115 +++++++++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 49 deletions(-)

diff --git a/content-sample/index.md b/content-sample/index.md
index ccdd9e7..ba3e291 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -17,17 +17,16 @@ and is shown as the main landing page.
 
 When you install Pico, it comes with a `content-sample` folder. Inside this
 folder is a sample website that will display until you add your own content.
-You should create your own `content` folder in Pico's root directory and place
-your files there. No configuration is required, Pico will automatically use the
-`content` folder if it exists.
+Simply add some `.md` files to your `content` folder in Pico's root directory.
+No configuration is required, Pico will automatically use the `content` folder
+as soon as you create your own `index.md`.
 
-If you create a folder within the content folder (e.g. `content/sub`) and put
-an `index.md` inside it, you can access that folder at the URL
-`http://example.com/?sub`. If you want another page within the sub folder,
-simply create a text file with the corresponding name and you will be able to
-access it (e.g. `content/sub/page.md` is accessible from the URL
-`http://example.com/?sub/page`). Below we've shown some examples of locations
-and their corresponding URLs:
+If you create a folder within the content directory (e.g. `content/sub`) and
+put an `index.md` inside it, you can access that folder at the URL
+`%base_url%?sub`. If you want another page within the sub folder, simply create
+a text file with the corresponding name and you will be able to access it
+(e.g. `content/sub/page.md` is accessible from the URL `%base_url%?sub/page`).
+Below we've shown some examples of locations and their corresponding URLs:
 
 <table style="width: 100%; max-width: 40em;">
     <thead>
@@ -71,7 +70,7 @@ As a common practice, we recommend you to separate your contents and assets
 (like images, downloads, etc.). We even deny access to your `content` directory
 by default. If you want to use some assets (e.g. a image) in one of your content
 files, you should create an `assets` folder in Pico's root directory and upload
-your assets there. You can then access them in your markdown using
+your assets there. You can then access them in your Markdown using
 <code>&#37;base_url&#37;/assets/</code> for example:
 <code>!\[Image Title\](&#37;base_url&#37;/assets/image.png)</code>
 
@@ -87,13 +86,18 @@ attributes of the page using [YAML][] (the "YAML header"). For example:
     Title: Welcome
     Description: This description will go in the meta description tag
     Author: Joe Bloggs
-    Date: 2013/01/01
+    Date: 2001-04-25
     Robots: noindex,nofollow
     Template: index
     ---
 
-These values will be contained in the `{{ meta }}` variable in themes
-(see below).
+These values will be contained in the `{{ meta }}` variable in themes (see
+below). Meta headers sometimes have a special meaning: For instance, Pico not
+only passes through the `Date` meta header, but rather evaluates it to really
+"understand" when this page was created. This comes into play when you want to
+sort your pages not just alphabetically, but by date. Another example is the
+`Template` meta header: It controls what Twig template Pico uses to display
+this page (e.g. if you add `Template: blog`, Pico uses `blog.twig`).
 
 There are also certain variables that you can use in your text files:
 
@@ -113,6 +117,7 @@ below Plugins section for details.
 
 If you want to use Pico as a blogging software, you probably want to do
 something like the following:
+
 1. Put all your blog articles in a separate `blog` folder in your `content`
    directory. All these articles should have both a `Date` and `Template` meta
    header, the latter with e.g. `blog-post` as value (see Step 2).
@@ -126,7 +131,7 @@ something like the following:
    do something like this:
    ```
     {% for page in pages|sort_by("time")|reverse %}
-        {% if page.id starts with "blog/" %}
+        {% if page.id starts with "blog/" and not page.hidden %}
             <div class="post">
                 <h3><a href="{{ page.url }}">{{ page.title }}</a></h3>
                 <p class="date">{{ page.date_formatted }}</p>
@@ -159,22 +164,22 @@ out the default theme for an example. Pico uses [Twig][] for template
 rendering. You can select your theme by setting the `theme` option in
 `config/config.yml` to the name of your theme folder.
 
-All themes must include an `index.twig` (or `index.html`) file to define the
-HTML structure of the theme. Below are the Twig variables that are available
-to use in your theme. Please note that paths (e.g. `{{ base_dir }}`) and URLs
+All themes must include an `index.twig` file to define the HTML structure of
+the theme. Below are the Twig variables that are available to use in your
+theme. Please note that paths (e.g. `{{ base_dir }}`) and URLs
 (e.g. `{{ base_url }}`) don't have a trailing slash.
 
 * `{{ config }}` - Contains the values you set in `config/config.yml`
                    (e.g. `{{ config.theme }}` becomes `default`)
 * `{{ base_dir }}` - The path to your Pico root directory
-* `{{ base_url }}` - The URL to your Pico site; use Twigs `link` filter to
+* `{{ base_url }}` - The URL to your Pico site; use Twig's `link` filter to
                      specify internal links (e.g. `{{ "sub/page"|link }}`),
                      this guarantees that your link works whether URL rewriting
                      is enabled or not
 * `{{ theme_dir }}` - The path to the currently active theme
 * `{{ theme_url }}` - The URL to the currently active theme
 * `{{ site_title }}` - Shortcut to the site title (see `config/config.yml`)
-* `{{ meta }}` - Contains the meta values from the current page
+* `{{ meta }}` - Contains the meta values of the current page
     * `{{ meta.title }}`
     * `{{ meta.description }}`
     * `{{ meta.author }}`
@@ -183,19 +188,22 @@ to use in your theme. Please note that paths (e.g. `{{ base_dir }}`) and URLs
     * `{{ meta.time }}`
     * `{{ meta.robots }}`
     * ...
-* `{{ content }}` - The content of the current page
-                    (after it has been processed through Markdown)
+* `{{ content }}` - The content of the current page after it has been processed
+                    through Markdown
 * `{{ pages }}` - A collection of all the content pages in your site
     * `{{ page.id }}` - The relative path to the content file (unique ID)
     * `{{ page.url }}` - The URL to the page
     * `{{ page.title }}` - The title of the page (YAML header)
     * `{{ page.description }}` - The description of the page (YAML header)
     * `{{ page.author }}` - The author of the page (YAML header)
-    * `{{ page.time }}` - The timestamp derived from the `Date` header
+    * `{{ page.time }}` - The [Unix timestamp][UnixTimestamp] derived from
+                          the `Date` header
     * `{{ page.date }}` - The date of the page (YAML header)
-    * `{{ page.date_formatted }}` - The formatted date of the page
+    * `{{ page.date_formatted }}` - The formatted date of the page as specified
+                                    by the `date_format` parameter in your
+                                    `config/config.yml`
     * `{{ page.raw_content }}` - The raw, not yet parsed contents of the page;
-                                 use Twigs `content` filter to get the parsed
+                                 use Twig's `content` filter to get the parsed
                                  contents of a page by passing its unique ID
                                  (e.g. `{{ "sub/page"|content }}`)
     * `{{ page.meta }}`- The meta values of the page
@@ -206,31 +214,40 @@ to use in your theme. Please note that paths (e.g. `{{ base_dir }}`) and URLs
 Pages can be used like the following:
 
     <ul class="nav">
-        {% for page in pages %}
+        {% for page in pages if not page.hidden %}
             <li><a href="{{ page.url }}">{{ page.title }}</a></li>
         {% endfor %}
     </ul>
 
 Additional to Twigs extensive list of filters, functions and tags, Pico also
-provides some useful additional filters to make theming easier. You can parse
-any Markdown string to HTML using the `markdown` filter. Arrays can be sorted
-by one of its keys or a arbitrary deep sub-key using the `sort_by` filter
-(e.g. `{% for page in pages|sort_by([ 'meta', 'nav' ]) %}...{% endfor %}`
-iterates through all pages, ordered by the `nav` meta header; please note the
-`[ 'meta', 'nav' ]` part of the example, it instructs Pico to sort by
-`page.meta.nav`). You can return all values of a given key or key path of an
-array using the `map` filter (e.g. `{{ pages|map("title") }}` returns all
-page titles).
+provides some useful additional filters to make theming easier.
+
+* Pass the unique ID of a page to the `link` filter to return the page's URL
+  (e.g. `{{ "sub/page"|link }}` gets %base_url%?sub/page).
+* To get the parsed contents of a page, pass its unique ID to the `content`
+  filter (e.g. `{{ "sub/page"|content }}`).
+* You can parse any Markdown string using the `markdown` filter (e.g. you can
+  use Markdown in the `description` meta variable and later parse it in your
+  theme using `{{ meta.description|markdown }}`).
+* Arrays can be sorted by one of its keys using the `sort_by` filter
+  (e.g. `{% for page in pages|sort_by([ 'meta', 'nav' ]) %}...{% endfor %}`
+  iterates through all pages, ordered by the `nav` meta header; please note the
+  `[ 'meta', 'nav' ]` part of the example, it instructs Pico to sort by
+  `page.meta.nav`).
+* You can return all values of a given array key using the `map` filter
+  (e.g. `{{ pages|map("title") }}` returns all page titles).
 
 You can use different templates for different content files by specifying the
-`Template` meta header. Simply add e.g. `Template: blog-post` to a content file
-and Pico will use the `blog-post.twig` file in your theme folder to render
-the page.
+`Template` meta header. Simply add e.g. `Template: blog` to the YAML header of
+a content file and Pico will use the `blog.twig` template in your theme folder
+to display the page.
 
-You don't have to create your own theme if Pico's default theme isn't
-sufficient for you, you can use one of the great themes third-party developers
-and designers created in the past. As with plugins, you can find themes in
-[our Wiki][WikiThemes] and on [our website][OfficialThemes].
+Pico's default theme isn't really intended to be used for a productive website,
+it's rather a starting point for creating your own theme. If the default theme
+isn't sufficient for you, and you don't want to create your own theme, you can
+use one of the great themes third-party developers and designers created in the
+past. As with plugins, you can find themes in [our Wiki][WikiThemes] and on
+[our website][OfficialThemes].
 
 ### Plugins
 
@@ -246,18 +263,17 @@ Depending on the plugin you've installed, you may have to go through some more
 steps (e.g. specifying config variables), the plugin docs or `README` file will
 explain what to do.
 
-Plugins which were written to work with Pico 1.0 can be enabled and disabled
-through your `config/config.yml`. If you want to e.g. disable the `PicoExcerpt`
-plugin, add the following line to your `config/config.yml`:
-`PicoExcerpt.enabled: false`. To force the plugin to be enabled replace `false`
-with `true`.
+Plugins which were written to work with Pico 1.0 and later can be enabled and
+disabled through your `config/config.yml`. If you want to e.g. disable the
+`PicoDeprecated` plugin, add the following line to your `config/config.yml`:
+`PicoDeprecated.enabled: false`. To force the plugin to be enabled, replace
+`false` by `true`.
 
 #### Plugins for developers
 
 You're a plugin developer? We love you guys! You can find tons of information
 about how to develop plugins at http://picocms.org/development/. If you've
-developed a plugin for Pico 0.9 or older, you probably want to upgrade it
-to the brand new plugin system introduced with Pico 1.0. Please refer to the
+developed a plugin before and want to upgrade it to Pico 2.0, refer to the
 [upgrade section of the docs][PluginUpgrade].
 
 ## Config
@@ -311,6 +327,7 @@ For more help have a look at the Pico documentation at http://picocms.org/docs.
 [MarkdownExtra]: https://michelf.ca/projects/php-markdown/extra/
 [YAML]: https://en.wikipedia.org/wiki/YAML
 [Twig]: http://twig.sensiolabs.org/documentation
+[UnixTimestamp]: https://en.wikipedia.org/wiki/Unix_timestamp
 [WikiThemes]: https://github.com/picocms/Pico/wiki/Pico-Themes
 [WikiPlugins]: https://github.com/picocms/Pico/wiki/Pico-Plugins
 [OfficialThemes]: http://picocms.org/themes/

From 03cc10183c3bb97a679c27e1886e95a4e64483e5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 31 Jan 2018 12:29:59 +0100
Subject: [PATCH 172/188] Fix page tree

---
 lib/Pico.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index a5cc61c..7c471f1 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1857,7 +1857,8 @@ class Pico
         foreach ($this->pages as $id => &$pageData) {
             // main index page
             if ($id === 'index') {
-                $this->pageTree['']['/'] = array('id' => '/', 'page' => &$pageData);
+                $this->pageTree['']['/']['id'] = '/';
+                $this->pageTree['']['/']['page'] = &$pageData;
                 $pageData['tree_node'] = &$this->pageTree['']['/'];
                 continue;
             }

From 9c182bd756eeea89ea0d73ec5846fc0f39a8cbec Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 3 Feb 2018 18:28:37 +0100
Subject: [PATCH 173/188] Add Lighttpd config to sample contents

Thanks @tony5 for bringing this up and testing!
---
 content-sample/index.md | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/content-sample/index.md b/content-sample/index.md
index ba3e291..b0f52ea 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -223,7 +223,7 @@ Additional to Twigs extensive list of filters, functions and tags, Pico also
 provides some useful additional filters to make theming easier.
 
 * Pass the unique ID of a page to the `link` filter to return the page's URL
-  (e.g. `{{ "sub/page"|link }}` gets %base_url%?sub/page).
+  (e.g. `{{ "sub/page"|link }}` gets `%base_url%?sub/page`).
 * To get the parsed contents of a page, pass its unique ID to the `content`
   filter (e.g. `{{ "sub/page"|content }}`).
 * You can parse any Markdown string using the `markdown` filter (e.g. you can
@@ -292,6 +292,8 @@ Pico's default URLs (e.g. %base_url%/?sub/page) already are very user-friendly.
 Additionally, Pico offers you a URL rewrite feature to make URLs even more
 user-friendly (e.g. %base_url%/sub/page).
 
+#### Apache
+
 If you're using the Apache web server, URL rewriting probably already is
 enabled - try it yourself, click on the [second URL](%base_url%/sub/page). If
 you get an error message from your web server, please make sure to enable the
@@ -299,6 +301,8 @@ you get an error message from your web server, please make sure to enable the
 still shows no rewritten URLs, force URL rewriting by setting
 `rewrite_url: true` in your `config/config.yml`.
 
+#### Nginx
+
 If you're using Nginx, you can use the following configuration to enable URL
 rewriting (lines `5` to `8`) and denying access to Pico's internal files
 (lines `1` to `3`). You'll need to adjust the path (`/pico` on lines `1`, `2`,
@@ -319,6 +323,27 @@ location /pico/ {
 }
 ```
 
+#### Lighttpd
+
+Pico runs smoothly on Lighttpd. You can use the following configuration to
+enable URL rewriting (lines `6` to `9`) and denying access to Pico's internal
+files (lines `1` to `4`). Make sure to adjust the path (`/pico` on lines `2`,
+`3` and `7`) to match your installation directory, and let Pico know about
+available URL rewriting by setting `rewrite_url: true` in your
+`config/config.yml`. The configuration below should provide the *bare minimum*
+you need for Pico.
+
+```
+url.rewrite-once = (
+    "^/pico/(config|content|vendor|composer\.(json|lock|phar))(/|$)" => "/pico/index.php",
+    "^/pico/(.+/)?\.(?!well-known(/|$))" => "/pico/index.php"
+)
+
+url.rewrite-if-not-file = (
+    "^/pico(/|$)" => "/pico/index.php"
+)
+```
+
 ## Documentation
 
 For more help have a look at the Pico documentation at http://picocms.org/docs.

From 5f7b4559756eb8c5e4c71f05847286cdc0a2d149 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 24 Feb 2018 13:19:04 +0100
Subject: [PATCH 174/188] Add README.md, CONTRIBUTING.md and CHANGELOG.md to
 pre-bundled releases

---
 .build/create-release.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.build/create-release.sh b/.build/create-release.sh
index ba8b053..8522e32 100755
--- a/.build/create-release.sh
+++ b/.build/create-release.sh
@@ -43,6 +43,11 @@ cp vendor/picocms/pico/index.php.dist index.php
 echo "Adding 'config/config.yml.template'..."
 cp vendor/picocms/pico/config/config.yml.template config/config.yml.template
 
+echo "Adding 'README.md', 'CONTRIBUTING.md', 'CHANGELOG.md'..."
+cp vendor/picocms/pico/README.md README.md
+cp vendor/picocms/pico/CONTRIBUTING.md CONTRIBUTING.md
+cp vendor/picocms/pico/CHANGELOG.md CHANGELOG.md
+
 echo "Preparing 'composer.json' for release..."
 composer require --no-update \
     "picocms/pico ^$VERSION_MILESTONE" \

From 80263a91dc5476baafa7b2a1282e40aebe9fed12 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 24 Feb 2018 14:02:59 +0100
Subject: [PATCH 175/188] Disallow the use of the callback filter for the
 url_param and form_param Twig functions

---
 lib/PicoTwigExtension.php | 60 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index f4662b2..9d499cb 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -89,8 +89,8 @@ class PicoTwigExtension extends Twig_Extension
     public function getFunctions()
     {
         return array(
-            'url_param' => new Twig_SimpleFunction('url_param', array($this->pico, 'getUrlParameter')),
-            'form_param' => new Twig_SimpleFunction('form_param', array($this->pico, 'getFormParameter'))
+            'url_param' => new Twig_SimpleFunction('url_param', array($this, 'urlParamFunction')),
+            'form_param' => new Twig_SimpleFunction('form_param', array($this, 'formParamFunction'))
         );
     }
 
@@ -281,4 +281,60 @@ class PicoTwigExtension extends Twig_Extension
 
         return $var;
     }
+
+    /**
+     * Filters a URL GET parameter with a specified filter
+     *
+     * The Twig function disallows the use of the `callback` filter.
+     *
+     * @see Pico::getUrlParameter()
+     *
+     * @param string                    $name    name of the URL GET parameter
+     *     to filter
+     * @param int|string                $filter  the filter to apply
+     * @param mixed|array               $options either a associative options
+     *     array to be used by the filter or a scalar default value
+     * @param int|string|int[]|string[] $flags   flags and flag strings to be
+     *     used by the filter
+     *
+     * @return mixed either the filtered data, FALSE if the filter fails, or
+     *     NULL if the URL GET parameter doesn't exist and no default value is
+     *     given
+     */
+    public function urlParamFunction($name, $filter = '', $options = null, $flags = null)
+    {
+        if (($filter === 'callback') || ($filter === FILTER_CALLBACK)) {
+            return false;
+        }
+
+        return $this->pico->getUrlParameter($name, $filter, $options, $flags);
+    }
+
+    /**
+     * Filters a HTTP POST parameter with a specified filter
+     *
+     * The Twig function disallows the use of the `callback` filter.
+     *
+     * @see Pico::getFormParameter()
+     *
+     * @param string                    $name    name of the HTTP POST
+     *     parameter to filter
+     * @param int|string                $filter  the filter to apply
+     * @param mixed|array               $options either a associative options
+     *     array to be used by the filter or a scalar default value
+     * @param int|string|int[]|string[] $flags   flags and flag strings to be
+     *     used by the filter
+     *
+     * @return mixed either the filtered data, FALSE if the filter fails, or
+     *     NULL if the HTTP POST parameter doesn't exist and no default value
+     *     is given
+     */
+    public function formParamFunction($name, $filter = '', $options = null, $flags = null)
+    {
+        if (($filter === 'callback') || ($filter === FILTER_CALLBACK)) {
+            return false;
+        }
+
+        return $this->pico->getFormParameter($name, $filter, $options, $flags);
+    }
 }

From 05c2c968c3c8977b2586c77134f10a70274f7a42 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 24 Feb 2018 16:40:00 +0100
Subject: [PATCH 176/188] Use filter_id() for the url_param and form_param Twig
 functions

This is a follow-up to 80263a91dc5476baafa7b2a1282e40aebe9fed12
---
 lib/PicoTwigExtension.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 9d499cb..a774184 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -303,7 +303,8 @@ class PicoTwigExtension extends Twig_Extension
      */
     public function urlParamFunction($name, $filter = '', $options = null, $flags = null)
     {
-        if (($filter === 'callback') || ($filter === FILTER_CALLBACK)) {
+        $filter = $filter ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false;
+        if (!$filter || ($filter === FILTER_CALLBACK)) {
             return false;
         }
 
@@ -331,7 +332,8 @@ class PicoTwigExtension extends Twig_Extension
      */
     public function formParamFunction($name, $filter = '', $options = null, $flags = null)
     {
-        if (($filter === 'callback') || ($filter === FILTER_CALLBACK)) {
+        $filter = $filter ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false;
+        if (!$filter || ($filter === FILTER_CALLBACK)) {
             return false;
         }
 

From 190889b77b7f1261a0462197e19240319586164c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 29 Mar 2018 22:45:12 +0200
Subject: [PATCH 177/188] Fix sorting of Pico::$nativePlugins

Thanks to PT on our Freenode IRC channel #picocms for reporting this!
---
 lib/Pico.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Pico.php b/lib/Pico.php
index 7c471f1..9e170ba 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -770,12 +770,14 @@ class Pico
         $plugins = $this->plugins;
         $nativePlugins = $this->nativePlugins;
         $sortedPlugins = array();
+        $sortedNativePlugins = array();
         $visitedPlugins = array();
 
         $visitPlugin = function ($plugin) use (
             $plugins,
             $nativePlugins,
             &$sortedPlugins,
+            &$sortedNativePlugins,
             &$visitedPlugins,
             &$visitPlugin
         ) {
@@ -802,6 +804,9 @@ class Pico
                 }
 
                 $sortedPlugins[$pluginName] = $plugin;
+                if (isset($nativePlugins[$pluginName])) {
+                    $sortedNativePlugins[$pluginName] = $plugin;
+                }
             }
         };
 
@@ -814,6 +819,7 @@ class Pico
         }
 
         $this->plugins = $sortedPlugins;
+        $this->nativePlugins = $sortedNativePlugins;
     }
 
     /**

From b405edba171dcb65135536b13f59801a25cfe7c8 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 29 Mar 2018 22:47:23 +0200
Subject: [PATCH 178/188] Various small improvements

---
 composer.json              | 3 +--
 config/config.yml.template | 3 ++-
 lib/Pico.php               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index a70ddbe..a2951ce 100644
--- a/composer.json
+++ b/composer.json
@@ -28,10 +28,9 @@
     "require": {
         "php": ">=5.3.6",
         "ext-dom": "*",
-        "ext-mbstring": "*",
         "twig/twig": "^1.35",
         "symfony/yaml" : "^2.8",
-        "erusev/parsedown": "^1.6",
+        "erusev/parsedown": "^1.7",
         "erusev/parsedown-extra": "^0.7"
     },
     "suggest": {
diff --git a/config/config.yml.template b/config/config.yml.template
index 081a8f9..6a6ac19 100644
--- a/config/config.yml.template
+++ b/config/config.yml.template
@@ -35,7 +35,8 @@ content_config:
                                     #     See https://michelf.ca/projects/php-markdown/extra/ for more info
     breaks: false                   # A boolean indicating whether breaks in the markup should be reflected in the
                                     #     parsed contents of the page
-    escape: false                   # Escape HTML markup in your content files
+    escape: false                   # Escape HTML markup in your content files; don't confuse this with some sort of
+                                    #     safe mode, enabling this doesn't allow you to process untrusted user input!
     auto_urls: true                 # Automatically link URLs found in your markup
 
 ##
diff --git a/lib/Pico.php b/lib/Pico.php
index 9e170ba..6be1f64 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1393,12 +1393,12 @@ class Pico
     }
 
     /**
-     * Returns the Parsedown Extra markdown parser
+     * Returns the Parsedown markdown parser
      *
      * This method triggers the `onParsedownRegistered` event when the
-     * Parsedown Extra parser wasn't initiated yet.
+     * Parsedown markdown parser wasn't initiated yet.
      *
-     * @return ParsedownExtra Parsedown Extra markdown parser
+     * @return Parsedown Parsedown markdown parser
      */
     public function getParsedown()
     {

From 568166ad072cc55b263792f159153b6c09daa69c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 29 Mar 2018 22:48:24 +0200
Subject: [PATCH 179/188] Check Pico::VERSION constant before deploying a new
 release

---
 .travis.yml  | 3 ++-
 lib/Pico.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e2c041e..6d382df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,8 @@ jobs:
       script:
         - deploy.sh
       before_deploy:
-        - create-release.sh "$TRAVIS_BUILD_DIR/pico-release-$TRAVIS_TAG.tar.gz"
+        - '[ "$TRAVIS_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo Pico::VERSION;")" ]'
+        - create-release.sh "pico-release-$TRAVIS_TAG.tar.gz"
       deploy:
         provider: releases
         api_key: ${GITHUB_OAUTH_TOKEN}
diff --git a/lib/Pico.php b/lib/Pico.php
index 6be1f64..bad58bc 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -49,7 +49,7 @@ class Pico
      *
      * @var string
      */
-    const VERSION = '2.0.0-beta.1';
+    const VERSION = '2.0.0-beta.3';
 
     /**
      * Pico version ID

From 93f216297625d528693dbd68111e75d4aca12eb0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 29 Mar 2018 22:48:36 +0200
Subject: [PATCH 180/188] Update CHANGELOG.md

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d5a687..98ed6b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,19 @@ Pico Changelog
           `PicoDeprecated`'s changelog. Please note that BC-breaking changes
           are only possible with a new major version.
 
+### Version 2.0.0-beta.3
+Released: -
+
+```
+* [Changed] Add `README.md`, `CONTRIBUTING.md` and `CHANGELOG.md` of main repo
+            to pre-bundled releases
+* [Changed] Disallow the use of the `callback` filter for the `url_param` and
+            `form_param` Twig functions
+* [Changed] Improve documentation
+* [Fixed] Fix page tree when sorting pages by arbitrary values
+* [Fixed] Fix sorting of `Pico::$nativePlugins`
+```
+
 ### Version 2.0.0-beta.2
 Released: 2018-01-21
 

From 25ada4a8df02c5ffeb60720604c20fca267c1bfe Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 7 Apr 2018 21:37:22 +0200
Subject: [PATCH 181/188] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98ed6b8..d761985 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,11 +17,12 @@ Pico Changelog
           are only possible with a new major version.
 
 ### Version 2.0.0-beta.3
-Released: -
+Released: 2018-04-07
 
 ```
 * [Changed] Add `README.md`, `CONTRIBUTING.md` and `CHANGELOG.md` of main repo
-            to pre-bundled releases
+            to pre-bundled releases, keep `.gitignore`
+* [Changed] Deny access to a possibly existing `composer.phar` in `.htaccess`
 * [Changed] Disallow the use of the `callback` filter for the `url_param` and
             `form_param` Twig functions
 * [Changed] Improve documentation

From 822d58db6062cd62a378f448e2b2e84ae52615c0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 7 Apr 2018 22:14:14 +0200
Subject: [PATCH 182/188] Fix auto-publishing of pre-bundled releases

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6d382df..1056dc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,12 +33,13 @@ jobs:
         - deploy.sh
       before_deploy:
         - '[ "$TRAVIS_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo Pico::VERSION;")" ]'
-        - create-release.sh "pico-release-$TRAVIS_TAG.tar.gz"
+        - create-release.sh "$TRAVIS_BUILD_DIR/pico-release-$TRAVIS_TAG.tar.gz"
       deploy:
         provider: releases
         api_key: ${GITHUB_OAUTH_TOKEN}
         file: pico-release-$TRAVIS_TAG.tar.gz
         skip_cleanup: true
+        name: Version $TRAVIS_TAG
         draft: true
         on:
           tags: true

From c12b50dc1b1b5a9fb8d328621641d4397033b1b5 Mon Sep 17 00:00:00 2001
From: johannes Heimbach <heimbachjohannes@gmail.com>
Date: Sun, 29 Apr 2018 17:21:27 +0200
Subject: [PATCH 184/188] stop config.yml on loading again

---
 lib/Pico.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index bad58bc..4e515cc 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -894,7 +894,7 @@ class Pico
         // merge $config of config/*.yml files
         $configFiles = $this->getFilesGlob($this->getConfigDir() . '*.yml');
         foreach ($configFiles as $configFile) {
-            if ($configFile !== 'config.yml') {
+            if ($configFile !== $this->getConfigDir() . 'config.yml') {
                 $this->config += $loadConfigClosure($configFile);
             }
         }

From 6d6a39b74441d68ae33c05dd610ca94d2e4d9b76 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 1 Jul 2018 15:22:40 +0200
Subject: [PATCH 185/188] Fix Travis build

See travis-ci/travis-ci#8248
---
 .build/install.sh | 4 ++++
 .travis.yml       | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/.build/install.sh b/.build/install.sh
index 713f521..5dde051 100755
--- a/.build/install.sh
+++ b/.build/install.sh
@@ -6,6 +6,10 @@ echo "Installing build dependencies..."
 
 case "$1" in
     "--deploy")
+        echo "Synchronizing package index files..."
+        sudo apt-get update
+
+        echo "Installing packages..."
         sudo apt-get install -y cloc
         ;;
 esac
diff --git a/.travis.yml b/.travis.yml
index 1056dc4..267ba0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,8 @@ jobs:
         api_key: ${GITHUB_OAUTH_TOKEN}
         file: pico-release-$TRAVIS_TAG.tar.gz
         skip_cleanup: true
+        tag_name: $TRAVIS_TAG
+        target_commitish: $TRAVIS_COMMIT
         name: Version $TRAVIS_TAG
         draft: true
         on:

From 1ce4a0bc368a96d16ca836eaea97b67968fdf408 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 1 Jul 2018 17:16:29 +0200
Subject: [PATCH 186/188] Sync user and inline docs

---
 README.md               | 28 +++++++-------
 content-sample/index.md | 81 +++++++++++++++++++++++++++--------------
 2 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index da379cf..d4f177c 100644
--- a/README.md
+++ b/README.md
@@ -19,17 +19,17 @@ Screenshot
 Install
 -------
 
-Installing Pico is dead simple - and done in seconds! If you have access to a shell on your server (i.e. SSH access), we recommend using [composer][]. If not, use a pre-bundled release. If you don't know what "SSH access" is, head over to the pre-bundled release. 😇
+Installing Pico is dead simple - and done in seconds! If you have access to a shell on your server (i.e. SSH access), we recommend using [Composer][]. If not, use a pre-bundled release. If you don't know what "SSH access" is, head over to the pre-bundled release. 😇
 
 Pico requires PHP 5.3.6+
 
-### I want to use composer
+### I want to use Composer
 
-Starting with Pico 2.0 we recommend installing Pico using composer whenever possible. Trust us, you won't regret it when it comes to upgrading Pico! Anyway, if you don't want to use composer, or if you simply can't use composer because you don't have access to a shell on your server, don't despair, installing Pico using a pre-bundled release is still easier than everything you know!
+Starting with Pico 2.0 we recommend installing Pico using Composer whenever possible. Trust us, you won't regret it when it comes to upgrading Pico! Anyway, if you don't want to use Composer, or if you simply can't use Composer because you don't have access to a shell on your server, don't despair, installing Pico using a pre-bundled release is still easier than everything you know!
 
 ###### Step 1
 
-Open a shell and navigate to the desired install directory of Pico within the `httpdocs` directory (e.g. `/var/www/html`) of your server. Download composer and run it with the `create-project` option:
+Open a shell and navigate to the desired install directory of Pico within the `httpdocs` directory (e.g. `/var/www/html`) of your server. Download Composer and run it with the `create-project` option:
 
 ```shell
 $ curl -sSL https://getcomposer.org/installer | php
@@ -42,7 +42,7 @@ What second step? There's no second step. That's it! Open your favorite web brow
 
 ### I want to use a pre-bundled release
 
-Do you know the feeling: I want to install a new website, upload all files of my favorite CMS and run the setup script - just to find out that I forgot about creating the SQL database first? Later the setup script tells me that my file permissions are wrong. Heck, what does this even mean? Forget about it, Pico is different!
+Do you know the feeling: You want to install a new website, so you upload all files of your favorite CMS and run the setup script - just to find out that you forgot about creating the SQL database first? Later the setup script tells you that the file permissions are wrong. Heck, what does this even mean? Forget about it, Pico is different!
 
 ###### Step 1
 
@@ -54,9 +54,9 @@ Okay, here's the catch: There's no catch. That's it! Open your favorite web brow
 
 ### I'm a developer
 
-So, you're one of these amazing folks making all of this possible? We love you guys! As a developer we recommend you to clone [Pico's Git repository][PicoGit] and use composer to install its dependencies. You can find both [Pico][PicoPackagist] and [Pico's composer starter project][PicoComposerPackagist] on [Packagist.org][Packagist]. Using Pico's Git repository is different from using one of the installation methods elucidated above, because it uses Pico as the composer root package. Furthermore it gives you the current development version of Pico, what is likely *unstable* and *not ready for production use*!
+So, you're one of these amazing folks making all of this possible? We love you guys! As a developer we recommend you to clone [Pico's Git repository][PicoGit] and use Composer to install its dependencies. You can find both [Pico][PicoPackagist] and [Pico's Composer starter project][PicoComposerPackagist] on [Packagist.org][Packagist]. Using Pico's Git repository is different from using one of the installation methods elucidated above, because it uses Pico as the Composer root package. Furthermore it gives you the current development version of Pico, what is likely *unstable* and *not ready for production use*!
 
-Open a shell and navigate to the desired install directory of Pico within the `httpdocs` directory (e.g. `/var/www/html`) of your server. You can now clone Pico's Git repository, download composer and install Pico's dependencies as follows:
+Open a shell and navigate to the desired install directory of Pico within the `httpdocs` directory (e.g. `/var/www/html`) of your server. You can now clone Pico's Git repository, download Composer and install Pico's dependencies as follows:
 
 ```shell
 $ git clone https://github.com/picocms/Pico.git .
@@ -67,21 +67,21 @@ $ php composer.phar install
 Upgrade
 -------
 
-Do you remember when you installed Pico? It was ingeniously simple, wasn't it? Upgrading Pico is no difference! The upgrade process differs depending on whether you used [composer][] or a pre-bundled release to install Pico. Please note that you should *always* create a backup of your Pico installation before upgrading!
+Do you remember when you installed Pico? It was ingeniously simple, wasn't it? Upgrading Pico is no difference! The upgrade process differs depending on whether you used [Composer][] or a pre-bundled release to install Pico. Please note that you should *always* create a backup of your Pico installation before upgrading!
 
 Pico follows [Semantic Versioning 2.0][SemVer] and uses version numbers like `MAJOR`.`MINOR`.`PATCH`. When we update the `PATCH` version (e.g. `2.0.0` to `2.0.1`), we made backwards-compatible bug fixes. If we change the `MINOR` version (e.g. `2.0` to `2.1`), we added functionality in a backwards-compatible manner. Upgrading Pico is dead simple in both cases. Simply head over to the appropiate Upgrade sections below.
 
 But wait, we forgot to mention what happens when we update the `MAJOR` version (e.g. `2.0` to `3.0`). In this case we made incompatible API changes. We will then provide a appropriate upgrade tutorial, so please head over to the ["Upgrade" page on our website][HelpUpgrade].
 
-### I've used composer to install Pico
+### I've used Composer to install Pico
 
-Upgrading Pico is dead simple if you've used composer to install Pico. Simply open a shell and navigate to Pico's install directory within the `httpdocs` directory (e.g. `/var/www/html/pico`) of your server. You can now upgrade Pico using just a single command:
+Upgrading Pico is dead simple if you've used Composer to install Pico. Simply open a shell and navigate to Pico's install directory within the `httpdocs` directory (e.g. `/var/www/html/pico`) of your server. You can now upgrade Pico using just a single command:
 
 ```shell
 $ php composer.phar update
 ```
 
-That's it! composer will automatically update Pico and all plugins and themes you've installed using composer. Please make sure to manually update all plugins and themes you've installed manually.
+That's it! Composer will automatically update Pico and all plugins and themes you've installed using Composer. Please make sure to manually update all plugins and themes you've installed manually.
 
 ### I've used a pre-bundled release to install Pico
 
@@ -93,7 +93,7 @@ That's it! Now that Pico is up-to-date, you need to update all plugins and theme
 
 ### I'm a developer
 
-As a developer you should be up-to-date already... 😉 For the sake of completeness, if you want to upgrade Pico, simply open a shell and navigate to Pico's install directory within the `httpdocs` directory (e.g. `/var/www/html/pico`) of your server. Then pull the latest commits from [Pico's Git repository][PicoGit] and let composer update your dependencies:
+As a developer you should be up-to-date already... 😉 For the sake of completeness, if you want to upgrade Pico, simply open a shell and navigate to Pico's install directory within the `httpdocs` directory (e.g. `/var/www/html/pico`) of your server. Then pull the latest commits from [Pico's Git repository][PicoGit] and let Composer update your dependencies:
 
 ```shell
 $ git pull
@@ -130,6 +130,8 @@ You want to contribute to Pico? We really appreciate that! You can help make Pic
 
 By contributing to Pico, you accept and agree to the *Developer Certificate of Origin* for your present and future contributions submitted to Pico. Please refer to the ["Developer Certificate of Origin" section in our `CONTRIBUTING.md`][ContributionGuidelinesDCO].
 
+You don't have time to contribute code to Pico, but still want to "stand a coffee" for the ones who do? You can contribute monetary to Pico using [Bountysource][], a crowd funding website that focuses on individual issues and feature requests. Just refer to the "Bounties and Fundraisers" section below for more info.
+
 Bounties and Fundraisers
 ------------------------
 
@@ -143,7 +145,7 @@ As a developer you can pick up a bounty by simply contributing to Pico (please r
 
 Official Pico Contributors won't claim bounties on their own behalf, Pico will never take any money out of Bountysource. All money collected by Pico is used to pledge new bounties or to support projects Pico depends on.
 
-[composer]: https://getcomposer.org/
+[Composer]: https://getcomposer.org/
 [LatestRelease]: https://github.com/picocms/Pico/releases/latest
 [PicoGit]: https://github.com/picocms/Pico
 [PicoPackagist]: http://packagist.org/packages/picocms/pico
diff --git a/content-sample/index.md b/content-sample/index.md
index b0f52ea..84f5d01 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -278,39 +278,66 @@ developed a plugin before and want to upgrade it to Pico 2.0, refer to the
 
 ## Config
 
-You can override the default Pico settings (and add your own custom settings)
-by editing `config/config.yml` in the Pico directory. For a brief overview of
-the available settings and their defaults see `config/config.yml.template`. To
-override a setting, simply copy the line from `config/config.yml.template`
-to `config/config.yml` and set your custom value. Pico will read all `*.yml`
-files in the `config/` dir, thus you can even use a distinct settings file to
-configure your custom theme (e.g. `config/my_theme.yml`).
+Configuring Pico really is stupidly simple: Just create a `config/config.yml`
+to override the default Pico settings (and add your own custom settings). Take
+a look at the `config/config.yml.template` for a brief overview of the
+available settings and their defaults. To override a setting, simply copy the
+line from `config/config.yml.template` to `config/config.yml` and set your
+custom value.
+
+But we didn't stop there. Rather than having just a single config file, you can
+use a arbitrary number of config files. Simply create a `.yml` file in Pico's
+`config` dir and you're good to go. This allows you to add some structure to
+your config, like a separate config file for your theme (`config/my_theme.yml`).
+
+Please note that Pico loads config files in a special way you should be aware
+of. First of all it loads the main config file `config/config.yml`, and then
+any other `*.yml` file in Pico's `config` dir in alphabetical order. The file
+order is crucial: Configiguration values which have been set already, cannot be
+overwritten by a succeeding file. For example, if you set `site_title: Pico` in
+`config/a.yml` and `site_title: My awesome site!` in `config/b.yml`, your site
+title will be "Pico".
+
+Since YAML files are plain text files, users might read your Pico config by
+navigating to `%base_url%/config/config.yml`. This is no problem in the first
+place, but might get a problem if you use plugins that require you to store
+security-relevant data in the config (like credentials). Thus you should
+*always* make sure to configure your webserver to deny access to Pico's
+`config` dir. Just refer to the "URL Rewriting" section below. By following the
+instructions, you will not just enable URL rewriting, but also deny access to
+Pico's `config` dir.
 
 ### URL Rewriting
 
 Pico's default URLs (e.g. %base_url%/?sub/page) already are very user-friendly.
 Additionally, Pico offers you a URL rewrite feature to make URLs even more
-user-friendly (e.g. %base_url%/sub/page).
+user-friendly (e.g. %base_url%/sub/page). Below you'll find some basic info
+about how to configure your webserver proberly to enable URL rewriting.
 
 #### Apache
 
 If you're using the Apache web server, URL rewriting probably already is
 enabled - try it yourself, click on the [second URL](%base_url%/sub/page). If
-you get an error message from your web server, please make sure to enable the
-[`mod_rewrite` module][ModRewrite]. Assuming the second URL works, but Pico
-still shows no rewritten URLs, force URL rewriting by setting
-`rewrite_url: true` in your `config/config.yml`.
+URL rewriting doesn't work (you're getting `404 Not Found` error messages from
+Apache), please make sure to enable the [`mod_rewrite` module][ModRewrite] and
+to enable `.htaccess` overrides. You might have to set the
+[`AllowOverride` directive][AllowOverride] to `AllowOverride All` in your
+virtual host config file or global `httpd.conf`/`apache.conf`. Assuming
+rewritten URLs work, but Pico still shows no rewritten URLs, force URL
+rewriting by setting `rewrite_url: true` in your `config/config.yml`. If you
+rather get a `500 Internal Server Error` no matter what you do, try removing
+the `Options` directive from Pico's `.htaccess` file (it's the last line).
 
 #### Nginx
 
-If you're using Nginx, you can use the following configuration to enable URL
-rewriting (lines `5` to `8`) and denying access to Pico's internal files
-(lines `1` to `3`). You'll need to adjust the path (`/pico` on lines `1`, `2`,
-`5` and `7`) to match your installation directory. Additionally, you'll need to
-enable URL rewriting by setting `rewrite_url: true` in your
-`config/config.yml`. The Nginx configuration should provide the *bare minimum*
-you need for Pico. Nginx is a very extensive subject. If you have any trouble,
-please read through our [Nginx configuration docs][NginxConfig].
+If you're using Nginx, you can use the following config to enable URL rewriting
+(lines `5` to `8`) and denying access to Pico's internal files (lines `1` to
+`3`). You'll need to adjust the path (`/pico` on lines `1`, `2`, `5` and `7`)
+to match your installation directory. Additionally, you'll need to enable URL
+rewriting by setting `rewrite_url: true` in your `config/config.yml`. The Nginx
+config should provide the *bare minimum* you need for Pico. Nginx is a very
+extensive subject. If you have any trouble, please read through our
+[Nginx config docs][NginxConfig].
 
 ```
 location ~ ^/pico/((config|content|vendor|composer\.(json|lock|phar))(/|$)|(.+/)?\.(?!well-known(/|$))) {
@@ -325,13 +352,12 @@ location /pico/ {
 
 #### Lighttpd
 
-Pico runs smoothly on Lighttpd. You can use the following configuration to
-enable URL rewriting (lines `6` to `9`) and denying access to Pico's internal
-files (lines `1` to `4`). Make sure to adjust the path (`/pico` on lines `2`,
-`3` and `7`) to match your installation directory, and let Pico know about
-available URL rewriting by setting `rewrite_url: true` in your
-`config/config.yml`. The configuration below should provide the *bare minimum*
-you need for Pico.
+Pico runs smoothly on Lighttpd. You can use the following config to enable URL
+rewriting (lines `6` to `9`) and denying access to Pico's internal files (lines
+`1` to `4`). Make sure to adjust the path (`/pico` on lines `2`, `3` and `7`)
+to match your installation directory, and let Pico know about available URL
+rewriting by setting `rewrite_url: true` in your `config/config.yml`. The
+config below should provide the *bare minimum* you need for Pico.
 
 ```
 url.rewrite-once = (
@@ -358,4 +384,5 @@ For more help have a look at the Pico documentation at http://picocms.org/docs.
 [OfficialThemes]: http://picocms.org/themes/
 [PluginUpgrade]: http://picocms.org/development/#upgrade
 [ModRewrite]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html
+[AllowOverride]: https://httpd.apache.org/docs/current/mod/core.html#allowoverride
 [NginxConfig]: http://picocms.org/in-depth/nginx/

From 09057db2e02a2fce130bfd30d0a9407694eb9682 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 1 Jul 2018 17:17:15 +0200
Subject: [PATCH 187/188] Add Pico::setConfig() example to index.php.dist

---
 index.php.dist | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/index.php.dist b/index.php.dist
index cd391ad..a1f981d 100644
--- a/index.php.dist
+++ b/index.php.dist
@@ -32,5 +32,8 @@ $pico = new Pico(
     'themes/'   // themes dir
 );
 
+// override configuration?
+//$pico->setConfig(array());
+
 // run application
 echo $pico->run();

From 25c32de0ab9ef1e5b16ef0081e01c4bb34a8d34a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 1 Jul 2018 17:23:09 +0200
Subject: [PATCH 188/188] Update CHANGELOG.md

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fa3909..9e0234a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,10 +17,13 @@ Pico Changelog
           are only possible with a new major version.
 
 ### Version 2.0.0
-Released: -
+Released: 2018-07-01
 
 ```
 * [New] Add Bountysource
+* [Changed] Improve documentation
+* [Changed] Improve release & build process
+* [Fixed] Don't load `config/config.yml` multiple times
 ```
 
 ### Version 2.0.0-beta.3