From 718b790b1987fb4a74079af2a289225165a855ba Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 29 Mar 2020 14:37:35 +0200
Subject: [PATCH 01/75] Kick-start development of Pico 3.0

---
 composer.json               | 3 ++-
 lib/AbstractPicoPlugin.php  | 2 +-
 lib/Pico.php                | 2 +-
 lib/PicoPluginInterface.php | 2 +-
 lib/PicoTwigExtension.php   | 2 +-
 plugins/DummyPlugin.php     | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 260467a5c..02b45aa72 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev"
+            "dev-master": "2.1.x-dev",
+            "dev-pico-3.0": "3.0.x-dev"
         }
     }
 }
diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index b732ac224..4cc318bdf 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -21,7 +21,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.1
+ * @version 3.0
  */
 abstract class AbstractPicoPlugin implements PicoPluginInterface
 {
diff --git a/lib/Pico.php b/lib/Pico.php
index e19cbb3bd..387de4079 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -40,7 +40,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.1
+ * @version 3.0
  */
 class Pico
 {
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index 85f9dfbd5..323be862c 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -26,7 +26,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.1
+ * @version 3.0
  */
 interface PicoPluginInterface
 {
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 098811024..d87a6e11a 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -16,7 +16,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.1
+ * @version 3.0
  */
 class PicoTwigExtension extends Twig_Extension
 {
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 415103bdc..6541f4e7a 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -19,7 +19,7 @@
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
- * @version 2.1
+ * @version 3.0
  */
 class DummyPlugin extends AbstractPicoPlugin
 {

From a053a72a12388e1ef7cfcddd4ac3a5bf7cade7bd Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 29 Mar 2020 14:39:02 +0200
Subject: [PATCH 02/75] Update dependencies, Pico now requires PHP 7.0.8+

Pico now depends on Twig 2.12, Symfony YAML 3.4, Parsedown 1.7.4 and Parsedown Extra 0.8.1.
---
 composer.json  | 10 +++++-----
 index.php.dist |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 02b45aa72..6e56b5c8d 100644
--- a/composer.json
+++ b/composer.json
@@ -31,11 +31,11 @@
         "source": "https://github.com/picocms/Pico"
     },
     "require": {
-        "php": ">=5.3.6",
-        "twig/twig": "^1.36",
-        "symfony/yaml" : "^2.8",
-        "erusev/parsedown": "1.8.0-beta-7",
-        "erusev/parsedown-extra": "0.8.0-beta-1"
+        "php": "^7.0.8",
+        "twig/twig": "^2.12",
+        "symfony/yaml" : "^3.4",
+        "erusev/parsedown": "1.7.4",
+        "erusev/parsedown-extra": "0.8.1"
     },
     "suggest": {
         "picocms/pico-theme": "Pico requires a theme to actually display the contents of your website. This is Pico's official default theme.",
diff --git a/index.php.dist b/index.php.dist
index a1f981dd5..46c6ddb76 100644
--- a/index.php.dist
+++ b/index.php.dist
@@ -11,8 +11,8 @@
  */
 
 // check PHP platform requirements
-if (PHP_VERSION_ID < 50306) {
-    die('Pico requires PHP 5.3.6 or above to run');
+if (PHP_VERSION_ID < 70008) {
+    die('Pico requires PHP 7.0.8 or above to run');
 }
 if (!extension_loaded('dom')) {
     die("Pico requires the PHP extension 'dom' to run");

From 2ee41e9a8d29756e338c6533e2b9ece010869ebc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 29 Mar 2020 14:57:08 +0200
Subject: [PATCH 03/75] Update Pico::VERSION and Pico::VERSION_ID

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

diff --git a/lib/Pico.php b/lib/Pico.php
index 387de4079..6455659aa 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -49,14 +49,14 @@ class Pico
      *
      * @var string
      */
-    const VERSION = '2.1.1';
+    const VERSION = '3.0.0-alpha.1';
 
     /**
      * Pico version ID
      *
      * @var int
      */
-    const VERSION_ID = 20101;
+    const VERSION_ID = 30000;
 
     /**
      * Pico API version

From 727d8a12c0b372b1f101686f0d68d0d6bc760fb3 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 29 Mar 2020 14:58:00 +0200
Subject: [PATCH 04/75] Fix Travis CI trying to build Pico 3.0 on PHP 5.x

---
 .travis.yml   | 17 ++++-------------
 composer.json |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 12bd14954..8aa14fc84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,6 @@ cache:
 jobs:
   include:
     # Test stage
-    - php: 5.3
-      dist: precise
-    - php: 5.4
-      dist: trusty
-    - php: 5.5
-      dist: trusty
-    - php: 5.6
-      dist: xenial
     - php: 7.0
       dist: xenial
     - php: 7.1
@@ -25,15 +17,14 @@ jobs:
     - php: 7.3
     - php: 7.4
     - php: nightly
-    - php: hhvm-3.24 # until Dec 2018
     - php: hhvm-3.27 # until Sep 2019
     - php: hhvm-3.30 # until Nov 2019
 
     # Branch deployment stage
     - stage: deploy-branch
       if: type == "push" && tag IS blank
-      php: 5.3
-      dist: precise
+      php: 7.0
+      dist: xenial
       install:
         - '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
         - install.sh --deploy
@@ -43,8 +34,8 @@ jobs:
     # Release deployment stage
     - stage: deploy-release
       if: tag IS present
-      php: 5.3
-      dist: precise
+      php: 7.0
+      dist: xenial
       install:
         - install.sh --deploy
       script:
diff --git a/composer.json b/composer.json
index 6e56b5c8d..de1bcfbe0 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "source": "https://github.com/picocms/Pico"
     },
     "require": {
-        "php": "^7.0.8",
+        "php": ">=7.0.8",
         "twig/twig": "^2.12",
         "symfony/yaml" : "^3.4",
         "erusev/parsedown": "1.7.4",

From b6a03431182aaefe6a84c5fd93260ca3880ee586 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 29 Mar 2020 15:07:32 +0200
Subject: [PATCH 05/75] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96784d87f..46768b090 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,17 @@ Pico Changelog
           `PicoDeprecated`'s changelog. Please note that BC-breaking changes
           are only possible with a new major version.
 
+### Version 3.0.0-alpha.1
+Released: 2020-03-29
+
+```
+* [New] Kick-start development of Pico 3.0
+* [Changed] Require PHP 7.0.8+
+* [Changed] Update dependencies: Twig 2.12, Symfony YAML 3.4, Parsedown 1.7.4
+            and Parsedown Extra 0.8.1; this is just an interim step, we'll
+            update to Twig 3.0+ and Symfony YAML 5.0+ later
+```
+
 ### Version 2.1.1
 Released: 2019-12-31
 

From 039dd4edb21386289ce1903a376e6a44b6a0d558 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 29 Mar 2020 15:33:14 +0200
Subject: [PATCH 06/75] Version 3.0.0-alpha.1

```
* [New] Kick-start development of Pico 3.0
* [Changed] Require PHP 7.0.8+
* [Changed] Update dependencies: Twig 2.12, Symfony YAML 3.4, Parsedown 1.7.4
            and Parsedown Extra 0.8.1; this is just an interim step, we'll
            update to Twig 3.0+ and Symfony YAML 5.0+ later
```

From 812ae5c21548905e308f002bc6d97a042ea09aad Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 10 Apr 2020 21:09:00 +0200
Subject: [PATCH 07/75] Move Pico to picocms\Pico\ namespace

---
 composer.json                                 |   6 +-
 index.php                                     |   2 +-
 index.php.dist                                |   2 +-
 ...tractPicoPlugin.php => AbstractPlugin.php} |  62 +++++-----
 lib/Pico.php                                  | 108 +++++++++---------
 ...luginInterface.php => PluginInterface.php} |  14 ++-
 ...icoTwigExtension.php => TwigExtension.php} |  68 +++++------
 plugins/DummyPlugin.php                       |   9 +-
 8 files changed, 140 insertions(+), 131 deletions(-)
 rename lib/{AbstractPicoPlugin.php => AbstractPlugin.php} (86%)
 rename lib/{PicoPluginInterface.php => PluginInterface.php} (91%)
 rename lib/{PicoTwigExtension.php => TwigExtension.php} (88%)

diff --git a/composer.json b/composer.json
index de1bcfbe0..2dfe2a4ec 100644
--- a/composer.json
+++ b/composer.json
@@ -43,10 +43,8 @@
         "picocms/composer-installer": "This Composer plugin is responsible for installing Pico plugins and themes using the Composer package manager."
     },
     "autoload": {
-        "psr-0": {
-            "Pico": "lib/",
-            "PicoPluginInterface": "lib/",
-            "AbstractPicoPlugin": "lib/"
+        "psr-4": {
+            "picocms\\Pico\\": "lib/"
         }
     },
     "extra": {
diff --git a/index.php b/index.php
index 0d13d6d3a..149ffb62a 100644
--- a/index.php
+++ b/index.php
@@ -26,7 +26,7 @@
 }
 
 // instance Pico
-$pico = new Pico(
+$pico = new \picocms\Pico\Pico(
     __DIR__,    // root dir
     'config/',  // config dir
     'plugins/', // plugins dir
diff --git a/index.php.dist b/index.php.dist
index 46c6ddb76..766153015 100644
--- a/index.php.dist
+++ b/index.php.dist
@@ -25,7 +25,7 @@ if (!extension_loaded('mbstring')) {
 require_once(__DIR__ . '/vendor/autoload.php');
 
 // instance Pico
-$pico = new Pico(
+$pico = new \picocms\Pico\Pico(
     __DIR__,    // root dir
     'config/',  // config dir
     'plugins/', // plugins dir
diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPlugin.php
similarity index 86%
rename from lib/AbstractPicoPlugin.php
rename to lib/AbstractPlugin.php
index 4cc318bdf..67b632bf4 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPlugin.php
@@ -10,25 +10,27 @@
  * License-Filename: LICENSE
  */
 
+namespace picocms\Pico;
+
 /**
  * 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.
+ * Please refer to {@see PluginInterface} for more information about how to
+ * develop a plugin for Pico.
  *
- * @see PicoPluginInterface
+ * @see PluginInterface
  *
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-abstract class AbstractPicoPlugin implements PicoPluginInterface
+abstract class AbstractPlugin implements PluginInterface
 {
     /**
      * Current instance of Pico
      *
-     * @see PicoPluginInterface::getPico()
+     * @see PluginInterface::getPico()
      * @var Pico
      */
     protected $pico;
@@ -36,8 +38,8 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     /**
      * Boolean indicating if this plugin is enabled (TRUE) or disabled (FALSE)
      *
-     * @see PicoPluginInterface::isEnabled()
-     * @see PicoPluginInterface::setEnabled()
+     * @see PluginInterface::isEnabled()
+     * @see PluginInterface::setEnabled()
      * @var bool|null
      */
     protected $enabled;
@@ -45,7 +47,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     /**
      * Boolean indicating if this plugin was ever enabled/disabled manually
      *
-     * @see PicoPluginInterface::isStatusChanged()
+     * @see PluginInterface::isStatusChanged()
      * @var bool
      */
     protected $statusChanged = false;
@@ -53,7 +55,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     /**
      * Boolean indicating whether this plugin matches Pico's API version
      *
-     * @see AbstractPicoPlugin::checkCompatibility()
+     * @see AbstractPlugin::checkCompatibility()
      * @var bool|null
      */
     protected $nativePlugin;
@@ -61,8 +63,8 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     /**
      * List of plugins which this plugin depends on
      *
-     * @see AbstractPicoPlugin::checkDependencies()
-     * @see PicoPluginInterface::getDependencies()
+     * @see AbstractPlugin::checkDependencies()
+     * @see PluginInterface::getDependencies()
      * @var string[]
      */
     protected $dependsOn = array();
@@ -70,8 +72,8 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
     /**
      * List of plugin which depend on this plugin
      *
-     * @see AbstractPicoPlugin::checkDependants()
-     * @see PicoPluginInterface::getDependants()
+     * @see AbstractPlugin::checkDependants()
+     * @see PluginInterface::getDependants()
      * @var object[]|null
      */
     protected $dependants;
@@ -122,7 +124,7 @@ protected function configEnabled()
                 // otherwise the plugin needs to be enabled manually
                 try {
                     $this->setEnabled(true, false, true);
-                } catch (RuntimeException $e) {
+                } catch (\RuntimeException $e) {
                     $this->enabled = false;
                 }
             }
@@ -196,7 +198,7 @@ public function getPluginConfig($configName = null, $default = null)
     /**
      * Passes all not satisfiable method calls to Pico
      *
-     * @see PicoPluginInterface::getPico()
+     * @see PluginInterface::getPico()
      *
      * @deprecated 2.1.0
      *
@@ -211,7 +213,7 @@ public function __call($methodName, array $params)
             return call_user_func_array(array($this->getPico(), $methodName), $params);
         }
 
-        throw new BadMethodCallException(
+        throw new \BadMethodCallException(
             'Call to undefined method ' . get_class($this->getPico()) . '::' . $methodName . '() '
             . 'through ' . get_called_class() . '::__call()'
         );
@@ -220,37 +222,37 @@ public function __call($methodName, array $params)
     /**
      * Enables all plugins which this plugin depends on
      *
-     * @see PicoPluginInterface::getDependencies()
+     * @see PluginInterface::getDependencies()
      *
      * @param bool $recursive enable required plugins automatically
      *
-     * @throws RuntimeException thrown when a dependency fails
+     * @throws \RuntimeException thrown when a dependency fails
      */
     protected function checkDependencies($recursive)
     {
         foreach ($this->getDependencies() as $pluginName) {
             try {
                 $plugin = $this->getPico()->getPlugin($pluginName);
-            } catch (RuntimeException $e) {
-                throw new RuntimeException(
+            } catch (\RuntimeException $e) {
+                throw new \RuntimeException(
                     "Unable to enable plugin '" . get_called_class() . "': "
                     . "Required plugin '" . $pluginName . "' not found"
                 );
             }
 
             // plugins which don't implement PicoPluginInterface are always enabled
-            if (($plugin instanceof PicoPluginInterface) && !$plugin->isEnabled()) {
+            if (($plugin instanceof PluginInterface) && !$plugin->isEnabled()) {
                 if ($recursive) {
                     if (!$plugin->isStatusChanged()) {
                         $plugin->setEnabled(true, true, true);
                     } else {
-                        throw new RuntimeException(
+                        throw new \RuntimeException(
                             "Unable to enable plugin '" . get_called_class() . "': "
                             . "Required plugin '" . $pluginName . "' was disabled manually"
                         );
                     }
                 } else {
-                    throw new RuntimeException(
+                    throw new \RuntimeException(
                         "Unable to enable plugin '" . get_called_class() . "': "
                         . "Required plugin '" . $pluginName . "' is disabled"
                     );
@@ -270,11 +272,11 @@ public function getDependencies()
     /**
      * Disables all plugins which depend on this plugin
      *
-     * @see PicoPluginInterface::getDependants()
+     * @see PluginInterface::getDependants()
      *
      * @param bool $recursive disabled dependant plugins automatically
      *
-     * @throws RuntimeException thrown when a dependency fails
+     * @throws \RuntimeException thrown when a dependency fails
      */
     protected function checkDependants($recursive)
     {
@@ -286,7 +288,7 @@ protected function checkDependants($recursive)
                         if (!$plugin->isStatusChanged()) {
                             $plugin->setEnabled(false, true, true);
                         } else {
-                            throw new RuntimeException(
+                            throw new \RuntimeException(
                                 "Unable to disable plugin '" . get_called_class() . "': "
                                 . "Required by manually enabled plugin '" . $pluginName . "'"
                             );
@@ -296,7 +298,7 @@ protected function checkDependants($recursive)
             } else {
                 $dependantsList = 'plugin' . ((count($dependants) > 1) ? 's' : '') . ' '
                     . "'" . implode("', '", array_keys($dependants)) . "'";
-                throw new RuntimeException(
+                throw new \RuntimeException(
                     "Unable to disable plugin '" . get_called_class() . "': "
                     . "Required by " . $dependantsList
                 );
@@ -313,7 +315,7 @@ public function getDependants()
             $this->dependants = array();
             foreach ($this->getPico()->getPlugins() as $pluginName => $plugin) {
                 // only plugins which implement PicoPluginInterface support dependencies
-                if ($plugin instanceof PicoPluginInterface) {
+                if ($plugin instanceof PluginInterface) {
                     $dependencies = $plugin->getDependencies();
                     if (in_array(get_called_class(), $dependencies)) {
                         $this->dependants[$pluginName] = $plugin;
@@ -335,7 +337,7 @@ public function getDependants()
      * newer API versions, what requires some special (version specific)
      * precaution and is therefore usually not the case.
      *
-     * @throws RuntimeException thrown when the plugin's and Pico's API aren't
+     * @throws \RuntimeException thrown when the plugin's and Pico's API aren't
      *     compatible
      */
     protected function checkCompatibility()
@@ -348,7 +350,7 @@ protected function checkCompatibility()
             $this->nativePlugin = ($pluginApiVersion === $picoApiVersion);
 
             if (!$this->nativePlugin && ($pluginApiVersion > $picoApiVersion)) {
-                throw new RuntimeException(
+                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 6455659aa..4d8201569 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -16,6 +16,8 @@
  * License-Filename: LICENSE
  */
 
+namespace picocms\Pico;
+
 /**
  * Pico
  *
@@ -147,7 +149,7 @@ class Pico
     /**
      * List of loaded plugins using the current API version
      *
-     * @var PicoPluginInterface[]
+     * @var PluginInterface[]
      */
     protected $nativePlugins = array();
 
@@ -251,7 +253,7 @@ class Pico
      * Parsedown Extra instance used for markdown parsing
      *
      * @see Pico::getParsedown()
-     * @var Parsedown|null
+     * @var \Parsedown|null
      */
     protected $parsedown;
 
@@ -307,7 +309,7 @@ class Pico
      * Twig instance used for template parsing
      *
      * @see Pico::getTwig()
-     * @var Twig_Environment|null
+     * @var \Twig_Environment|null
      */
     protected $twig;
 
@@ -408,13 +410,13 @@ public function getThemesDir()
      *
      * @return string rendered Pico contents
      *
-     * @throws Exception thrown when a irrecoverable error occurs
+     * @throws \Exception thrown when a irrecoverable error occurs
      */
     public function run()
     {
         // check lock
         if ($this->locked) {
-            throw new LogicException('You cannot run the same Pico instance multiple times');
+            throw new \LogicException('You cannot run the same Pico instance multiple times');
         }
 
         // lock Pico
@@ -431,7 +433,7 @@ public function run()
 
         // check content dir
         if (!is_dir($this->getConfig('content_dir'))) {
-            throw new RuntimeException('Invalid content directory "' . $this->getConfig('content_dir') . '"');
+            throw new \RuntimeException('Invalid content directory "' . $this->getConfig('content_dir') . '"');
         }
 
         // load theme
@@ -542,7 +544,7 @@ public function run()
      * @see Pico::getPlugin()
      * @see Pico::getPlugins()
      *
-     * @throws RuntimeException thrown when a plugin couldn't be loaded
+     * @throws \RuntimeException thrown when a plugin couldn't be loaded
      */
     protected function loadPlugins()
     {
@@ -553,7 +555,7 @@ protected function loadPlugins()
         }
 
         if (!isset($this->plugins['PicoDeprecated']) && (count($this->plugins) !== count($this->nativePlugins))) {
-            throw new RuntimeException(
+            throw new \RuntimeException(
                 "Plugins using an older API than version " . static::API_VERSION . " found, "
                 . "but PicoDeprecated isn't loaded"
             );
@@ -574,7 +576,7 @@ protected function loadPlugins()
      *
      * @return string[] installer names of the loaded plugins
      *
-     * @throws RuntimeException thrown when a plugin couldn't be loaded
+     * @throws \RuntimeException thrown when a plugin couldn't be loaded
      */
     protected function loadComposerPlugins(array $pluginBlacklist = array())
     {
@@ -601,8 +603,8 @@ protected function loadComposerPlugins(array $pluginBlacklist = array())
                     continue;
                 }
 
-                if (!($plugin instanceof PicoPluginInterface)) {
-                    throw new RuntimeException(
+                if (!($plugin instanceof PluginInterface)) {
+                    throw new \RuntimeException(
                         "Unable to load plugin '" . $className . "' via 'vendor/pico-plugin.php': "
                         . "Plugins installed by composer must implement 'PicoPluginInterface'"
                     );
@@ -642,7 +644,7 @@ protected function loadComposerPlugins(array $pluginBlacklist = array())
      *
      * @param string[] $pluginBlacklist class names of plugins not to load
      *
-     * @throws RuntimeException thrown when a plugin couldn't be loaded
+     * @throws \RuntimeException thrown when a plugin couldn't be loaded
      */
     protected function loadLocalPlugins(array $pluginBlacklist = array())
     {
@@ -668,7 +670,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = array())
                 $pluginFile = $file . '/' . $className . '.php';
 
                 if (!is_file($this->getPluginsDir() . $pluginFile)) {
-                    throw new RuntimeException(
+                    throw new \RuntimeException(
                         "Unable to load plugin '" . $className . "' from '" . $pluginFile . "': File not found"
                     );
                 }
@@ -676,7 +678,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = array())
                 $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");
+                throw new \RuntimeException("Unable to load plugin from '" . $file . "': Not a valid plugin file");
             }
 
             if (isset($this->plugins[$className]) || isset($pluginBlacklist[$className])) {
@@ -692,13 +694,13 @@ protected function loadLocalPlugins(array $pluginBlacklist = array())
 
                 $this->plugins[$className] = $plugin;
 
-                if ($plugin instanceof PicoPluginInterface) {
+                if ($plugin instanceof PluginInterface) {
                     if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
                         $this->nativePlugins[$className] = $plugin;
                     }
                 }
             } else {
-                throw new RuntimeException(
+                throw new \RuntimeException(
                     "Unable to load plugin '" . $className . "' from '" . $pluginFile . "': Plugin class not found"
                 );
             }
@@ -708,11 +710,11 @@ protected function loadLocalPlugins(array $pluginBlacklist = array())
     /**
      * Manually loads a plugin
      *
-     * 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
+     * Manually loaded plugins MUST implement {@see PluginInterface}. 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.
      *
@@ -730,12 +732,12 @@ protected function loadLocalPlugins(array $pluginBlacklist = array())
      * @see Pico::getPlugin()
      * @see Pico::getPlugins()
      *
-     * @param PicoPluginInterface|string $plugin either the class name of a
-     *     plugin to instantiate or a plugin instance
+     * @param PluginInterface|string $plugin either the class name of a plugin
+     *     to instantiate or a plugin instance
      *
-     * @return PicoPluginInterface instance of the loaded plugin
+     * @return PluginInterface instance of the loaded plugin
      *
-     * @throws RuntimeException thrown when the plugin couldn't be loaded
+     * @throws \RuntimeException thrown when the plugin couldn't be loaded
      */
     public function loadPlugin($plugin)
     {
@@ -744,14 +746,14 @@ public function loadPlugin($plugin)
             if (class_exists($className)) {
                 $plugin = new $className($this);
             } else {
-                throw new RuntimeException("Unable to load plugin '" . $className . "': Class not found");
+                throw new \RuntimeException("Unable to load plugin '" . $className . "': Class not found");
             }
         }
 
         $className = get_class($plugin);
 
-        if (!($plugin instanceof PicoPluginInterface)) {
-            throw new RuntimeException(
+        if (!($plugin instanceof PluginInterface)) {
+            throw new \RuntimeException(
                 "Unable to load plugin '" . $className . "': "
                 . "Manually loaded plugins must implement 'PicoPluginInterface'"
             );
@@ -820,7 +822,7 @@ protected function sortPlugins()
                 $visitedPlugins[$pluginName] = true;
 
                 $dependencies = array();
-                if ($plugin instanceof PicoPluginInterface) {
+                if ($plugin instanceof PluginInterface) {
                     $dependencies = $plugin->getDependencies();
                 }
                 if (!isset($nativePlugins[$pluginName])) {
@@ -857,8 +859,8 @@ protected function sortPlugins()
     /**
      * Returns the instance of a named plugin
      *
-     * Plugins SHOULD implement {@see PicoPluginInterface}, but you MUST NOT
-     * rely on it. For more information see {@see PicoPluginInterface}.
+     * Plugins SHOULD implement {@see PluginInterface}, but you MUST NOT rely
+     * on it. For more information see {@see PluginInterface}.
      *
      * @see Pico::loadPlugins()
      * @see Pico::getPlugins()
@@ -867,7 +869,7 @@ protected function sortPlugins()
      *
      * @return object instance of the plugin
      *
-     * @throws RuntimeException thrown when the plugin wasn't found
+     * @throws \RuntimeException thrown when the plugin wasn't found
      */
     public function getPlugin($pluginName)
     {
@@ -875,7 +877,7 @@ public function getPlugin($pluginName)
             return $this->plugins[$pluginName];
         }
 
-        throw new RuntimeException("Missing plugin '" . $pluginName . "'");
+        throw new \RuntimeException("Missing plugin '" . $pluginName . "'");
     }
 
     /**
@@ -1035,12 +1037,12 @@ protected function loadConfig()
      *
      * @param array $config array with config variables
      *
-     * @throws LogicException thrown if Pico already started processing
+     * @throws \LogicException thrown if Pico already started processing
      */
     public function setConfig(array $config)
     {
         if ($this->locked) {
-            throw new LogicException("You cannot modify Pico's config after processing has started");
+            throw new \LogicException("You cannot modify Pico's config after processing has started");
         }
 
         $this->config = $config;
@@ -1141,7 +1143,7 @@ protected function loadTheme()
 
         // check for theme compatibility
         if (!isset($this->plugins['PicoDeprecated']) && ($this->themeApiVersion < static::API_VERSION)) {
-            throw new RuntimeException(
+            throw new \RuntimeException(
                 'Current theme "' . $this->theme . '" uses API version ' . $this->themeApiVersion . ', but Pico '
                 . 'provides API version ' . static::API_VERSION . ' and PicoDeprecated isn\'t loaded'
             );
@@ -1542,12 +1544,12 @@ public function getFileMeta()
      * This method triggers the `onParsedownRegistered` event when the
      * Parsedown markdown parser wasn't initiated yet.
      *
-     * @return Parsedown Parsedown markdown parser
+     * @return \Parsedown Parsedown markdown parser
      */
     public function getParsedown()
     {
         if ($this->parsedown === null) {
-            $className = $this->config['content_config']['extra'] ? 'ParsedownExtra' : 'Parsedown';
+            $className = $this->config['content_config']['extra'] ? '\ParsedownExtra' : '\Parsedown';
             $this->parsedown = new $className();
 
             $this->parsedown->setBreaksEnabled((bool) $this->config['content_config']['breaks']);
@@ -2075,25 +2077,25 @@ public function getPageTree()
      * 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 filter `content` as well as Pico's
-     * {@see PicoTwigExtension} Twig extension.
+     * {@see TwigExtension} Twig extension.
      *
      * @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
+     * @return \Twig_Environment|null Twig template engine
      */
     public function getTwig()
     {
         if ($this->twig === null) {
             $twigConfig = $this->getConfig('twig_config');
 
-            $twigLoader = new Twig_Loader_Filesystem($this->getThemesDir() . $this->getTheme());
-            $this->twig = new Twig_Environment($twigLoader, $twigConfig);
-            $this->twig->addExtension(new PicoTwigExtension($this));
+            $twigLoader = new \Twig_Loader_Filesystem($this->getThemesDir() . $this->getTheme());
+            $this->twig = new \Twig_Environment($twigLoader, $twigConfig);
+            $this->twig->addExtension(new TwigExtension($this));
 
             if (!empty($twigConfig['debug'])) {
-                $this->twig->addExtension(new Twig_Extension_Debug());
+                $this->twig->addExtension(new \Twig_Extension_Debug());
             }
 
             // register content filter
@@ -2101,7 +2103,7 @@ public function getTwig()
             // 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(
+            $this->twig->addFilter(new \Twig_SimpleFilter(
                 'content',
                 function ($page) use ($pico, &$pages) {
                     if (isset($pages[$page])) {
@@ -2142,7 +2144,7 @@ protected function getTwigVariables()
             'theme_url' => $this->getConfig('themes_url') . $this->getTheme(),
             'site_title' => $this->getConfig('site_title'),
             'meta' => $this->meta,
-            'content' => new Twig_Markup($this->content, 'UTF-8'),
+            'content' => new \Twig_Markup($this->content, 'UTF-8'),
             'pages' => $this->pages,
             'previous_page' => $this->previousPage,
             'current_page' => $this->currentPage,
@@ -2281,14 +2283,14 @@ public function isDebugModeEnabled()
      *
      * @return string URL
      *
-     * @throws InvalidArgumentException thrown when invalid arguments got passed
+     * @throws \InvalidArgumentException thrown when invalid arguments got passed
      */
     public function getPageUrl($page, $queryData = null, $dropIndex = true)
     {
         if (is_array($queryData)) {
             $queryData = http_build_query($queryData, '', '&');
         } elseif (($queryData !== null) && !is_string($queryData)) {
-            throw new InvalidArgumentException(
+            throw new \InvalidArgumentException(
                 'Argument 2 passed to ' . __METHOD__ . ' must be of the type array or string, '
                 . (is_object($queryData) ? get_class($queryData) : gettype($queryData)) . ' given'
             );
@@ -2682,7 +2684,7 @@ public function getAbsolutePath($path, $basePath = null, $endSlash = true)
      *
      * @return string normalized path
      *
-     * @throws UnexpectedValueException thrown when a absolute path is passed
+     * @throws \UnexpectedValueException thrown when a absolute path is passed
      *     although absolute paths aren't allowed
      */
     public function getNormalizedPath($path, $allowAbsolutePath = false, $endSlash = true)
@@ -2701,7 +2703,7 @@ public function getNormalizedPath($path, $allowAbsolutePath = false, $endSlash =
         }
 
         if ($absolutePath && !$allowAbsolutePath) {
-            throw new UnexpectedValueException(
+            throw new \UnexpectedValueException(
                 'Argument 1 passed to ' . __METHOD__ . ' must be a relative path, absolute path "' . $path . '" given'
             );
         }
@@ -2736,7 +2738,7 @@ public function getNormalizedPath($path, $allowAbsolutePath = false, $endSlash =
      * @param string $url      relative or absolute URL
      * @param string $baseUrl  treat relative URLs relative to the given URL;
      *     defaults to Pico::getBaseUrl()
-     * @param bool $endSlash   whether to add a trailing slash to the absolute
+     * @param bool   $endSlash whether to add a trailing slash to the absolute
      *     URL or not (defaults to TRUE)
      *
      * @return string absolute URL
@@ -2761,8 +2763,8 @@ public function getAbsoluteUrl($url, $baseUrl = null, $endSlash = true)
      *
      * You MUST NOT trigger events of Pico's core with a plugin!
      *
-     * @see PicoPluginInterface
-     * @see AbstractPicoPlugin
+     * @see PluginInterface
+     * @see AbstractPlugin
      * @see DummyPlugin
      *
      * @param string $eventName name of the event to trigger
diff --git a/lib/PicoPluginInterface.php b/lib/PluginInterface.php
similarity index 91%
rename from lib/PicoPluginInterface.php
rename to lib/PluginInterface.php
index 323be862c..ec6974577 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PluginInterface.php
@@ -10,6 +10,8 @@
  * License-Filename: LICENSE
  */
 
+namespace picocms\Pico;
+
 /**
  * Common interface for Pico plugins
  *
@@ -28,7 +30,7 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-interface PicoPluginInterface
+interface PluginInterface
 {
     /**
      * Handles a event that was triggered by Pico
@@ -41,8 +43,8 @@ public function handleEvent($eventName, array $params);
     /**
      * Enables or disables this plugin
      *
-     * @see PicoPluginInterface::isEnabled()
-     * @see PicoPluginInterface::isStatusChanged()
+     * @see PluginInterface::isEnabled()
+     * @see PluginInterface::isStatusChanged()
      *
      * @param bool $enabled   enable (TRUE) or disable (FALSE) this plugin
      * @param bool $recursive when TRUE, enable or disable recursively.
@@ -54,7 +56,7 @@ public function handleEvent($eventName, array $params);
      * @param bool $auto      enable or disable to fulfill a dependency. This
      *     parameter is optional and defaults to FALSE.
      *
-     * @throws RuntimeException thrown when a dependency fails
+     * @throws \RuntimeException thrown when a dependency fails
      */
     public function setEnabled($enabled, $recursive = true, $auto = false);
 
@@ -65,7 +67,7 @@ public function setEnabled($enabled, $recursive = true, $auto = false);
      * wasn't triggered on all plugins yet. This method might even return NULL
      * then. The plugin's status might change later.
      *
-     * @see PicoPluginInterface::setEnabled()
+     * @see PluginInterface::setEnabled()
      *
      * @return bool|null plugin is enabled (TRUE) or disabled (FALSE)
      */
@@ -74,7 +76,7 @@ public function isEnabled();
     /**
      * Returns TRUE if the plugin was ever enabled/disabled manually
      *
-     * @see PicoPluginInterface::setEnabled()
+     * @see PluginInterface::setEnabled()
      *
      * @return bool plugin is in its default state (TRUE), FALSE otherwise
      */
diff --git a/lib/PicoTwigExtension.php b/lib/TwigExtension.php
similarity index 88%
rename from lib/PicoTwigExtension.php
rename to lib/TwigExtension.php
index d87a6e11a..d726191f2 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/TwigExtension.php
@@ -10,6 +10,8 @@
  * License-Filename: LICENSE
  */
 
+namespace picocms\Pico;
+
 /**
  * Pico's Twig extension to implement additional filters
  *
@@ -18,12 +20,12 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-class PicoTwigExtension extends Twig_Extension
+class TwigExtension extends \Twig_Extension
 {
     /**
      * Current instance of Pico
      *
-     * @see PicoTwigExtension::getPico()
+     * @see TwigExtension::getPico()
      * @var Pico
      */
     private $pico;
@@ -67,20 +69,20 @@ public function getName()
      *
      * @see Twig_ExtensionInterface::getFilters()
      *
-     * @return Twig_SimpleFilter[] array of Pico's Twig filters
+     * @return \Twig_SimpleFilter[] array of Pico's Twig filters
      */
     public function getFilters()
     {
         return array(
-            'markdown' => new Twig_SimpleFilter(
+            'markdown' => new \Twig_SimpleFilter(
                 'markdown',
                 array($this, 'markdownFilter'),
                 array('is_safe' => array('html'))
             ),
-            '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')),
-            'url' => new Twig_SimpleFilter('url', array($this->pico, 'substituteUrl'))
+            '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')),
+            'url' => new \Twig_SimpleFilter('url', array($this->pico, 'substituteUrl'))
         );
     }
 
@@ -89,14 +91,14 @@ public function getFilters()
      *
      * @see Twig_ExtensionInterface::getFunctions()
      *
-     * @return Twig_SimpleFunction[] array of Pico's Twig functions
+     * @return \Twig_SimpleFunction[] array of Pico's Twig functions
      */
     public function getFunctions()
     {
         return array(
-            'url_param' => new Twig_SimpleFunction('url_param', array($this, 'urlParamFunction')),
-            'form_param' => new Twig_SimpleFunction('form_param', array($this, 'formParamFunction')),
-            'pages' => new Twig_SimpleFunction('pages', array($this, 'pagesFunction'))
+            'url_param' => new \Twig_SimpleFunction('url_param', array($this, 'urlParamFunction')),
+            'form_param' => new \Twig_SimpleFunction('form_param', array($this, 'formParamFunction')),
+            'pages' => new \Twig_SimpleFunction('pages', array($this, 'pagesFunction'))
         );
     }
 
@@ -129,19 +131,19 @@ public function markdownFilter($markdown, array $meta = array(), $singleLine = f
      * 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
      *
-     * @throws Twig_Error_Runtime
+     * @throws \Twig_Error_Runtime
      */
     public function mapFilter($var, $mapKeyPath)
     {
-        if (!is_array($var) && (!is_object($var) || !($var instanceof Traversable))) {
-            throw new Twig_Error_Runtime(sprintf(
+        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)
             ));
@@ -166,11 +168,11 @@ public function mapFilter($var, $mapKeyPath)
      * 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
@@ -178,20 +180,20 @@ public function mapFilter($var, $mapKeyPath)
      *
      * @return array sorted array
      *
-     * @throws Twig_Error_Runtime
+     * @throws \Twig_Error_Runtime
      */
     public function sortByFilter($var, $sortKeyPath, $fallback = 'bottom')
     {
-        if (is_object($var) && ($var instanceof Traversable)) {
+        if (is_object($var) && ($var instanceof \Traversable)) {
             $var = iterator_to_array($var, true);
         } elseif (!is_array($var)) {
-            throw new Twig_Error_Runtime(sprintf(
+            throw new \Twig_Error_Runtime(sprintf(
                 'The sort_by filter only works with arrays or "Traversable", got "%s"',
                 is_object($var) ? get_class($var) : gettype($var)
             ));
         }
         if (($fallback !== 'top') && ($fallback !== 'bottom') && ($fallback !== 'keep') && ($fallback !== "remove")) {
-            throw new Twig_Error_Runtime(
+            throw new \Twig_Error_Runtime(
                 'The sort_by filter only supports the "top", "bottom", "keep" and "remove" fallbacks'
             );
         }
@@ -243,10 +245,10 @@ public function sortByFilter($var, $sortKeyPath, $fallback = 'bottom')
      * 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
-     *     array interpreted as key path (when passing e.g. ['foo', 'bar'],
-     *     the method will return $var['foo']['bar']) specifying the value
+     * @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
@@ -261,9 +263,9 @@ public static function getKeyOfVar($var, $keyPath)
 
         foreach ($keyPath as $key) {
             if (is_object($var)) {
-                if ($var instanceof ArrayAccess) {
+                if ($var instanceof \ArrayAccess) {
                     // use ArrayAccess, see below
-                } elseif ($var instanceof Traversable) {
+                } elseif ($var instanceof \Traversable) {
                     $var = iterator_to_array($var);
                 } elseif (isset($var->{$key})) {
                     $var = $var->{$key};
@@ -272,7 +274,7 @@ public static function getKeyOfVar($var, $keyPath)
                     try {
                         $var = call_user_func(array($var, 'get' . ucfirst($key)));
                         continue;
-                    } catch (BadMethodCallException $e) {
+                    } catch (\BadMethodCallException $e) {
                         return null;
                     }
                 } else {
@@ -421,7 +423,7 @@ public function formParamFunction($name, $filter = '', $options = null, $flags =
      *
      * @return array[] the data of the matched pages
      *
-     * @throws Twig_Error_Runtime
+     * @throws \Twig_Error_Runtime
      */
     public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset = 1)
     {
@@ -443,7 +445,7 @@ public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset
         $depthOffset = $depthOffset + $offset;
 
         if (($depth !== null) && ($depth < 0)) {
-            throw new Twig_Error_Runtime('The pages function doesn\'t support negative depths');
+            throw new \Twig_Error_Runtime('The pages function doesn\'t support negative depths');
         }
 
         $pageTree = $this->getPico()->getPageTree();
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 6541f4e7a..99bf72e65 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -10,6 +10,9 @@
  * License-Filename: LICENSE
  */
 
+use picocms\Pico\AbstractPlugin;
+use picocms\Pico\Pico;
+
 /**
  * Pico dummy plugin - a template for plugins
  *
@@ -21,7 +24,7 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-class DummyPlugin extends AbstractPicoPlugin
+class DummyPlugin extends AbstractPlugin
 {
     /**
      * API version used by this plugin
@@ -52,7 +55,7 @@ class DummyPlugin extends AbstractPicoPlugin
      * No matter what, the user can always explicitly enable or disable this
      * plugin in Pico's config.
      *
-     * @see AbstractPicoPlugin::$enabled
+     * @see AbstractPlugin::$enabled
      * @var bool|null
      */
     protected $enabled = false;
@@ -63,7 +66,7 @@ class DummyPlugin extends AbstractPicoPlugin
      * If your plugin doesn't depend on any other plugin, remove this class
      * property.
      *
-     * @see AbstractPicoPlugin::$dependsOn
+     * @see AbstractPlugin::$dependsOn
      * @var string[]
      */
     protected $dependsOn = array();

From b1a58b9300a7d3f972dec25c6c35374ea2d235e8 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 10 Apr 2020 21:28:48 +0200
Subject: [PATCH 08/75] Update code styling to PHP 7.0+

This commit includes no functional changes.
---
 index.php              |   2 +-
 index.php.dist         |   2 +-
 lib/AbstractPlugin.php |  10 +--
 lib/Pico.php           | 189 ++++++++++++++++++++---------------------
 lib/TwigExtension.php  |  48 +++++------
 5 files changed, 124 insertions(+), 127 deletions(-)

diff --git a/index.php b/index.php
index 149ffb62a..83d112f57 100644
--- a/index.php
+++ b/index.php
@@ -34,7 +34,7 @@
 );
 
 // override configuration?
-//$pico->setConfig(array());
+//$pico->setConfig([]);
 
 // run application
 echo $pico->run();
diff --git a/index.php.dist b/index.php.dist
index 766153015..3dc407027 100644
--- a/index.php.dist
+++ b/index.php.dist
@@ -33,7 +33,7 @@ $pico = new \picocms\Pico\Pico(
 );
 
 // override configuration?
-//$pico->setConfig(array());
+//$pico->setConfig([]);
 
 // run application
 echo $pico->run();
diff --git a/lib/AbstractPlugin.php b/lib/AbstractPlugin.php
index 67b632bf4..a8c6725e1 100644
--- a/lib/AbstractPlugin.php
+++ b/lib/AbstractPlugin.php
@@ -67,7 +67,7 @@ abstract class AbstractPlugin implements PluginInterface
      * @see PluginInterface::getDependencies()
      * @var string[]
      */
-    protected $dependsOn = array();
+    protected $dependsOn = [];
 
     /**
      * List of plugin which depend on this plugin
@@ -100,7 +100,7 @@ public function handleEvent($eventName, array $params)
 
         if ($this->isEnabled() || ($eventName === 'onPluginsLoaded')) {
             if (method_exists($this, $eventName)) {
-                call_user_func_array(array($this, $eventName), $params);
+                call_user_func_array([ $this, $eventName ], $params);
             }
         }
     }
@@ -186,7 +186,7 @@ public function getPico()
      */
     public function getPluginConfig($configName = null, $default = null)
     {
-        $pluginConfig = $this->getPico()->getConfig(get_called_class(), array());
+        $pluginConfig = $this->getPico()->getConfig(get_called_class(), []);
 
         if ($configName === null) {
             return $pluginConfig;
@@ -210,7 +210,7 @@ public function getPluginConfig($configName = null, $default = null)
     public function __call($methodName, array $params)
     {
         if (method_exists($this->getPico(), $methodName)) {
-            return call_user_func_array(array($this->getPico(), $methodName), $params);
+            return call_user_func_array([ $this->getPico(), $methodName ], $params);
         }
 
         throw new \BadMethodCallException(
@@ -312,7 +312,7 @@ protected function checkDependants($recursive)
     public function getDependants()
     {
         if ($this->dependants === null) {
-            $this->dependants = array();
+            $this->dependants = [];
             foreach ($this->getPico()->getPlugins() as $pluginName => $plugin) {
                 // only plugins which implement PicoPluginInterface support dependencies
                 if ($plugin instanceof PluginInterface) {
diff --git a/lib/Pico.php b/lib/Pico.php
index 4d8201569..e3e54ded2 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -51,21 +51,21 @@ class Pico
      *
      * @var string
      */
-    const VERSION = '3.0.0-alpha.1';
+    public const VERSION = '3.0.0-alpha.1';
 
     /**
      * Pico version ID
      *
      * @var int
      */
-    const VERSION_ID = 30000;
+    public const VERSION_ID = 30000;
 
     /**
      * Pico API version
      *
      * @var int
      */
-    const API_VERSION = 3;
+    public const API_VERSION = 3;
 
     /**
      * Sort files in alphabetical ascending order
@@ -73,7 +73,7 @@ class Pico
      * @see Pico::getFiles()
      * @var int
      */
-    const SORT_ASC = 0;
+    public const SORT_ASC = 0;
 
     /**
      * Sort files in alphabetical descending order
@@ -81,7 +81,7 @@ class Pico
      * @see Pico::getFiles()
      * @var int
      */
-    const SORT_DESC = 1;
+    public const SORT_DESC = 1;
 
     /**
      * Don't sort files
@@ -89,7 +89,7 @@ class Pico
      * @see Pico::getFiles()
      * @var int
      */
-    const SORT_NONE = 2;
+    public const SORT_NONE = 2;
 
     /**
      * Root directory of this Pico instance
@@ -144,14 +144,14 @@ class Pico
      * @see Pico::getPlugins()
      * @var object[]
      */
-    protected $plugins = array();
+    protected $plugins = [];
 
     /**
      * List of loaded plugins using the current API version
      *
      * @var PluginInterface[]
      */
-    protected $nativePlugins = array();
+    protected $nativePlugins = [];
 
     /**
      * Boolean indicating whether Pico loads plugins from the filesystem
@@ -425,11 +425,11 @@ public function run()
         // load plugins
         $this->loadPlugins();
         $this->sortPlugins();
-        $this->triggerEvent('onPluginsLoaded', array($this->plugins));
+        $this->triggerEvent('onPluginsLoaded', [ $this->plugins ]);
 
         // load config
         $this->loadConfig();
-        $this->triggerEvent('onConfigLoaded', array(&$this->config));
+        $this->triggerEvent('onConfigLoaded', [ &$this->config ]);
 
         // check content dir
         if (!is_dir($this->getConfig('content_dir'))) {
@@ -438,21 +438,18 @@ public function run()
 
         // load theme
         $this->theme = $this->config['theme'];
-        $this->triggerEvent('onThemeLoading', array(&$this->theme));
+        $this->triggerEvent('onThemeLoading', [ &$this->theme ]);
 
         $this->loadTheme();
-        $this->triggerEvent(
-            'onThemeLoaded',
-            array($this->theme, $this->themeApiVersion, &$this->config['theme_config'])
-        );
+        $this->triggerEvent('onThemeLoaded', [ $this->theme, $this->themeApiVersion, &$this->config['theme_config'] ]);
 
         // evaluate request url
         $this->evaluateRequestUrl();
-        $this->triggerEvent('onRequestUrl', array(&$this->requestUrl));
+        $this->triggerEvent('onRequestUrl', [ &$this->requestUrl ]);
 
         // discover requested file
         $this->requestFile = $this->resolveFilePath($this->requestUrl);
-        $this->triggerEvent('onRequestFile', array(&$this->requestFile));
+        $this->triggerEvent('onRequestFile', [ &$this->requestFile ]);
 
         // load raw file content
         $this->triggerEvent('onContentLoading');
@@ -470,51 +467,51 @@ public function run()
             $this->rawContent = $this->load404Content($this->requestFile);
             $this->is404Content = true;
 
-            $this->triggerEvent('on404ContentLoaded', array(&$this->rawContent));
+            $this->triggerEvent('on404ContentLoaded', [ &$this->rawContent ]);
         }
 
-        $this->triggerEvent('onContentLoaded', array(&$this->rawContent));
+        $this->triggerEvent('onContentLoaded', [ &$this->rawContent ]);
 
         // parse file meta
         $this->triggerEvent('onMetaParsing');
         $this->meta = $this->parseFileMeta($this->rawContent, $this->getMetaHeaders());
-        $this->triggerEvent('onMetaParsed', array(&$this->meta));
+        $this->triggerEvent('onMetaParsed', [ &$this->meta ]);
 
         // parse file content
         $this->triggerEvent('onContentParsing');
 
         $markdown = $this->prepareFileContent($this->rawContent, $this->meta);
-        $this->triggerEvent('onContentPrepared', array(&$markdown));
+        $this->triggerEvent('onContentPrepared', [ &$markdown ]);
 
         $this->content = $this->parseFileContent($markdown);
-        $this->triggerEvent('onContentParsed', array(&$this->content));
+        $this->triggerEvent('onContentParsed', [ &$this->content ]);
 
         // read pages
         $this->triggerEvent('onPagesLoading');
 
         $this->readPages();
-        $this->triggerEvent('onPagesDiscovered', array(&$this->pages));
+        $this->triggerEvent('onPagesDiscovered', [ &$this->pages ]);
 
         $this->sortPages();
-        $this->triggerEvent('onPagesLoaded', array(&$this->pages));
+        $this->triggerEvent('onPagesLoaded', [ &$this->pages ]);
 
         $this->discoverPageSiblings();
         $this->discoverCurrentPage();
         $this->triggerEvent(
             'onCurrentPageDiscovered',
-            array(&$this->currentPage, &$this->previousPage, &$this->nextPage)
+            [ &$this->currentPage, &$this->previousPage, &$this->nextPage ]
         );
 
         $this->buildPageTree();
-        $this->triggerEvent('onPageTreeBuilt', array(&$this->pageTree));
+        $this->triggerEvent('onPageTreeBuilt', [ &$this->pageTree ]);
 
         // render template
         $this->twigVariables = $this->getTwigVariables();
         $this->twigTemplate = $this->getTwigTemplate();
-        $this->triggerEvent('onPageRendering', array(&$this->twigTemplate, &$this->twigVariables));
+        $this->triggerEvent('onPageRendering', [ &$this->twigTemplate, &$this->twigVariables ]);
 
         $output = $this->getTwig()->render($this->twigTemplate, $this->twigVariables);
-        $this->triggerEvent('onPageRendered', array(&$output));
+        $this->triggerEvent('onPageRendered', [ &$output ]);
 
         return $output;
     }
@@ -578,20 +575,20 @@ protected function loadPlugins()
      *
      * @throws \RuntimeException thrown when a plugin couldn't be loaded
      */
-    protected function loadComposerPlugins(array $pluginBlacklist = array())
+    protected function loadComposerPlugins(array $pluginBlacklist = [])
     {
-        $composerPlugins = array();
+        $composerPlugins = [];
         if (is_file($this->getVendorDir() . 'vendor/pico-plugin.php')) {
             // composer root package
-            $composerPlugins = require($this->getVendorDir() . 'vendor/pico-plugin.php') ?: array();
+            $composerPlugins = require($this->getVendorDir() . 'vendor/pico-plugin.php') ?: [];
         } elseif (is_file($this->getVendorDir() . '../../../vendor/pico-plugin.php')) {
             // composer dependency package
-            $composerPlugins = require($this->getVendorDir() . '../../../vendor/pico-plugin.php') ?: array();
+            $composerPlugins = require($this->getVendorDir() . '../../../vendor/pico-plugin.php') ?: [];
         }
 
         $pluginBlacklist = array_fill_keys($pluginBlacklist, true);
 
-        $loadedPlugins = array();
+        $loadedPlugins = [];
         foreach ($composerPlugins as $package => $pluginData) {
             $loadedPlugins[] = $pluginData['installerName'];
 
@@ -646,7 +643,7 @@ protected function loadComposerPlugins(array $pluginBlacklist = array())
      *
      * @throws \RuntimeException thrown when a plugin couldn't be loaded
      */
-    protected function loadLocalPlugins(array $pluginBlacklist = array())
+    protected function loadLocalPlugins(array $pluginBlacklist = [])
     {
         // scope isolated require()
         $includeClosure = function ($pluginFile) {
@@ -658,7 +655,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = array())
 
         $pluginBlacklist = array_fill_keys($pluginBlacklist, true);
 
-        $files = scandir($this->getPluginsDir()) ?: array();
+        $files = scandir($this->getPluginsDir()) ?: [];
         foreach ($files as $file) {
             if ($file[0] === '.') {
                 continue;
@@ -767,7 +764,7 @@ public function loadPlugin($plugin)
 
         // trigger onPluginManuallyLoaded event
         // the event is also triggered on the newly loaded plugin, allowing you to distinguish manual and auto loading
-        $this->triggerEvent('onPluginManuallyLoaded', array($plugin));
+        $this->triggerEvent('onPluginManuallyLoaded', [ $plugin ]);
 
         return $plugin;
     }
@@ -803,9 +800,9 @@ protected function sortPlugins()
     {
         $plugins = $this->plugins;
         $nativePlugins = $this->nativePlugins;
-        $sortedPlugins = array();
-        $sortedNativePlugins = array();
-        $visitedPlugins = array();
+        $sortedPlugins = [];
+        $sortedNativePlugins = [];
+        $visitedPlugins = [];
 
         $visitPlugin = function ($plugin) use (
             $plugins,
@@ -821,7 +818,7 @@ protected function sortPlugins()
             if (!isset($visitedPlugins[$pluginName])) {
                 $visitedPlugins[$pluginName] = true;
 
-                $dependencies = array();
+                $dependencies = [];
                 if ($plugin instanceof PluginInterface) {
                     $dependencies = $plugin->getDependencies();
                 }
@@ -914,11 +911,11 @@ protected function loadConfig()
         $loadConfigClosure = function ($configFile) use ($yamlParser) {
             $yaml = file_get_contents($configFile);
             $config = $yamlParser->parse($yaml);
-            return is_array($config) ? $config : array();
+            return is_array($config) ? $config : [];
         };
 
         // load main config file (config/config.yml)
-        $this->config = is_array($this->config) ? $this->config : array();
+        $this->config = is_array($this->config) ? $this->config : [];
         if (is_file($this->getConfigDir() . 'config.yml')) {
             $this->config += $loadConfigClosure($this->getConfigDir() . 'config.yml');
         }
@@ -932,7 +929,7 @@ protected function loadConfig()
         }
 
         // merge default config
-        $this->config += array(
+        $this->config += [
             'site_title' => 'Pico',
             'base_url' => null,
             'rewrite_url' => null,
@@ -952,8 +949,8 @@ protected function loadConfig()
             'content_config' => null,
             'assets_dir' => 'assets/',
             'assets_url' => null,
-            'plugins_url' => null
-        );
+            'plugins_url' => null,
+        ];
 
         if (!$this->config['base_url']) {
             $this->config['base_url'] = $this->getBaseUrl();
@@ -1001,7 +998,7 @@ protected function loadConfig()
             $this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']);
         }
 
-        $defaultContentConfig = array('extra' => true, 'breaks' => false, 'escape' => false, 'auto_urls' => true);
+        $defaultContentConfig = [ 'extra' => true, 'breaks' => false, 'escape' => false, 'auto_urls' => true ];
         if (!is_array($this->config['content_config'])) {
             $this->config['content_config'] = $defaultContentConfig;
         } else {
@@ -1081,21 +1078,21 @@ public function getConfig($configName = null, $default = null)
      */
     protected function loadTheme()
     {
-        $themeConfig = array();
+        $themeConfig = [];
 
         // load theme config from pico-theme.yml
         $themeConfigFile = $this->getThemesDir() . $this->getTheme() . '/pico-theme.yml';
         if (is_file($themeConfigFile)) {
             $themeConfigYaml = file_get_contents($themeConfigFile);
             $themeConfig = $this->getYamlParser()->parse($themeConfigYaml);
-            $themeConfig = is_array($themeConfig) ? $themeConfig : array();
+            $themeConfig = is_array($themeConfig) ? $themeConfig : [];
         }
 
-        $themeConfig += array(
+        $themeConfig += [
             'api_version' => null,
-            'meta' => array(),
-            'twig_config' => array()
-        );
+            'meta' => [],
+            'twig_config' => [],
+        ];
 
         // theme API version
         if (is_int($themeConfig['api_version']) || preg_match('/^[0-9]+$/', $themeConfig['api_version'])) {
@@ -1107,7 +1104,7 @@ protected function loadTheme()
         unset($themeConfig['api_version']);
 
         // twig config
-        $themeTwigConfig = array('autoescape' => 'html', 'strict_variables' => false, 'charset' => 'utf-8');
+        $themeTwigConfig = [ 'autoescape' => 'html', 'strict_variables' => false, 'charset' => 'utf-8' ];
         foreach ($themeTwigConfig as $key => $_) {
             if (isset($themeConfig['twig_config'][$key])) {
                 $themeTwigConfig[$key] = $themeConfig['twig_config'][$key];
@@ -1116,8 +1113,8 @@ protected function loadTheme()
 
         unset($themeConfig['twig_config']);
 
-        $defaultTwigConfig = array('debug' => null, 'cache' => false, 'auto_reload' => null);
-        $this->config['twig_config'] = is_array($this->config['twig_config']) ? $this->config['twig_config'] : array();
+        $defaultTwigConfig = [ 'debug' => null, 'cache' => false, 'auto_reload' => null ];
+        $this->config['twig_config'] = is_array($this->config['twig_config']) ? $this->config['twig_config'] : [];
         $this->config['twig_config'] = array_merge($defaultTwigConfig, $themeTwigConfig, $this->config['twig_config']);
 
         if ($this->config['twig_config']['autoescape'] === true) {
@@ -1131,7 +1128,7 @@ protected function loadTheme()
         }
 
         // meta headers
-        $this->themeMetaHeaders = is_array($themeConfig['meta']) ? $themeConfig['meta'] : array();
+        $this->themeMetaHeaders = is_array($themeConfig['meta']) ? $themeConfig['meta'] : [];
         unset($themeConfig['meta']);
 
         // theme config
@@ -1229,7 +1226,7 @@ protected function evaluateRequestUrl()
             $scriptName = isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : '/index.php';
 
             $basePath = dirname($scriptName);
-            $basePath = !in_array($basePath, array('.', '/', '\\'), true) ? $basePath . '/' : '/';
+            $basePath = !in_array($basePath, [ '.', '/', '\\' ], true) ? $basePath . '/' : '/';
             $basePathLength = strlen($basePath);
 
             $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
@@ -1413,7 +1410,7 @@ public function is404Content()
     public function getMetaHeaders()
     {
         if ($this->metaHeaders === null) {
-            $this->metaHeaders = array(
+            $this->metaHeaders = [
                 'Title' => 'title',
                 'Description' => 'description',
                 'Author' => 'author',
@@ -1422,14 +1419,14 @@ public function getMetaHeaders()
                 'Time' => 'time',
                 'Robots' => 'robots',
                 'Template' => 'template',
-                'Hidden' => 'hidden'
-            );
+                'Hidden' => 'hidden',
+            ];
 
             if ($this->themeMetaHeaders) {
                 $this->metaHeaders += $this->themeMetaHeaders;
             }
 
-            $this->triggerEvent('onMetaHeaders', array(&$this->metaHeaders));
+            $this->triggerEvent('onMetaHeaders', [ &$this->metaHeaders ]);
         }
 
         return $this->metaHeaders;
@@ -1447,7 +1444,7 @@ public function getYamlParser()
     {
         if ($this->yamlParser === null) {
             $this->yamlParser = new \Symfony\Component\Yaml\Parser();
-            $this->triggerEvent('onYamlParserRegistered', array(&$this->yamlParser));
+            $this->triggerEvent('onYamlParserRegistered', [ &$this->yamlParser ]);
         }
 
         return $this->yamlParser;
@@ -1475,12 +1472,12 @@ public function getYamlParser()
      */
     public function parseFileMeta($rawContent, array $headers)
     {
-        $meta = array();
+        $meta = [];
         $pattern = "/^(?:\xEF\xBB\xBF)?(\/(\*)|---)[[: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]) ?: array();
-            $meta = is_array($meta) ? $meta : array('title' => $meta);
+            $meta = $this->getYamlParser()->parse($rawMetaMatches[3]) ?: [];
+            $meta = is_array($meta) ? $meta : [ 'title' => $meta ];
 
             foreach ($headers as $name => $key) {
                 if (isset($meta[$name])) {
@@ -1556,7 +1553,7 @@ public function getParsedown()
             $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));
+            $this->triggerEvent('onParsedownRegistered', [ &$this->parsedown ]);
         }
 
         return $this->parsedown;
@@ -1577,7 +1574,7 @@ public function getParsedown()
      *
      * @return string prepared Markdown contents
      */
-    public function prepareFileContent($rawContent, array $meta = array())
+    public function prepareFileContent($rawContent, array $meta = [])
     {
         // remove meta header
         $metaHeaderPattern = "/^(?:\xEF\xBB\xBF)?(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
@@ -1598,9 +1595,9 @@ public function prepareFileContent($rawContent, array $meta = array())
      *
      * @return string substituted Markdown contents
      */
-    public function substituteFileContent($markdown, array $meta = array())
+    public function substituteFileContent($markdown, array $meta = [])
     {
-        $variables = array();
+        $variables = [];
 
         // replace %version%
         $variables['%version%'] = static::VERSION;
@@ -1715,7 +1712,7 @@ protected function readPages()
         $contentDir = $this->getConfig('content_dir');
         $contentExt = $this->getConfig('content_ext');
 
-        $this->pages = array();
+        $this->pages = [];
         $files = $this->getFiles($contentDir, $contentExt, self::SORT_NONE);
         foreach ($files as $i => $file) {
             // skip 404 page
@@ -1730,7 +1727,7 @@ protected function readPages()
             // skip inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists) by default
             $conflictFile = $contentDir . $id . '/index' . $contentExt;
             $skipFile = in_array($conflictFile, $files, true) ?: null;
-            $this->triggerEvent('onSinglePageLoading', array($id, &$skipFile));
+            $this->triggerEvent('onSinglePageLoading', [ $id, &$skipFile ]);
 
             if ($skipFile) {
                 continue;
@@ -1741,7 +1738,7 @@ protected function readPages()
                 $rawContent = $this->loadFileContent($file);
 
                 // trigger onSinglePageContent event
-                $this->triggerEvent('onSinglePageContent', array($id, &$rawContent));
+                $this->triggerEvent('onSinglePageContent', [ $id, &$rawContent ]);
 
                 $headers = $this->getMetaHeaders();
                 try {
@@ -1758,7 +1755,7 @@ protected function readPages()
             // build page data
             // title, description, author and date are assumed to be pretty basic data
             // everything else is accessible through $page['meta']
-            $page = array(
+            $page = [
                 'id' => $id,
                 'url' => $url,
                 'title' => &$meta['title'],
@@ -1769,8 +1766,8 @@ protected function readPages()
                 'date_formatted' => &$meta['date_formatted'],
                 'hidden' => ($meta['hidden'] || preg_match('/(?:^|\/)_/', $id)),
                 'raw_content' => &$rawContent,
-                'meta' => &$meta
-            );
+                'meta' => &$meta,
+            ];
 
             if ($file === $this->requestFile) {
                 $page['content'] = &$this->content;
@@ -1779,7 +1776,7 @@ protected function readPages()
             unset($rawContent, $meta);
 
             // trigger onSinglePageLoaded event
-            $this->triggerEvent('onSinglePageLoaded', array(&$page));
+            $this->triggerEvent('onSinglePageLoaded', [ &$page ]);
 
             if ($page !== null) {
                 $this->pages[$id] = $page;
@@ -2009,7 +2006,7 @@ public function getNextPage()
      */
     protected function buildPageTree()
     {
-        $this->pageTree = array();
+        $this->pageTree = [];
         foreach ($this->pages as $id => &$pageData) {
             // main index page
             if ($id === 'index') {
@@ -2116,11 +2113,11 @@ function ($page) use ($pico, &$pages) {
                     }
                     return null;
                 },
-                array('is_safe' => array('html'))
+                [ 'is_safe' => [ 'html' ] ]
             ));
 
             // trigger onTwigRegistration event
-            $this->triggerEvent('onTwigRegistered', array(&$this->twig));
+            $this->triggerEvent('onTwigRegistered', [ &$this->twig ]);
         }
 
         return $this->twig;
@@ -2135,7 +2132,7 @@ function ($page) use ($pico, &$pages) {
      */
     protected function getTwigVariables()
     {
-        return array(
+        return [
             'config' => $this->getConfig(),
             'base_url' => rtrim($this->getBaseUrl(), '/'),
             'plugins_url' => rtrim($this->getConfig('plugins_url'), '/'),
@@ -2149,8 +2146,8 @@ protected function getTwigVariables()
             'previous_page' => $this->previousPage,
             'current_page' => $this->currentPage,
             'next_page' => $this->nextPage,
-            'version' => static::VERSION
-        );
+            'version' => static::VERSION,
+        ];
     }
 
     /**
@@ -2205,7 +2202,7 @@ public function getBaseUrl()
         $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'), true) ? 'https' : 'http';
+            $protocol = in_array($secureProxyHeader, [ 'https', 'on', 'ssl', '1' ], true) ? 'https' : 'http';
         } elseif (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] !== 'off')) {
             $protocol = 'https';
         } elseif ($port === 443) {
@@ -2213,7 +2210,7 @@ public function getBaseUrl()
         }
 
         $basePath = isset($_SERVER['SCRIPT_NAME']) ? dirname($_SERVER['SCRIPT_NAME']) : '/';
-        $basePath = !in_array($basePath, array('.', '/', '\\'), true) ? $basePath . '/' : '/';
+        $basePath = !in_array($basePath, [ '.', '/', '\\' ], true) ? $basePath . '/' : '/';
 
         if ((($protocol === 'http') && ($port !== 80)) || (($protocol === 'https') && ($port !== 443))) {
             $host = $host . ':' . $port;
@@ -2364,14 +2361,14 @@ public function getPageId($path)
      */
     public function substituteUrl($url)
     {
-        $variables = array(
+        $variables = [
             '%base_url%?' => $this->getBaseUrl() . (!$this->isUrlRewritingEnabled() ? '?' : ''),
             '%base_url%' => rtrim($this->getBaseUrl(), '/'),
             '%plugins_url%' => rtrim($this->getConfig('plugins_url'), '/'),
             '%themes_url%' => rtrim($this->getConfig('themes_url'), '/'),
             '%assets_url%' => rtrim($this->getConfig('assets_url'), '/'),
-            '%theme_url%' => $this->getConfig('themes_url') . $this->getTheme()
-        );
+            '%theme_url%' => $this->getConfig('themes_url') . $this->getTheme(),
+        ];
 
         return str_replace(array_keys($variables), $variables, $url);
     }
@@ -2415,7 +2412,7 @@ public function getUrlFromPath($absolutePath)
         $basePath = '';
         if (isset($_SERVER['SCRIPT_FILENAME']) && strrpos($_SERVER['SCRIPT_FILENAME'], '/')) {
             $basePath = dirname($_SERVER['SCRIPT_FILENAME']);
-            $basePath = !in_array($basePath, array('.', '/', '\\'), true) ? $basePath . '/' : '/';
+            $basePath = !in_array($basePath, [ '.', '/', '\\' ], true) ? $basePath . '/' : '/';
             $basePathLength = strlen($basePath);
 
             if ((substr($absolutePath, 0, $basePathLength) === $basePath) && ($basePath !== '/')) {
@@ -2539,7 +2536,7 @@ protected function filterVariable($variable, $filter = '', $options = null, $fla
             $defaultValue = isset($options['default']) ? $options['default'] : null;
         } elseif ($options !== null) {
             $defaultValue = $options;
-            $options = array('default' => $defaultValue);
+            $options = [ 'default' => $defaultValue ];
         }
 
         if ($variable === null) {
@@ -2551,7 +2548,7 @@ protected function filterVariable($variable, $filter = '', $options = null, $fla
             return false;
         }
 
-        $filterOptions = array('options' => $options, 'flags' => 0);
+        $filterOptions = [ 'options' => $options, 'flags' => 0 ];
         foreach ((array) $flags as $flag) {
             if (is_numeric($flag)) {
                 $filterOptions['flags'] |= (int) $flag;
@@ -2586,14 +2583,14 @@ public function getFiles($directory, $fileExtension = '', $order = self::SORT_AS
     {
         $directory = rtrim($directory, '/');
         $fileExtensionLength = strlen($fileExtension);
-        $result = array();
+        $result = [];
 
         $files = scandir($directory, $order);
         if ($files !== false) {
             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('~', '#'), true)) {
+                if (($file[0] === '.') || in_array(substr($file, -1), [ '~', '#' ], true)) {
                     continue;
                 }
 
@@ -2626,14 +2623,14 @@ public function getFiles($directory, $fileExtension = '', $order = self::SORT_AS
      */
     public function getFilesGlob($pattern, $order = self::SORT_ASC)
     {
-        $result = array();
+        $result = [];
         $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('/', '~', '#'), true)) {
+                if (in_array(substr($file, -1), [ '/', '~', '#' ], true)) {
                     continue;
                 }
 
@@ -2711,7 +2708,7 @@ public function getNormalizedPath($path, $allowAbsolutePath = false, $endSlash =
         $path = str_replace('\\', '/', $path);
         $pathParts = explode('/', $path);
 
-        $resultParts = array();
+        $resultParts = [];
         foreach ($pathParts as $pathPart) {
             if (($pathPart === '') || ($pathPart === '.')) {
                 continue;
@@ -2770,7 +2767,7 @@ public function getAbsoluteUrl($url, $baseUrl = null, $endSlash = true)
      * @param string $eventName name of the event to trigger
      * @param array  $params    optional parameters to pass
      */
-    public function triggerEvent($eventName, array $params = array())
+    public function triggerEvent($eventName, array $params = [])
     {
         foreach ($this->nativePlugins as $plugin) {
             $plugin->handleEvent($eventName, $params);
diff --git a/lib/TwigExtension.php b/lib/TwigExtension.php
index d726191f2..3f8df6f27 100644
--- a/lib/TwigExtension.php
+++ b/lib/TwigExtension.php
@@ -73,17 +73,17 @@ public function getName()
      */
     public function getFilters()
     {
-        return array(
+        return [
             'markdown' => new \Twig_SimpleFilter(
                 'markdown',
-                array($this, 'markdownFilter'),
-                array('is_safe' => array('html'))
+                [ $this, 'markdownFilter' ],
+                [ 'is_safe' => [ 'html' ] ]
             ),
-            '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')),
-            'url' => new \Twig_SimpleFilter('url', array($this->pico, 'substituteUrl'))
-        );
+            'map' => new \Twig_SimpleFilter('map', [ $this, 'mapFilter' ]),
+            'sort_by' => new \Twig_SimpleFilter('sort_by', [ $this, 'sortByFilter' ]),
+            'link' => new \Twig_SimpleFilter('link', [ $this->pico, 'getPageUrl' ]),
+            'url' => new \Twig_SimpleFilter('url', [ $this->pico, 'substituteUrl' ]),
+        ];
     }
 
     /**
@@ -95,11 +95,11 @@ public function getFilters()
      */
     public function getFunctions()
     {
-        return array(
-            'url_param' => new \Twig_SimpleFunction('url_param', array($this, 'urlParamFunction')),
-            'form_param' => new \Twig_SimpleFunction('form_param', array($this, 'formParamFunction')),
-            'pages' => new \Twig_SimpleFunction('pages', array($this, 'pagesFunction'))
-        );
+        return [
+            'url_param' => new \Twig_SimpleFunction('url_param', [ $this, 'urlParamFunction' ]),
+            'form_param' => new \Twig_SimpleFunction('form_param', [ $this, 'formParamFunction' ]),
+            'pages' => new \Twig_SimpleFunction('pages', [ $this, 'pagesFunction' ]),
+        ];
     }
 
     /**
@@ -119,7 +119,7 @@ public function getFunctions()
      *
      * @return string parsed HTML
      */
-    public function markdownFilter($markdown, array $meta = array(), $singleLine = false)
+    public function markdownFilter($markdown, array $meta = [], $singleLine = false)
     {
         $markdown = $this->getPico()->substituteFileContent($markdown, $meta);
         return $this->getPico()->parseFileContent($markdown, $singleLine);
@@ -149,7 +149,7 @@ public function mapFilter($var, $mapKeyPath)
             ));
         }
 
-        $result = array();
+        $result = [];
         foreach ($var as $key => $value) {
             $mapValue = $this->getKeyOfVar($value, $mapKeyPath);
             $result[$key] = ($mapValue !== null) ? $mapValue : $value;
@@ -200,7 +200,7 @@ public function sortByFilter($var, $sortKeyPath, $fallback = 'bottom')
 
         $twigExtension = $this;
         $varKeys = array_keys($var);
-        $removeItems = array();
+        $removeItems = [];
         uksort($var, function ($a, $b) use ($twigExtension, $var, $varKeys, $sortKeyPath, $fallback, &$removeItems) {
             $aSortValue = $twigExtension->getKeyOfVar($var[$a], $sortKeyPath);
             $aSortValueNull = ($aSortValue === null);
@@ -258,7 +258,7 @@ public static function getKeyOfVar($var, $keyPath)
         if (!$keyPath) {
             return null;
         } elseif (!is_array($keyPath)) {
-            $keyPath = array($keyPath);
+            $keyPath = [ $keyPath ];
         }
 
         foreach ($keyPath as $key) {
@@ -270,9 +270,9 @@ public static function getKeyOfVar($var, $keyPath)
                 } elseif (isset($var->{$key})) {
                     $var = $var->{$key};
                     continue;
-                } elseif (is_callable(array($var, 'get' . ucfirst($key)))) {
+                } elseif (is_callable([ $var, 'get' . ucfirst($key) ])) {
                     try {
-                        $var = call_user_func(array($var, 'get' . ucfirst($key)));
+                        $var = call_user_func([ $var, 'get' . ucfirst($key) ]);
                         continue;
                     } catch (\BadMethodCallException $e) {
                         return null;
@@ -433,7 +433,7 @@ public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset
         }
 
         for (; $offset < 0; $offset++) {
-            if (in_array($start, array('', '.', '/'), true)) {
+            if (in_array($start, [ '', '.', '/' ], true)) {
                 $offset = 0;
                 break;
             }
@@ -449,7 +449,7 @@ public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset
         }
 
         $pageTree = $this->getPico()->getPageTree();
-        if (in_array($start, array('', '.', '/'), true)) {
+        if (in_array($start, [ '', '.', '/' ], true)) {
             if (($depth === null) && ($depthOffset <= 0)) {
                 return $this->getPico()->getPages();
             }
@@ -463,11 +463,11 @@ public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset
         }
 
         if (!$startNode) {
-            return array();
+            return [];
         }
 
         $getPagesClosure = function ($nodes, $depth, $depthOffset) use (&$getPagesClosure) {
-            $pages = array();
+            $pages = [];
             foreach ($nodes as $node) {
                 if (isset($node['page']) && ($depthOffset <= 0)) {
                     $pages[$node['page']['id']] = &$node['page'];
@@ -481,7 +481,7 @@ public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset
         };
 
         return $getPagesClosure(
-            array($startNode),
+            [ $startNode ],
             ($depth !== null) ? $depth : INF,
             $depthOffset
         );

From 85d757302015b53a16b2dff85c50831d46a9d696 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 10 Apr 2020 23:11:53 +0200
Subject: [PATCH 09/75] Update to Symfony YAML 5.0 and Twig 3.0

Pico now requires PHP 7.2.5+
---
 composer.json              |  6 +++---
 config/config.yml.template |  2 +-
 content-sample/_meta.md    |  2 +-
 index.php.dist             |  4 ++--
 lib/Pico.php               | 27 +++++++++++++++----------
 lib/TwigExtension.php      | 41 +++++++++++++++++++++-----------------
 6 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/composer.json b/composer.json
index 2dfe2a4ec..8be85c6a4 100644
--- a/composer.json
+++ b/composer.json
@@ -31,9 +31,9 @@
         "source": "https://github.com/picocms/Pico"
     },
     "require": {
-        "php": ">=7.0.8",
-        "twig/twig": "^2.12",
-        "symfony/yaml" : "^3.4",
+        "php": ">=7.2.5",
+        "twig/twig": "^3.0",
+        "symfony/yaml" : "^5.0",
         "erusev/parsedown": "1.7.4",
         "erusev/parsedown-extra": "0.8.1"
     },
diff --git a/config/config.yml.template b/config/config.yml.template
index 159585bc6..4e292277e 100644
--- a/config/config.yml.template
+++ b/config/config.yml.template
@@ -27,7 +27,7 @@ twig_config:                        # Twig template engine config
 ##
 # Content
 #
-date_format: %D %T                  # Pico's default date format;
+date_format: "%D %T"                # Pico's default date format;
                                     #     See https://php.net/manual/en/function.strftime.php for more info
 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")
diff --git a/content-sample/_meta.md b/content-sample/_meta.md
index d18f05120..b686a84a5 100644
--- a/content-sample/_meta.md
+++ b/content-sample/_meta.md
@@ -1,5 +1,5 @@
 ---
-Logo: %theme_url%/img/pico-white.svg
+Logo: "%theme_url%/img/pico-white.svg"
 Tagline: Making the web easy.
 Social:
     - title: Visit us on GitHub
diff --git a/index.php.dist b/index.php.dist
index 3dc407027..9550c5922 100644
--- a/index.php.dist
+++ b/index.php.dist
@@ -11,8 +11,8 @@
  */
 
 // check PHP platform requirements
-if (PHP_VERSION_ID < 70008) {
-    die('Pico requires PHP 7.0.8 or above to run');
+if (PHP_VERSION_ID < 70205) {
+    die('Pico requires PHP 7.2.5 or above to run');
 }
 if (!extension_loaded('dom')) {
     die("Pico requires the PHP extension 'dom' to run");
diff --git a/lib/Pico.php b/lib/Pico.php
index e3e54ded2..6cd245feb 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -18,6 +18,13 @@
 
 namespace picocms\Pico;
 
+use Symfony\Component\Yaml\Parser as YamlParser;
+use Twig\Environment as TwigEnvironment;
+use Twig\Extension\DebugExtension as TwigDebugExtension;
+use Twig\Loader\FilesystemLoader as TwigFilesystemLoader;
+use Twig\Markup as TwigMarkup;
+use Twig\TwigFilter;
+
 /**
  * Pico
  *
@@ -229,7 +236,7 @@ class Pico
      * Symfony YAML instance used for meta header parsing
      *
      * @see Pico::getYamlParser()
-     * @var \Symfony\Component\Yaml\Parser|null
+     * @var YamlParser|null
      */
     protected $yamlParser;
 
@@ -309,7 +316,7 @@ class Pico
      * Twig instance used for template parsing
      *
      * @see Pico::getTwig()
-     * @var \Twig_Environment|null
+     * @var TwigEnvironment|null
      */
     protected $twig;
 
@@ -1438,12 +1445,12 @@ public function getMetaHeaders()
      * This method triggers the `onYamlParserRegistered` event when the Symfony
      * YAML parser wasn't initiated yet.
      *
-     * @return \Symfony\Component\Yaml\Parser Symfony YAML parser
+     * @return YamlParser Symfony YAML parser
      */
     public function getYamlParser()
     {
         if ($this->yamlParser === null) {
-            $this->yamlParser = new \Symfony\Component\Yaml\Parser();
+            $this->yamlParser = new YamlParser();
             $this->triggerEvent('onYamlParserRegistered', [ &$this->yamlParser ]);
         }
 
@@ -2080,19 +2087,19 @@ public function getPageTree()
      * @see http://twig.sensiolabs.org/ Twig website
      * @see https://github.com/twigphp/Twig Twig on GitHub
      *
-     * @return \Twig_Environment|null Twig template engine
+     * @return TwigEnvironment|null Twig template engine
      */
     public function getTwig()
     {
         if ($this->twig === null) {
             $twigConfig = $this->getConfig('twig_config');
 
-            $twigLoader = new \Twig_Loader_Filesystem($this->getThemesDir() . $this->getTheme());
-            $this->twig = new \Twig_Environment($twigLoader, $twigConfig);
+            $twigLoader = new TwigFilesystemLoader($this->getThemesDir() . $this->getTheme());
+            $this->twig = new TwigEnvironment($twigLoader, $twigConfig);
             $this->twig->addExtension(new TwigExtension($this));
 
             if (!empty($twigConfig['debug'])) {
-                $this->twig->addExtension(new \Twig_Extension_Debug());
+                $this->twig->addExtension(new TwigDebugExtension());
             }
 
             // register content filter
@@ -2100,7 +2107,7 @@ public function getTwig()
             // 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(
+            $this->twig->addFilter(new TwigFilter(
                 'content',
                 function ($page) use ($pico, &$pages) {
                     if (isset($pages[$page])) {
@@ -2141,7 +2148,7 @@ protected function getTwigVariables()
             'theme_url' => $this->getConfig('themes_url') . $this->getTheme(),
             'site_title' => $this->getConfig('site_title'),
             'meta' => $this->meta,
-            'content' => new \Twig_Markup($this->content, 'UTF-8'),
+            'content' => new TwigMarkup($this->content, 'UTF-8'),
             'pages' => $this->pages,
             'previous_page' => $this->previousPage,
             'current_page' => $this->currentPage,
diff --git a/lib/TwigExtension.php b/lib/TwigExtension.php
index 3f8df6f27..eb5827466 100644
--- a/lib/TwigExtension.php
+++ b/lib/TwigExtension.php
@@ -12,6 +12,11 @@
 
 namespace picocms\Pico;
 
+use Twig\Error\RuntimeError as TwigRuntimeError;
+use Twig\Extension\AbstractExtension as AbstractTwigExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+
 /**
  * Pico's Twig extension to implement additional filters
  *
@@ -20,7 +25,7 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-class TwigExtension extends \Twig_Extension
+class TwigExtension extends AbstractTwigExtension
 {
     /**
      * Current instance of Pico
@@ -69,20 +74,20 @@ public function getName()
      *
      * @see Twig_ExtensionInterface::getFilters()
      *
-     * @return \Twig_SimpleFilter[] array of Pico's Twig filters
+     * @return TwigFilter[] array of Pico's Twig filters
      */
     public function getFilters()
     {
         return [
-            'markdown' => new \Twig_SimpleFilter(
+            'markdown' => new TwigFilter(
                 'markdown',
                 [ $this, 'markdownFilter' ],
                 [ 'is_safe' => [ 'html' ] ]
             ),
-            'map' => new \Twig_SimpleFilter('map', [ $this, 'mapFilter' ]),
-            'sort_by' => new \Twig_SimpleFilter('sort_by', [ $this, 'sortByFilter' ]),
-            'link' => new \Twig_SimpleFilter('link', [ $this->pico, 'getPageUrl' ]),
-            'url' => new \Twig_SimpleFilter('url', [ $this->pico, 'substituteUrl' ]),
+            'map' => new TwigFilter('map', [ $this, 'mapFilter' ]),
+            'sort_by' => new TwigFilter('sort_by', [ $this, 'sortByFilter' ]),
+            'link' => new TwigFilter('link', [ $this->pico, 'getPageUrl' ]),
+            'url' => new TwigFilter('url', [ $this->pico, 'substituteUrl' ]),
         ];
     }
 
@@ -91,14 +96,14 @@ public function getFilters()
      *
      * @see Twig_ExtensionInterface::getFunctions()
      *
-     * @return \Twig_SimpleFunction[] array of Pico's Twig functions
+     * @return TwigFunction[] array of Pico's Twig functions
      */
     public function getFunctions()
     {
         return [
-            'url_param' => new \Twig_SimpleFunction('url_param', [ $this, 'urlParamFunction' ]),
-            'form_param' => new \Twig_SimpleFunction('form_param', [ $this, 'formParamFunction' ]),
-            'pages' => new \Twig_SimpleFunction('pages', [ $this, 'pagesFunction' ]),
+            'url_param' => new TwigFunction('url_param', [ $this, 'urlParamFunction' ]),
+            'form_param' => new TwigFunction('form_param', [ $this, 'formParamFunction' ]),
+            'pages' => new TwigFunction('pages', [ $this, 'pagesFunction' ]),
         ];
     }
 
@@ -138,12 +143,12 @@ public function markdownFilter($markdown, array $meta = [], $singleLine = false)
      *
      * @return array mapped values
      *
-     * @throws \Twig_Error_Runtime
+     * @throws TwigRuntimeError
      */
     public function mapFilter($var, $mapKeyPath)
     {
         if (!is_array($var) && (!is_object($var) || !($var instanceof \Traversable))) {
-            throw new \Twig_Error_Runtime(sprintf(
+            throw new TwigRuntimeError(sprintf(
                 'The map filter only works with arrays or "Traversable", got "%s"',
                 is_object($var) ? get_class($var) : gettype($var)
             ));
@@ -180,20 +185,20 @@ public function mapFilter($var, $mapKeyPath)
      *
      * @return array sorted array
      *
-     * @throws \Twig_Error_Runtime
+     * @throws TwigRuntimeError
      */
     public function sortByFilter($var, $sortKeyPath, $fallback = 'bottom')
     {
         if (is_object($var) && ($var instanceof \Traversable)) {
             $var = iterator_to_array($var, true);
         } elseif (!is_array($var)) {
-            throw new \Twig_Error_Runtime(sprintf(
+            throw new TwigRuntimeError(sprintf(
                 'The sort_by filter only works with arrays or "Traversable", got "%s"',
                 is_object($var) ? get_class($var) : gettype($var)
             ));
         }
         if (($fallback !== 'top') && ($fallback !== 'bottom') && ($fallback !== 'keep') && ($fallback !== "remove")) {
-            throw new \Twig_Error_Runtime(
+            throw new TwigRuntimeError(
                 'The sort_by filter only supports the "top", "bottom", "keep" and "remove" fallbacks'
             );
         }
@@ -423,7 +428,7 @@ public function formParamFunction($name, $filter = '', $options = null, $flags =
      *
      * @return array[] the data of the matched pages
      *
-     * @throws \Twig_Error_Runtime
+     * @throws TwigRuntimeError
      */
     public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset = 1)
     {
@@ -445,7 +450,7 @@ public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset
         $depthOffset = $depthOffset + $offset;
 
         if (($depth !== null) && ($depth < 0)) {
-            throw new \Twig_Error_Runtime('The pages function doesn\'t support negative depths');
+            throw new TwigRuntimeError('The pages function doesn\'t support negative depths');
         }
 
         $pageTree = $this->getPico()->getPageTree();

From 62aa4dbc7e7feb26a562d3aaca0325e3d2bdc374 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 10 Apr 2020 23:44:00 +0200
Subject: [PATCH 10/75] Check theme dir before trying to load theme

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

diff --git a/lib/Pico.php b/lib/Pico.php
index 6cd245feb..21d57694c 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1085,6 +1085,12 @@ public function getConfig($configName = null, $default = null)
      */
     protected function loadTheme()
     {
+        if (!is_dir($this->getThemesDir() . $this->getTheme())) {
+            throw new \RuntimeException(
+                'Couldn\'t load theme "' . $this->theme . '": No such theme directory'
+            );
+        }
+
         $themeConfig = [];
 
         // load theme config from pico-theme.yml

From bdafcb5b96722392e04a2da94cacfb515fb02137 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 10 Apr 2020 23:46:44 +0200
Subject: [PATCH 11/75] Fix Travis CI

---
 .travis.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8aa14fc84..5d7ee4ede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+os: linux
 dist: bionic
 sudo: false
 
@@ -10,21 +11,15 @@ cache:
 jobs:
   include:
     # Test stage
-    - php: 7.0
-      dist: xenial
-    - php: 7.1
     - php: 7.2
     - php: 7.3
     - php: 7.4
     - php: nightly
-    - php: hhvm-3.27 # until Sep 2019
-    - php: hhvm-3.30 # until Nov 2019
 
     # Branch deployment stage
     - stage: deploy-branch
       if: type == "push" && tag IS blank
-      php: 7.0
-      dist: xenial
+      php: 7.2
       install:
         - '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
         - install.sh --deploy
@@ -34,8 +29,7 @@ jobs:
     # Release deployment stage
     - stage: deploy-release
       if: tag IS present
-      php: 7.0
-      dist: xenial
+      php: 7.2
       install:
         - install.sh --deploy
       script:

From 646aa355e5acbb6d3d66fcef01c6e5e359e4d266 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 11 Apr 2020 21:15:50 +0200
Subject: [PATCH 12/75] Various small improvements

---
 lib/Pico.php            |  7 +++++--
 lib/TwigExtension.php   |  9 +++++----
 plugins/DummyPlugin.php | 11 ++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 21d57694c..e5a14f5fc 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1559,8 +1559,11 @@ public function getFileMeta()
     public function getParsedown()
     {
         if ($this->parsedown === null) {
-            $className = $this->config['content_config']['extra'] ? '\ParsedownExtra' : '\Parsedown';
-            $this->parsedown = new $className();
+            if ($this->config['content_config']['extra']) {
+                $this->parsedown = new \ParsedownExtra();
+            } else {
+                $this->parsedown = new \Parsedown();
+            }
 
             $this->parsedown->setBreaksEnabled((bool) $this->config['content_config']['breaks']);
             $this->parsedown->setMarkupEscaped((bool) $this->config['content_config']['escape']);
diff --git a/lib/TwigExtension.php b/lib/TwigExtension.php
index eb5827466..2b76b66bb 100644
--- a/lib/TwigExtension.php
+++ b/lib/TwigExtension.php
@@ -14,6 +14,7 @@
 
 use Twig\Error\RuntimeError as TwigRuntimeError;
 use Twig\Extension\AbstractExtension as AbstractTwigExtension;
+use Twig\Extension\ExtensionInterface as TwigExtensionInterface;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 
@@ -60,7 +61,7 @@ public function getPico()
     /**
      * Returns the name of the extension
      *
-     * @see Twig_ExtensionInterface::getName()
+     * @see TwigExtensionInterface::getName()
      *
      * @return string the extension name
      */
@@ -72,7 +73,7 @@ public function getName()
     /**
      * Returns a list of Pico-specific Twig filters
      *
-     * @see Twig_ExtensionInterface::getFilters()
+     * @see TwigExtensionInterface::getFilters()
      *
      * @return TwigFilter[] array of Pico's Twig filters
      */
@@ -94,7 +95,7 @@ public function getFilters()
     /**
      * Returns a list of Pico-specific Twig functions
      *
-     * @see Twig_ExtensionInterface::getFunctions()
+     * @see TwigExtensionInterface::getFunctions()
      *
      * @return TwigFunction[] array of Pico's Twig functions
      */
@@ -406,7 +407,7 @@ public function formParamFunction($name, $filter = '', $options = null, $flags =
      * returns Pico's full pages array.
      *
      * If `$depth` is negative after taking `$offset` into consideration, the
-     * function will throw a {@see Twig_Error_Runtime} exception, since this
+     * function will throw a {@see TwigRuntimeError} exception, since this
      * would simply make no sense and is likely an error. Passing a negative
      * `$depthOffset` is equivalent to passing `$depthOffset = 0`.
      *
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 987a6266c..4a066e797 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -12,6 +12,7 @@
 
 use picocms\Pico\AbstractPlugin;
 use picocms\Pico\Pico;
+use Twig\Environment as TwigEnvironment;
 
 /**
  * Pico dummy plugin - a template for plugins
@@ -31,7 +32,7 @@ class DummyPlugin extends AbstractPlugin
      *
      * @var int
      */
-    const API_VERSION = 3;
+    public const API_VERSION = 3;
 
     /**
      * This plugin is disabled by default
@@ -39,8 +40,8 @@ class DummyPlugin extends AbstractPlugin
      * 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 DummyPlugin::$dependsOn}), Pico enables the plugin by default.
-     * Otherwise the plugin is silently disabled.
+     * {@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
@@ -498,9 +499,9 @@ public function onParsedownRegistered(Parsedown &$parsedown)
      *
      * @see Pico::getTwig()
      *
-     * @param Twig_Environment &$twig Twig instance
+     * @param TwigEnvironment &$twig Twig instance
      */
-    public function onTwigRegistered(Twig_Environment &$twig)
+    public function onTwigRegistered(TwigEnvironment &$twig)
     {
         // your code
     }

From 1b1fa73fd9dd872f449bf3911c9daae9089e6afb Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 11 Apr 2020 21:21:33 +0200
Subject: [PATCH 13/75] Fix Travis CI

---
 .build/deploy-branch.sh | 2 +-
 .build/install.sh       | 2 +-
 .build/release.sh       | 2 +-
 .travis.yml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.build/deploy-branch.sh b/.build/deploy-branch.sh
index d8284a7ed..ca0fda7a5 100755
--- a/.build/deploy-branch.sh
+++ b/.build/deploy-branch.sh
@@ -4,7 +4,7 @@ set -e
 [ -n "$PICO_BUILD_ENV" ] || { echo "No Pico build environment specified" >&2; exit 1; }
 
 # get current Pico milestone
-VERSION="$(php -r "require_once('$PICO_PROJECT_DIR/lib/Pico.php'); echo Pico::VERSION;")"
+VERSION="$(php -r "require_once('$PICO_PROJECT_DIR/lib/Pico.php'); echo picocms\Pico\Pico::VERSION;")"
 MILESTONE="Pico$([[ "$VERSION" =~ ^([0-9]+\.[0-9]+)\. ]] && echo " ${BASH_REMATCH[1]}")"
 
 echo "Deploying $PROJECT_REPO_BRANCH branch ($MILESTONE)..."
diff --git a/.build/install.sh b/.build/install.sh
index dff079c8e..738f64848 100755
--- a/.build/install.sh
+++ b/.build/install.sh
@@ -24,7 +24,7 @@ if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -n "$PROJECT_REPO_BRANCH" ]; then
     if [ -z "$PICO_VERSION_PATTERN" ]; then
         PICO_VERSION_PATTERN="$(php -r "
             require_once('$PICO_PROJECT_DIR/lib/Pico.php');
-            echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
+            echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', picocms\Pico\Pico::VERSION);
         ")"
     fi
 
diff --git a/.build/release.sh b/.build/release.sh
index 7a2cc1d0d..b8fb6537d 100755
--- a/.build/release.sh
+++ b/.build/release.sh
@@ -16,7 +16,7 @@ echo
 if [ -z "$VERSION" ]; then
     PICO_VERSION="$(php -r "
         require_once('$PICO_PROJECT_DIR/lib/Pico.php');
-        echo preg_replace('/-(?:dev|n|nightly)(?:[.-]?[0-9]+)?(?:[.-]dev)?$/', '', Pico::VERSION);
+        echo preg_replace('/-(?:dev|n|nightly)(?:[.-]?[0-9]+)?(?:[.-]dev)?$/', '', picocms\Pico\Pico::VERSION);
     ")"
 
     VERSION="v$PICO_VERSION-dev+${PROJECT_REPO_BRANCH:-master}"
diff --git a/.travis.yml b/.travis.yml
index 5d7ee4ede..ee54509d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ jobs:
       install:
         - install.sh --deploy
       script:
-        - '[ "$PROJECT_REPO_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo Pico::VERSION;")" ]'
+        - '[ "$PROJECT_REPO_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo picocms\Pico\Pico::VERSION;")" ]'
         - deploy-release.sh
       before_deploy:
         - release.sh "$PROJECT_REPO_TAG"

From de5bd4399ce134816d4df50bff432d1f30b57506 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 11 Apr 2020 22:13:00 +0200
Subject: [PATCH 14/75] Update to phpDocumentor 3 config

---
 .phpdoc.xml | 65 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/.phpdoc.xml b/.phpdoc.xml
index 8f6456e48..3d3a64b6d 100644
--- a/.phpdoc.xml
+++ b/.phpdoc.xml
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<phpdocumentor>
-    <title><![CDATA[Pico API Documentation]]></title>
-    <parser>
-        <target>.build/phpdoc.cache</target>
-    </parser>
-    <transformer>
-        <target>.build/phpdoc</target>
-    </transformer>
-    <transformations>
-        <template name="clean"/>
-    </transformations>
-    <files>
-        <directory>.</directory>
-        <file>index.php</file>
-        <file>index.php.dist</file>
-
-        <!-- exclude .build and .github directories -->
-        <ignore>.build/*</ignore>
-        <ignore>.github/*</ignore>
-
-        <!-- exclude user config -->
-        <ignore>config/*</ignore>
-        <file>config/config.yml.template</file>
-
-        <!-- exclude all plugins -->
-        <ignore>plugins/*</ignore>
-        <file>plugins/DummyPlugin.php</file>
-
-        <!-- exclude vendor dir -->
-        <ignore>vendor/*</ignore>
-    </files>
+<phpdocumentor
+        configVersion="3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.phpdoc.org"
+        xsi:noNamespaceSchemaLocation="data/xsd/phpdoc.xsd"
+>
+    <paths>
+        <output>.build/phpdoc</output>
+        <cache>.build/phpdoc.cache</cache>
+    </paths>
+    <version number="3.0.0">
+        <folder>latest</folder>
+        <api>
+            <source dsn=".">
+                <path>.</path>
+            </source>
+            <output>private</output>
+            <ignore hidden="true" symlinks="true">
+                <path>.build/*</path>
+                <path>.github/*</path>
+                <path>config/*</path>
+                <path>plugins/**/*</path>
+                <path>themes/**/*</path>
+                <path>vendor/*</path>
+            </ignore>
+            <extensions>
+                <extension>php</extension>
+                <extension>php.dist</extension>
+            </extensions>
+            <include-source>true</include-source>
+            <default-package-name>Pico</default-package-name>
+        </api>
+    </version>
+    <template name="default"/>
 </phpdocumentor>

From 9f596ac5b727763a5925f00f624da72fc83c7e05 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 11 Apr 2020 23:12:22 +0200
Subject: [PATCH 15/75] Improve phpDocumentor 3 config

---
 .phpdoc.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.phpdoc.xml b/.phpdoc.xml
index 3d3a64b6d..05850d338 100644
--- a/.phpdoc.xml
+++ b/.phpdoc.xml
@@ -10,24 +10,19 @@
         <cache>.build/phpdoc.cache</cache>
     </paths>
     <version number="3.0.0">
-        <folder>latest</folder>
         <api>
             <source dsn=".">
                 <path>.</path>
             </source>
-            <output>private</output>
             <ignore hidden="true" symlinks="true">
-                <path>.build/*</path>
-                <path>.github/*</path>
-                <path>config/*</path>
-                <path>plugins/**/*</path>
-                <path>themes/**/*</path>
-                <path>vendor/*</path>
+                <path>.build/**/*</path>
+                <path>vendor/**/*</path>
             </ignore>
             <extensions>
                 <extension>php</extension>
                 <extension>php.dist</extension>
             </extensions>
+            <visibility>public</visibility>
             <include-source>true</include-source>
             <default-package-name>Pico</default-package-name>
         </api>

From efc4fb5288d39e66a81df3707255278b33506232 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 11 Apr 2020 23:21:20 +0200
Subject: [PATCH 16/75] Remove deprecated AbstractPlugin::__call()

Use AbstractPlugin::getPico() instead (e.g. `->getPico()->getConfig('my_config')` instead of `->getConfig('my_config')`).
---
 lib/AbstractPlugin.php | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/lib/AbstractPlugin.php b/lib/AbstractPlugin.php
index a8c6725e1..1176bba13 100644
--- a/lib/AbstractPlugin.php
+++ b/lib/AbstractPlugin.php
@@ -195,30 +195,6 @@ public function getPluginConfig($configName = null, $default = null)
         return isset($pluginConfig[$configName]) ? $pluginConfig[$configName] : $default;
     }
 
-    /**
-     * Passes all not satisfiable method calls to Pico
-     *
-     * @see PluginInterface::getPico()
-     *
-     * @deprecated 2.1.0
-     *
-     * @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)
-    {
-        if (method_exists($this->getPico(), $methodName)) {
-            return call_user_func_array([ $this->getPico(), $methodName ], $params);
-        }
-
-        throw new \BadMethodCallException(
-            'Call to undefined method ' . get_class($this->getPico()) . '::' . $methodName . '() '
-            . 'through ' . get_called_class() . '::__call()'
-        );
-    }
-
     /**
      * Enables all plugins which this plugin depends on
      *

From bc816febfca84fed80ca96d499bb5e034b0f8e8f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 11 Apr 2020 23:21:45 +0200
Subject: [PATCH 17/75] Remove deprecated Pico::getBaseThemeUrl()

Use Pico::getConfig('themes_url') instead.
---
 lib/Pico.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index e5a14f5fc..3be483eff 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -2389,20 +2389,6 @@ public function substituteUrl($url)
         return str_replace(array_keys($variables), $variables, $url);
     }
 
-    /**
-     * Returns the URL of the themes folder of this Pico instance
-     *
-     * @see Pico::getUrlFromPath()
-     *
-     * @deprecated 2.1.0
-     *
-     * @return string
-     */
-    public function getBaseThemeUrl()
-    {
-        return $this->getConfig('themes_url');
-    }
-
     /**
      * Returns the URL of a given absolute path within this Pico instance
      *

From d6f9806b3229d5a506d01be28449ca0c01cca300 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 1 May 2020 20:55:00 +0200
Subject: [PATCH 18/75] Replace substr()-based comparisons by substr_compare()

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

diff --git a/lib/Pico.php b/lib/Pico.php
index 3be483eff..396204663 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -678,7 +678,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = [])
                         "Unable to load plugin '" . $className . "' from '" . $pluginFile . "': File not found"
                     );
                 }
-            } elseif (substr($file, -4) === '.php') {
+            } elseif (substr_compare($file, '.php', -4) === 0) {
                 $className = preg_replace('/^[0-9]+-/', '', substr($file, 0, -4));
                 $pluginFile = $file;
             } else {
@@ -1243,7 +1243,7 @@ protected function evaluateRequestUrl()
             $basePathLength = strlen($basePath);
 
             $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
-            if ($requestUri && (substr($requestUri, 0, $basePathLength) === $basePath)) {
+            if ($requestUri && (substr_compare($requestUri, $basePath, 0, $basePathLength) === 0)) {
                 $requestUri = substr($requestUri, $basePathLength);
                 if ($requestUri && (($queryStringPos = strpos($requestUri, '?')) !== false)) {
                     $requestUri = substr($requestUri, 0, $queryStringPos);
@@ -1358,7 +1358,7 @@ public function load404Content($file)
         $contentDirLength = strlen($contentDir);
         $contentExt = $this->getConfig('content_ext');
 
-        if (substr($file, 0, $contentDirLength) === $contentDir) {
+        if (substr_compare($file, $contentDir, 0, $contentDirLength) === 0) {
             $errorFileDir = substr($file, $contentDirLength);
 
             while ($errorFileDir !== '.') {
@@ -2314,7 +2314,7 @@ public function getPageUrl($page, $queryData = null, $dropIndex = true)
             if ($page === 'index') {
                 $page = '';
             } elseif (($pagePathLength = strrpos($page, '/')) !== false) {
-                if (substr($page, $pagePathLength + 1) === 'index') {
+                if (substr_compare($page, 'index', $pagePathLength + 1) === 0) {
                     $page = substr($page, 0, $pagePathLength);
                 }
             }
@@ -2346,13 +2346,13 @@ public function getPageId($path)
     {
         $contentDir = $this->getConfig('content_dir');
         $contentDirLength = strlen($contentDir);
-        if (substr($path, 0, $contentDirLength) !== $contentDir) {
+        if (substr_compare($path, $contentDir, 0, $contentDirLength) !== 0) {
             return null;
         }
 
         $contentExt = $this->getConfig('content_ext');
         $contentExtLength = strlen($contentExt);
-        if (substr($path, -$contentExtLength) !== $contentExt) {
+        if (substr_compare($path, $contentExt, -$contentExtLength) !== 0) {
             return null;
         }
 
@@ -2417,7 +2417,7 @@ public function getUrlFromPath($absolutePath)
             $basePath = !in_array($basePath, [ '.', '/', '\\' ], true) ? $basePath . '/' : '/';
             $basePathLength = strlen($basePath);
 
-            if ((substr($absolutePath, 0, $basePathLength) === $basePath) && ($basePath !== '/')) {
+            if ((substr_compare($absolutePath, $basePath, 0, $basePathLength) === 0) && ($basePath !== '/')) {
                 return $this->getBaseUrl() . substr($absolutePath, $basePathLength);
             }
         }
@@ -2426,7 +2426,7 @@ public function getUrlFromPath($absolutePath)
             $basePath = $this->getRootDir();
             $basePathLength = strlen($basePath);
 
-            if (substr($absolutePath, 0, $basePathLength) === $basePath) {
+            if (substr_compare($absolutePath, $basePath, 0, $basePathLength) === 0) {
                 return $this->getBaseUrl() . substr($absolutePath, $basePathLength);
             }
         }
@@ -2599,7 +2599,7 @@ public function getFiles($directory, $fileExtension = '', $order = self::SORT_AS
                 if (is_dir($directory . '/' . $file)) {
                     // get files recursively
                     $result = array_merge($result, $this->getFiles($directory . '/' . $file, $fileExtension, $order));
-                } elseif (!$fileExtension || (substr($file, -$fileExtensionLength) === $fileExtension)) {
+                } elseif (!$fileExtension || (substr_compare($file, $fileExtension, -$fileExtensionLength) === 0)) {
                     $result[] = $directory . '/' . $file;
                 }
             }

From 9bf317f9031f12ca44aaa2a93977c529a717a21a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 10 Jul 2020 19:45:21 +0200
Subject: [PATCH 19/75] Travis CI: Use phpDocumentor 3

---
 .build/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.build/install.sh b/.build/install.sh
index 738f64848..c64bf803b 100755
--- a/.build/install.sh
+++ b/.build/install.sh
@@ -5,7 +5,7 @@ set -e
 
 # setup build system
 BUILD_REQUIREMENTS=( --phpcs )
-[ "$1" != "--deploy" ] || BUILD_REQUIREMENTS+=( --cloc --phpdoc )
+[ "$1" != "--deploy" ] || BUILD_REQUIREMENTS+=( --cloc --phpdoc3 )
 "$PICO_TOOLS_DIR/setup/$PICO_BUILD_ENV.sh" "${BUILD_REQUIREMENTS[@]}"
 
 # set COMPOSER_ROOT_VERSION when necessary

From 59d9514ed475b841ad885c899037e4474bb6ca0f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 24 Dec 2020 17:40:58 +0100
Subject: [PATCH 20/75] Travis CI: Add PHP 8.0 target

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

diff --git a/.travis.yml b/.travis.yml
index 8aa14fc84..868130ee3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ jobs:
     - php: 7.2
     - php: 7.3
     - php: 7.4
+    - php: 8.0
     - php: nightly
     - php: hhvm-3.27 # until Sep 2019
     - php: hhvm-3.30 # until Nov 2019

From 4b95733a519f1c251f8fa4e1cd9c3828cde99ede Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 24 Dec 2020 17:30:58 +0100
Subject: [PATCH 21/75] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb14da04c..0d2fed319 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,14 @@ Pico Changelog
           `PicoDeprecated`'s changelog. Please note that BC-breaking changes
           are only possible with a new major version.
 
+### Version 3.0.0-alpha.2
+Released: 2020-12-24
+
+```
+* [Changed] Merge all fixes of Pico v2.1.2 to v2.1.4
+* [Fixed] #575: Update Symfony YAML v3.4 to support PHP 8.0+
+```
+
 ### Version 2.1.4
 Released: 2020-08-29
 

From 888b910a84cac1071b9b6161649b0a729ba027af Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 24 Dec 2020 17:32:12 +0100
Subject: [PATCH 22/75] Update Pico::VERSION

Pico::VERSION_ID isn't updated because this is a alpha release.
---
 lib/Pico.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index d6dc75e3d..4b3a45019 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -49,7 +49,7 @@ class Pico
      *
      * @var string
      */
-    const VERSION = '3.0.0-alpha.1';
+    const VERSION = '3.0.0-alpha.2';
 
     /**
      * Pico version ID

From f7637ad335a97a639d69f9e7a1ef500762bad6f7 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 24 Dec 2020 17:32:27 +0100
Subject: [PATCH 23/75] Version 3.0.0-alpha.2

```
* [Changed] Merge all fixes of Pico v2.1.2 to v2.1.4
* [Fixed] #575: Update Symfony YAML v3.4 to support PHP 8.0+
```

From edfab74ff20bcf259a79654127479735953eea7f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Feb 2022 22:43:19 +0100
Subject: [PATCH 24/75] Add %page_*% replacements for Markdown files

`%page_id%` is replaced by the page's ID, `%page_url%` by the page's relative URL, and `%page_path%` by the dirname of page file.
---
 lib/Pico.php | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 396204663..07d0a83f1 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -487,7 +487,7 @@ public function run()
         // parse file content
         $this->triggerEvent('onContentParsing');
 
-        $markdown = $this->prepareFileContent($this->rawContent, $this->meta);
+        $markdown = $this->prepareFileContent($this->rawContent, $this->meta, $requestedPageId);
         $this->triggerEvent('onContentPrepared', [ &$markdown ]);
 
         $this->content = $this->parseFileContent($markdown);
@@ -1585,12 +1585,14 @@ public function getParsedown()
      * @see Pico::parseFileContent()
      * @see Pico::getFileContent()
      *
-     * @param string $rawContent raw contents of a page
-     * @param array  $meta       meta data to use for %meta.*% replacement
+     * @param string      $rawContent raw contents of a page
+     * @param array       $meta       meta data to use for %meta.*% replacement
+     * @param string|null $pageId     unique ID of the page for %page_*%
+     *     replacement, might be NULL
      *
      * @return string prepared Markdown contents
      */
-    public function prepareFileContent($rawContent, array $meta = [])
+    public function prepareFileContent($rawContent, array $meta = [], $pageId = null)
     {
         // remove meta header
         $metaHeaderPattern = "/^(?:\xEF\xBB\xBF)?(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
@@ -1598,7 +1600,7 @@ public function prepareFileContent($rawContent, array $meta = [])
         $markdown = preg_replace($metaHeaderPattern, '', $rawContent, 1);
 
         // replace placeholders
-        $markdown = $this->substituteFileContent($markdown, $meta);
+        $markdown = $this->substituteFileContent($markdown, $meta, $pageId);
 
         return $markdown;
     }
@@ -1606,12 +1608,14 @@ public function prepareFileContent($rawContent, array $meta = [])
     /**
      * 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
+     * @param string      $markdown Markdown contents of a page
+     * @param array       $meta     meta data to use for %meta.*% replacement
+     * @param string|null $pageId   unique ID of the page for %page_*%
+     *     replacement, might be NULL
      *
      * @return string substituted Markdown contents
      */
-    public function substituteFileContent($markdown, array $meta = [])
+    public function substituteFileContent($markdown, array $meta = [], $pageId = null)
     {
         $variables = [];
 
@@ -1640,6 +1644,18 @@ public function substituteFileContent($markdown, array $meta = [])
         // replace %theme_url%
         $variables['%theme_url%'] = $this->getConfig('themes_url') . $this->getTheme();
 
+        // replace %page_id%, %page_url% and %page_path%
+        if ($pageId !== null) {
+            $pageUrl = ($pageId !== 'index') ? ((basename($pageId) !== 'index') ? $pageId : dirname($pageId)) : '';
+
+            $pagePath = dirname($pageId);
+            $pagePath = !in_array($pagePath, [ '', '.', '/', '\\' ], true) ? $pagePath : '';
+
+            $variables['%page_id%'] = $pageId;
+            $variables['%page_url%'] = $pageUrl;
+            $variables['%page_path%'] = $pagePath;
+        }
+
         // replace %meta.*%
         if ($meta) {
             foreach ($meta as $metaKey => $metaValue) {
@@ -2122,7 +2138,7 @@ function ($page) use ($pico, &$pages) {
                     if (isset($pages[$page])) {
                         $pageData = &$pages[$page];
                         if (!isset($pageData['content'])) {
-                            $markdown = $pico->prepareFileContent($pageData['raw_content'], $pageData['meta']);
+                            $markdown = $pico->prepareFileContent($pageData['raw_content'], $pageData['meta'], $page);
                             $pageData['content'] = $pico->parseFileContent($markdown);
                         }
                         return $pageData['content'];

From 41fc15a7e81de1e54665c39c40afafe4e3394158 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Feb 2022 23:14:08 +0100
Subject: [PATCH 25/75] Remove picocms\Pico\ namespace

This reverts commit 812ae5c21548905e308f002bc6d97a042ea09aad
---
 .build/deploy-branch.sh                       |  2 +-
 .build/install.sh                             |  2 +-
 .build/release.sh                             |  2 +-
 .travis.yml                                   |  2 +-
 composer.json                                 |  2 +-
 index.php                                     |  2 +-
 index.php.dist                                |  2 +-
 ...tractPlugin.php => AbstractPicoPlugin.php} | 34 ++++++++--------
 lib/Pico.php                                  | 40 +++++++++----------
 ...nInterface.php => PicoPluginInterface.php} | 12 +++---
 ...wigExtension.php => PicoTwigExtension.php} |  6 +--
 plugins/DummyPlugin.php                       |  8 ++--
 12 files changed, 53 insertions(+), 61 deletions(-)
 rename lib/{AbstractPlugin.php => AbstractPicoPlugin.php} (92%)
 rename lib/{PluginInterface.php => PicoPluginInterface.php} (93%)
 rename lib/{TwigExtension.php => PicoTwigExtension.php} (99%)

diff --git a/.build/deploy-branch.sh b/.build/deploy-branch.sh
index ca0fda7a5..d8284a7ed 100755
--- a/.build/deploy-branch.sh
+++ b/.build/deploy-branch.sh
@@ -4,7 +4,7 @@ set -e
 [ -n "$PICO_BUILD_ENV" ] || { echo "No Pico build environment specified" >&2; exit 1; }
 
 # get current Pico milestone
-VERSION="$(php -r "require_once('$PICO_PROJECT_DIR/lib/Pico.php'); echo picocms\Pico\Pico::VERSION;")"
+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)..."
diff --git a/.build/install.sh b/.build/install.sh
index c64bf803b..01d772d25 100755
--- a/.build/install.sh
+++ b/.build/install.sh
@@ -24,7 +24,7 @@ if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -n "$PROJECT_REPO_BRANCH" ]; then
     if [ -z "$PICO_VERSION_PATTERN" ]; then
         PICO_VERSION_PATTERN="$(php -r "
             require_once('$PICO_PROJECT_DIR/lib/Pico.php');
-            echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', picocms\Pico\Pico::VERSION);
+            echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
         ")"
     fi
 
diff --git a/.build/release.sh b/.build/release.sh
index b8fb6537d..7a2cc1d0d 100755
--- a/.build/release.sh
+++ b/.build/release.sh
@@ -16,7 +16,7 @@ echo
 if [ -z "$VERSION" ]; then
     PICO_VERSION="$(php -r "
         require_once('$PICO_PROJECT_DIR/lib/Pico.php');
-        echo preg_replace('/-(?:dev|n|nightly)(?:[.-]?[0-9]+)?(?:[.-]dev)?$/', '', picocms\Pico\Pico::VERSION);
+        echo preg_replace('/-(?:dev|n|nightly)(?:[.-]?[0-9]+)?(?:[.-]dev)?$/', '', Pico::VERSION);
     ")"
 
     VERSION="v$PICO_VERSION-dev+${PROJECT_REPO_BRANCH:-master}"
diff --git a/.travis.yml b/.travis.yml
index ee54509d4..5d7ee4ede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ jobs:
       install:
         - install.sh --deploy
       script:
-        - '[ "$PROJECT_REPO_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo picocms\Pico\Pico::VERSION;")" ]'
+        - '[ "$PROJECT_REPO_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo Pico::VERSION;")" ]'
         - deploy-release.sh
       before_deploy:
         - release.sh "$PROJECT_REPO_TAG"
diff --git a/composer.json b/composer.json
index 8be85c6a4..e37b54de6 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
     },
     "autoload": {
         "psr-4": {
-            "picocms\\Pico\\": "lib/"
+            "": "lib/"
         }
     },
     "extra": {
diff --git a/index.php b/index.php
index 83d112f57..fedc54410 100644
--- a/index.php
+++ b/index.php
@@ -26,7 +26,7 @@
 }
 
 // instance Pico
-$pico = new \picocms\Pico\Pico(
+$pico = new Pico(
     __DIR__,    // root dir
     'config/',  // config dir
     'plugins/', // plugins dir
diff --git a/index.php.dist b/index.php.dist
index 9550c5922..36fcdbc81 100644
--- a/index.php.dist
+++ b/index.php.dist
@@ -25,7 +25,7 @@ if (!extension_loaded('mbstring')) {
 require_once(__DIR__ . '/vendor/autoload.php');
 
 // instance Pico
-$pico = new \picocms\Pico\Pico(
+$pico = new Pico(
     __DIR__,    // root dir
     'config/',  // config dir
     'plugins/', // plugins dir
diff --git a/lib/AbstractPlugin.php b/lib/AbstractPicoPlugin.php
similarity index 92%
rename from lib/AbstractPlugin.php
rename to lib/AbstractPicoPlugin.php
index 1176bba13..144170f0c 100644
--- a/lib/AbstractPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -10,27 +10,25 @@
  * License-Filename: LICENSE
  */
 
-namespace picocms\Pico;
-
 /**
  * Abstract class to extend from when implementing a Pico plugin
  *
- * Please refer to {@see PluginInterface} for more information about how to
+ * Please refer to {@see PicoPluginInterface} for more information about how to
  * develop a plugin for Pico.
  *
- * @see PluginInterface
+ * @see PicoPluginInterface
  *
  * @author  Daniel Rudolf
  * @link    http://picocms.org
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-abstract class AbstractPlugin implements PluginInterface
+abstract class AbstractPicoPlugin implements PicoPluginInterface
 {
     /**
      * Current instance of Pico
      *
-     * @see PluginInterface::getPico()
+     * @see PicoPluginInterface::getPico()
      * @var Pico
      */
     protected $pico;
@@ -38,8 +36,8 @@ abstract class AbstractPlugin implements PluginInterface
     /**
      * Boolean indicating if this plugin is enabled (TRUE) or disabled (FALSE)
      *
-     * @see PluginInterface::isEnabled()
-     * @see PluginInterface::setEnabled()
+     * @see PicoPluginInterface::isEnabled()
+     * @see PicoPluginInterface::setEnabled()
      * @var bool|null
      */
     protected $enabled;
@@ -47,7 +45,7 @@ abstract class AbstractPlugin implements PluginInterface
     /**
      * Boolean indicating if this plugin was ever enabled/disabled manually
      *
-     * @see PluginInterface::isStatusChanged()
+     * @see PicoPluginInterface::isStatusChanged()
      * @var bool
      */
     protected $statusChanged = false;
@@ -55,7 +53,7 @@ abstract class AbstractPlugin implements PluginInterface
     /**
      * Boolean indicating whether this plugin matches Pico's API version
      *
-     * @see AbstractPlugin::checkCompatibility()
+     * @see AbstractPicoPlugin::checkCompatibility()
      * @var bool|null
      */
     protected $nativePlugin;
@@ -63,8 +61,8 @@ abstract class AbstractPlugin implements PluginInterface
     /**
      * List of plugins which this plugin depends on
      *
-     * @see AbstractPlugin::checkDependencies()
-     * @see PluginInterface::getDependencies()
+     * @see AbstractPicoPlugin::checkDependencies()
+     * @see PicoPluginInterface::getDependencies()
      * @var string[]
      */
     protected $dependsOn = [];
@@ -72,8 +70,8 @@ abstract class AbstractPlugin implements PluginInterface
     /**
      * List of plugin which depend on this plugin
      *
-     * @see AbstractPlugin::checkDependants()
-     * @see PluginInterface::getDependants()
+     * @see AbstractPicoPlugin::checkDependants()
+     * @see PicoPluginInterface::getDependants()
      * @var object[]|null
      */
     protected $dependants;
@@ -198,7 +196,7 @@ public function getPluginConfig($configName = null, $default = null)
     /**
      * Enables all plugins which this plugin depends on
      *
-     * @see PluginInterface::getDependencies()
+     * @see PicoPluginInterface::getDependencies()
      *
      * @param bool $recursive enable required plugins automatically
      *
@@ -217,7 +215,7 @@ protected function checkDependencies($recursive)
             }
 
             // plugins which don't implement PicoPluginInterface are always enabled
-            if (($plugin instanceof PluginInterface) && !$plugin->isEnabled()) {
+            if (($plugin instanceof PicoPluginInterface) && !$plugin->isEnabled()) {
                 if ($recursive) {
                     if (!$plugin->isStatusChanged()) {
                         $plugin->setEnabled(true, true, true);
@@ -248,7 +246,7 @@ public function getDependencies()
     /**
      * Disables all plugins which depend on this plugin
      *
-     * @see PluginInterface::getDependants()
+     * @see PicoPluginInterface::getDependants()
      *
      * @param bool $recursive disabled dependant plugins automatically
      *
@@ -291,7 +289,7 @@ public function getDependants()
             $this->dependants = [];
             foreach ($this->getPico()->getPlugins() as $pluginName => $plugin) {
                 // only plugins which implement PicoPluginInterface support dependencies
-                if ($plugin instanceof PluginInterface) {
+                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 07d0a83f1..663a41300 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -16,8 +16,6 @@
  * License-Filename: LICENSE
  */
 
-namespace picocms\Pico;
-
 use Symfony\Component\Yaml\Parser as YamlParser;
 use Twig\Environment as TwigEnvironment;
 use Twig\Extension\DebugExtension as TwigDebugExtension;
@@ -156,7 +154,7 @@ class Pico
     /**
      * List of loaded plugins using the current API version
      *
-     * @var PluginInterface[]
+     * @var PicoPluginInterface[]
      */
     protected $nativePlugins = [];
 
@@ -607,7 +605,7 @@ protected function loadComposerPlugins(array $pluginBlacklist = [])
                     continue;
                 }
 
-                if (!($plugin instanceof PluginInterface)) {
+                if (!($plugin instanceof PicoPluginInterface)) {
                     throw new \RuntimeException(
                         "Unable to load plugin '" . $className . "' via 'vendor/pico-plugin.php': "
                         . "Plugins installed by composer must implement 'PicoPluginInterface'"
@@ -698,7 +696,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = [])
 
                 $this->plugins[$className] = $plugin;
 
-                if ($plugin instanceof PluginInterface) {
+                if ($plugin instanceof PicoPluginInterface) {
                     if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
                         $this->nativePlugins[$className] = $plugin;
                     }
@@ -714,11 +712,11 @@ protected function loadLocalPlugins(array $pluginBlacklist = [])
     /**
      * Manually loads a plugin
      *
-     * Manually loaded plugins MUST implement {@see PluginInterface}. 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
+     * 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.
      *
@@ -736,10 +734,10 @@ protected function loadLocalPlugins(array $pluginBlacklist = [])
      * @see Pico::getPlugin()
      * @see Pico::getPlugins()
      *
-     * @param PluginInterface|string $plugin either the class name of a plugin
-     *     to instantiate or a plugin instance
+     * @param PicoPluginInterface|string $plugin either the class name of a
+     *     plugin to instantiate or a plugin instance
      *
-     * @return PluginInterface instance of the loaded plugin
+     * @return PicoPluginInterface instance of the loaded plugin
      *
      * @throws \RuntimeException thrown when the plugin couldn't be loaded
      */
@@ -756,7 +754,7 @@ public function loadPlugin($plugin)
 
         $className = get_class($plugin);
 
-        if (!($plugin instanceof PluginInterface)) {
+        if (!($plugin instanceof PicoPluginInterface)) {
             throw new \RuntimeException(
                 "Unable to load plugin '" . $className . "': "
                 . "Manually loaded plugins must implement 'PicoPluginInterface'"
@@ -826,7 +824,7 @@ protected function sortPlugins()
                 $visitedPlugins[$pluginName] = true;
 
                 $dependencies = [];
-                if ($plugin instanceof PluginInterface) {
+                if ($plugin instanceof PicoPluginInterface) {
                     $dependencies = $plugin->getDependencies();
                 }
                 if (!isset($nativePlugins[$pluginName])) {
@@ -863,8 +861,8 @@ protected function sortPlugins()
     /**
      * Returns the instance of a named plugin
      *
-     * Plugins SHOULD implement {@see PluginInterface}, but you MUST NOT rely
-     * on it. For more information see {@see PluginInterface}.
+     * Plugins SHOULD implement {@see PicoPluginInterface}, but you MUST NOT
+     * rely on it. For more information see {@see PicoPluginInterface}.
      *
      * @see Pico::loadPlugins()
      * @see Pico::getPlugins()
@@ -2106,7 +2104,7 @@ public function getPageTree()
      * 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 filter `content` as well as Pico's
-     * {@see TwigExtension} Twig extension.
+     * {@see PicoTwigExtension} Twig extension.
      *
      * @see Pico::getTwig()
      * @see http://twig.sensiolabs.org/ Twig website
@@ -2121,7 +2119,7 @@ public function getTwig()
 
             $twigLoader = new TwigFilesystemLoader($this->getThemesDir() . $this->getTheme());
             $this->twig = new TwigEnvironment($twigLoader, $twigConfig);
-            $this->twig->addExtension(new TwigExtension($this));
+            $this->twig->addExtension(new PicoTwigExtension($this));
 
             if (!empty($twigConfig['debug'])) {
                 $this->twig->addExtension(new TwigDebugExtension());
@@ -2778,8 +2776,8 @@ public function getAbsoluteUrl($url, $baseUrl = null, $endSlash = true)
      *
      * You MUST NOT trigger events of Pico's core with a plugin!
      *
-     * @see PluginInterface
-     * @see AbstractPlugin
+     * @see PicoPluginInterface
+     * @see AbstractPicoPlugin
      * @see DummyPlugin
      *
      * @param string $eventName name of the event to trigger
diff --git a/lib/PluginInterface.php b/lib/PicoPluginInterface.php
similarity index 93%
rename from lib/PluginInterface.php
rename to lib/PicoPluginInterface.php
index ec6974577..d89ea3a81 100644
--- a/lib/PluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -10,8 +10,6 @@
  * License-Filename: LICENSE
  */
 
-namespace picocms\Pico;
-
 /**
  * Common interface for Pico plugins
  *
@@ -30,7 +28,7 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-interface PluginInterface
+interface PicoPluginInterface
 {
     /**
      * Handles a event that was triggered by Pico
@@ -43,8 +41,8 @@ public function handleEvent($eventName, array $params);
     /**
      * Enables or disables this plugin
      *
-     * @see PluginInterface::isEnabled()
-     * @see PluginInterface::isStatusChanged()
+     * @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.
@@ -67,7 +65,7 @@ public function setEnabled($enabled, $recursive = true, $auto = false);
      * wasn't triggered on all plugins yet. This method might even return NULL
      * then. The plugin's status might change later.
      *
-     * @see PluginInterface::setEnabled()
+     * @see PicoPluginInterface::setEnabled()
      *
      * @return bool|null plugin is enabled (TRUE) or disabled (FALSE)
      */
@@ -76,7 +74,7 @@ public function isEnabled();
     /**
      * Returns TRUE if the plugin was ever enabled/disabled manually
      *
-     * @see PluginInterface::setEnabled()
+     * @see PicoPluginInterface::setEnabled()
      *
      * @return bool plugin is in its default state (TRUE), FALSE otherwise
      */
diff --git a/lib/TwigExtension.php b/lib/PicoTwigExtension.php
similarity index 99%
rename from lib/TwigExtension.php
rename to lib/PicoTwigExtension.php
index 2b76b66bb..1a4491ab0 100644
--- a/lib/TwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -10,8 +10,6 @@
  * License-Filename: LICENSE
  */
 
-namespace picocms\Pico;
-
 use Twig\Error\RuntimeError as TwigRuntimeError;
 use Twig\Extension\AbstractExtension as AbstractTwigExtension;
 use Twig\Extension\ExtensionInterface as TwigExtensionInterface;
@@ -26,12 +24,12 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-class TwigExtension extends AbstractTwigExtension
+class PicoTwigExtension extends AbstractTwigExtension
 {
     /**
      * Current instance of Pico
      *
-     * @see TwigExtension::getPico()
+     * @see PicoTwigExtension::getPico()
      * @var Pico
      */
     private $pico;
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 4a066e797..2a28133fd 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -10,7 +10,7 @@
  * License-Filename: LICENSE
  */
 
-use picocms\Pico\AbstractPlugin;
+use picocms\Pico\AbstractPicoPlugin;
 use picocms\Pico\Pico;
 use Twig\Environment as TwigEnvironment;
 
@@ -25,7 +25,7 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
-class DummyPlugin extends AbstractPlugin
+class DummyPlugin extends AbstractPicoPlugin
 {
     /**
      * API version used by this plugin
@@ -56,7 +56,7 @@ class DummyPlugin extends AbstractPlugin
      * No matter what, the user can always explicitly enable or disable this
      * plugin in Pico's config.
      *
-     * @see AbstractPlugin::$enabled
+     * @see AbstractPicoPlugin::$enabled
      * @var bool|null
      */
     protected $enabled = false;
@@ -67,7 +67,7 @@ class DummyPlugin extends AbstractPlugin
      * If your plugin doesn't depend on any other plugin, remove this class
      * property.
      *
-     * @see AbstractPlugin::$dependsOn
+     * @see AbstractPicoPlugin::$dependsOn
      * @var string[]
      */
     protected $dependsOn = array();

From fe6c8f805a2dfa6d132ee6e0c2e81b43c6d552c5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Feb 2022 23:15:39 +0100
Subject: [PATCH 26/75] Re-add deprecated Pico::getBaseThemeUrl() and
 AbstractPicoPlugin::__call()

This reverts commits efc4fb5288d39e66a81df3707255278b33506232 and bc816febfca84fed80ca96d499bb5e034b0f8e8f
---
 lib/AbstractPicoPlugin.php | 24 ++++++++++++++++++++++++
 lib/Pico.php               | 14 ++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 144170f0c..bdfaf9c32 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -193,6 +193,30 @@ public function getPluginConfig($configName = null, $default = null)
         return isset($pluginConfig[$configName]) ? $pluginConfig[$configName] : $default;
     }
 
+    /**
+     * Passes all not satisfiable method calls to Pico
+     *
+     * @see PicoPluginInterface::getPico()
+     *
+     * @deprecated 2.1.0
+     *
+     * @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)
+    {
+        if (method_exists($this->getPico(), $methodName)) {
+            return call_user_func_array(array($this->getPico(), $methodName), $params);
+        }
+
+        throw new BadMethodCallException(
+            'Call to undefined method ' . get_class($this->getPico()) . '::' . $methodName . '() '
+            . 'through ' . get_called_class() . '::__call()'
+        );
+    }
+
     /**
      * Enables all plugins which this plugin depends on
      *
diff --git a/lib/Pico.php b/lib/Pico.php
index 663a41300..f92d9eb23 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -2373,6 +2373,20 @@ public function getPageId($path)
         return substr($path, $contentDirLength, -$contentExtLength) ?: null;
     }
 
+    /**
+     * Returns the URL of the themes folder of this Pico instance
+     *
+     * @see Pico::getUrlFromPath()
+     *
+     * @deprecated 2.1.0
+     *
+     * @return string
+     */
+    public function getBaseThemeUrl()
+    {
+        return $this->getConfig('themes_url');
+    }
+
     /**
      * Substitutes URL placeholders (e.g. %base_url%)
      *

From 1b956afc29d5103731e2a928fb11100dbd735bdc Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Feb 2022 23:15:51 +0100
Subject: [PATCH 27/75] Code cleanup

---
 lib/PicoTwigExtension.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 1a4491ab0..72431eff2 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -78,11 +78,7 @@ public function getName()
     public function getFilters()
     {
         return [
-            'markdown' => new TwigFilter(
-                'markdown',
-                [ $this, 'markdownFilter' ],
-                [ 'is_safe' => [ 'html' ] ]
-            ),
+            'markdown' => new TwigFilter('markdown', [ $this, 'markdownFilter' ], [ 'is_safe' => [ 'html' ] ]),
             'map' => new TwigFilter('map', [ $this, 'mapFilter' ]),
             'sort_by' => new TwigFilter('sort_by', [ $this, 'sortByFilter' ]),
             'link' => new TwigFilter('link', [ $this->pico, 'getPageUrl' ]),

From 5a81fe89d8a2ba6dd41eebc022a0afe66f8f6faa Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Feb 2022 23:22:33 +0100
Subject: [PATCH 28/75] CONTRIBUTING.md: Probot Stale was replaced by GitHub
 Actions

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4eafb0070..db8933bd5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -200,7 +200,7 @@ Issues and pull requests labeled with `info: Feedback Needed` indicate that feed
 
 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. This is also true for the `info: Pinned` label: It indicates a important issue or pull request that remains open on purpose.
 
-After resolving a issue, we usually keep it open for about a week to give users some more time for feedback and further questions. This is especially true for issues with the `type: Notice`, `type: Support`, `type: Discussion` and `type: Invalid` labels. After 7 days with no interaction, [Probot](https://probot.github.io/)'s [Stale](https://github.com/apps/stale) bot adds the `info: Stale` label to the issue to ask the participants whether the issue has been resolved. If no more activity occurs, the issue will be automatically closed by Stale bot 2 days later.
+After resolving a issue, we usually keep it open for about a week to give users some more time for feedback and further questions. This is especially true for issues with the `type: Notice`, `type: Support`, `type: Discussion` and `type: Invalid` labels. After 7 days with no interaction, the [GitHub Actions](https://github.com/picocms/Pico/actions/workflows/stale.yml) bot adds the `info: Stale` label to the issue to ask the participants whether the issue has been resolved. If no more activity occurs, the issue will be automatically closed by Stale bot 2 days later.
 
 Issues and pull requests labeled with `info: Information Needed` indicate that we have asked one of the participants for further information and didn't receive any feedback yet. It is usually added after Stale bot adds the `info: Stale` label to give the participants some more days to give the necessary information.
 

From f7ccd0b70398b1f45e1e627c0347c52f7733d894 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Feb 2022 23:22:58 +0100
Subject: [PATCH 29/75] Revert "Added Temporary PHP 8.0 Notice"

This reverts commit ff5e345e58f6ccdb2683ea33a2fde3337853ca0c.
---
 README.md | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/README.md b/README.md
index d1db6b9df..213f419d8 100644
--- a/README.md
+++ b/README.md
@@ -11,22 +11,6 @@ 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.
 
----
-
-### PHP 8.0+ Users
-
-Seeing an `Unparenthesized a ? b : c ? d : e is not supported.` error?
-
-Pico currently has issues with PHP versions newer than 8.0.  This is due to Pico's dependencies, and not Pico itself.  There's currently an "alpha" build of Pico you can download as a [Pre-Bundled Release](https://github.com/picocms/Pico/releases/tag/v3.0.0-alpha.2) that solves this issue.
-
-This "alpha" is **perfectly safe** to use in production, as the *only* changes are **updated dependencies and version number strings**.  If you're curious, you can confirm this by [comparing the changes](https://github.com/picocms/Pico/compare/pico-3.0-alpha) between branches.
-
-More work was intended to be done on this branch, hence the "3.0" label, but it hasn't happened yet.  There's an [on-going discussion](https://github.com/picocms/Pico/issues/608) about getting just these updated dependencies merged in as an official update (either Pico 2.2 or 3.0) as soon as possible.
-
-Sorry for the inconvenience, and thanks to all Pico users for your patience on the matter. ❤️
-
----
-
 Screenshot
 ----------
 

From 0f152c71659dc4b31ac052a470638f9fa88a1042 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Feb 2022 23:23:59 +0100
Subject: [PATCH 30/75] Travis CI: Test on PHP 8.0 and 8.1

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

diff --git a/.travis.yml b/.travis.yml
index 5d7ee4ede..7d5e0c231 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ jobs:
     - php: 7.2
     - php: 7.3
     - php: 7.4
+    - php: 8.0
+    - php: 8.1
     - php: nightly
 
     # Branch deployment stage

From 76a761c3a23946ba20395484186583f2946ddcb1 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 7 Feb 2022 00:00:27 +0100
Subject: [PATCH 31/75] Bump to API version 4

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

diff --git a/lib/Pico.php b/lib/Pico.php
index 9a9bb545c..3ec5a8787 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -70,7 +70,7 @@ class Pico
      *
      * @var int
      */
-    public const API_VERSION = 3;
+    public const API_VERSION = 4;
 
     /**
      * Sort files in alphabetical ascending order
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 2a28133fd..243727df5 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -32,7 +32,7 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @var int
      */
-    public const API_VERSION = 3;
+    public const API_VERSION = 4;
 
     /**
      * This plugin is disabled by default

From e33f6c8148751e670e921ab9466b88f0acd544e5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 13 Feb 2022 15:10:08 +0100
Subject: [PATCH 32/75] Update various links

---
 .phpdoc.xml                 |  2 +-
 CONTRIBUTING.md             | 16 ++++++++--------
 README.md                   | 20 ++++++++++----------
 composer.json               |  6 +++---
 content-sample/index.md     |  4 ++--
 lib/AbstractPicoPlugin.php  |  4 ++--
 lib/Pico.php                |  8 ++++----
 lib/PicoPluginInterface.php |  4 ++--
 lib/PicoTwigExtension.php   |  4 ++--
 plugins/DummyPlugin.php     |  4 ++--
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.phpdoc.xml b/.phpdoc.xml
index 05850d338..1a60543b2 100644
--- a/.phpdoc.xml
+++ b/.phpdoc.xml
@@ -2,7 +2,7 @@
 <phpdocumentor
         configVersion="3"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="http://www.phpdoc.org"
+        xmlns="https://www.phpdoc.org"
         xsi:noNamespaceSchemaLocation="data/xsd/phpdoc.xsd"
 >
     <paths>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index db8933bd5..ab7b64433 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ Please describe your issue as clear as possible and always include the *Pico ver
 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.
+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](https://picocms.org/development/) of our website.
 
 ### Developer Certificate of Origin
 
@@ -108,7 +108,7 @@ Please keep in mind that pull requests should be small (i.e. one feature per req
 
 ### Coding Standards
 
-Pico uses the [PSR-2 Coding Standard](http://www.php-fig.org/psr/psr-2/) as defined by the [PHP Framework Interoperability Group (PHP-FIG)](http://www.php-fig.org/).
+Pico uses the [PSR-2 Coding Standard](https://www.php-fig.org/psr/psr-2/) as defined by the [PHP Framework Interoperability Group (PHP-FIG)](https://www.php-fig.org/).
 
 For historical reasons we don't use formal namespaces. Markdown files in the `content-sample` folder (the inline documentation) must follow a hard limit of 80 characters line length.
 
@@ -122,18 +122,18 @@ 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 [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.
+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](https://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](https://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
 ----------
 
-Pico follows [Semantic Versioning 2.0](http://semver.org) and uses version numbers like `MAJOR`.`MINOR`.`PATCH`. We will increment the:
+Pico follows [Semantic Versioning 2.0](https://semver.org) and uses version numbers like `MAJOR`.`MINOR`.`PATCH`. We will increment the:
 
 - `MAJOR` version when we make incompatible API changes,
 - `MINOR` version when we add functionality in a backwards-compatible manner, and
 - `PATCH` version when we make backwards-compatible bug fixes.
 
-For more information please refer to the http://semver.org website.
+For more information please refer to the https://semver.org website.
 
 Branching
 ---------
@@ -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), 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.
+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](https://picocms.org/phpDoc/) (powered by [phpDoc](https://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:
 
@@ -171,7 +171,7 @@ Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico:
 
 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.
+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](https://packagist.org/packages/picocms/pico) will be updated automatically.
 
 Labeling of Issues & Pull Requests
 ----------------------------------
@@ -206,4 +206,4 @@ Issues and pull requests labeled with `info: Information Needed` indicate that w
 
 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`.
 
-When a issue or pull request isn't directly related to Pico's core, but the project as a whole, it is labeled with `info: Meta`. Issues labeled with `info: Website` are related to [Pico's website](http://picocms.org), however, in this case it is usually expedient to move the issue to the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io) instead. The same applies to the `info: Pico CMS for Nextcloud` label; these issues are related to [Pico CMS for Nextcloud](https://apps.nextcloud.com/apps/cms_pico).
+When a issue or pull request isn't directly related to Pico's core, but the project as a whole, it is labeled with `info: Meta`. Issues labeled with `info: Website` are related to [Pico's website](https://picocms.org), however, in this case it is usually expedient to move the issue to the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io) instead. The same applies to the `info: Pico CMS for Nextcloud` label; these issues are related to [Pico CMS for Nextcloud](https://apps.nextcloud.com/apps/cms_pico).
diff --git a/README.md b/README.md
index 213f419d8..e1b7712be 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Pico
 
 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.
+Visit us at https://picocms.org/ and see https://picocms.org/about/ for more info.
 
 Screenshot
 ----------
@@ -198,7 +198,7 @@ Contributing
 
 You want to contribute to Pico? We really appreciate that! You can help make Pico better by [contributing code][PullRequests] or [reporting issues][Issues], but please take note of our [contribution guidelines][ContributionGuidelines]. In general you can contribute in three different areas:
 
-1. Plugins & Themes: You're a plugin developer or theme designer? We love you folks! 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!
+1. Plugins & Themes: You're a plugin developer or theme designer? We love you folks! You can find tons of information about how to develop plugins and themes at https://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 our website's Git repository from https://github.com/picocms/picocms.github.io, change the Markdown files and open a [pull request][PullRequestsWebsite].
 
@@ -232,21 +232,21 @@ Official Pico Contributors won't claim bounties on their own behalf, Pico will n
 [PicoThemePackagist]: https://packagist.org/packages/picocms/pico-theme
 [PicoDeprecatedPackagist]: https://packagist.org/packages/picocms/pico-deprecated
 [PicoComposerPackagist]: https://packagist.org/packages/picocms/pico-composer
-[SemVer]: http://semver.org
+[SemVer]: https://semver.org
 [HelpFork]: https://help.github.com/en/github/getting-started-with-github/fork-a-repo
-[HelpUpgrade]: http://picocms.org/in-depth/upgrade/
-[HelpUserDocs]: http://picocms.org/docs/
-[HelpDevDocs]: http://picocms.org/development/
-[Submit]: http://picocms.org/in-depth/submission_guidelines
-[OfficialPlugins]: http://picocms.org/plugins/
-[OfficialThemes]: http://picocms.org/themes/
+[HelpUpgrade]: https://picocms.org/in-depth/upgrade/
+[HelpUserDocs]: https://picocms.org/docs/
+[HelpDevDocs]: https://picocms.org/development/
+[Submit]: https://picocms.org/in-depth/submission_guidelines
+[OfficialPlugins]: https://picocms.org/plugins/
+[OfficialThemes]: https://picocms.org/themes/
 [Wiki]: https://github.com/picocms/Pico/wiki
 [WikiPlugins]: https://github.com/picocms/Pico/wiki/Pico-Plugins
 [WikiThemes]: https://github.com/picocms/Pico/wiki/Pico-Themes
 [Issues]: https://github.com/picocms/Pico/issues
 [IssuesSearch]: https://github.com/picocms/Pico/search?type=Issues
 [LiberaChat]: https://web.libera.chat/#picocms
-[LiberaChatLogs]: http://picocms.org/irc-logs
+[LiberaChatLogs]: https://picocms.org/irc-logs
 [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
diff --git a/composer.json b/composer.json
index 18d87cbb8..a27b8f1b7 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "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": ["pico", "picocms", "pico-cms", "simple", "flat-file", "cms", "content-management", "website", "markdown-to-html", "php", "markdown", "yaml", "twig" ],
-    "homepage": "http://picocms.org/",
+    "homepage": "https://picocms.org/",
     "license": "MIT",
     "authors": [
         {
@@ -18,7 +18,7 @@
         },
         {
             "name": "The Pico Community",
-            "homepage": "http://picocms.org/"
+            "homepage": "https://picocms.org/"
         },
         {
             "name": "Contributors",
@@ -26,7 +26,7 @@
         }
     ],
     "support": {
-        "docs": "http://picocms.org/docs",
+        "docs": "https://picocms.org/docs",
         "issues": "https://github.com/picocms/Pico/issues",
         "source": "https://github.com/picocms/Pico"
     },
diff --git a/content-sample/index.md b/content-sample/index.md
index 6e7460e6f..36d564c6a 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -360,7 +360,7 @@ even easier.
 
 #### Plugins for users
 
-Officially tested plugins can be found at http://picocms.org/plugins/, but
+Officially tested plugins can be found at https://picocms.org/plugins/, but
 there are many awesome third-party plugins out there! A good start point for
 discovery is [our Wiki][WikiPlugins].
 
@@ -385,7 +385,7 @@ disabled through your `config/config.yml`. If you want to e.g. disable the
 #### 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
+about how to develop plugins at https://picocms.org/development/. If you've
 developed a plugin before and want to upgrade it to Pico 2.0, refer to the
 [upgrade section of the docs][PluginUpgrade].
 
diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index bdfaf9c32..998a9be3d 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -19,8 +19,8 @@
  * @see PicoPluginInterface
  *
  * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
+ * @link    https://picocms.org
+ * @license https://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
 abstract class AbstractPicoPlugin implements PicoPluginInterface
diff --git a/lib/Pico.php b/lib/Pico.php
index 3ec5a8787..1a3498642 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -41,12 +41,12 @@
  * - Open Source: Pico is completely free and open source,
  *   released under the MIT license.
  *
- * See <http://picocms.org/> for more info.
+ * See <https://picocms.org/> for more info.
  *
  * @author  Gilbert Pellegrom
  * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
+ * @link    https://picocms.org
+ * @license https://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
 class Pico
@@ -2121,7 +2121,7 @@ public function getPageTree()
      * {@see PicoTwigExtension} Twig extension.
      *
      * @see Pico::getTwig()
-     * @see http://twig.sensiolabs.org/ Twig website
+     * @see https://twig.symfony.com/ Twig website
      * @see https://github.com/twigphp/Twig Twig on GitHub
      *
      * @return TwigEnvironment|null Twig template engine
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index d89ea3a81..2a360d59e 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -24,8 +24,8 @@
  * to update your plugin to use Pico's latest API version.
  *
  * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
+ * @link    https://picocms.org
+ * @license https://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
 interface PicoPluginInterface
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 72431eff2..e3bb638a8 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -20,8 +20,8 @@
  * Pico's Twig extension to implement additional filters
  *
  * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
+ * @link    https://picocms.org
+ * @license https://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
 class PicoTwigExtension extends AbstractTwigExtension
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 243727df5..031efbd24 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -21,8 +21,8 @@
  * Simply remove the events you don't need and add your own logic.
  *
  * @author  Daniel Rudolf
- * @link    http://picocms.org
- * @license http://opensource.org/licenses/MIT The MIT License
+ * @link    https://picocms.org
+ * @license https://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
 class DummyPlugin extends AbstractPicoPlugin

From 68c47429ef6a0800ddf5ea22c76577a6e2993066 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 13 Feb 2022 15:13:10 +0100
Subject: [PATCH 33/75] Add GitHub workflow 'test'

Runs `composer install` and `phpcs` on basically every push, replaces Travis CI.
---
 .github/workflows/test.yml | 98 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..59e8311ef
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,98 @@
+name: Test Pico CMS
+
+on:
+    push:
+        branches:
+            - master
+            - pico-3.0
+        tags: [ 'v*.*.*' ]
+    pull_request:
+        branches:
+            - master
+            - pico-3.0
+
+jobs:
+    test:
+        name: PHP ${{ matrix.PHP_VERSION }}
+
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+
+        strategy:
+            matrix:
+                PHP_VERSION:
+                    - '7.2'
+                    - '7.3'
+                    - '7.4'
+                    - '8.0'
+                    - '8.1'
+                    - 'nightly'
+            fail-fast: false
+
+        continue-on-error: ${{ matrix.PHP_VERSION == 'nightly' }}
+
+        env:
+            PHP_VERSION: ${{ matrix.PHP_VERSION }}
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v2
+
+            - name: Setup PHP ${{ env.PHP_VERSION }}
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ env.PHP_VERSION }}
+                  tools: composer, phpcs
+
+            - name: Read Pico version
+              run: |
+                  PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
+                  echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
+
+            - name: Setup Composer
+              if: ${{ github.ref_type == 'branch' }}
+              run: |
+                  COMPOSER_ROOT_VERSION=
+
+                  COMPOSER_BRANCH_ALIAS="$(php -r "
+                      \$json = json_decode(file_get_contents('./composer.json'), true);
+                      if (\$json !== null) {
+                          if (isset(\$json['extra']['branch-alias']['dev-$GITHUB_REF_NAME'])) {
+                              echo 'dev-$GITHUB_REF_NAME';
+                          }
+                      }
+                  ")"
+
+                  if [ -z "$COMPOSER_BRANCH_ALIAS" ]; then
+                      PICO_VERSION_PATTERN="$(php -r "
+                          require_once('./lib/Pico.php');
+                          echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
+                      ")"
+                  fi
+
+                  if [ -n "$PICO_VERSION_PATTERN" ]; then
+                      COMPOSER_ROOT_VERSION="$PICO_VERSION_PATTERN"
+                      echo "COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION" | tee -a "$GITHUB_ENV"
+                  fi
+
+            - name: Get Composer cache directory
+              run: |
+                  COMPOSER_CACHE_DIR="$(composer config cache-dir)"
+                  echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
+
+            - name: Restore Composer cache
+              uses: actions/cache@v2
+              with:
+                  path: ${{ env.COMPOSER_CACHE_DIR }}
+                  key: ${{ runner.os }}-composer-php${{ matrix.PHP_VERSION }}
+                  restore-keys: |
+                      ${{ runner.os }}-composer-
+
+            - name: Install Composer dependencies
+              run: |
+                  composer install
+
+            - name: Run PHP_CodeSniffer
+              run: |
+                  phpcs --standard=.phpcs.xml

From 8b4b20fe97a9e9067fc0ab9cc07cf3b3dd796217 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 13 Feb 2022 15:34:44 +0100
Subject: [PATCH 34/75] PHP_CodeSniffer: Allow using strftime()

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

diff --git a/lib/Pico.php b/lib/Pico.php
index 1a3498642..ac01c30ae 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1534,7 +1534,10 @@ public function parseFileMeta($rawContent, array $headers)
                         $encodingList[] = 'Windows-1252';
                     }
 
+                    // phpcs:disable Generic.PHP.DeprecatedFunctions
                     $rawFormattedDate = strftime($this->getConfig('date_format'), $meta['time']);
+                    // phpcs:enable
+
                     $meta['date_formatted'] = mb_convert_encoding($rawFormattedDate, 'UTF-8', $encodingList);
                 } else {
                     $meta['date_formatted'] = '';

From 92907a1361f7dcca5896cf1217ab24906378a001 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 13 Feb 2022 15:39:57 +0100
Subject: [PATCH 35/75] GitHub 'test' workflow: Run on any pull request

---
 .github/workflows/test.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 59e8311ef..f0320fa23 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,14 +2,9 @@ name: Test Pico CMS
 
 on:
     push:
-        branches:
-            - master
-            - pico-3.0
+        branches: [ 'master' ]
         tags: [ 'v*.*.*' ]
-    pull_request:
-        branches:
-            - master
-            - pico-3.0
+    pull_request: {}
 
 jobs:
     test:

From 23b00ba1e0b5295c9c373064a35e499e601c210e Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 13 Feb 2022 16:50:23 +0100
Subject: [PATCH 36/75] CI: Move install steps to reusable 'install' action

---
 .github/actions/install/action.yml | 71 ++++++++++++++++++++++++++++++
 .github/workflows/test.yml         | 54 ++---------------------
 2 files changed, 74 insertions(+), 51 deletions(-)
 create mode 100644 .github/actions/install/action.yml

diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
new file mode 100644
index 000000000..a5150e4ec
--- /dev/null
+++ b/.github/actions/install/action.yml
@@ -0,0 +1,71 @@
+name: Install Pico CMS
+description: Install Pico CMS to the current working directory
+
+inputs:
+    php-version:
+        description: PHP version to setup.
+        required: true
+    php-tools:
+        description: Setup additional PHP tools.
+        required: false
+
+runs:
+    using: "composite"
+    steps:
+        - name: Setup PHP ${{ inputs.php-version }}
+          uses: shivammathur/setup-php@v2
+          with:
+              php-version: ${{ inputs.php-version }}
+              tools: composer, ${{ inputs.php-tools }}
+
+        - name: Read Pico version
+          shell: bash
+          run: |
+              PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
+              echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
+
+        - name: Setup Composer
+          if: ${{ github.ref_type == 'branch' }}
+          shell: bash
+          run: |
+              COMPOSER_ROOT_VERSION=
+
+              COMPOSER_BRANCH_ALIAS="$(php -r "
+                  \$json = json_decode(file_get_contents('./composer.json'), true);
+                  if (\$json !== null) {
+                      if (isset(\$json['extra']['branch-alias']['dev-$GITHUB_REF_NAME'])) {
+                          echo 'dev-$GITHUB_REF_NAME';
+                      }
+                  }
+              ")"
+
+              if [ -z "$COMPOSER_BRANCH_ALIAS" ]; then
+                  PICO_VERSION_PATTERN="$(php -r "
+                      require('./lib/Pico.php');
+                      echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
+                  ")"
+              fi
+
+              if [ -n "$PICO_VERSION_PATTERN" ]; then
+                  COMPOSER_ROOT_VERSION="$PICO_VERSION_PATTERN"
+                  echo "COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION" | tee -a "$GITHUB_ENV"
+              fi
+
+        - name: Get Composer cache directory
+          shell: bash
+          run: |
+              COMPOSER_CACHE_DIR="$(composer config cache-dir)"
+              echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
+
+        - name: Restore Composer cache
+          uses: actions/cache@v2
+          with:
+              path: ${{ env.COMPOSER_CACHE_DIR }}
+              key: ${{ runner.os }}-composer-php${{ inputs.php-version }}
+              restore-keys: |
+                  ${{ runner.os }}-composer-
+
+        - name: Install Composer dependencies
+          shell: bash
+          run: |
+              composer install
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f0320fa23..97fde0e91 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,59 +34,11 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v2
 
-            - name: Setup PHP ${{ env.PHP_VERSION }}
-              uses: shivammathur/setup-php@v2
+            - name: Install Pico CMS
+              uses: ./.github/actions/install
               with:
                   php-version: ${{ env.PHP_VERSION }}
-                  tools: composer, phpcs
-
-            - name: Read Pico version
-              run: |
-                  PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
-                  echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
-
-            - name: Setup Composer
-              if: ${{ github.ref_type == 'branch' }}
-              run: |
-                  COMPOSER_ROOT_VERSION=
-
-                  COMPOSER_BRANCH_ALIAS="$(php -r "
-                      \$json = json_decode(file_get_contents('./composer.json'), true);
-                      if (\$json !== null) {
-                          if (isset(\$json['extra']['branch-alias']['dev-$GITHUB_REF_NAME'])) {
-                              echo 'dev-$GITHUB_REF_NAME';
-                          }
-                      }
-                  ")"
-
-                  if [ -z "$COMPOSER_BRANCH_ALIAS" ]; then
-                      PICO_VERSION_PATTERN="$(php -r "
-                          require_once('./lib/Pico.php');
-                          echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
-                      ")"
-                  fi
-
-                  if [ -n "$PICO_VERSION_PATTERN" ]; then
-                      COMPOSER_ROOT_VERSION="$PICO_VERSION_PATTERN"
-                      echo "COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION" | tee -a "$GITHUB_ENV"
-                  fi
-
-            - name: Get Composer cache directory
-              run: |
-                  COMPOSER_CACHE_DIR="$(composer config cache-dir)"
-                  echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
-
-            - name: Restore Composer cache
-              uses: actions/cache@v2
-              with:
-                  path: ${{ env.COMPOSER_CACHE_DIR }}
-                  key: ${{ runner.os }}-composer-php${{ matrix.PHP_VERSION }}
-                  restore-keys: |
-                      ${{ runner.os }}-composer-
-
-            - name: Install Composer dependencies
-              run: |
-                  composer install
+                  php-tools: phpcs
 
             - name: Run PHP_CodeSniffer
               run: |

From b9de38f7f2b9861d4a25aae0bb9cc9fdb3204ddd Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 19 Feb 2022 16:38:24 +0100
Subject: [PATCH 37/75] CI: Improve reusable 'install' action

---
 .github/actions/install/action.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index a5150e4ec..92073f556 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -30,24 +30,11 @@ runs:
           run: |
               COMPOSER_ROOT_VERSION=
 
-              COMPOSER_BRANCH_ALIAS="$(php -r "
-                  \$json = json_decode(file_get_contents('./composer.json'), true);
-                  if (\$json !== null) {
-                      if (isset(\$json['extra']['branch-alias']['dev-$GITHUB_REF_NAME'])) {
-                          echo 'dev-$GITHUB_REF_NAME';
-                      }
-                  }
-              ")"
-
-              if [ -z "$COMPOSER_BRANCH_ALIAS" ]; then
-                  PICO_VERSION_PATTERN="$(php -r "
+              if [ -z "$(composer config extra.branch-alias."dev-$GITHUB_REF_NAME")" ]; then
+                  COMPOSER_ROOT_VERSION="$(php -r "
                       require('./lib/Pico.php');
                       echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
                   ")"
-              fi
-
-              if [ -n "$PICO_VERSION_PATTERN" ]; then
-                  COMPOSER_ROOT_VERSION="$PICO_VERSION_PATTERN"
                   echo "COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION" | tee -a "$GITHUB_ENV"
               fi
 

From d01918a2fec0dab827982f39d6de5e476ccd5500 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 19 Feb 2022 16:46:11 +0100
Subject: [PATCH 38/75] CI: Update Stale Bot config

---
 .github/workflows/stale.yml | 53 ++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 878d942c9..5ca512e0d 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,28 +1,33 @@
-name: "Mark or close stale issues and PRs"
+name: Mark or close stale issues and PRs
+
 on:
-  schedule:
-    - cron: "0 12 * * *"
+    schedule:
+        - cron: "0 */6 * * *"
 
 jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v3
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 7
-          days-before-close: 2
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has not had
-            recent activity. It will be closed in two days if no further activity
-            occurs. Thank you for your contributions! :+1:
-          stale-pr-message: >
-            This pull request has been automatically marked as stale because it has not had
-            recent activity. It will be closed in two days if no further activity
-            occurs. Thank you for your contributions! :+1:
-          stale-pr-label: "info: Stale"
-          stale-issue-label: "info: Stale"
-          exempt-issue-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned"
-          exempt-pr-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned"
-          remove-stale-when-updated: true
+    stale:
+        name: Mark or close stale issues and PRs
+
+        runs-on: ubuntu-latest
+        permissions:
+            issues: write
+            pull-requests: write
 
+        steps:
+            -   uses: actions/stale@v3
+                with:
+                    days-before-stale: 7
+                    days-before-close: 2
+                    stale-issue-message: >
+                        This issue has been automatically marked as stale because it has not had
+                        recent activity. It will be closed in two days if no further activity
+                        occurs. Thank you for your contributions! :+1:
+                    stale-pr-message: >
+                        This pull request has been automatically marked as stale because it has not had
+                        recent activity. It will be closed in two days if no further activity
+                        occurs. Thank you for your contributions! :+1:
+                    stale-pr-label: "info: Stale"
+                    stale-issue-label: "info: Stale"
+                    exempt-issue-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned"
+                    exempt-pr-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned"
+                    remove-stale-when-updated: true

From f4706bb8e1562b23fa192e57d3579feaa88deafe Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 19 Feb 2022 16:46:49 +0100
Subject: [PATCH 39/75] CI: Improve GitHub Actions YAML formatting

---
 .github/actions/install/action.yml | 88 +++++++++++++++---------------
 .github/workflows/test.yml         | 24 ++++----
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index 92073f556..59df5464c 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -12,47 +12,47 @@ inputs:
 runs:
     using: "composite"
     steps:
-        - name: Setup PHP ${{ inputs.php-version }}
-          uses: shivammathur/setup-php@v2
-          with:
-              php-version: ${{ inputs.php-version }}
-              tools: composer, ${{ inputs.php-tools }}
-
-        - name: Read Pico version
-          shell: bash
-          run: |
-              PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
-              echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
-
-        - name: Setup Composer
-          if: ${{ github.ref_type == 'branch' }}
-          shell: bash
-          run: |
-              COMPOSER_ROOT_VERSION=
-
-              if [ -z "$(composer config extra.branch-alias."dev-$GITHUB_REF_NAME")" ]; then
-                  COMPOSER_ROOT_VERSION="$(php -r "
-                      require('./lib/Pico.php');
-                      echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
-                  ")"
-                  echo "COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION" | tee -a "$GITHUB_ENV"
-              fi
-
-        - name: Get Composer cache directory
-          shell: bash
-          run: |
-              COMPOSER_CACHE_DIR="$(composer config cache-dir)"
-              echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
-
-        - name: Restore Composer cache
-          uses: actions/cache@v2
-          with:
-              path: ${{ env.COMPOSER_CACHE_DIR }}
-              key: ${{ runner.os }}-composer-php${{ inputs.php-version }}
-              restore-keys: |
-                  ${{ runner.os }}-composer-
-
-        - name: Install Composer dependencies
-          shell: bash
-          run: |
-              composer install
+        -   name: Setup PHP ${{ inputs.php-version }}
+            uses: shivammathur/setup-php@v2
+            with:
+                php-version: ${{ inputs.php-version }}
+                tools: composer, ${{ inputs.php-tools }}
+
+        -   name: Read Pico version
+            shell: bash
+            run: |
+                PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
+                echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
+
+        -   name: Setup Composer
+            if: ${{ github.ref_type == 'branch' }}
+            shell: bash
+            run: |
+                COMPOSER_ROOT_VERSION=
+
+                if [ -z "$(composer config extra.branch-alias."dev-$GITHUB_REF_NAME")" ]; then
+                    COMPOSER_ROOT_VERSION="$(php -r "
+                        require('./lib/Pico.php');
+                        echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
+                    ")"
+                    echo "COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION" | tee -a "$GITHUB_ENV"
+                fi
+
+        -   name: Get Composer cache directory
+            shell: bash
+            run: |
+                COMPOSER_CACHE_DIR="$(composer config cache-dir)"
+                echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
+
+        -   name: Restore Composer cache
+            uses: actions/cache@v2
+            with:
+                path: ${{ env.COMPOSER_CACHE_DIR }}
+                key: ${{ runner.os }}-composer-php${{ inputs.php-version }}
+                restore-keys: |
+                    ${{ runner.os }}-composer-
+
+        -   name: Install Composer dependencies
+            shell: bash
+            run: |
+                composer install
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 97fde0e91..23938b678 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,15 +31,15 @@ jobs:
             PHP_VERSION: ${{ matrix.PHP_VERSION }}
 
         steps:
-            - name: Checkout repository
-              uses: actions/checkout@v2
-
-            - name: Install Pico CMS
-              uses: ./.github/actions/install
-              with:
-                  php-version: ${{ env.PHP_VERSION }}
-                  php-tools: phpcs
-
-            - name: Run PHP_CodeSniffer
-              run: |
-                  phpcs --standard=.phpcs.xml
+            -   name: Checkout repository
+                uses: actions/checkout@v2
+
+            -   name: Install Pico CMS
+                uses: ./.github/actions/install
+                with:
+                    php-version: ${{ env.PHP_VERSION }}
+                    php-tools: phpcs
+
+            -   name: Run PHP_CodeSniffer
+                run: |
+                    phpcs --standard=.phpcs.xml

From bdb86d37ff05961485fbff620ca25020704e56c0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 19 Feb 2022 16:52:09 +0100
Subject: [PATCH 40/75] CI: Improve Composer root version guessing for PRs

---
 .github/actions/install/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index 59df5464c..7150c9a69 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -30,7 +30,7 @@ runs:
             run: |
                 COMPOSER_ROOT_VERSION=
 
-                if [ -z "$(composer config extra.branch-alias."dev-$GITHUB_REF_NAME")" ]; then
+                if [ -z "$(composer config extra.branch-alias."dev-${GITHUB_HEAD_REF:-GITHUB_REF_NAME}" 2> /dev/null)" ]; then
                     COMPOSER_ROOT_VERSION="$(php -r "
                         require('./lib/Pico.php');
                         echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);

From 61880d150e0227d30f33cd34322b357bbbfcf41f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 26 Feb 2022 21:52:11 +0100
Subject: [PATCH 41/75] Update Pico::VERSION to '3.0.0-dev'

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

diff --git a/lib/Pico.php b/lib/Pico.php
index ac01c30ae..2e3dbe9a8 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -56,7 +56,7 @@ class Pico
      *
      * @var string
      */
-    public const VERSION = '3.0.0-alpha.1';
+    public const VERSION = '3.0.0-dev';
 
     /**
      * Pico version ID

From 93dbbe750d06584036a4932929dc7d0406f686f0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 26 Feb 2022 21:53:38 +0100
Subject: [PATCH 42/75] Add 'SECURITY.md' to .htaccess

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

diff --git a/.htaccess b/.htaccess
index b3e76858c..742186e63 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|phar))(/|$) index.php [L]
+    RewriteRule ^(CHANGELOG\.md|SECURITY.md|composer\.(json|lock|phar))(/|$) index.php [L]
     RewriteRule (^\.|/\.)(?!well-known(/|$)) index.php [L]
 
     # Enable URL rewriting

From 4bf326076666ab6472fc5066d759cc031ef623c8 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 26 Feb 2022 21:53:57 +0100
Subject: [PATCH 43/75] phpDoc: Ignore .github dir

---
 .phpdoc.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.phpdoc.xml b/.phpdoc.xml
index 1a60543b2..0180a69ad 100644
--- a/.phpdoc.xml
+++ b/.phpdoc.xml
@@ -16,6 +16,7 @@
             </source>
             <ignore hidden="true" symlinks="true">
                 <path>.build/**/*</path>
+                <path>.github/**/*</path>
                 <path>vendor/**/*</path>
             </ignore>
             <extensions>

From e3365a4345057b80492b38f7c0d57e09d8dc3f8c Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 26 Feb 2022 22:27:43 +0100
Subject: [PATCH 44/75] CI: Check Pico version on tag push

---
 .github/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 23938b678..98ffb1fc0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,6 +40,11 @@ jobs:
                     php-version: ${{ env.PHP_VERSION }}
                     php-tools: phpcs
 
+            -   name: Check Pico version
+                if: ${{ github.ref_type == 'tag' }}
+                run: |
+                    [ "$GITHUB_REF_NAME" == "v$PICO_VERSION" ]
+
             -   name: Run PHP_CodeSniffer
                 run: |
                     phpcs --standard=.phpcs.xml

From 261b5c68a70716b6ec64f0770fe4a7114b543825 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 26 Feb 2022 23:43:26 +0100
Subject: [PATCH 45/75] CI: Add 'deploy-branch.yml' workflow to update website
 on branch updates

---
 .github/actions/install/action.yml  | 10 ++-
 .github/workflows/deploy-branch.yml | 97 +++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/deploy-branch.yml

diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index 7150c9a69..8068e8c1c 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -2,6 +2,10 @@ name: Install Pico CMS
 description: Install Pico CMS to the current working directory
 
 inputs:
+    path:
+        description: Install Pico CMS in directory.
+        required: false
+        default: .
     php-version:
         description: PHP version to setup.
         required: true
@@ -20,6 +24,7 @@ runs:
 
         -   name: Read Pico version
             shell: bash
+            working-directory: ${{ inputs.path }}
             run: |
                 PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
                 echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
@@ -27,6 +32,7 @@ runs:
         -   name: Setup Composer
             if: ${{ github.ref_type == 'branch' }}
             shell: bash
+            working-directory: ${{ inputs.path }}
             run: |
                 COMPOSER_ROOT_VERSION=
 
@@ -40,8 +46,9 @@ runs:
 
         -   name: Get Composer cache directory
             shell: bash
+            working-directory: ${{ inputs.path }}
             run: |
-                COMPOSER_CACHE_DIR="$(composer config cache-dir)"
+                COMPOSER_CACHE_DIR="$(composer config --global cache-dir)"
                 echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
 
         -   name: Restore Composer cache
@@ -54,5 +61,6 @@ runs:
 
         -   name: Install Composer dependencies
             shell: bash
+            working-directory: ${{ inputs.path }}
             run: |
                 composer install
diff --git a/.github/workflows/deploy-branch.yml b/.github/workflows/deploy-branch.yml
new file mode 100644
index 000000000..c8fd01beb
--- /dev/null
+++ b/.github/workflows/deploy-branch.yml
@@ -0,0 +1,97 @@
+name: Git branch deployment
+
+on:
+    push:
+        branches:
+            - 'master'
+            - 'pico-3.0'
+
+env:
+    WEBSITE_REPO_SLUG: picocms/picocms.github.io
+    WEBSITE_REPO_BRANCH: master
+    CI_TOOLS_SETUP: https://raw.githubusercontent.com/picocms/ci-tools/master/setup.sh
+
+jobs:
+    website:
+        name: Update website for branch updates
+
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+
+        env:
+            PHP_VERSION: '7.4'
+            BUILD_DIR: ./build
+            WEBSITE_DIR: ./website
+
+        steps:
+            -   name: Setup CI tools
+                run: |
+                    . <(curl -fsS -L "$CI_TOOLS_SETUP")
+                    echo "CI_TOOLS_PATH=$CI_TOOLS_PATH" | tee -a "$GITHUB_ENV"
+
+            -   name: Checkout repository
+                uses: actions/checkout@v2
+                with:
+                    path: ${{ env.BUILD_DIR }}
+
+            -   name: Install Pico CMS
+                uses: ./build/.github/actions/install
+                with:
+                    path: ${{ env.BUILD_DIR }}
+                    php-version: ${{ env.PHP_VERSION }}
+                    php-tools: phpdoc
+
+            -   name: Read Pico milestone
+                working-directory: ${{ env.BUILD_DIR }}
+                run: |
+                    PICO_VERSION_MILESTONE="$(php -r 'require("./lib/Pico.php"); preg_match("/^([0-9]+\.[0-9]+)\./", Pico::VERSION, $m); echo $m[1];')"
+                    echo "PICO_VERSION_MILESTONE=$PICO_VERSION_MILESTONE" | tee -a "$GITHUB_ENV"
+
+            -   name: Checkout website repository
+                uses: actions/checkout@v2
+                with:
+                    repository: ${{ env.WEBSITE_REPO_SLUG }}
+                    ref: ${{ env.WEBSITE_REPO_BRANCH }}
+                    path: ${{ env.WEBSITE_DIR }}
+
+            #
+            # Update phpDoc class docs
+            #
+
+            -   name: Update phpDoc class docs
+                run: |
+                    "$CI_TOOLS_PATH/generate-phpdoc.sh" \
+                        "$BUILD_DIR/.phpdoc.xml" \
+                        "$WEBSITE_DIR/phpDoc/$GITHUB_REF_NAME" \
+                        "$WEBSITE_DIR/phpDoc/$GITHUB_REF_NAME.cache" \
+                        "Pico $PICO_VERSION_MILESTONE API Documentation ($GITHUB_REF_NAME branch)"
+
+            -   name: Check for phpDoc class docs updates
+                run: |
+                    PHPDOC_UPDATED="$([ -n "$(git -C "$WEBSITE_DIR" status --porcelain "phpDoc/$GITHUB_REF_NAME.cache")" ] && echo "yes" || echo "no")"
+                    echo "PHPDOC_UPDATED=$PHPDOC_UPDATED" | tee -a "$GITHUB_ENV"
+
+            -   name: Update phpDoc class docs list
+                if: ${{ env.PHPDOC_UPDATED == 'yes' }}
+                run: |
+                    "$CI_TOOLS_PATH/update-phpdoc-list.sh" \
+                        "$WEBSITE_DIR/_data/phpDoc.yml" \
+                        "$GITHUB_REF_NAME" "branch" \
+                        "<code>$GITHUB_REF_NAME</code> branch" "$(date +%s)"
+
+            -   name: Commit phpDoc class docs updates
+                if: ${{ env.PHPDOC_UPDATED == 'yes' }}
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    repository: ${{ env.WEBSITE_DIR }}
+                    file_pattern: >-
+                        phpDoc/${{ github.ref_name }}
+                        phpDoc/${{ github.ref_name }}.cache
+                        _data/phpDoc.yml
+                    commit_user_name: Pico CMS Bot
+                    commit_user_email: bot@picocms.org
+                    commit_message: >-
+                        Update phpDocumentor class docs
+                        for ${{ github.ref_name }} branch
+                        @ ${{ github.sha }}

From 1aacce829f83cc9a1e9e5fd9abcee8db7d94a9a2 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 27 Feb 2022 21:20:19 +0100
Subject: [PATCH 46/75] :tada: Switch from Travis CI to GitHub Actions for
 release deployment

Since Travis CI was transformed into a proprietary service we didn't have a CI pipeline. This heavily refactors and simplifies the CI pipeline and uses GitHub Actions to deploy new Pico releases. You can use Pico's Makefile to build new releases locally, too. Pico's build script no longer depends on any external resources (like our `picocms/ci-tools` collection). However, this isn't true for other release deployment steps, like updating phpDoc class docs, version badge, cloc stats, etc., even though the CI scripts are mostly self-containing now.
---
 .build/build.sh                      | 446 +++++++++++++++++++++++++++
 .build/clean.sh                      |  25 --
 .build/deploy-branch.sh              |  44 ---
 .build/deploy-release.sh             | 119 -------
 .build/init.sh.inc                   |  19 --
 .build/install.sh                    |  40 ---
 .build/release.sh                    |  91 ------
 .gitattributes                       |   1 -
 .github/workflows/deploy-release.yml | 248 +++++++++++++++
 .github/workflows/test.yml           |   2 +-
 .gitignore                           |   3 -
 .travis.yml                          |  69 -----
 CONTRIBUTING.md                      |   4 +-
 Makefile                             |  51 +++
 14 files changed, 748 insertions(+), 414 deletions(-)
 create mode 100755 .build/build.sh
 delete mode 100755 .build/clean.sh
 delete mode 100755 .build/deploy-branch.sh
 delete mode 100755 .build/deploy-release.sh
 delete mode 100644 .build/init.sh.inc
 delete mode 100755 .build/install.sh
 delete mode 100755 .build/release.sh
 create mode 100644 .github/workflows/deploy-release.yml
 delete mode 100644 .travis.yml
 create mode 100644 Makefile

diff --git a/.build/build.sh b/.build/build.sh
new file mode 100755
index 000000000..d6d6f4629
--- /dev/null
+++ b/.build/build.sh
@@ -0,0 +1,446 @@
+#!/bin/bash
+# Pico -- build.sh
+# Builds a new Pico release and creates release archives.
+#
+# This file is part of Pico, a stupidly simple, blazing fast, flat file CMS.
+# Visit us at https://picocms.org/ for more info.
+#
+# Copyright (c) 2017  Daniel Rudolf <https://www.daniel-rudolf.de>
+#
+# This work is licensed under the terms of the MIT license.
+# For a copy, see LICENSE file or <https://opensource.org/licenses/MIT>.
+#
+# SPDX-License-Identifier: MIT
+# License-Filename: LICENSE
+
+set -eu -o pipefail
+export LC_ALL=C
+
+# env variables
+PHP="${PHP:-php}"
+export -n PHP
+
+COMPOSER="${COMPOSER:-composer}"
+export -n COMPOSER
+
+if ! which "$PHP" > /dev/null; then
+    echo "Missing script dependency: php" >&2
+    exit 1
+elif ! which "$COMPOSER" > /dev/null; then
+    echo "Missing script dependency: composer" >&2
+    exit 1
+elif ! which "git" > /dev/null; then
+    echo "Missing script dependency: git" >&2
+    exit 1
+elif ! which "rsync" > /dev/null; then
+    echo "Missing script dependency: rsync" >&2
+    exit 1
+elif ! which "jq" > /dev/null; then
+    echo "Missing script dependency: jq" >&2
+    exit 1
+fi
+
+# parameters
+BUILD_NAME="pico"
+BUILD_PROJECT="picocms/pico"
+BUILD_VERSION=
+
+PICO_COMPOSER_NAME="pico-composer"
+PICO_COMPOSER_PROJECT="picocms/pico-composer"
+PICO_COMPOSER_DIR=
+
+PICO_THEME_NAME="pico-theme"
+PICO_THEME_PROJECT="picocms/pico-theme"
+PICO_THEME_DIR=
+
+PICO_DEPRECATED_NAME="pico-deprecated"
+PICO_DEPRECATED_PROJECT="picocms/pico-deprecated"
+PICO_DEPRECATED_DIR=
+
+# options
+VERSION=
+NOCHECK=
+NOCLEAN=
+
+while [ $# -gt 0 ]; do
+    if [ "$1" == "--help" ]; then
+        echo "Usage:"
+        echo "  build.sh [OPTIONS]... [VERSION]"
+        echo
+        echo "Builds a new Pico release and creates release archives."
+        echo
+        echo "Help options:"
+        echo "  --help                  display this help and exit"
+        echo
+        echo "Application options:"
+        echo "  --pico-composer PATH    path to a local copy of '$PICO_COMPOSER_PROJECT'"
+        echo "  --pico-theme PATH       path to a local copy of '$PICO_THEME_PROJECT'"
+        echo "  --pico-deprecated PATH  path to a local copy of '$PICO_DEPRECATED_PROJECT'"
+        echo "  --no-check              skip version checks for dev builds"
+        echo "  --no-clean              don't remove build dir on exit"
+        echo
+        echo "You must run this script from within Pico's source directory. Please note"
+        echo "that this script will perform a large number of strict sanity checks before"
+        echo "building a new non-development version of Pico. VERSION must start with 'v'."
+        exit 0
+    elif [ "$1" == "--no-check" ]; then
+        NOCHECK="y"
+        shift
+    elif [ "$1" == "--no-clean" ]; then
+        NOCLEAN="y"
+        shift
+    elif [ "$1" == "--pico-composer" ] && [ $# -ge 2 ]; then
+        PICO_COMPOSER_DIR="$2"
+        shift 2
+    elif [ "$1" == "--pico-theme" ] && [ $# -ge 2 ]; then
+        PICO_THEME_DIR="$2"
+        shift 2
+    elif [ "$1" == "--pico-deprecated" ] && [ $# -ge 2 ]; then
+        PICO_DEPRECATED_DIR="$2"
+        shift 2
+    elif [ -z "$VERSION" ] && [ "${1:0:1}" == "v" ]; then
+        VERSION="$1"
+        shift
+    else
+        echo "Unknown option: $1" >&2
+        exit 1
+    fi
+done
+
+# check options and current working dir
+if [ ! -f "./composer.json" ] || [ ! -f "./lib/Pico.php" ]; then
+    echo "You must run this from within Pico's source directory" >&2
+    exit 1
+elif [ "$(git rev-parse --is-inside-work-tree 2> /dev/null)" != "true" ]; then
+    echo "You must run this from within a non-bare Git repository" >&2
+    exit 1
+fi
+
+if [ -n "$PICO_COMPOSER_DIR" ]; then
+    if [ ! -f "$PICO_COMPOSER_DIR/composer.json" ] || [ ! -f "$PICO_COMPOSER_DIR/index.php" ]; then
+        echo "You must pass a source directory of '$PICO_COMPOSER_PROJECT' as '--pico-composer': $PICO_COMPOSER_DIR" >&2
+        exit 1
+    elif [ "$(git -C "$PICO_COMPOSER_DIR" rev-parse --is-inside-work-tree 2> /dev/null)" != "true" ]; then
+        echo "You must pass a non-bare Git repository as '--pico-composer': $PICO_COMPOSER_DIR" >&2
+        exit 1
+    fi
+fi
+
+if [ -n "$PICO_THEME_DIR" ]; then
+    if [ ! -f "$PICO_THEME_DIR/composer.json" ] || [ ! -f "$PICO_THEME_DIR/pico-theme.yml" ]; then
+        echo "You must pass a source directory of '$PICO_THEME_PROJECT' as '--pico-theme': $PICO_THEME_DIR" >&2
+        exit 1
+    elif [ "$(git -C "$PICO_THEME_DIR" rev-parse --is-inside-work-tree 2> /dev/null)" != "true" ]; then
+        echo "You must pass a non-bare Git repository as '--pico-theme': $PICO_THEME_DIR" >&2
+        exit 1
+    fi
+fi
+
+if [ -n "$PICO_DEPRECATED_DIR" ]; then
+    if [ ! -f "$PICO_DEPRECATED_DIR/composer.json" ] || [ ! -f "$PICO_DEPRECATED_DIR/PicoDeprecated.php" ]; then
+        echo "You must pass a source directory of '$PICO_DEPRECATED_PROJECT' as '--pico-deprecated': $PICO_DEPRECATED_DIR" >&2
+        exit 1
+    elif [ "$(git -C "$PICO_DEPRECATED_DIR" rev-parse --is-inside-work-tree 2> /dev/null)" != "true" ]; then
+        echo "You must pass a non-bare Git repository as '--pico-deprecated': $PICO_DEPRECATED_DIR" >&2
+        exit 1
+    fi
+fi
+
+# parse version
+function parse_version {
+    VERSION_FULL="${1#v}"
+
+    if ! [[ "$VERSION_FULL" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9A-Za-z\.\-]+))?(\+([0-9A-Za-z\.\-]+))?$ ]]; then
+        return 1
+    fi
+
+    VERSION_MAJOR="${BASH_REMATCH[1]}"
+    VERSION_MINOR="${BASH_REMATCH[2]}"
+    VERSION_PATCH="${BASH_REMATCH[3]}"
+    VERSION_SUFFIX="${BASH_REMATCH[5]}"
+
+    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
+}
+
+BUILD_VERSION="v$("$PHP" -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
+
+if ! parse_version "$BUILD_VERSION"; then
+     echo "Unable to build Pico: Invalid Pico version '$BUILD_VERSION'" >&2
+     exit 1
+fi
+
+if [ -z "$VERSION" ]; then
+    GIT_LOCAL_HEAD="$(git rev-parse HEAD)"
+    GIT_LOCAL_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+    DATETIME="$(date -u +'%Y%m%dT%H%M%SZ')"
+
+    VERSION="v$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+    [ -z "$VERSION_SUFFIX" ] || VERSION+="-$VERSION_SUFFIX"
+    [ "$VERSION_STABILITY" == "dev" ] || VERSION+="-dev"
+    VERSION+="+git.$GIT_LOCAL_HEAD.$DATETIME"
+
+    if ! parse_version "$VERSION"; then
+         echo "Unable to build Pico: Invalid build version '$VERSION'" >&2
+         exit 1
+    fi
+
+    DEPENDENCY_VERSION="dev-$GIT_LOCAL_BRANCH"
+else
+    if ! parse_version "$VERSION"; then
+         echo "Unable to build Pico: Invalid build version '$VERSION'" >&2
+         exit 1
+    fi
+
+    DEPENDENCY_VERSION=
+    if [ "$VERSION_STABILITY" == "dev" ]; then
+         DEPENDENCY_VERSION="$(jq -r --arg ALIAS "$VERSION_MAJOR.$VERSION_MINOR.x-dev" \
+            '.extra."branch-alias"|to_entries|map(select(.value==$ALIAS).key)[0]//empty' \
+            "composer.json")"
+    fi
+
+    if [ -z "$DEPENDENCY_VERSION" ]; then
+        DEPENDENCY_VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+        [ -z "$VERSION_SUFFIX" ] || DEPENDENCY_VERSION+="-$VERSION_SUFFIX"
+        [ "$VERSION_STABILITY" == "stable" ] || DEPENDENCY_VERSION+="@$VERSION_STABILITY"
+    fi
+fi
+
+# build checks
+if [ "$VERSION_STABILITY" != "dev" ]; then
+    GIT_LOCAL_CLEAN="$(git status --porcelain)"
+    GIT_LOCAL_HEAD="$(git rev-parse HEAD)"
+    GIT_LOCAL_TAG="$(git rev-parse --verify "refs/tags/$VERSION" 2> /dev/null || true)"
+    GIT_REMOTE="$(git 'for-each-ref' --format='%(upstream:remotename)' "$(git symbolic-ref -q HEAD)")"
+    GIT_REMOTE_TAG="$(git ls-remote "${GIT_REMOTE:-origin}" "refs/tags/$VERSION" 2> /dev/null | cut -f 1 || true)"
+
+    if [ "$VERSION" != "$BUILD_VERSION" ]; then
+        echo "Unable to build Pico: Building $VERSION, but Pico indicates $BUILD_VERSION" >&2
+        exit 1
+    elif [ -n "$GIT_LOCAL_CLEAN" ]; then
+        echo "Unable to build Pico: Building $VERSION, but the working tree is not clean" >&2
+        exit 1
+    elif [ -z "$GIT_LOCAL_TAG" ]; then
+        echo "Unable to build Pico: Building $VERSION, but no matching local Git tag was found" >&2
+        exit 1
+    elif [ "$GIT_LOCAL_HEAD" != "$GIT_LOCAL_TAG" ]; then
+        echo "Unable to build Pico: Building $VERSION, but the matching Git tag is not checked out" >&2
+        exit 1
+    elif [ -z "$GIT_REMOTE_TAG" ]; then
+        echo "Unable to build Pico: Building $VERSION, but no matching remote Git tag was found" >&2
+        exit 1
+    elif [ "$GIT_LOCAL_TAG" != "$GIT_REMOTE_TAG" ]; then
+        echo "Unable to build Pico: Building $VERSION, but the matching local and remote Git tags differ" >&2
+        exit 1
+    elif [ -n "$PICO_COMPOSER_DIR" ] || [ -n "$PICO_THEME_DIR" ] || [ -n "$PICO_DEPRECATED_DIR" ]; then
+        echo "Unable to build Pico: Refusing to build a non-dev version with local dependencies" >&2
+        exit 1
+    fi
+elif [ -z "$NOCHECK" ]; then
+    if [[ "$VERSION" != "$BUILD_VERSION"* ]]; then
+        echo "Unable to build Pico: Building $VERSION, but Pico indicates $BUILD_VERSION" >&2
+        exit 1
+    fi
+fi
+
+# build in progress...
+APP_DIR="$PWD"
+
+BUILD_DIR="$(mktemp -d)"
+[ -n "$NOCLEAN" ] || trap "rm -rf ${BUILD_DIR@Q}" ERR EXIT
+
+echo "Building Pico $BUILD_VERSION ($VERSION)..."
+[ -z "$NOCLEAN" ] || echo "Build directory: $BUILD_DIR"
+echo
+
+if [ "$VERSION_STABILITY" == "dev" ]; then
+    # copy dev version of Pico
+    echo "Creating clean working tree copy of '$BUILD_PROJECT'..."
+    rsync -a \
+        --exclude="/.build" \
+        --exclude="/.git" \
+        --exclude="/.github" \
+        --exclude="/assets/.gitignore" \
+        --exclude="/config/.gitignore" \
+        --exclude="/content/.gitignore" \
+        --exclude="/plugins/.gitignore" \
+        --exclude="/themes/.gitignore" \
+        --exclude="/.gitattributes" \
+        --exclude="/.gitignore" \
+        --exclude="/.phpcs.xml" \
+        --exclude="/.phpdoc.xml" \
+        --exclude-from=<(git ls-files --exclude-standard -oi --directory) \
+        ./ "$BUILD_DIR/$BUILD_NAME/"
+
+    # copy dev version of Composer starter project
+    if [ -n "$PICO_COMPOSER_DIR" ]; then
+        echo "Creating clean working tree copy of '$PICO_COMPOSER_PROJECT'..."
+        rsync -a \
+            --exclude="/.git" \
+            --exclude="/assets/.gitignore" \
+            --exclude="/config/.gitignore" \
+            --exclude="/content/.gitignore" \
+            --exclude="/plugins/.gitignore" \
+            --exclude="/themes/.gitignore" \
+            --exclude="/.gitattributes" \
+            --exclude="/.gitignore" \
+            --exclude-from=<(git -C "$PICO_COMPOSER_DIR" ls-files --exclude-standard -oi --directory) \
+            "$PICO_COMPOSER_DIR/" "$BUILD_DIR/$PICO_COMPOSER_NAME/"
+    fi
+
+    # copy dev version of default theme
+    if [ -n "$PICO_THEME_DIR" ]; then
+        echo "Creating clean working tree copy of '$PICO_THEME_PROJECT'..."
+        rsync -a \
+            --exclude="/.git" \
+            --exclude="/.github" \
+            --exclude="/.gitattributes" \
+            --exclude="/.gitignore" \
+            --exclude-from=<(git -C "$PICO_THEME_DIR" ls-files --exclude-standard -oi --directory) \
+            "$PICO_THEME_DIR/" "$BUILD_DIR/$PICO_THEME_NAME/"
+    fi
+
+    # copy dev version of PicoDeprecated
+    if [ -n "$PICO_DEPRECATED_DIR" ]; then
+        echo "Creating clean working tree copy of '$PICO_DEPRECATED_PROJECT'..."
+        rsync -a \
+            --exclude="/.build" \
+            --exclude="/.git" \
+            --exclude="/.github" \
+            --exclude="/.gitattributes" \
+            --exclude="/.gitignore" \
+            --exclude="/.phpcs.xml" \
+            --exclude-from=<(git -C "$PICO_DEPRECATED_DIR" ls-files --exclude-standard -oi --directory) \
+            "$PICO_DEPRECATED_DIR/" "$BUILD_DIR/$PICO_DEPRECATED_NAME/"
+    fi
+
+    echo
+fi
+
+if [ "$VERSION_STABILITY" != "dev" ] || [ -z "$PICO_COMPOSER_DIR" ]; then
+    PICO_COMPOSER_VERSION="$DEPENDENCY_VERSION"
+    [[ "$PICO_COMPOSER_VERSION" == "dev-"* ]] || PICO_COMPOSER_VERSION="$VERSION_MAJOR.$VERSION_MINOR"
+
+    # download Composer starter project
+    echo "Setting up Pico's Composer starter project (version '$PICO_COMPOSER_VERSION')..."
+    "$COMPOSER" create-project --no-install "$PICO_COMPOSER_PROJECT" \
+        "$BUILD_DIR/$PICO_COMPOSER_NAME" \
+        "$PICO_COMPOSER_VERSION"
+    echo
+fi
+
+# switch to build dir...
+cd "$BUILD_DIR/$PICO_COMPOSER_NAME"
+
+# inject local copy of Pico
+if [ "$VERSION_STABILITY" == "dev" ]; then
+    function composer_repo_config {
+        jq -nc --arg PACKAGE "$1" --arg VERSION "$2" --arg URL "$3" \
+            '{"type": "path", "url": $URL, options: {"symlink": false, "versions": {($PACKAGE): $VERSION}}}'
+    }
+
+    echo "Adding Composer repository for '$BUILD_PROJECT'..."
+    "$COMPOSER" config repositories."$BUILD_NAME" \
+        "$(composer_repo_config "$BUILD_PROJECT" "$DEPENDENCY_VERSION" "$BUILD_DIR/$BUILD_NAME")"
+
+    if [ -n "$PICO_THEME_DIR" ]; then
+        echo "Adding Composer repository for '$PICO_THEME_PROJECT'..."
+        "$COMPOSER" config repositories."$PICO_THEME_NAME" \
+            "$(composer_repo_config "$PICO_THEME_PROJECT" "$DEPENDENCY_VERSION" "$BUILD_DIR/$PICO_THEME_NAME")"
+    fi
+
+    if [ -n "$PICO_DEPRECATED_DIR" ]; then
+        echo "Adding Composer repository for '$PICO_DEPRECATED_PROJECT'..."
+        "$COMPOSER" config repositories."$PICO_DEPRECATED_NAME" \
+            "$(composer_repo_config "$PICO_DEPRECATED_PROJECT" "$DEPENDENCY_VERSION" "$BUILD_DIR/$PICO_DEPRECATED_NAME")"
+    fi
+
+    echo
+fi
+
+# update build version constraints
+echo "Updating Composer dependency version constraints..."
+"$COMPOSER" require --no-update \
+    "$BUILD_PROJECT $DEPENDENCY_VERSION" \
+    "$PICO_THEME_PROJECT $DEPENDENCY_VERSION" \
+    "$PICO_DEPRECATED_PROJECT $DEPENDENCY_VERSION"
+echo
+
+# set minimum stability
+if [ "$VERSION_STABILITY" != "stable" ]; then
+    echo "Setting minimum stability to '$VERSION_STABILITY'..."
+    "$COMPOSER" config "minimum-stability" "$VERSION_STABILITY"
+    "$COMPOSER" config "prefer-stable" "true"
+    echo
+fi
+
+# install dependencies
+echo "Installing Composer dependencies..."
+"$COMPOSER" install --no-dev --optimize-autoloader
+echo
+
+# prepare release
+echo "Replacing 'index.php'..."
+cp "vendor/$BUILD_PROJECT/index.php.dist" index.php
+
+echo "Adding 'README.md', 'CONTRIBUTING.md', 'CHANGELOG.md', 'SECURITY.md'..."
+cp "vendor/$BUILD_PROJECT/README.md" README.md
+cp "vendor/$BUILD_PROJECT/CONTRIBUTING.md" CONTRIBUTING.md
+cp "vendor/$BUILD_PROJECT/CHANGELOG.md" CHANGELOG.md
+cp "vendor/$BUILD_PROJECT/SECURITY.md" SECURITY.md
+
+echo "Removing '.git' directory..."
+rm -rf .git
+
+echo "Removing '.git' directories of dependencies..."
+find vendor/ -type d -path 'vendor/*/*/.git' -print0 | xargs -0 rm -rf
+
+echo "Removing '.git' directories of plugins and themes..."
+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 "Removing 'index.php' and 'index.php.dist' from 'vendor/$BUILD_PROJECT'"
+rm -f "vendor/$BUILD_PROJECT/index.php"
+rm -f "vendor/$BUILD_PROJECT/index.php.dist"
+echo
+
+# restore composer.json
+echo "Restoring Composer dependency version constraints..."
+"$COMPOSER" require --no-update \
+    "$BUILD_PROJECT ^$VERSION_MAJOR.$VERSION_MINOR" \
+    "$PICO_THEME_PROJECT ^$VERSION_MAJOR.$VERSION_MINOR" \
+    "$PICO_DEPRECATED_PROJECT ^$VERSION_MAJOR.$VERSION_MINOR"
+
+if [ "$VERSION_STABILITY" == "dev" ]; then
+    echo "Removing Composer repositories..."
+    "$COMPOSER" config --unset repositories."$BUILD_NAME"
+
+    if [ -n "$PICO_THEME_DIR" ]; then
+        "$COMPOSER" config --unset repositories."$PICO_THEME_NAME"
+    fi
+    if [ -n "$PICO_DEPRECATED_DIR" ]; then
+        "$COMPOSER" config --unset repositories."$PICO_DEPRECATED_NAME"
+    fi
+fi
+
+echo
+
+# create release archives
+ARCHIVE_FILENAME="$BUILD_NAME-release-$VERSION"
+
+echo "Creating release archive '$ARCHIVE_FILENAME.tar.gz'..."
+find . -mindepth 1 -maxdepth 1 -printf '%f\0' \
+    | xargs -0 -- tar -czf "$APP_DIR/$ARCHIVE_FILENAME.tar.gz" --
+
+echo "Creating release archive '$ARCHIVE_FILENAME.zip'..."
+zip -q -r "$APP_DIR/$ARCHIVE_FILENAME.zip" .
diff --git a/.build/clean.sh b/.build/clean.sh
deleted file mode 100755
index a816cb8e9..000000000
--- a/.build/clean.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-[ -n "$PICO_BUILD_ENV" ] || { echo "No Pico build environment specified" >&2; exit 1; }
-
-# parameters
-ARCHIVE_DIR="${1:-$PICO_PROJECT_DIR}"   # directory to create release archives in
-
-# print parameters
-echo "Cleaning up build environment..."
-printf 'PICO_DEPLOY_DIR="%s"\n' "$PICO_DEPLOY_DIR"
-printf 'PICO_BUILD_DIR="%s"\n' "$PICO_BUILD_DIR"
-printf 'ARCHIVE_DIR="%s"\n' "$ARCHIVE_DIR"
-echo
-
-echo "Removing deployment directory..."
-[ ! -d "$PICO_DEPLOY_DIR" ] || rm -rf "$PICO_DEPLOY_DIR"
-
-echo "Removing build directory..."
-[ ! -d "$PICO_BUILD_DIR" ] || rm -rf "$PICO_BUILD_DIR"
-
-echo "Removing release archives..."
-find "$ARCHIVE_DIR" -mindepth 1 -maxdepth 1 \
-    \( -name 'pico-release-*.tar.gz' -o -name 'pico-release-*.zip' \) \
-    -delete
diff --git a/.build/deploy-branch.sh b/.build/deploy-branch.sh
deleted file mode 100755
index d8284a7ed..000000000
--- a/.build/deploy-branch.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-[ -n "$PICO_BUILD_ENV" ] || { echo "No Pico build environment specified" >&2; exit 1; }
-
-# 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
deleted file mode 100755
index eef5d70a0..000000000
--- a/.build/deploy-release.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-[ -n "$PICO_BUILD_ENV" ] || { echo "No Pico build environment specified" >&2; exit 1; }
-
-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_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
-
-# parse version
-. "$PICO_TOOLS_DIR/functions/parse-version.sh.inc"
-
-if ! parse_version "$PROJECT_REPO_TAG"; then
-    echo "Invalid version '$PROJECT_REPO_TAG'; aborting..." >&2
-    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 "$PICO_DEPLOY_DIR" "https://github.com/$DEPLOY_REPO_SLUG.git" "$DEPLOY_REPO_BRANCH"
-
-cd "$PICO_DEPLOY_DIR"
-
-# setup repo
-github-setup.sh
-
-# generate phpDocs
-if [ "$DEPLOY_PHPDOC_RELEASES" == "true" ]; then
-    # generate phpDocs
-    generate-phpdoc.sh \
-        "$PICO_PROJECT_DIR/.phpdoc.xml" \
-        "-" "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT" \
-        "Pico $VERSION_MILESTONE API Documentation (v$VERSION_FULL)"
-
-    if [ -n "$(git status --porcelain "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT")" ]; then
-        # update phpDoc list
-        update-phpdoc-list.sh \
-            "$PICO_DEPLOY_DIR/_data/phpDoc.yml" \
-            "$PICO_DEPLOYMENT" "version" "Pico $VERSION_FULL" "$(date +%s)"
-
-        # commit phpDocs
-        github-commit.sh \
-            "Update phpDocumentor class docs for v$VERSION_FULL" \
-            "$PICO_DEPLOY_DIR/phpDoc/$PICO_DEPLOYMENT" "$PICO_DEPLOY_DIR/_data/phpDoc.yml"
-    fi
-fi
-
-# 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 \
-            "$PICO_DEPLOY_DIR/badges/pico-version.svg" \
-            "release" "$VERSION_FULL" "blue"
-
-        # commit version badge
-        github-commit.sh \
-            "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 \
-            "$PICO_DEPLOY_DIR/_data/version.yml" \
-            "$VERSION_FULL"
-
-        # commit version file
-        github-commit.sh \
-            "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 \
-            "$PICO_PROJECT_DIR" \
-            "$PICO_DEPLOY_DIR/_data/cloc.yml"
-
-        # commit cloc statistics
-        github-commit.sh \
-            "Update cloc statistics for v$VERSION_FULL" \
-            "$PICO_DEPLOY_DIR/_data/cloc.yml"
-    fi
-fi
-
-# deploy
-github-deploy.sh "$PROJECT_REPO_SLUG" "tags/$PROJECT_REPO_TAG" "$PROJECT_REPO_COMMIT"
diff --git a/.build/init.sh.inc b/.build/init.sh.inc
deleted file mode 100644
index e9cee446d..000000000
--- a/.build/init.sh.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-if [ -z "$PICO_BUILD_ENV" ]; then
-    echo "No Pico build environment specified" >&2
-    exit 1
-fi
-
-# add project build dir to $PATH
-export PATH="$PICO_PROJECT_DIR/.build:$PATH"
-
-# set environment variables
-__picocms_cmd export RELEASE_REPO_SLUG="${RELEASE_REPO_SLUG:-picocms/pico-composer}"
-__picocms_cmd export RELEASE_REPO_BRANCH="${RELEASE_REPO_BRANCH:-master}"
-
-if [ "$PROJECT_REPO_SLUG" != "picocms/Pico" ]; then
-    __picocms_cmd export DEPLOY_REPO_SLUG="${DEPLOY_REPO_SLUG:-$PROJECT_REPO_SLUG}"
-    __picocms_cmd export DEPLOY_REPO_BRANCH="${DEPLOY_REPO_BRANCH:-gh-pages}"
-else
-    __picocms_cmd export DEPLOY_REPO_SLUG="${DEPLOY_REPO_SLUG:-picocms.github.io}"
-    __picocms_cmd export DEPLOY_REPO_BRANCH="${DEPLOY_REPO_BRANCH:-master}"
-fi
diff --git a/.build/install.sh b/.build/install.sh
deleted file mode 100755
index 01d772d25..000000000
--- a/.build/install.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-[ -n "$PICO_BUILD_ENV" ] || { echo "No Pico build environment specified" >&2; exit 1; }
-
-# setup build system
-BUILD_REQUIREMENTS=( --phpcs )
-[ "$1" != "--deploy" ] || BUILD_REQUIREMENTS+=( --cloc --phpdoc3 )
-"$PICO_TOOLS_DIR/setup/$PICO_BUILD_ENV.sh" "${BUILD_REQUIREMENTS[@]}"
-
-# set COMPOSER_ROOT_VERSION when necessary
-if [ -z "$COMPOSER_ROOT_VERSION" ] && [ -n "$PROJECT_REPO_BRANCH" ]; then
-    echo "Setting up Composer..."
-
-    PICO_VERSION_PATTERN="$(php -r "
-        \$json = json_decode(file_get_contents('$PICO_PROJECT_DIR/composer.json'), true);
-        if (\$json !== null) {
-            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('$PICO_PROJECT_DIR/lib/Pico.php');
-            echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
-        ")"
-    fi
-
-    if [ -n "$PICO_VERSION_PATTERN" ]; then
-        export COMPOSER_ROOT_VERSION="$PICO_VERSION_PATTERN"
-    fi
-
-    echo
-fi
-
-# install dependencies
-echo "Running \`composer install\`$([ -n "$COMPOSER_ROOT_VERSION" ] && echo -n " ($COMPOSER_ROOT_VERSION)")..."
-composer install --no-suggest
diff --git a/.build/release.sh b/.build/release.sh
deleted file mode 100755
index 7a2cc1d0d..000000000
--- a/.build/release.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-[ -n "$PICO_BUILD_ENV" ] || { echo "No Pico build environment specified" >&2; exit 1; }
-
-# parameters
-VERSION="${1:-$PROJECT_REPO_TAG}"       # version to create a release for
-ARCHIVE_DIR="${2:-$PICO_PROJECT_DIR}"   # directory to create release archives in
-
-# print parameters
-echo "Creating new release..."
-printf 'VERSION="%s"\n' "$VERSION"
-echo
-
-# guess version string
-if [ -z "$VERSION" ]; then
-    PICO_VERSION="$(php -r "
-        require_once('$PICO_PROJECT_DIR/lib/Pico.php');
-        echo preg_replace('/-(?:dev|n|nightly)(?:[.-]?[0-9]+)?(?:[.-]dev)?$/', '', Pico::VERSION);
-    ")"
-
-    VERSION="v$PICO_VERSION-dev+${PROJECT_REPO_BRANCH:-master}"
-    echo "Creating development release of Pico v$PICO_VERSION ($VERSION)..."
-    echo
-fi
-
-# parse version
-. "$PICO_TOOLS_DIR/functions/parse-version.sh.inc"
-
-if ! parse_version "$VERSION"; then
-    echo "Unable to create release archive: Invalid version '$VERSION'" >&2
-    exit 1
-fi
-
-DEPENDENCY_VERSION="$VERSION_FULL@$VERSION_STABILITY"
-if [ "$VERSION_STABILITY" == "dev" ] && [ -n "$VERSION_BUILD" ]; then
-    DEPENDENCY_VERSION="dev-$VERSION_BUILD"
-fi
-
-# clone repo
-github-clone.sh "$PICO_BUILD_DIR" "https://github.com/$RELEASE_REPO_SLUG.git" "$RELEASE_REPO_BRANCH"
-
-cd "$PICO_BUILD_DIR"
-
-# force Pico version
-echo "Updating composer dependencies..."
-composer require --no-update \
-    "picocms/pico $DEPENDENCY_VERSION" \
-    "picocms/pico-theme $DEPENDENCY_VERSION" \
-    "picocms/pico-deprecated $DEPENDENCY_VERSION"
-echo
-
-# force minimum stability <= beta due to Parsedown 1.8 currently being in beta
-if [ "$VERSION_STABILITY" == "stable" ] || [ "$VERSION_STABILITY" == "rc" ]; then
-    VERSION_STABILITY="beta"
-fi
-
-# set minimum stability
-if [ "$VERSION_STABILITY" != "stable" ]; then
-    echo "Setting minimum stability to '$VERSION_STABILITY'..."
-    composer config "minimum-stability" "$VERSION_STABILITY"
-    composer config "prefer-stable" "true"
-    echo
-fi
-
-# 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 "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 "Removing '.git' directories of plugins and themes..."
-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 "Preparing 'composer.json' for release..."
-composer require --no-update \
-    "picocms/pico ^$VERSION_MILESTONE" \
-    "picocms/pico-theme ^$VERSION_MILESTONE" \
-    "picocms/pico-deprecated ^$VERSION_MILESTONE"
-
-# create release archives
-create-release.sh "$PICO_BUILD_DIR" "$ARCHIVE_DIR" "pico-release-v$VERSION_FULL"
diff --git a/.gitattributes b/.gitattributes
index bc9dbf292..9c003e83a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,4 +9,3 @@
 /.gitignore         export-ignore
 /.phpcs.xml         export-ignore
 /.phpdoc.xml        export-ignore
-/.travis.yml        export-ignore
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
new file mode 100644
index 000000000..a303287bc
--- /dev/null
+++ b/.github/workflows/deploy-release.yml
@@ -0,0 +1,248 @@
+name: Git tag deployment
+
+on:
+    push:
+        tags: [ 'v*.*.*' ]
+
+env:
+    WEBSITE_REPO_SLUG: picocms/picocms.github.io
+    WEBSITE_REPO_BRANCH: master
+    CI_TOOLS_SETUP: https://raw.githubusercontent.com/picocms/ci-tools/master/setup.sh
+
+jobs:
+    test:
+        name: Test Pico CMS
+        uses: ./.github/workflows/test.yml
+
+    website:
+        name: Update website for new releases
+
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+
+        needs: test
+
+        env:
+            PHP_VERSION: '7.4'
+            BUILD_DIR: ./build
+            WEBSITE_DIR: ./website
+            CLOC_SOURCE: https://github.com/AlDanial/cloc/releases/download/1.92/cloc-1.92.pl
+
+        steps:
+            -   name: Setup CI tools
+                run: |
+                    . <(curl -fsS -L "$CI_TOOLS_SETUP")
+                    echo "CI_TOOLS_PATH=$CI_TOOLS_PATH" | tee -a "$GITHUB_ENV"
+
+            -   name: Checkout repository
+                uses: actions/checkout@v2
+                with:
+                    path: ${{ env.BUILD_DIR }}
+
+            -   name: Install Pico CMS
+                uses: ./build/.github/actions/install
+                with:
+                    path: ${{ env.BUILD_DIR }}
+                    php-version: ${{ env.PHP_VERSION }}
+                    php-tools: phpdoc
+
+            -   name: Parse Pico version
+                run: |
+                    . "$CI_TOOLS_PATH/parse_version.inc.sh"
+
+                    if ! parse_version "$GITHUB_REF_NAME"; then
+                        echo "Invalid version string: $GITHUB_REF_NAME" >&2
+                        exit 1
+                    fi
+
+                    printf '%s=%s\n' \
+                        "PICO_VERSION_FULL" "$VERSION_FULL" \
+                        "PICO_VERSION_STABILITY" "$VERSION_STABILITY" \
+                        "PICO_VERSION_MILESTONE" "$VERSION_MILESTONE" \
+                        | tee -a "$GITHUB_ENV"
+
+            -   name: Checkout website repository
+                uses: actions/checkout@v2
+                with:
+                    repository: ${{ env.WEBSITE_REPO_SLUG }}
+                    ref: ${{ env.WEBSITE_REPO_BRANCH }}
+                    path: ${{ env.WEBSITE_DIR }}
+
+            #
+            # Update phpDoc class docs
+            #
+
+            -   name: Update phpDoc class docs
+                run: |
+                    "$CI_TOOLS_PATH/generate-phpdoc.sh" \
+                        "$BUILD_DIR/.phpdoc.xml" \
+                        "$WEBSITE_DIR/phpDoc/$GITHUB_REF_NAME" \
+                        "$WEBSITE_DIR/phpDoc/$GITHUB_REF_NAME/cache" \
+                        "Pico $PICO_VERSION_MILESTONE API Documentation ($GITHUB_REF_NAME)"
+
+            -   name: Update phpDoc class docs list
+                run: |
+                    "$CI_TOOLS_PATH/update-phpdoc-list.sh" \
+                        "$WEBSITE_DIR/_data/phpDoc.yml" \
+                        "$GITHUB_REF_NAME" "version" \
+                        "Pico $PICO_VERSION_FULL" "$(date +%s)"
+
+            -   name: Commit phpDoc class docs updates
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    repository: ${{ env.WEBSITE_DIR }}
+                    file_pattern: >-
+                        phpDoc/${{ github.ref_name }}
+                        _data/phpDoc.yml
+                    commit_user_name: Pico CMS Bot
+                    commit_user_email: bot@picocms.org
+                    commit_message: >-
+                        Update phpDocumentor class docs
+                        for ${{ github.ref_name }}
+
+            #
+            # Update version badge
+            #
+
+            -   name: Generate version badge
+                if: ${{ env.PICO_VERSION_STABILITY == 'stable' }}
+                run: |
+                    "$CI_TOOLS_PATH/generate-badge.sh" \
+                        "$WEBSITE_DIR/badges/pico-version.svg" \
+                        "release" "$PICO_VERSION_FULL" "blue"
+
+            -   name: Commit version badge
+                if: ${{ env.PICO_VERSION_STABILITY == 'stable' }}
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    repository: ${{ env.WEBSITE_DIR }}
+                    file_pattern: >-
+                        badges/pico-version.svg
+                    commit_user_name: Pico CMS Bot
+                    commit_user_email: bot@picocms.org
+                    commit_message: >-
+                        Update version badge for ${{ github.ref_name }}
+
+            #
+            # Update version file
+            #
+
+            -   name: Update version file
+                if: ${{ env.PICO_VERSION_STABILITY == 'stable' }}
+                run: |
+                    "$CI_TOOLS_PATH/update-version-file.sh" \
+                        "$WEBSITE_DIR/_data/version.yml" \
+                        "$PICO_VERSION_FULL"
+
+            -   name: Commit version file
+                if: ${{ env.PICO_VERSION_STABILITY == 'stable' }}
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    repository: ${{ env.WEBSITE_DIR }}
+                    file_pattern: >-
+                        _data/version.yml
+                    commit_user_name: Pico CMS Bot
+                    commit_user_email: bot@picocms.org
+                    commit_message: >-
+                        Update version file for ${{ github.ref_name }}
+
+            #
+            # Update cloc statistics
+            #
+
+            -   name: Install cloc
+                if: ${{ env.PICO_VERSION_STABILITY == 'stable' }}
+                run: |
+                    sudo curl -fsS -L -o "/usr/local/bin/cloc" "$CLOC_SOURCE"
+                    sudo chmod +x "/usr/local/bin/cloc"
+
+            -   name: Update cloc statistics
+                if: ${{ env.PICO_VERSION_STABILITY == 'stable' }}
+                run: |
+                    "$CI_TOOLS_PATH/update-cloc-stats.sh" \
+                        "$WEBSITE_DIR/_data/cloc.yml" \
+                        "$BUILD_DIR/lib" \
+                        "$BUILD_DIR/index.php"
+
+            -   name: Commit cloc statistics
+                if: ${{ env.PICO_VERSION_STABILITY == 'stable' }}
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    repository: ${{ env.WEBSITE_DIR }}
+                    file_pattern: >-
+                        _data/cloc.yml
+                    commit_user_name: Pico CMS Bot
+                    commit_user_email: bot@picocms.org
+                    commit_message: >-
+                        Update cloc statistics for ${{ github.ref_name }}
+
+    deploy:
+        name: Create Pico release
+
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+
+        needs: test
+
+        env:
+            PHP_VERSION: '7.2'
+
+        steps:
+            -   name: Setup CI tools
+                run: |
+                    . <(curl -fsS -L "$CI_TOOLS_SETUP")
+                    echo "CI_TOOLS_PATH=$CI_TOOLS_PATH" | tee -a "$GITHUB_ENV"
+
+            -   name: Checkout repository
+                uses: actions/checkout@v2
+
+            -   name: Setup PHP ${{ env.PHP_VERSION }}
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ env.PHP_VERSION }}
+                    tools: composer
+
+            -   name: Get Composer cache directory
+                run: |
+                    COMPOSER_CACHE_DIR="$(composer config --global cache-dir)"
+                    echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
+
+            -   name: Restore Composer cache
+                uses: actions/cache@v2
+                with:
+                    path: ${{ env.COMPOSER_CACHE_DIR }}
+                    key: ${{ runner.os }}-composer-php${{ env.PHP_VERSION }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+
+            -   name: Parse Pico version
+                run: |
+                    . "$CI_TOOLS_PATH/parse_version.inc.sh"
+
+                    if ! parse_version "$GITHUB_REF_NAME"; then
+                        echo "Invalid version string: $GITHUB_REF_NAME" >&2
+                        exit 1
+                    fi
+
+                    printf '%s=%s\n' \
+                        "PICO_VERSION_FULL" "$VERSION_FULL" \
+                        "PICO_VERSION_STABILITY" "$VERSION_STABILITY" \
+                        | tee -a "$GITHUB_ENV"
+
+            -   name: Build Pico and create release archives
+                run: |
+                    make build version="$GITHUB_REF_NAME"
+
+            -   name: Create GitHub release and upload release archives
+                uses: softprops/action-gh-release@v1
+                with:
+                    name: Version ${{ env.PICO_VERSION_FULL }}
+                    body: >-
+                        Pico ${{ github.ref_name }}
+                    prerelease: ${{ env.PICO_VERSION_STABILITY != 'stable' }}
+                    draft: true
+                    files: |
+                        pico-release-${{ github.ref_name }}.tar.gz
+                        pico-release-${{ github.ref_name }}.zip
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 98ffb1fc0..cf8cb4758 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,8 +3,8 @@ name: Test Pico CMS
 on:
     push:
         branches: [ 'master' ]
-        tags: [ 'v*.*.*' ]
     pull_request: {}
+    workflow_call: {}
 
 jobs:
     test:
diff --git a/.gitignore b/.gitignore
index 490151f25..c30fa9795 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,9 +15,6 @@ desktop.ini
 /vendor
 
 # Build system
-/.build/build
-/.build/deploy
-/.build/ci-tools
 /pico-release-*.tar.gz
 /pico-release-*.zip
 
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 7d5e0c231..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-os: linux
-dist: bionic
-sudo: false
-
-language: php
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-jobs:
-  include:
-    # Test stage
-    - php: 7.2
-    - php: 7.3
-    - php: 7.4
-    - php: 8.0
-    - php: 8.1
-    - php: nightly
-
-    # Branch deployment stage
-    - stage: deploy-branch
-      if: type == "push" && tag IS blank
-      php: 7.2
-      install:
-        - '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
-        - install.sh --deploy
-      script:
-        - deploy-branch.sh
-
-    # Release deployment stage
-    - stage: deploy-release
-      if: tag IS present
-      php: 7.2
-      install:
-        - install.sh --deploy
-      script:
-        - '[ "$PROJECT_REPO_TAG" == "v$(php -r "require_once(\"lib/Pico.php\"); echo Pico::VERSION;")" ]'
-        - deploy-release.sh
-      before_deploy:
-        - release.sh "$PROJECT_REPO_TAG"
-      deploy:
-        provider: releases
-        api_key: ${GITHUB_OAUTH_TOKEN}
-        file:
-          - pico-release-$PROJECT_REPO_TAG.tar.gz
-          - pico-release-$PROJECT_REPO_TAG.zip
-        skip_cleanup: true
-        name: Version ${PROJECT_REPO_TAG:1}
-        draft: true
-        on:
-          tags: true
-
-  # Ignore nightly build failures
-  allow_failures:
-    - php: nightly
-  fast_finish: true
-
-before_install:
-  - 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"
-  - . "$PICO_PROJECT_DIR/.build/init.sh.inc"
-
-install:
-  - install.sh
-
-script:
-  - phpcs --standard=.phpcs.xml "$PICO_PROJECT_DIR"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab7b64433..ab4456641 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](https://picocms.org/phpDoc/) (powered by [phpDoc](https://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.
+We use [GitHub Actions](https://github.com/picocms/Pico/actions) to automate the build & release process of Pico - also called [continous integration](https://en.wikipedia.org/wiki/Continuous_integration), or CI. With our CI pipeline we generate and deploy a [PHP class documentation](https://picocms.org/phpDoc/) (powered by [phpDoc](https://phpdoc.org)) for new releases and on every commit to the `master` branch. Our  CI pipeline 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 the [`deploy-branch.yml` workflow](https://github.com/picocms/Pico/blob/master/.github/workflows/deploy-branch.yml), the [`deploy-release.yml` workflow](https://github.com/picocms/Pico/blob/master/.github/workflows/deploy-release.yml), the [`picocms/ci-tools` repo](https://github.com/picocms/ci-tools) and Pico's [`.build/build.sh` script](https://github.com/picocms/Pico/blob/master/.build/build.sh) 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:
 
@@ -171,7 +171,7 @@ Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico:
 
 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](https://packagist.org/packages/picocms/pico) will be updated automatically.
+Our CI pipeline 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](https://packagist.org/packages/picocms/pico) will be updated automatically.
 
 Labeling of Issues & Pull Requests
 ----------------------------------
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..a8335c99f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,51 @@
+# Pico -- Makefile
+# Makefile to build new Pico releases using './.build/build.sh'.
+#
+# This file is part of Pico, a stupidly simple, blazing fast, flat file CMS.
+# Visit us at https://picocms.org/ for more info.
+#
+# Copyright (c) 2022  Daniel Rudolf <https://www.daniel-rudolf.de>
+#
+# This work is licensed under the terms of the MIT license.
+# For a copy, see LICENSE file or <https://opensource.org/licenses/MIT>.
+#
+# SPDX-License-Identifier: MIT
+# License-Filename: LICENSE
+
+version?=
+nocheck?=false
+
+php?=php
+composer?=composer
+
+app_name=pico
+archive_tar=$(app_name)-release-*.tar.gz
+archive_zip=$(app_name)-release-*.zip
+export=$(app_name)-export.tar.gz
+
+all: clean build
+
+clean: clean-build clean-export
+
+clean-build:
+	find "." -name "$(archive_tar)" -exec rm -f {} \;
+	find "." -name "$(archive_zip)" -exec rm -f {} \;
+
+clean-export:
+	rm -f "./$(export)"
+
+build: export PHP=$(php)
+build: export COMPOSER=$(composer)
+build:
+	./.build/build.sh$(if $(filter true,$(nocheck)), --no-check,)$(if $(version), "$(version)",)
+
+export:
+	git archive --prefix "$(app_name)/" -o "./$(export)" HEAD
+
+composer:
+	$(composer) install --optimize-autoloader --no-dev
+
+.PHONY: all \
+	clean clean-build clean-export \
+	build export \
+	composer

From 9d08d4247a31f30897171d02752191f639d76590 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 27 Feb 2022 22:29:40 +0100
Subject: [PATCH 47/75] CI: Add Composer oauth token for github.com

---
 .github/actions/install/action.yml   | 8 +++++++-
 .github/workflows/deploy-release.yml | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index 8068e8c1c..43275f3f2 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -29,7 +29,13 @@ runs:
                 PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
                 echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
 
-        -   name: Setup Composer
+        -   name: Setup Composer auth
+            shell: bash
+            working-directory: ${{ inputs.path }}
+            run: |
+                composer config --global github-oauth.github.com "${{ github.token }}"
+
+        -   name: Setup Composer root version
             if: ${{ github.ref_type == 'branch' }}
             shell: bash
             working-directory: ${{ inputs.path }}
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index a303287bc..1109cd46b 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -204,6 +204,10 @@ jobs:
                     php-version: ${{ env.PHP_VERSION }}
                     tools: composer
 
+            -   name: Setup Composer auth
+                run: |
+                    composer config --global github-oauth.github.com "${{ github.token }}"
+
             -   name: Get Composer cache directory
                 run: |
                     COMPOSER_CACHE_DIR="$(composer config --global cache-dir)"

From 6f1fc9f8de9f1e5899e1a000b114f537c16ac845 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 27 Feb 2022 23:00:07 +0100
Subject: [PATCH 48/75] CI: Run 'test' workflow as part of the 'deploy-branch'
 workflow

Mimics the behaviour of the 'deploy-release' workflow, even though branch deployment doesn't depend on Pico's tests to succeed. Pull requests still use the 'test' workflow directly.
---
 .github/workflows/deploy-branch.yml | 4 ++++
 .github/workflows/test.yml          | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-branch.yml b/.github/workflows/deploy-branch.yml
index c8fd01beb..a6ee7ad92 100644
--- a/.github/workflows/deploy-branch.yml
+++ b/.github/workflows/deploy-branch.yml
@@ -12,6 +12,10 @@ env:
     CI_TOOLS_SETUP: https://raw.githubusercontent.com/picocms/ci-tools/master/setup.sh
 
 jobs:
+    test:
+        name: Test Pico CMS
+        uses: ./.github/workflows/test.yml
+
     website:
         name: Update website for branch updates
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cf8cb4758..d618b02d2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,8 +1,6 @@
 name: Test Pico CMS
 
 on:
-    push:
-        branches: [ 'master' ]
     pull_request: {}
     workflow_call: {}
 

From 0f48280f733d4b9c38d4cd59990d98b192fdead2 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 27 Feb 2022 23:01:19 +0100
Subject: [PATCH 49/75] composer.json: Allow using all Composer plugins in the
 'picocms/*' namespace

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

diff --git a/composer.json b/composer.json
index a27b8f1b7..8e124f5bf 100644
--- a/composer.json
+++ b/composer.json
@@ -49,6 +49,9 @@
         }
     },
     "extra": {
+        "allow-plugins": {
+            "picocms/*": true
+        },
         "branch-alias": {
             "dev-master": "2.1.x-dev",
             "dev-pico-3.0": "3.0.x-dev"

From a3f801b89a47547dce6b733b6e05d2a463029c56 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 3 Mar 2022 21:37:04 +0100
Subject: [PATCH 50/75] Enable PHP strict typing

We can't enable strict typing everywhere without major BC breaks (likely Pico 4.0), so we're doing this on a best-effort basis.

Fixes #603
---
 lib/AbstractPicoPlugin.php  |   2 +
 lib/Pico.php                | 149 +++++++++++++++++++-----------------
 lib/PicoPluginInterface.php |   2 +
 lib/PicoTwigExtension.php   |  22 +++---
 4 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 998a9be3d..195d63b45 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -10,6 +10,8 @@
  * License-Filename: LICENSE
  */
 
+declare(strict_types=1);
+
 /**
  * Abstract class to extend from when implementing a Pico plugin
  *
diff --git a/lib/Pico.php b/lib/Pico.php
index 2e3dbe9a8..7211be5ba 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -16,6 +16,8 @@
  * License-Filename: LICENSE
  */
 
+declare(strict_types=1);
+
 use Symfony\Component\Yaml\Parser as YamlParser;
 use Twig\Environment as TwigEnvironment;
 use Twig\Extension\DebugExtension as TwigDebugExtension;
@@ -346,8 +348,13 @@ class Pico
      * @param bool   $enableLocalPlugins enables (TRUE; default) or disables
      *     (FALSE) loading plugins from the filesystem
      */
-    public function __construct($rootDir, $configDir, $pluginsDir, $themesDir, $enableLocalPlugins = true)
-    {
+    public function __construct(
+        string $rootDir,
+        string $configDir,
+        string $pluginsDir,
+        string $themesDir,
+        bool $enableLocalPlugins = true
+    ) {
         $this->rootDir = rtrim($rootDir, '/\\') . '/';
         $this->vendorDir = dirname(__DIR__) . '/';
         $this->configDir = $this->getAbsolutePath($configDir);
@@ -361,7 +368,7 @@ public function __construct($rootDir, $configDir, $pluginsDir, $themesDir, $enab
      *
      * @return string root directory path
      */
-    public function getRootDir()
+    public function getRootDir(): string
     {
         return $this->rootDir;
     }
@@ -371,7 +378,7 @@ public function getRootDir()
      *
      * @return string vendor directory path
      */
-    public function getVendorDir()
+    public function getVendorDir(): string
     {
         return $this->vendorDir;
     }
@@ -381,7 +388,7 @@ public function getVendorDir()
      *
      * @return string config directory path
      */
-    public function getConfigDir()
+    public function getConfigDir(): string
     {
         return $this->configDir;
     }
@@ -391,7 +398,7 @@ public function getConfigDir()
      *
      * @return string plugins directory path
      */
-    public function getPluginsDir()
+    public function getPluginsDir(): string
     {
         return $this->pluginsDir;
     }
@@ -401,7 +408,7 @@ public function getPluginsDir()
      *
      * @return string themes directory path
      */
-    public function getThemesDir()
+    public function getThemesDir(): string
     {
         return $this->themesDir;
     }
@@ -417,7 +424,7 @@ public function getThemesDir()
      *
      * @throws \Exception thrown when a irrecoverable error occurs
      */
-    public function run()
+    public function run(): string
     {
         // check lock
         if ($this->locked) {
@@ -548,7 +555,7 @@ public function run()
      *
      * @throws \RuntimeException thrown when a plugin couldn't be loaded
      */
-    protected function loadPlugins()
+    protected function loadPlugins(): void
     {
         $composerPlugins = $this->loadComposerPlugins();
 
@@ -580,7 +587,7 @@ protected function loadPlugins()
      *
      * @throws \RuntimeException thrown when a plugin couldn't be loaded
      */
-    protected function loadComposerPlugins(array $pluginBlacklist = [])
+    protected function loadComposerPlugins(array $pluginBlacklist = []): array
     {
         $composerPlugins = [];
         if (is_file($this->getVendorDir() . 'vendor/pico-plugin.php')) {
@@ -648,7 +655,7 @@ protected function loadComposerPlugins(array $pluginBlacklist = [])
      *
      * @throws \RuntimeException thrown when a plugin couldn't be loaded
      */
-    protected function loadLocalPlugins(array $pluginBlacklist = [])
+    protected function loadLocalPlugins(array $pluginBlacklist = []): void
     {
         // scope isolated require()
         $includeClosure = function ($pluginFile) {
@@ -741,7 +748,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = [])
      *
      * @throws \RuntimeException thrown when the plugin couldn't be loaded
      */
-    public function loadPlugin($plugin)
+    public function loadPlugin($plugin): PicoPluginInterface
     {
         if (!is_object($plugin)) {
             $className = (string) $plugin;
@@ -801,7 +808,7 @@ public function loadPlugin($plugin)
      * @see https://github.com/marcj/topsort.php/blob/1.1.0/src/Implementations/ArraySort.php
      *     \MJS\TopSort\Implementations\ArraySort class
      */
-    protected function sortPlugins()
+    protected function sortPlugins(): void
     {
         $plugins = $this->plugins;
         $nativePlugins = $this->nativePlugins;
@@ -873,7 +880,7 @@ protected function sortPlugins()
      *
      * @throws \RuntimeException thrown when the plugin wasn't found
      */
-    public function getPlugin($pluginName)
+    public function getPlugin(string $pluginName): object
     {
         if (isset($this->plugins[$pluginName])) {
             return $this->plugins[$pluginName];
@@ -890,7 +897,7 @@ public function getPlugin($pluginName)
      *
      * @return object[]|null
      */
-    public function getPlugins()
+    public function getPlugins(): ?array
     {
         return $this->plugins;
     }
@@ -909,7 +916,7 @@ public function getPlugins()
      * @see Pico::setConfig()
      * @see Pico::getConfig()
      */
-    protected function loadConfig()
+    protected function loadConfig(): void
     {
         // load config closure
         $yamlParser = $this->getYamlParser();
@@ -1046,7 +1053,7 @@ protected function loadConfig()
      *
      * @throws \LogicException thrown if Pico already started processing
      */
-    public function setConfig(array $config)
+    public function setConfig(array $config): void
     {
         if ($this->locked) {
             throw new \LogicException("You cannot modify Pico's config after processing has started");
@@ -1071,7 +1078,7 @@ public function setConfig(array $config)
      *     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)
+    public function getConfig(string $configName = null, $default = null)
     {
         if ($configName !== null) {
             return isset($this->config[$configName]) ? $this->config[$configName] : $default;
@@ -1086,7 +1093,7 @@ public function getConfig($configName = null, $default = null)
      * @see Pico::getTheme()
      * @see Pico::getThemeApiVersion()
      */
-    protected function loadTheme()
+    protected function loadTheme(): void
     {
         if (!is_dir($this->getThemesDir() . $this->getTheme())) {
             throw new \RuntimeException(
@@ -1169,9 +1176,9 @@ protected function loadTheme()
      * @see Pico::loadTheme()
      * @see Pico::getThemeApiVersion()
      *
-     * @return string
+     * @return string|null
      */
-    public function getTheme()
+    public function getTheme(): ?string
     {
         return $this->theme;
     }
@@ -1182,9 +1189,9 @@ public function getTheme()
      * @see Pico::loadTheme()
      * @see Pico::getTheme()
      *
-     * @return int
+     * @return int|null
      */
-    public function getThemeApiVersion()
+    public function getThemeApiVersion(): ?int
     {
         return $this->themeApiVersion;
     }
@@ -1226,7 +1233,7 @@ public function getThemeApiVersion()
      *
      * @see Pico::getRequestUrl()
      */
-    protected function evaluateRequestUrl()
+    protected function evaluateRequestUrl(): void
     {
         // use QUERY_STRING; e.g. /pico/?sub/page
         $pathComponent = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
@@ -1269,7 +1276,7 @@ protected function evaluateRequestUrl()
      *
      * @return string|null request URL
      */
-    public function getRequestUrl()
+    public function getRequestUrl(): ?string
     {
         return $this->requestUrl;
     }
@@ -1290,7 +1297,7 @@ public function getRequestUrl()
      *
      * @return string path to the resolved content file
      */
-    public function resolveFilePath($requestUrl)
+    public function resolveFilePath(string $requestUrl): string
     {
         $contentDir = $this->getConfig('content_dir');
         $contentExt = $this->getConfig('content_ext');
@@ -1322,9 +1329,9 @@ public function resolveFilePath($requestUrl)
      *
      * @see Pico::resolveFilePath()
      *
-     * @return string|null file pat
+     * @return string|null file path
      */
-    public function getRequestFile()
+    public function getRequestFile(): ?string
     {
         return $this->requestFile;
     }
@@ -1338,7 +1345,7 @@ public function getRequestFile()
      *
      * @return string raw contents of the file
      */
-    public function loadFileContent($file)
+    public function loadFileContent(string $file): string
     {
         return file_get_contents($file);
     }
@@ -1355,7 +1362,7 @@ public function loadFileContent($file)
      *
      * @return string raw contents of the 404 file
      */
-    public function load404Content($file)
+    public function load404Content(string $file): string
     {
         $contentDir = $this->getConfig('content_dir');
         $contentDirLength = strlen($contentDir);
@@ -1396,7 +1403,7 @@ public function load404Content($file)
      *
      * @return string|null raw contents
      */
-    public function getRawContent()
+    public function getRawContent(): ?string
     {
         return $this->rawContent;
     }
@@ -1408,7 +1415,7 @@ public function getRawContent()
      *
      * @return bool TRUE if Pico is serving a 404 page, FALSE otherwise
      */
-    public function is404Content()
+    public function is404Content(): bool
     {
         return $this->is404Content;
     }
@@ -1423,7 +1430,7 @@ public function is404Content()
      *     key to search for, the array value is later used to access the
      *     found value
      */
-    public function getMetaHeaders()
+    public function getMetaHeaders(): array
     {
         if ($this->metaHeaders === null) {
             $this->metaHeaders = [
@@ -1456,7 +1463,7 @@ public function getMetaHeaders()
      *
      * @return YamlParser Symfony YAML parser
      */
-    public function getYamlParser()
+    public function getYamlParser(): YamlParser
     {
         if ($this->yamlParser === null) {
             $this->yamlParser = new YamlParser();
@@ -1486,7 +1493,7 @@ public function getYamlParser()
      * @throws \Symfony\Component\Yaml\Exception\ParseException thrown when the
      *     meta data is invalid
      */
-    public function parseFileMeta($rawContent, array $headers)
+    public function parseFileMeta(string $rawContent, array $headers): array
     {
         $meta = [];
         $pattern = "/^(?:\xEF\xBB\xBF)?(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
@@ -1558,7 +1565,7 @@ public function parseFileMeta($rawContent, array $headers)
      *
      * @return array|null parsed meta data
      */
-    public function getFileMeta()
+    public function getFileMeta(): ?array
     {
         return $this->meta;
     }
@@ -1571,7 +1578,7 @@ public function getFileMeta()
      *
      * @return \Parsedown Parsedown markdown parser
      */
-    public function getParsedown()
+    public function getParsedown(): \Parsedown
     {
         if ($this->parsedown === null) {
             if ($this->config['content_config']['extra']) {
@@ -1607,7 +1614,7 @@ public function getParsedown()
      *
      * @return string prepared Markdown contents
      */
-    public function prepareFileContent($rawContent, array $meta = [], $pageId = null)
+    public function prepareFileContent(string $rawContent, array $meta = [], string $pageId = null): string
     {
         // remove meta header
         $metaHeaderPattern = "/^(?:\xEF\xBB\xBF)?(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
@@ -1630,7 +1637,7 @@ public function prepareFileContent($rawContent, array $meta = [], $pageId = null
      *
      * @return string substituted Markdown contents
      */
-    public function substituteFileContent($markdown, array $meta = [], $pageId = null)
+    public function substituteFileContent(string $markdown, array $meta = [], string $pageId = null): string
     {
         $variables = [];
 
@@ -1702,7 +1709,7 @@ public function substituteFileContent($markdown, array $meta = [], $pageId = nul
      *
      * @return string parsed contents (HTML)
      */
-    public function parseFileContent($markdown, $singleLine = false)
+    public function parseFileContent(string $markdown, bool $singleLine = false): string
     {
         $markdownParser = $this->getParsedown();
         return !$singleLine ? @$markdownParser->text($markdown) : @$markdownParser->line($markdown);
@@ -1717,7 +1724,7 @@ public function parseFileContent($markdown, $singleLine = false)
      *
      * @return string|null parsed contents
      */
-    public function getFileContent()
+    public function getFileContent(): ?string
     {
         return $this->content;
     }
@@ -1754,7 +1761,7 @@ public function getFileContent()
      * @see Pico::discoverPageSiblings()
      * @see Pico::getPages()
      */
-    protected function readPages()
+    protected function readPages(): void
     {
         $contentDir = $this->getConfig('content_dir');
         $contentExt = $this->getConfig('content_ext');
@@ -1837,7 +1844,7 @@ protected function readPages()
      * @see Pico::readPages()
      * @see Pico::getPages()
      */
-    protected function sortPages()
+    protected function sortPages(): void
     {
         // sort pages
         $order = strtolower($this->getConfig('pages_order'));
@@ -1916,7 +1923,7 @@ protected function sortPages()
      * @see Pico::readPages()
      * @see Pico::getPages()
      */
-    protected function discoverPageSiblings()
+    protected function discoverPageSiblings(): void
     {
         if (($this->getConfig('order_by') === 'date') && ($this->getConfig('order') === 'desc')) {
             $precedingPageKey = 'next_page';
@@ -1952,7 +1959,7 @@ protected function discoverPageSiblings()
      *
      * @return array[]|null the data of all pages
      */
-    public function getPages()
+    public function getPages(): ?array
     {
         return $this->pages;
     }
@@ -1965,7 +1972,7 @@ public function getPages()
      * @see Pico::getPreviousPage()
      * @see Pico::getNextPage()
      */
-    protected function discoverCurrentPage()
+    protected function discoverCurrentPage(): void
     {
         $currentPageId = $this->getPageId($this->requestFile);
         if ($currentPageId && isset($this->pages[$currentPageId])) {
@@ -1982,7 +1989,7 @@ protected function discoverCurrentPage()
      *
      * @return array|null page data
      */
-    public function getCurrentPage()
+    public function getCurrentPage(): ?array
     {
         return $this->currentPage;
     }
@@ -1994,7 +2001,7 @@ public function getCurrentPage()
      *
      * @return array|null page data
      */
-    public function getPreviousPage()
+    public function getPreviousPage(): ?array
     {
         return $this->previousPage;
     }
@@ -2006,7 +2013,7 @@ public function getPreviousPage()
      *
      * @return array|null page data
      */
-    public function getNextPage()
+    public function getNextPage(): ?array
     {
         return $this->nextPage;
     }
@@ -2051,7 +2058,7 @@ public function getNextPage()
      *
      * @see Pico::getPageTree()
      */
-    protected function buildPageTree()
+    protected function buildPageTree(): void
     {
         $this->pageTree = [];
         foreach ($this->pages as $id => &$pageData) {
@@ -2110,7 +2117,7 @@ protected function buildPageTree()
      *
      * @return array[]|null the tree structure of all pages
      */
-    public function getPageTree()
+    public function getPageTree(): ?array
     {
         return $this->pageTree;
     }
@@ -2127,9 +2134,9 @@ public function getPageTree()
      * @see https://twig.symfony.com/ Twig website
      * @see https://github.com/twigphp/Twig Twig on GitHub
      *
-     * @return TwigEnvironment|null Twig template engine
+     * @return TwigEnvironment Twig template engine
      */
-    public function getTwig()
+    public function getTwig(): TwigEnvironment
     {
         if ($this->twig === null) {
             $twigConfig = $this->getConfig('twig_config');
@@ -2177,7 +2184,7 @@ function ($page) use ($pico, &$pages) {
      *
      * @return array template variables
      */
-    protected function getTwigVariables()
+    protected function getTwigVariables(): array
     {
         return [
             'config' => $this->getConfig(),
@@ -2202,7 +2209,7 @@ protected function getTwigVariables()
      *
      * @return string template name
      */
-    protected function getTwigTemplate()
+    protected function getTwigTemplate(): string
     {
         $templateName = !empty($this->meta['template']) ? $this->meta['template'] : 'index';
         return $templateName . '.twig';
@@ -2217,7 +2224,7 @@ protected function getTwigTemplate()
      *
      * @return string the base url
      */
-    public function getBaseUrl()
+    public function getBaseUrl(): string
     {
         $baseUrl = $this->getConfig('base_url');
         if ($baseUrl) {
@@ -2272,7 +2279,7 @@ public function getBaseUrl()
      *
      * @return bool TRUE if URL rewriting is enabled, FALSE otherwise
      */
-    public function isUrlRewritingEnabled()
+    public function isUrlRewritingEnabled(): bool
     {
         $urlRewritingEnabled = $this->getConfig('rewrite_url');
         if ($urlRewritingEnabled !== null) {
@@ -2295,7 +2302,7 @@ public function isUrlRewritingEnabled()
      *
      * @return bool TRUE if Pico's debug mode is enabled, FALSE otherwise
      */
-    public function isDebugModeEnabled()
+    public function isDebugModeEnabled(): bool
     {
         $debugModeEnabled = $this->getConfig('debug');
         if ($debugModeEnabled !== null) {
@@ -2329,7 +2336,7 @@ public function isDebugModeEnabled()
      *
      * @throws \InvalidArgumentException thrown when invalid arguments got passed
      */
-    public function getPageUrl($page, $queryData = null, $dropIndex = true)
+    public function getPageUrl(string $page, $queryData = null, bool $dropIndex = true): string
     {
         if (is_array($queryData)) {
             $queryData = http_build_query($queryData, '', '&');
@@ -2373,7 +2380,7 @@ public function getPageUrl($page, $queryData = null, $dropIndex = true)
      *
      * @return string|null either the corresponding page ID or NULL
      */
-    public function getPageId($path)
+    public function getPageId(string $path): ?string
     {
         $contentDir = $this->getConfig('content_dir');
         $contentDirLength = strlen($contentDir);
@@ -2399,7 +2406,7 @@ public function getPageId($path)
      *
      * @return string
      */
-    public function getBaseThemeUrl()
+    public function getBaseThemeUrl(): string
     {
         return $this->getConfig('themes_url');
     }
@@ -2420,7 +2427,7 @@ public function getBaseThemeUrl()
      *
      * @return string URL with replaced placeholders
      */
-    public function substituteUrl($url)
+    public function substituteUrl(string $url): string
     {
         $variables = [
             '%base_url%?' => $this->getBaseUrl() . (!$this->isUrlRewritingEnabled() ? '?' : ''),
@@ -2452,7 +2459,7 @@ public function substituteUrl($url)
      *
      * @return string the URL of the given folder
      */
-    public function getUrlFromPath($absolutePath)
+    public function getUrlFromPath(string $absolutePath): string
     {
         $absolutePath = str_replace('\\', '/', $absolutePath);
 
@@ -2500,7 +2507,7 @@ public function getUrlFromPath($absolutePath)
      *     NULL if the URL GET parameter doesn't exist and no default value is
      *     given
      */
-    public function getUrlParameter($name, $filter = '', $options = null, $flags = null)
+    public function getUrlParameter(string $name, $filter = '', $options = null, $flags = null)
     {
         $variable = (isset($_GET[$name]) && is_scalar($_GET[$name])) ? $_GET[$name] : null;
         return $this->filterVariable($variable, $filter, $options, $flags);
@@ -2527,7 +2534,7 @@ public function getUrlParameter($name, $filter = '', $options = null, $flags = n
      *     NULL if the HTTP POST parameter doesn't exist and no default value
      *     is given
      */
-    public function getFormParameter($name, $filter = '', $options = null, $flags = null)
+    public function getFormParameter(string $name, $filter = '', $options = null, $flags = null)
     {
         $variable = (isset($_POST[$name]) && is_scalar($_POST[$name])) ? $_POST[$name] : null;
         return $this->filterVariable($variable, $filter, $options, $flags);
@@ -2626,7 +2633,7 @@ protected function filterVariable($variable, $filter = '', $options = null, $fla
      *
      * @return array list of found files
      */
-    public function getFiles($directory, $fileExtension = '', $order = self::SORT_ASC)
+    public function getFiles(string $directory, string $fileExtension = '', int $order = self::SORT_ASC): array
     {
         $directory = rtrim($directory, '/');
         $fileExtensionLength = strlen($fileExtension);
@@ -2668,7 +2675,7 @@ public function getFiles($directory, $fileExtension = '', $order = self::SORT_AS
      *
      * @return array list of found files
      */
-    public function getFilesGlob($pattern, $order = self::SORT_ASC)
+    public function getFilesGlob(string $pattern, int $order = self::SORT_ASC): array
     {
         $result = [];
         $sortFlag = ($order === self::SORT_NONE) ? GLOB_NOSORT : 0;
@@ -2699,7 +2706,7 @@ public function getFilesGlob($pattern, $order = self::SORT_ASC)
      *
      * @return string absolute path
      */
-    public function getAbsolutePath($path, $basePath = null, $endSlash = true)
+    public function getAbsolutePath(string $path, string $basePath = null, bool $endSlash = true): string
     {
         if ($basePath === null) {
             $basePath = $this->getRootDir();
@@ -2731,7 +2738,7 @@ public function getAbsolutePath($path, $basePath = null, $endSlash = true)
      * @throws \UnexpectedValueException thrown when a absolute path is passed
      *     although absolute paths aren't allowed
      */
-    public function getNormalizedPath($path, $allowAbsolutePath = false, $endSlash = true)
+    public function getNormalizedPath(string $path, bool $allowAbsolutePath = false, bool $endSlash = true): string
     {
         $absolutePath = '';
         if (DIRECTORY_SEPARATOR === '\\') {
@@ -2787,7 +2794,7 @@ public function getNormalizedPath($path, $allowAbsolutePath = false, $endSlash =
      *
      * @return string absolute URL
      */
-    public function getAbsoluteUrl($url, $baseUrl = null, $endSlash = true)
+    public function getAbsoluteUrl(string $url, string $baseUrl = null, bool $endSlash = true): string
     {
         if (($url[0] !== '/') && !preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $url)) {
             $url = (($baseUrl !== null) ? $baseUrl : $this->getBaseUrl()) . $url;
@@ -2814,7 +2821,7 @@ public function getAbsoluteUrl($url, $baseUrl = null, $endSlash = true)
      * @param string $eventName name of the event to trigger
      * @param array  $params    optional parameters to pass
      */
-    public function triggerEvent($eventName, array $params = [])
+    public function triggerEvent(string $eventName, array $params = []): void
     {
         foreach ($this->nativePlugins as $plugin) {
             $plugin->handleEvent($eventName, $params);
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index 2a360d59e..4825fd521 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -10,6 +10,8 @@
  * License-Filename: LICENSE
  */
 
+declare(strict_types=1);
+
 /**
  * Common interface for Pico plugins
  *
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index e3bb638a8..960d7b671 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -10,6 +10,8 @@
  * License-Filename: LICENSE
  */
 
+declare(strict_types=1);
+
 use Twig\Error\RuntimeError as TwigRuntimeError;
 use Twig\Extension\AbstractExtension as AbstractTwigExtension;
 use Twig\Extension\ExtensionInterface as TwigExtensionInterface;
@@ -51,7 +53,7 @@ public function __construct(Pico $pico)
      *
      * @return Pico the extension's instance of Pico
      */
-    public function getPico()
+    public function getPico(): Pico
     {
         return $this->pico;
     }
@@ -63,7 +65,7 @@ public function getPico()
      *
      * @return string the extension name
      */
-    public function getName()
+    public function getName(): string
     {
         return 'PicoTwigExtension';
     }
@@ -75,7 +77,7 @@ public function getName()
      *
      * @return TwigFilter[] array of Pico's Twig filters
      */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             'markdown' => new TwigFilter('markdown', [ $this, 'markdownFilter' ], [ 'is_safe' => [ 'html' ] ]),
@@ -93,7 +95,7 @@ public function getFilters()
      *
      * @return TwigFunction[] array of Pico's Twig functions
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             'url_param' => new TwigFunction('url_param', [ $this, 'urlParamFunction' ]),
@@ -119,7 +121,7 @@ public function getFunctions()
      *
      * @return string parsed HTML
      */
-    public function markdownFilter($markdown, array $meta = [], $singleLine = false)
+    public function markdownFilter(string $markdown, array $meta = [], bool $singleLine = false): string
     {
         $markdown = $this->getPico()->substituteFileContent($markdown, $meta);
         return $this->getPico()->parseFileContent($markdown, $singleLine);
@@ -140,7 +142,7 @@ public function markdownFilter($markdown, array $meta = [], $singleLine = false)
      *
      * @throws TwigRuntimeError
      */
-    public function mapFilter($var, $mapKeyPath)
+    public function mapFilter($var, $mapKeyPath): array
     {
         if (!is_array($var) && (!is_object($var) || !($var instanceof \Traversable))) {
             throw new TwigRuntimeError(sprintf(
@@ -182,7 +184,7 @@ public function mapFilter($var, $mapKeyPath)
      *
      * @throws TwigRuntimeError
      */
-    public function sortByFilter($var, $sortKeyPath, $fallback = 'bottom')
+    public function sortByFilter($var, $sortKeyPath, string $fallback = 'bottom'): array
     {
         if (is_object($var) && ($var instanceof \Traversable)) {
             $var = iterator_to_array($var, true);
@@ -314,7 +316,7 @@ public static function getKeyOfVar($var, $keyPath)
      *     NULL if the URL GET parameter doesn't exist and no default value is
      *     given
      */
-    public function urlParamFunction($name, $filter = '', $options = null, $flags = null)
+    public function urlParamFunction(string $name, $filter = '', $options = null, $flags = null)
     {
         $filter = $filter ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false;
         if (!$filter || ($filter === FILTER_CALLBACK)) {
@@ -343,7 +345,7 @@ public function urlParamFunction($name, $filter = '', $options = null, $flags =
      *     NULL if the HTTP POST parameter doesn't exist and no default value
      *     is given
      */
-    public function formParamFunction($name, $filter = '', $options = null, $flags = null)
+    public function formParamFunction(string $name, $filter = '', $options = null, $flags = null)
     {
         $filter = $filter ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false;
         if (!$filter || ($filter === FILTER_CALLBACK)) {
@@ -425,7 +427,7 @@ public function formParamFunction($name, $filter = '', $options = null, $flags =
      *
      * @throws TwigRuntimeError
      */
-    public function pagesFunction($start = '', $depth = 0, $depthOffset = 0, $offset = 1)
+    public function pagesFunction(string $start = '', ?int $depth = 0, int $depthOffset = 0, int $offset = 1): array
     {
         $start = (string) $start;
         if (basename($start) === 'index') {

From 9a8b3da2aed1ee43af352046dce710f80046f23f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 3 Mar 2022 21:39:27 +0100
Subject: [PATCH 51/75] Simplify PHP class imports

---
 lib/AbstractPicoPlugin.php  | 22 ++++++-------
 lib/Pico.php                | 64 ++++++++++++++++++-------------------
 lib/PicoPluginInterface.php |  2 +-
 lib/PicoTwigExtension.php   | 24 +++++++-------
 plugins/DummyPlugin.php     |  5 +--
 5 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 195d63b45..250d75756 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -124,7 +124,7 @@ protected function configEnabled()
                 // otherwise the plugin needs to be enabled manually
                 try {
                     $this->setEnabled(true, false, true);
-                } catch (\RuntimeException $e) {
+                } catch (RuntimeException $e) {
                     $this->enabled = false;
                 }
             }
@@ -226,15 +226,15 @@ public function __call($methodName, array $params)
      *
      * @param bool $recursive enable required plugins automatically
      *
-     * @throws \RuntimeException thrown when a dependency fails
+     * @throws RuntimeException thrown when a dependency fails
      */
     protected function checkDependencies($recursive)
     {
         foreach ($this->getDependencies() as $pluginName) {
             try {
                 $plugin = $this->getPico()->getPlugin($pluginName);
-            } catch (\RuntimeException $e) {
-                throw new \RuntimeException(
+            } catch (RuntimeException $e) {
+                throw new RuntimeException(
                     "Unable to enable plugin '" . get_called_class() . "': "
                     . "Required plugin '" . $pluginName . "' not found"
                 );
@@ -246,13 +246,13 @@ protected function checkDependencies($recursive)
                     if (!$plugin->isStatusChanged()) {
                         $plugin->setEnabled(true, true, true);
                     } else {
-                        throw new \RuntimeException(
+                        throw new RuntimeException(
                             "Unable to enable plugin '" . get_called_class() . "': "
                             . "Required plugin '" . $pluginName . "' was disabled manually"
                         );
                     }
                 } else {
-                    throw new \RuntimeException(
+                    throw new RuntimeException(
                         "Unable to enable plugin '" . get_called_class() . "': "
                         . "Required plugin '" . $pluginName . "' is disabled"
                     );
@@ -276,7 +276,7 @@ public function getDependencies()
      *
      * @param bool $recursive disabled dependant plugins automatically
      *
-     * @throws \RuntimeException thrown when a dependency fails
+     * @throws RuntimeException thrown when a dependency fails
      */
     protected function checkDependants($recursive)
     {
@@ -288,7 +288,7 @@ protected function checkDependants($recursive)
                         if (!$plugin->isStatusChanged()) {
                             $plugin->setEnabled(false, true, true);
                         } else {
-                            throw new \RuntimeException(
+                            throw new RuntimeException(
                                 "Unable to disable plugin '" . get_called_class() . "': "
                                 . "Required by manually enabled plugin '" . $pluginName . "'"
                             );
@@ -298,7 +298,7 @@ protected function checkDependants($recursive)
             } else {
                 $dependantsList = 'plugin' . ((count($dependants) > 1) ? 's' : '') . ' '
                     . "'" . implode("', '", array_keys($dependants)) . "'";
-                throw new \RuntimeException(
+                throw new RuntimeException(
                     "Unable to disable plugin '" . get_called_class() . "': "
                     . "Required by " . $dependantsList
                 );
@@ -337,7 +337,7 @@ public function getDependants()
      * newer API versions, what requires some special (version specific)
      * precaution and is therefore usually not the case.
      *
-     * @throws \RuntimeException thrown when the plugin's and Pico's API aren't
+     * @throws RuntimeException thrown when the plugin's and Pico's API aren't
      *     compatible
      */
     protected function checkCompatibility()
@@ -350,7 +350,7 @@ protected function checkCompatibility()
             $this->nativePlugin = ($pluginApiVersion === $picoApiVersion);
 
             if (!$this->nativePlugin && ($pluginApiVersion > $picoApiVersion)) {
-                throw new \RuntimeException(
+                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 7211be5ba..e2f7eecf6 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -18,6 +18,7 @@
 
 declare(strict_types=1);
 
+use Symfony\Component\Yaml\Exception\ParseException as YamlParseException;
 use Symfony\Component\Yaml\Parser as YamlParser;
 use Twig\Environment as TwigEnvironment;
 use Twig\Extension\DebugExtension as TwigDebugExtension;
@@ -260,7 +261,7 @@ class Pico
      * Parsedown Extra instance used for markdown parsing
      *
      * @see Pico::getParsedown()
-     * @var \Parsedown|null
+     * @var Parsedown|null
      */
     protected $parsedown;
 
@@ -422,13 +423,13 @@ public function getThemesDir(): string
      *
      * @return string rendered Pico contents
      *
-     * @throws \Exception thrown when a irrecoverable error occurs
+     * @throws Exception thrown when a irrecoverable error occurs
      */
     public function run(): string
     {
         // check lock
         if ($this->locked) {
-            throw new \LogicException('You cannot run the same Pico instance multiple times');
+            throw new LogicException('You cannot run the same Pico instance multiple times');
         }
 
         // lock Pico
@@ -445,7 +446,7 @@ public function run(): string
 
         // check content dir
         if (!is_dir($this->getConfig('content_dir'))) {
-            throw new \RuntimeException('Invalid content directory "' . $this->getConfig('content_dir') . '"');
+            throw new RuntimeException('Invalid content directory "' . $this->getConfig('content_dir') . '"');
         }
 
         // load theme
@@ -553,7 +554,7 @@ public function run(): string
      * @see Pico::getPlugin()
      * @see Pico::getPlugins()
      *
-     * @throws \RuntimeException thrown when a plugin couldn't be loaded
+     * @throws RuntimeException thrown when a plugin couldn't be loaded
      */
     protected function loadPlugins(): void
     {
@@ -564,7 +565,7 @@ protected function loadPlugins(): void
         }
 
         if (!isset($this->plugins['PicoDeprecated']) && (count($this->plugins) !== count($this->nativePlugins))) {
-            throw new \RuntimeException(
+            throw new RuntimeException(
                 "Plugins using an older API than version " . static::API_VERSION . " found, "
                 . "but PicoDeprecated isn't loaded"
             );
@@ -585,7 +586,7 @@ protected function loadPlugins(): void
      *
      * @return string[] installer names of the loaded plugins
      *
-     * @throws \RuntimeException thrown when a plugin couldn't be loaded
+     * @throws RuntimeException thrown when a plugin couldn't be loaded
      */
     protected function loadComposerPlugins(array $pluginBlacklist = []): array
     {
@@ -613,7 +614,7 @@ protected function loadComposerPlugins(array $pluginBlacklist = []): array
                 }
 
                 if (!($plugin instanceof PicoPluginInterface)) {
-                    throw new \RuntimeException(
+                    throw new RuntimeException(
                         "Unable to load plugin '" . $className . "' via 'vendor/pico-plugin.php': "
                         . "Plugins installed by composer must implement 'PicoPluginInterface'"
                     );
@@ -653,7 +654,7 @@ protected function loadComposerPlugins(array $pluginBlacklist = []): array
      *
      * @param string[] $pluginBlacklist class names of plugins not to load
      *
-     * @throws \RuntimeException thrown when a plugin couldn't be loaded
+     * @throws RuntimeException thrown when a plugin couldn't be loaded
      */
     protected function loadLocalPlugins(array $pluginBlacklist = []): void
     {
@@ -679,7 +680,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = []): void
                 $pluginFile = $file . '/' . $className . '.php';
 
                 if (!is_file($this->getPluginsDir() . $pluginFile)) {
-                    throw new \RuntimeException(
+                    throw new RuntimeException(
                         "Unable to load plugin '" . $className . "' from '" . $pluginFile . "': File not found"
                     );
                 }
@@ -687,7 +688,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = []): void
                 $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");
+                throw new RuntimeException("Unable to load plugin from '" . $file . "': Not a valid plugin file");
             }
 
             if (isset($this->plugins[$className]) || isset($pluginBlacklist[$className])) {
@@ -709,7 +710,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = []): void
                     }
                 }
             } else {
-                throw new \RuntimeException(
+                throw new RuntimeException(
                     "Unable to load plugin '" . $className . "' from '" . $pluginFile . "': Plugin class not found"
                 );
             }
@@ -746,7 +747,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = []): void
      *
      * @return PicoPluginInterface instance of the loaded plugin
      *
-     * @throws \RuntimeException thrown when the plugin couldn't be loaded
+     * @throws RuntimeException thrown when the plugin couldn't be loaded
      */
     public function loadPlugin($plugin): PicoPluginInterface
     {
@@ -755,14 +756,14 @@ public function loadPlugin($plugin): PicoPluginInterface
             if (class_exists($className)) {
                 $plugin = new $className($this);
             } else {
-                throw new \RuntimeException("Unable to load plugin '" . $className . "': Class not found");
+                throw new RuntimeException("Unable to load plugin '" . $className . "': Class not found");
             }
         }
 
         $className = get_class($plugin);
 
         if (!($plugin instanceof PicoPluginInterface)) {
-            throw new \RuntimeException(
+            throw new RuntimeException(
                 "Unable to load plugin '" . $className . "': "
                 . "Manually loaded plugins must implement 'PicoPluginInterface'"
             );
@@ -878,7 +879,7 @@ protected function sortPlugins(): void
      *
      * @return object instance of the plugin
      *
-     * @throws \RuntimeException thrown when the plugin wasn't found
+     * @throws RuntimeException thrown when the plugin wasn't found
      */
     public function getPlugin(string $pluginName): object
     {
@@ -886,7 +887,7 @@ public function getPlugin(string $pluginName): object
             return $this->plugins[$pluginName];
         }
 
-        throw new \RuntimeException("Missing plugin '" . $pluginName . "'");
+        throw new RuntimeException("Missing plugin '" . $pluginName . "'");
     }
 
     /**
@@ -1051,12 +1052,12 @@ protected function loadConfig(): void
      *
      * @param array $config array with config variables
      *
-     * @throws \LogicException thrown if Pico already started processing
+     * @throws LogicException thrown if Pico already started processing
      */
     public function setConfig(array $config): void
     {
         if ($this->locked) {
-            throw new \LogicException("You cannot modify Pico's config after processing has started");
+            throw new LogicException("You cannot modify Pico's config after processing has started");
         }
 
         $this->config = $config;
@@ -1096,7 +1097,7 @@ public function getConfig(string $configName = null, $default = null)
     protected function loadTheme(): void
     {
         if (!is_dir($this->getThemesDir() . $this->getTheme())) {
-            throw new \RuntimeException(
+            throw new RuntimeException(
                 'Couldn\'t load theme "' . $this->theme . '": No such theme directory'
             );
         }
@@ -1163,7 +1164,7 @@ protected function loadTheme(): void
 
         // check for theme compatibility
         if (!isset($this->plugins['PicoDeprecated']) && ($this->themeApiVersion < static::API_VERSION)) {
-            throw new \RuntimeException(
+            throw new RuntimeException(
                 'Current theme "' . $this->theme . '" uses API version ' . $this->themeApiVersion . ', but Pico '
                 . 'provides API version ' . static::API_VERSION . ' and PicoDeprecated isn\'t loaded'
             );
@@ -1490,8 +1491,7 @@ public function getYamlParser(): YamlParser
      *
      * @return array parsed meta data
      *
-     * @throws \Symfony\Component\Yaml\Exception\ParseException thrown when the
-     *     meta data is invalid
+     * @throws YamlParseException thrown when the meta data is invalid
      */
     public function parseFileMeta(string $rawContent, array $headers): array
     {
@@ -1576,15 +1576,15 @@ public function getFileMeta(): ?array
      * This method triggers the `onParsedownRegistered` event when the
      * Parsedown markdown parser wasn't initiated yet.
      *
-     * @return \Parsedown Parsedown markdown parser
+     * @return Parsedown Parsedown markdown parser
      */
-    public function getParsedown(): \Parsedown
+    public function getParsedown(): Parsedown
     {
         if ($this->parsedown === null) {
             if ($this->config['content_config']['extra']) {
-                $this->parsedown = new \ParsedownExtra();
+                $this->parsedown = new ParsedownExtra();
             } else {
-                $this->parsedown = new \Parsedown();
+                $this->parsedown = new Parsedown();
             }
 
             $this->parsedown->setBreaksEnabled((bool) $this->config['content_config']['breaks']);
@@ -1797,7 +1797,7 @@ protected function readPages(): void
                 $headers = $this->getMetaHeaders();
                 try {
                     $meta = $this->parseFileMeta($rawContent, $headers);
-                } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
+                } catch (YamlParseException $e) {
                     $meta = $this->parseFileMeta('', $headers);
                     $meta['YAML_ParseError'] = $e->getMessage();
                 }
@@ -2334,14 +2334,14 @@ public function isDebugModeEnabled(): bool
      *
      * @return string URL
      *
-     * @throws \InvalidArgumentException thrown when invalid arguments got passed
+     * @throws InvalidArgumentException thrown when invalid arguments got passed
      */
     public function getPageUrl(string $page, $queryData = null, bool $dropIndex = true): string
     {
         if (is_array($queryData)) {
             $queryData = http_build_query($queryData, '', '&');
         } elseif (($queryData !== null) && !is_string($queryData)) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'Argument 2 passed to ' . __METHOD__ . ' must be of the type array or string, '
                 . (is_object($queryData) ? get_class($queryData) : gettype($queryData)) . ' given'
             );
@@ -2735,7 +2735,7 @@ public function getAbsolutePath(string $path, string $basePath = null, bool $end
      *
      * @return string normalized path
      *
-     * @throws \UnexpectedValueException thrown when a absolute path is passed
+     * @throws UnexpectedValueException thrown when a absolute path is passed
      *     although absolute paths aren't allowed
      */
     public function getNormalizedPath(string $path, bool $allowAbsolutePath = false, bool $endSlash = true): string
@@ -2754,7 +2754,7 @@ public function getNormalizedPath(string $path, bool $allowAbsolutePath = false,
         }
 
         if ($absolutePath && !$allowAbsolutePath) {
-            throw new \UnexpectedValueException(
+            throw new UnexpectedValueException(
                 'Argument 1 passed to ' . __METHOD__ . ' must be a relative path, absolute path "' . $path . '" given'
             );
         }
diff --git a/lib/PicoPluginInterface.php b/lib/PicoPluginInterface.php
index 4825fd521..ba21eb591 100644
--- a/lib/PicoPluginInterface.php
+++ b/lib/PicoPluginInterface.php
@@ -56,7 +56,7 @@ public function handleEvent($eventName, array $params);
      * @param bool $auto      enable or disable to fulfill a dependency. This
      *     parameter is optional and defaults to FALSE.
      *
-     * @throws \RuntimeException thrown when a dependency fails
+     * @throws RuntimeException thrown when a dependency fails
      */
     public function setEnabled($enabled, $recursive = true, $auto = false);
 
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 960d7b671..f85dc8664 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -133,8 +133,8 @@ public function markdownFilter(string $markdown, array $meta = [], bool $singleL
      * 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)
      *
@@ -144,7 +144,7 @@ public function markdownFilter(string $markdown, array $meta = [], bool $singleL
      */
     public function mapFilter($var, $mapKeyPath): array
     {
-        if (!is_array($var) && (!is_object($var) || !($var instanceof \Traversable))) {
+        if (!is_array($var) && (!is_object($var) || !($var instanceof Traversable))) {
             throw new TwigRuntimeError(sprintf(
                 'The map filter only works with arrays or "Traversable", got "%s"',
                 is_object($var) ? get_class($var) : gettype($var)
@@ -170,11 +170,11 @@ public function mapFilter($var, $mapKeyPath): array
      * 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
@@ -186,7 +186,7 @@ public function mapFilter($var, $mapKeyPath): array
      */
     public function sortByFilter($var, $sortKeyPath, string $fallback = 'bottom'): array
     {
-        if (is_object($var) && ($var instanceof \Traversable)) {
+        if (is_object($var) && ($var instanceof Traversable)) {
             $var = iterator_to_array($var, true);
         } elseif (!is_array($var)) {
             throw new TwigRuntimeError(sprintf(
@@ -247,8 +247,8 @@ public function sortByFilter($var, $sortKeyPath, string $fallback = 'bottom'): a
      * 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
      *
@@ -265,9 +265,9 @@ public static function getKeyOfVar($var, $keyPath)
 
         foreach ($keyPath as $key) {
             if (is_object($var)) {
-                if ($var instanceof \ArrayAccess) {
+                if ($var instanceof ArrayAccess) {
                     // use ArrayAccess, see below
-                } elseif ($var instanceof \Traversable) {
+                } elseif ($var instanceof Traversable) {
                     $var = iterator_to_array($var);
                 } elseif (isset($var->{$key})) {
                     $var = $var->{$key};
@@ -276,7 +276,7 @@ public static function getKeyOfVar($var, $keyPath)
                     try {
                         $var = call_user_func([ $var, 'get' . ucfirst($key) ]);
                         continue;
-                    } catch (\BadMethodCallException $e) {
+                    } catch (BadMethodCallException $e) {
                         return null;
                     }
                 } else {
diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 031efbd24..27547bd2c 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -12,6 +12,7 @@
 
 use picocms\Pico\AbstractPicoPlugin;
 use picocms\Pico\Pico;
+use Symfony\Component\Yaml\Parser as YamlParser;
 use Twig\Environment as TwigEnvironment;
 
 /**
@@ -475,9 +476,9 @@ public function onMetaHeaders(array &$headers)
      *
      * @see Pico::getYamlParser()
      *
-     * @param \Symfony\Component\Yaml\Parser &$yamlParser YAML parser instance
+     * @param YamlParser &$yamlParser YAML parser instance
      */
-    public function onYamlParserRegistered(\Symfony\Component\Yaml\Parser &$yamlParser)
+    public function onYamlParserRegistered(YamlParser &$yamlParser)
     {
         // your code
     }

From 71c0dfbffb4ed9929c8c6592cb11cf50d4a580ba Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 3 Mar 2022 21:54:26 +0100
Subject: [PATCH 52/75] Proberly handle page data of hidden pages when
 accessing such a page

This is a workaround for meta pages (i.e. pages starting with a '_'): If a user attempts to request such a page, Pico won't respond with the contents of this meta page, but with a 404 page. This is expected behavior. However, we also have a shortcut in Pico::readPages() attempting to skip reading the contents of the requested page twice. Since we're not serving the contents of the meta page, but of the 404 page, we accidentally overwrite the contents of the meta page by Pico's 404 page. This is unexpected behavior. Even though this commit fixes this particular issue, it doesn't fix its major cause, as the shortcut still exists and can still be triggered by plugin authors by simply overwriting the contents of an existing page. Even though a plugin author might want this to happen, we can't really tell whether it is intended or not. The solution is to remove the shortcut, but we don't want that either, it's a useful performance optimization. The only real solution to this is to switch to page objects, allowing us to handle such situations more verbose. This feature is expected for Pico 4.0. For now we leave this partially fixed...

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

diff --git a/lib/Pico.php b/lib/Pico.php
index e2f7eecf6..65322e1ee 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1788,7 +1788,7 @@ protected function readPages(): void
             }
 
             $url = $this->getPageUrl($id);
-            if ($file !== $this->requestFile) {
+            if (($file !== $this->requestFile) || $this->is404Content) {
                 $rawContent = $this->loadFileContent($file);
 
                 // trigger onSinglePageContent event
@@ -1823,7 +1823,7 @@ protected function readPages(): void
                 'meta' => &$meta,
             ];
 
-            if ($file === $this->requestFile) {
+            if (($file === $this->requestFile) && !$this->is404Content) {
                 $page['content'] = &$this->content;
             }
 

From 872da5714c76df938894af89fade34d5294bf9c4 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 3 Mar 2022 21:59:41 +0100
Subject: [PATCH 53/75] DummyPlugin: Remove missed imports of the picocms
 namespace

---
 plugins/DummyPlugin.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 27547bd2c..af2ec8412 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -10,8 +10,6 @@
  * License-Filename: LICENSE
  */
 
-use picocms\Pico\AbstractPicoPlugin;
-use picocms\Pico\Pico;
 use Symfony\Component\Yaml\Parser as YamlParser;
 use Twig\Environment as TwigEnvironment;
 

From 070714d1d82e894b3386f8716e147461e3013098 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 3 Mar 2022 22:02:51 +0100
Subject: [PATCH 54/75] DummyPlugin: Encourage devs to use PHP strict typing

---
 plugins/DummyPlugin.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index af2ec8412..614c8c041 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -10,6 +10,8 @@
  * License-Filename: LICENSE
  */
 
+declare(strict_types=1);
+
 use Symfony\Component\Yaml\Parser as YamlParser;
 use Twig\Environment as TwigEnvironment;
 
@@ -97,7 +99,7 @@ public function onPluginsLoaded(array $plugins)
      *
      * @param object $plugin loaded plugin instance
      */
-    public function onPluginManuallyLoaded($plugin)
+    public function onPluginManuallyLoaded(object $plugin)
     {
         // your code
     }
@@ -124,7 +126,7 @@ public function onConfigLoaded(array &$config)
      *
      * @param string &$theme name of current theme
      */
-    public function onThemeLoading(&$theme)
+    public function onThemeLoading(string &$theme)
     {
         // your code
     }
@@ -140,7 +142,7 @@ public function onThemeLoading(&$theme)
      * @param int    $themeApiVersion API version of the theme
      * @param array  &$themeConfig    config array of the theme
      */
-    public function onThemeLoaded($theme, $themeApiVersion, array &$themeConfig)
+    public function onThemeLoaded(string $theme, int $themeApiVersion, array &$themeConfig)
     {
         // your code
     }
@@ -152,7 +154,7 @@ public function onThemeLoaded($theme, $themeApiVersion, array &$themeConfig)
      *
      * @param string &$url part of the URL describing the requested contents
      */
-    public function onRequestUrl(&$url)
+    public function onRequestUrl(string &$url)
     {
         // your code
     }
@@ -165,7 +167,7 @@ public function onRequestUrl(&$url)
      *
      * @param string &$file absolute path to the content file to serve
      */
-    public function onRequestFile(&$file)
+    public function onRequestFile(string &$file)
     {
         // your code
     }
@@ -201,7 +203,7 @@ public function on404ContentLoading()
      *
      * @param string &$rawContent raw file contents
      */
-    public function on404ContentLoaded(&$rawContent)
+    public function on404ContentLoaded(string &$rawContent)
     {
         // your code
     }
@@ -219,7 +221,7 @@ public function on404ContentLoaded(&$rawContent)
      *
      * @param string &$rawContent raw file contents
      */
-    public function onContentLoaded(&$rawContent)
+    public function onContentLoaded(string &$rawContent)
     {
         // your code
     }
@@ -270,7 +272,7 @@ public function onContentParsing()
      *
      * @param string &$markdown Markdown contents of the requested page
      */
-    public function onContentPrepared(&$markdown)
+    public function onContentPrepared(string &$markdown)
     {
         // your code
     }
@@ -284,7 +286,7 @@ public function onContentPrepared(&$markdown)
      *
      * @param string &$content parsed contents (HTML) of the requested page
      */
-    public function onContentParsed(&$content)
+    public function onContentParsed(string &$content)
     {
         // your code
     }
@@ -316,7 +318,7 @@ public function onPagesLoading()
      * @param bool|null $skipPage set this to TRUE to remove this page from the
      *     pages array, otherwise leave it unchanged
      */
-    public function onSinglePageLoading($id, &$skipPage)
+    public function onSinglePageLoading(string $id, ?bool &$skipPage)
     {
         // your code
     }
@@ -334,7 +336,7 @@ public function onSinglePageLoading($id, &$skipPage)
      * @param string $id          relative path to the content file
      * @param string &$rawContent raw file contents
      */
-    public function onSinglePageContent($id, &$rawContent)
+    public function onSinglePageContent(string $id, string &$rawContent)
     {
         // your code
     }
@@ -438,7 +440,7 @@ public function onPageTreeBuilt(array &$pageTree)
      * @param string &$templateName  file name of the template
      * @param array  &$twigVariables template variables
      */
-    public function onPageRendering(&$templateName, array &$twigVariables)
+    public function onPageRendering(string &$templateName, array &$twigVariables)
     {
         // your code
     }
@@ -450,7 +452,7 @@ public function onPageRendering(&$templateName, array &$twigVariables)
      *
      * @param string &$output contents which will be sent to the user
      */
-    public function onPageRendered(&$output)
+    public function onPageRendered(string &$output)
     {
         // your code
     }

From dde3a76d78edbc425b390d11134d80bb1c748f89 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2022 18:03:27 +0100
Subject: [PATCH 55/75] CI: Fix Composer root version guessing

---
 .github/actions/install/action.yml | 35 +++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index 43275f3f2..046d47579 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -35,21 +35,6 @@ runs:
             run: |
                 composer config --global github-oauth.github.com "${{ github.token }}"
 
-        -   name: Setup Composer root version
-            if: ${{ github.ref_type == 'branch' }}
-            shell: bash
-            working-directory: ${{ inputs.path }}
-            run: |
-                COMPOSER_ROOT_VERSION=
-
-                if [ -z "$(composer config extra.branch-alias."dev-${GITHUB_HEAD_REF:-GITHUB_REF_NAME}" 2> /dev/null)" ]; then
-                    COMPOSER_ROOT_VERSION="$(php -r "
-                        require('./lib/Pico.php');
-                        echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
-                    ")"
-                    echo "COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION" | tee -a "$GITHUB_ENV"
-                fi
-
         -   name: Get Composer cache directory
             shell: bash
             working-directory: ${{ inputs.path }}
@@ -65,6 +50,26 @@ runs:
                 restore-keys: |
                     ${{ runner.os }}-composer-
 
+        -   name: Setup Composer root version
+            if: ${{ github.ref_type == 'branch' }}
+            shell: bash
+            working-directory: ${{ inputs.path }}
+            run: |
+                COMPOSER_ROOT_VERSION=
+
+                COMPOSER_ROOT_VERSION="$(composer config \
+                    extra.branch-alias."dev-${GITHUB_HEAD_REF:-GITHUB_REF_NAME}" \
+                    2> /dev/null)"
+
+                if [ -z "$COMPOSER_ROOT_VERSION" ]; then
+                    COMPOSER_ROOT_VERSION="$(php -r "
+                        require('./lib/Pico.php');
+                        echo preg_replace('/\.[0-9]+-dev$/', '.x-dev', Pico::VERSION);
+                    ")"
+                fi
+
+                echo "COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION" | tee -a "$GITHUB_ENV"
+
         -   name: Install Composer dependencies
             shell: bash
             working-directory: ${{ inputs.path }}

From 00ac6c070037a3fc6f00f77482293cbd9c83b0e5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2022 18:04:03 +0100
Subject: [PATCH 56/75] CI: Some small styling improvements

---
 .build/build.sh                    |  6 ++++--
 .github/actions/install/action.yml | 14 +++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.build/build.sh b/.build/build.sh
index d6d6f4629..b05846cb4 100755
--- a/.build/build.sh
+++ b/.build/build.sh
@@ -263,6 +263,7 @@ echo "Building Pico $BUILD_VERSION ($VERSION)..."
 [ -z "$NOCLEAN" ] || echo "Build directory: $BUILD_DIR"
 echo
 
+# prepare dev versions of components
 if [ "$VERSION_STABILITY" == "dev" ]; then
     # copy dev version of Pico
     echo "Creating clean working tree copy of '$BUILD_PROJECT'..."
@@ -327,11 +328,11 @@ if [ "$VERSION_STABILITY" == "dev" ]; then
     echo
 fi
 
+# download Composer starter project
 if [ "$VERSION_STABILITY" != "dev" ] || [ -z "$PICO_COMPOSER_DIR" ]; then
     PICO_COMPOSER_VERSION="$DEPENDENCY_VERSION"
     [[ "$PICO_COMPOSER_VERSION" == "dev-"* ]] || PICO_COMPOSER_VERSION="$VERSION_MAJOR.$VERSION_MINOR"
 
-    # download Composer starter project
     echo "Setting up Pico's Composer starter project (version '$PICO_COMPOSER_VERSION')..."
     "$COMPOSER" create-project --no-install "$PICO_COMPOSER_PROJECT" \
         "$BUILD_DIR/$PICO_COMPOSER_NAME" \
@@ -342,7 +343,7 @@ fi
 # switch to build dir...
 cd "$BUILD_DIR/$PICO_COMPOSER_NAME"
 
-# inject local copy of Pico
+# inject local component copies
 if [ "$VERSION_STABILITY" == "dev" ]; then
     function composer_repo_config {
         jq -nc --arg PACKAGE "$1" --arg VERSION "$2" --arg URL "$3" \
@@ -412,6 +413,7 @@ find plugins/ -type d -path 'plugins/*/.git' -print0 | xargs -0 rm -rf
 echo "Removing 'index.php' and 'index.php.dist' from 'vendor/$BUILD_PROJECT'"
 rm -f "vendor/$BUILD_PROJECT/index.php"
 rm -f "vendor/$BUILD_PROJECT/index.php.dist"
+
 echo
 
 # restore composer.json
diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index 046d47579..c4a7e1103 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -22,13 +22,6 @@ runs:
                 php-version: ${{ inputs.php-version }}
                 tools: composer, ${{ inputs.php-tools }}
 
-        -   name: Read Pico version
-            shell: bash
-            working-directory: ${{ inputs.path }}
-            run: |
-                PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
-                echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
-
         -   name: Setup Composer auth
             shell: bash
             working-directory: ${{ inputs.path }}
@@ -75,3 +68,10 @@ runs:
             working-directory: ${{ inputs.path }}
             run: |
                 composer install
+
+        -   name: Read Pico version
+            shell: bash
+            working-directory: ${{ inputs.path }}
+            run: |
+                PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
+                echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"

From cb2cf3a4a34f1bd25c30a957d54bd73ec1491557 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 6 Mar 2022 18:05:46 +0100
Subject: [PATCH 57/75] DummyPlugin: Add PHP return types to event methods

Follow-up to 070714d1d82e894b3386f8716e147461e3013098
---
 plugins/DummyPlugin.php | 60 ++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/plugins/DummyPlugin.php b/plugins/DummyPlugin.php
index 614c8c041..f7b9c6634 100644
--- a/plugins/DummyPlugin.php
+++ b/plugins/DummyPlugin.php
@@ -85,7 +85,7 @@ class DummyPlugin extends AbstractPicoPlugin
      *
      * @param object[] $plugins loaded plugin instances
      */
-    public function onPluginsLoaded(array $plugins)
+    public function onPluginsLoaded(array $plugins): void
     {
         // your code
     }
@@ -99,7 +99,7 @@ public function onPluginsLoaded(array $plugins)
      *
      * @param object $plugin loaded plugin instance
      */
-    public function onPluginManuallyLoaded(object $plugin)
+    public function onPluginManuallyLoaded(object $plugin): void
     {
         // your code
     }
@@ -113,7 +113,7 @@ public function onPluginManuallyLoaded(object $plugin)
      *
      * @param array &$config array of config variables
      */
-    public function onConfigLoaded(array &$config)
+    public function onConfigLoaded(array &$config): void
     {
         // your code
     }
@@ -126,7 +126,7 @@ public function onConfigLoaded(array &$config)
      *
      * @param string &$theme name of current theme
      */
-    public function onThemeLoading(string &$theme)
+    public function onThemeLoading(string &$theme): void
     {
         // your code
     }
@@ -142,7 +142,7 @@ public function onThemeLoading(string &$theme)
      * @param int    $themeApiVersion API version of the theme
      * @param array  &$themeConfig    config array of the theme
      */
-    public function onThemeLoaded(string $theme, int $themeApiVersion, array &$themeConfig)
+    public function onThemeLoaded(string $theme, int $themeApiVersion, array &$themeConfig): void
     {
         // your code
     }
@@ -154,7 +154,7 @@ public function onThemeLoaded(string $theme, int $themeApiVersion, array &$theme
      *
      * @param string &$url part of the URL describing the requested contents
      */
-    public function onRequestUrl(string &$url)
+    public function onRequestUrl(string &$url): void
     {
         // your code
     }
@@ -167,7 +167,7 @@ public function onRequestUrl(string &$url)
      *
      * @param string &$file absolute path to the content file to serve
      */
-    public function onRequestFile(string &$file)
+    public function onRequestFile(string &$file): void
     {
         // your code
     }
@@ -178,7 +178,7 @@ public function onRequestFile(string &$file)
      * @see Pico::loadFileContent()
      * @see DummyPlugin::onContentLoaded()
      */
-    public function onContentLoading()
+    public function onContentLoading(): void
     {
         // your code
     }
@@ -189,7 +189,7 @@ public function onContentLoading()
      * @see Pico::load404Content()
      * @see DummyPlugin::on404ContentLoaded()
      */
-    public function on404ContentLoading()
+    public function on404ContentLoading(): void
     {
         // your code
     }
@@ -203,7 +203,7 @@ public function on404ContentLoading()
      *
      * @param string &$rawContent raw file contents
      */
-    public function on404ContentLoaded(string &$rawContent)
+    public function on404ContentLoaded(string &$rawContent): void
     {
         // your code
     }
@@ -221,7 +221,7 @@ public function on404ContentLoaded(string &$rawContent)
      *
      * @param string &$rawContent raw file contents
      */
-    public function onContentLoaded(string &$rawContent)
+    public function onContentLoaded(string &$rawContent): void
     {
         // your code
     }
@@ -232,7 +232,7 @@ public function onContentLoaded(string &$rawContent)
      * @see Pico::parseFileMeta()
      * @see DummyPlugin::onMetaParsed()
      */
-    public function onMetaParsing()
+    public function onMetaParsing(): void
     {
         // your code
     }
@@ -245,7 +245,7 @@ public function onMetaParsing()
      *
      * @param string[] &$meta parsed meta data
      */
-    public function onMetaParsed(array &$meta)
+    public function onMetaParsed(array &$meta): void
     {
         // your code
     }
@@ -258,7 +258,7 @@ public function onMetaParsed(array &$meta)
      * @see DummyPlugin::onContentPrepared()
      * @see DummyPlugin::onContentParsed()
      */
-    public function onContentParsing()
+    public function onContentParsing(): void
     {
         // your code
     }
@@ -272,7 +272,7 @@ public function onContentParsing()
      *
      * @param string &$markdown Markdown contents of the requested page
      */
-    public function onContentPrepared(string &$markdown)
+    public function onContentPrepared(string &$markdown): void
     {
         // your code
     }
@@ -286,7 +286,7 @@ public function onContentPrepared(string &$markdown)
      *
      * @param string &$content parsed contents (HTML) of the requested page
      */
-    public function onContentParsed(string &$content)
+    public function onContentParsed(string &$content): void
     {
         // your code
     }
@@ -297,7 +297,7 @@ public function onContentParsed(string &$content)
      * @see DummyPlugin::onPagesDiscovered()
      * @see DummyPlugin::onPagesLoaded()
      */
-    public function onPagesLoading()
+    public function onPagesLoading(): void
     {
         // your code
     }
@@ -318,7 +318,7 @@ public function onPagesLoading()
      * @param bool|null $skipPage set this to TRUE to remove this page from the
      *     pages array, otherwise leave it unchanged
      */
-    public function onSinglePageLoading(string $id, ?bool &$skipPage)
+    public function onSinglePageLoading(string $id, ?bool &$skipPage): void
     {
         // your code
     }
@@ -336,7 +336,7 @@ public function onSinglePageLoading(string $id, ?bool &$skipPage)
      * @param string $id          relative path to the content file
      * @param string &$rawContent raw file contents
      */
-    public function onSinglePageContent(string $id, string &$rawContent)
+    public function onSinglePageContent(string $id, string &$rawContent): void
     {
         // your code
     }
@@ -352,7 +352,7 @@ public function onSinglePageContent(string $id, string &$rawContent)
      *
      * @param array &$pageData data of the loaded page
      */
-    public function onSinglePageLoaded(array &$pageData)
+    public function onSinglePageLoaded(array &$pageData): void
     {
         // your code
     }
@@ -370,7 +370,7 @@ public function onSinglePageLoaded(array &$pageData)
      *
      * @param array[] &$pages list of all known pages
      */
-    public function onPagesDiscovered(array &$pages)
+    public function onPagesDiscovered(array &$pages): void
     {
         // your code
     }
@@ -388,7 +388,7 @@ public function onPagesDiscovered(array &$pages)
      *
      * @param array[] &$pages sorted list of all known pages
      */
-    public function onPagesLoaded(array &$pages)
+    public function onPagesLoaded(array &$pages): void
     {
         // your code
     }
@@ -413,7 +413,7 @@ public function onCurrentPageDiscovered(
         array &$currentPage = null,
         array &$previousPage = null,
         array &$nextPage = null
-    ) {
+    ): void {
         // your code
     }
 
@@ -427,7 +427,7 @@ public function onCurrentPageDiscovered(
      *
      * @param  array  &$pageTree page tree
      */
-    public function onPageTreeBuilt(array &$pageTree)
+    public function onPageTreeBuilt(array &$pageTree): void
     {
         // your code
     }
@@ -440,7 +440,7 @@ public function onPageTreeBuilt(array &$pageTree)
      * @param string &$templateName  file name of the template
      * @param array  &$twigVariables template variables
      */
-    public function onPageRendering(string &$templateName, array &$twigVariables)
+    public function onPageRendering(string &$templateName, array &$twigVariables): void
     {
         // your code
     }
@@ -452,7 +452,7 @@ public function onPageRendering(string &$templateName, array &$twigVariables)
      *
      * @param string &$output contents which will be sent to the user
      */
-    public function onPageRendered(string &$output)
+    public function onPageRendered(string &$output): void
     {
         // your code
     }
@@ -466,7 +466,7 @@ public function onPageRendered(string &$output)
      *     key specifies the YAML key to search for, the array value is later
      *     used to access the found value
      */
-    public function onMetaHeaders(array &$headers)
+    public function onMetaHeaders(array &$headers): void
     {
         // your code
     }
@@ -478,7 +478,7 @@ public function onMetaHeaders(array &$headers)
      *
      * @param YamlParser &$yamlParser YAML parser instance
      */
-    public function onYamlParserRegistered(YamlParser &$yamlParser)
+    public function onYamlParserRegistered(YamlParser &$yamlParser): void
     {
         // your code
     }
@@ -490,7 +490,7 @@ public function onYamlParserRegistered(YamlParser &$yamlParser)
      *
      * @param Parsedown &$parsedown Parsedown instance
      */
-    public function onParsedownRegistered(Parsedown &$parsedown)
+    public function onParsedownRegistered(Parsedown &$parsedown): void
     {
         // your code
     }
@@ -502,7 +502,7 @@ public function onParsedownRegistered(Parsedown &$parsedown)
      *
      * @param TwigEnvironment &$twig Twig instance
      */
-    public function onTwigRegistered(TwigEnvironment &$twig)
+    public function onTwigRegistered(TwigEnvironment &$twig): void
     {
         // your code
     }

From 998f0d1dbd2c634e0509232d49aacf7791744362 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 7 Mar 2022 21:24:20 +0100
Subject: [PATCH 58/75] CI: Fix Composer root version guessing (again)

---
 .github/actions/install/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index c4a7e1103..c4829545a 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -51,8 +51,8 @@ runs:
                 COMPOSER_ROOT_VERSION=
 
                 COMPOSER_ROOT_VERSION="$(composer config \
-                    extra.branch-alias."dev-${GITHUB_HEAD_REF:-GITHUB_REF_NAME}" \
-                    2> /dev/null)"
+                    extra.branch-alias."dev-${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}" \
+                    2> /dev/null || true)"
 
                 if [ -z "$COMPOSER_ROOT_VERSION" ]; then
                     COMPOSER_ROOT_VERSION="$(php -r "

From 60d0f5403c7b7fd00b068e8ede3326a3b566bcdd Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 8 Mar 2022 20:13:42 +0100
Subject: [PATCH 59/75] CI: Use build script to publish new releases

Since Pico depends on PicoDeprecated, and PicoDeprecated depends on Pico, a chicken-egg-problem arises: When pushing a new tag for Pico, GitHub Actions will try to build this new release by downloading the matching version of PicoDeprecated from Packagist. Since we didn't release a new version of PicoDeprecated yet, this will fail. So we need to push PicoDeprecated's tag first. Doing so yields GitHub Actions trying to build PicoDeprecated's new release - by trying to download the matching version of Pico from Packagist, which doesn't exist yet.

Thus builds will always fail - unless you push both tags at the exact same time, and unless you send some prayers that GitHub Actions delays building until Packagist picks up the new releases. The simplest solution is not to use GitHub Actions to publish new releases, but letting the user to do it instead. With this changeset this is as simple as `make publish version=v3.0.0`. The 'deploy-release' GitHub workflow now just updates the website and is triggered by publishing the GitHub release, not the tag. This additionally allows the user to perform some manual tests before publication.

The build script now depends on GitHub CLI (`gh`), see https://cli.github.com/. You must setup authentication first (`gh auth login`).
---
 .build/build.sh                      | 42 +++++++++++++-
 .github/workflows/deploy-branch.yml  |  4 --
 .github/workflows/deploy-release.yml | 86 +---------------------------
 .github/workflows/test.yml           |  6 +-
 Makefile                             |  8 ++-
 5 files changed, 54 insertions(+), 92 deletions(-)

diff --git a/.build/build.sh b/.build/build.sh
index b05846cb4..02693b30c 100755
--- a/.build/build.sh
+++ b/.build/build.sh
@@ -32,6 +32,9 @@ elif ! which "$COMPOSER" > /dev/null; then
 elif ! which "git" > /dev/null; then
     echo "Missing script dependency: git" >&2
     exit 1
+elif ! which "gh" > /dev/null; then
+    echo "Missing script dependency: gh" >&2
+    exit 1
 elif ! which "rsync" > /dev/null; then
     echo "Missing script dependency: rsync" >&2
     exit 1
@@ -57,8 +60,11 @@ PICO_DEPRECATED_NAME="pico-deprecated"
 PICO_DEPRECATED_PROJECT="picocms/pico-deprecated"
 PICO_DEPRECATED_DIR=
 
+PHP_VERSION="7.2"
+
 # options
 VERSION=
+PUBLISH=
 NOCHECK=
 NOCLEAN=
 
@@ -73,6 +79,7 @@ while [ $# -gt 0 ]; do
         echo "  --help                  display this help and exit"
         echo
         echo "Application options:"
+        echo "  --publish               create GitHub release and upload artifacts"
         echo "  --pico-composer PATH    path to a local copy of '$PICO_COMPOSER_PROJECT'"
         echo "  --pico-theme PATH       path to a local copy of '$PICO_THEME_PROJECT'"
         echo "  --pico-deprecated PATH  path to a local copy of '$PICO_DEPRECATED_PROJECT'"
@@ -83,6 +90,9 @@ while [ $# -gt 0 ]; do
         echo "that this script will perform a large number of strict sanity checks before"
         echo "building a new non-development version of Pico. VERSION must start with 'v'."
         exit 0
+    elif [ "$1" == "--publish" ]; then
+        PUBLISH="y"
+        shift
     elif [ "$1" == "--no-check" ]; then
         NOCHECK="y"
         shift
@@ -223,6 +233,7 @@ if [ "$VERSION_STABILITY" != "dev" ]; then
     GIT_LOCAL_TAG="$(git rev-parse --verify "refs/tags/$VERSION" 2> /dev/null || true)"
     GIT_REMOTE="$(git 'for-each-ref' --format='%(upstream:remotename)' "$(git symbolic-ref -q HEAD)")"
     GIT_REMOTE_TAG="$(git ls-remote "${GIT_REMOTE:-origin}" "refs/tags/$VERSION" 2> /dev/null | cut -f 1 || true)"
+    PHP_VERSION_LOCAL="$("$PHP" -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')"
 
     if [ "$VERSION" != "$BUILD_VERSION" ]; then
         echo "Unable to build Pico: Building $VERSION, but Pico indicates $BUILD_VERSION" >&2
@@ -242,14 +253,20 @@ if [ "$VERSION_STABILITY" != "dev" ]; then
     elif [ "$GIT_LOCAL_TAG" != "$GIT_REMOTE_TAG" ]; then
         echo "Unable to build Pico: Building $VERSION, but the matching local and remote Git tags differ" >&2
         exit 1
+    elif [ "$PHP_VERSION_LOCAL" != "$PHP_VERSION" ]; then
+        echo "Unable to build Pico: Refusing to build Pico with PHP $PHP_VERSION_LOCAL, expecting PHP $PHP_VERSION" >&2
+        exit 1
     elif [ -n "$PICO_COMPOSER_DIR" ] || [ -n "$PICO_THEME_DIR" ] || [ -n "$PICO_DEPRECATED_DIR" ]; then
         echo "Unable to build Pico: Refusing to build a non-dev version with local dependencies" >&2
         exit 1
     fi
-elif [ -z "$NOCHECK" ]; then
-    if [[ "$VERSION" != "$BUILD_VERSION"* ]]; then
+else
+    if [ -z "$NOCHECK" ] && [[ "$VERSION" != "$BUILD_VERSION"* ]]; then
         echo "Unable to build Pico: Building $VERSION, but Pico indicates $BUILD_VERSION" >&2
         exit 1
+    elif [ -n "$PUBLISH" ]; then
+        echo "Unable to build Pico: Refusing to publish a dev version" >&2
+        exit 1
     fi
 fi
 
@@ -446,3 +463,24 @@ find . -mindepth 1 -maxdepth 1 -printf '%f\0' \
 
 echo "Creating release archive '$ARCHIVE_FILENAME.zip'..."
 zip -q -r "$APP_DIR/$ARCHIVE_FILENAME.zip" .
+
+echo
+
+# publish release
+if [ -n "$PUBLISH" ]; then
+    # switch to app dir
+    cd "$APP_DIR"
+
+    # create GitHub release and upload release archives
+    echo "Creating GitHub release and uploading release archives..."
+
+    GITHUB_PRERELEASE=
+    [ "$VERSION_STABILITY" == "stable" ] || GITHUB_PRERELEASE="--prerelease"
+
+    gh release create "$VERSION" \
+        --title "Version $VERSION_FULL" \
+        --generate-notes \
+        "$GITHUB_PRERELEASE" \
+        "$APP_DIR/$ARCHIVE_FILENAME.tar.gz" \
+        "$APP_DIR/$ARCHIVE_FILENAME.zip"
+fi
diff --git a/.github/workflows/deploy-branch.yml b/.github/workflows/deploy-branch.yml
index a6ee7ad92..c8fd01beb 100644
--- a/.github/workflows/deploy-branch.yml
+++ b/.github/workflows/deploy-branch.yml
@@ -12,10 +12,6 @@ env:
     CI_TOOLS_SETUP: https://raw.githubusercontent.com/picocms/ci-tools/master/setup.sh
 
 jobs:
-    test:
-        name: Test Pico CMS
-        uses: ./.github/workflows/test.yml
-
     website:
         name: Update website for branch updates
 
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index 1109cd46b..96360b8f0 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -1,8 +1,8 @@
-name: Git tag deployment
+name: Git release deployment
 
 on:
-    push:
-        tags: [ 'v*.*.*' ]
+    release:
+        types: [ 'published' ]
 
 env:
     WEBSITE_REPO_SLUG: picocms/picocms.github.io
@@ -10,10 +10,6 @@ env:
     CI_TOOLS_SETUP: https://raw.githubusercontent.com/picocms/ci-tools/master/setup.sh
 
 jobs:
-    test:
-        name: Test Pico CMS
-        uses: ./.github/workflows/test.yml
-
     website:
         name: Update website for new releases
 
@@ -21,8 +17,6 @@ jobs:
         permissions:
             contents: write
 
-        needs: test
-
         env:
             PHP_VERSION: '7.4'
             BUILD_DIR: ./build
@@ -176,77 +170,3 @@ jobs:
                     commit_user_email: bot@picocms.org
                     commit_message: >-
                         Update cloc statistics for ${{ github.ref_name }}
-
-    deploy:
-        name: Create Pico release
-
-        runs-on: ubuntu-latest
-        permissions:
-            contents: write
-
-        needs: test
-
-        env:
-            PHP_VERSION: '7.2'
-
-        steps:
-            -   name: Setup CI tools
-                run: |
-                    . <(curl -fsS -L "$CI_TOOLS_SETUP")
-                    echo "CI_TOOLS_PATH=$CI_TOOLS_PATH" | tee -a "$GITHUB_ENV"
-
-            -   name: Checkout repository
-                uses: actions/checkout@v2
-
-            -   name: Setup PHP ${{ env.PHP_VERSION }}
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ env.PHP_VERSION }}
-                    tools: composer
-
-            -   name: Setup Composer auth
-                run: |
-                    composer config --global github-oauth.github.com "${{ github.token }}"
-
-            -   name: Get Composer cache directory
-                run: |
-                    COMPOSER_CACHE_DIR="$(composer config --global cache-dir)"
-                    echo "COMPOSER_CACHE_DIR=$COMPOSER_CACHE_DIR" | tee -a "$GITHUB_ENV"
-
-            -   name: Restore Composer cache
-                uses: actions/cache@v2
-                with:
-                    path: ${{ env.COMPOSER_CACHE_DIR }}
-                    key: ${{ runner.os }}-composer-php${{ env.PHP_VERSION }}
-                    restore-keys: |
-                        ${{ runner.os }}-composer-
-
-            -   name: Parse Pico version
-                run: |
-                    . "$CI_TOOLS_PATH/parse_version.inc.sh"
-
-                    if ! parse_version "$GITHUB_REF_NAME"; then
-                        echo "Invalid version string: $GITHUB_REF_NAME" >&2
-                        exit 1
-                    fi
-
-                    printf '%s=%s\n' \
-                        "PICO_VERSION_FULL" "$VERSION_FULL" \
-                        "PICO_VERSION_STABILITY" "$VERSION_STABILITY" \
-                        | tee -a "$GITHUB_ENV"
-
-            -   name: Build Pico and create release archives
-                run: |
-                    make build version="$GITHUB_REF_NAME"
-
-            -   name: Create GitHub release and upload release archives
-                uses: softprops/action-gh-release@v1
-                with:
-                    name: Version ${{ env.PICO_VERSION_FULL }}
-                    body: >-
-                        Pico ${{ github.ref_name }}
-                    prerelease: ${{ env.PICO_VERSION_STABILITY != 'stable' }}
-                    draft: true
-                    files: |
-                        pico-release-${{ github.ref_name }}.tar.gz
-                        pico-release-${{ github.ref_name }}.zip
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d618b02d2..bddc9a93c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,8 +1,12 @@
 name: Test Pico CMS
 
 on:
+    push:
+        branches:
+            - 'master'
+            - 'pico-3.0'
+        tags: [ 'v*.*.*' ]
     pull_request: {}
-    workflow_call: {}
 
 jobs:
     test:
diff --git a/Makefile b/Makefile
index a8335c99f..3d4bd55dc 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@
 
 version?=
 nocheck?=false
+publish=false
 
 php?=php
 composer?=composer
@@ -37,15 +38,18 @@ clean-export:
 build: export PHP=$(php)
 build: export COMPOSER=$(composer)
 build:
-	./.build/build.sh$(if $(filter true,$(nocheck)), --no-check,)$(if $(version), "$(version)",)
+	./.build/build.sh$(if $(filter true,$(publish)), --publish,)$(if $(filter true,$(nocheck)), --no-check,)$(if $(version), "$(version)",)
 
 export:
 	git archive --prefix "$(app_name)/" -o "./$(export)" HEAD
 
+publish: publish=true
+publish: build
+
 composer:
 	$(composer) install --optimize-autoloader --no-dev
 
 .PHONY: all \
 	clean clean-build clean-export \
-	build export \
+	build export publish \
 	composer

From 3b6984dbd7322ada45f88ba43e6f0434fcbf641f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Tue, 8 Mar 2022 22:41:11 +0100
Subject: [PATCH 60/75] Add some "art" to Pico class docs

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

diff --git a/lib/Pico.php b/lib/Pico.php
index 65322e1ee..9b247220f 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -29,6 +29,15 @@
 /**
  * Pico
  *
+ * ```
+ *      ______  __
+ *     / __  / /_/
+ *    / /_/ / __  ____  ____
+ *   / ____/ / / / __/ / __ \
+ *  / /     / / / /__ / /_/ /
+ * /_/     /_/  \___/ \____/
+ * ```
+ *
  * Pico is a stupidly simple, blazing fast, flat file CMS.
  *
  * - Stupidly Simple: Pico makes creating and maintaining a

From c0639ccef65dc4cc2b222dad0c911e81d70470ee Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 9 Mar 2022 15:36:58 +0100
Subject: [PATCH 61/75] Minor code improvements

---
 lib/AbstractPicoPlugin.php | 20 ++++++++++----------
 lib/Pico.php               | 21 +++++++++------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/lib/AbstractPicoPlugin.php b/lib/AbstractPicoPlugin.php
index 250d75756..92b8d91fd 100644
--- a/lib/AbstractPicoPlugin.php
+++ b/lib/AbstractPicoPlugin.php
@@ -110,7 +110,7 @@ public function handleEvent($eventName, array $params)
      */
     protected function configEnabled()
     {
-        $pluginEnabled = $this->getPico()->getConfig(get_called_class() . '.enabled');
+        $pluginEnabled = $this->getPico()->getConfig(static::class . '.enabled');
         if ($pluginEnabled !== null) {
             $this->setEnabled($pluginEnabled);
         } else {
@@ -186,7 +186,7 @@ public function getPico()
      */
     public function getPluginConfig($configName = null, $default = null)
     {
-        $pluginConfig = $this->getPico()->getConfig(get_called_class(), []);
+        $pluginConfig = $this->getPico()->getConfig(static::class, []);
 
         if ($configName === null) {
             return $pluginConfig;
@@ -215,7 +215,7 @@ public function __call($methodName, array $params)
 
         throw new BadMethodCallException(
             'Call to undefined method ' . get_class($this->getPico()) . '::' . $methodName . '() '
-            . 'through ' . get_called_class() . '::__call()'
+            . 'through ' . static::class . '::__call()'
         );
     }
 
@@ -235,7 +235,7 @@ protected function checkDependencies($recursive)
                 $plugin = $this->getPico()->getPlugin($pluginName);
             } catch (RuntimeException $e) {
                 throw new RuntimeException(
-                    "Unable to enable plugin '" . get_called_class() . "': "
+                    "Unable to enable plugin '" . static::class . "': "
                     . "Required plugin '" . $pluginName . "' not found"
                 );
             }
@@ -247,13 +247,13 @@ protected function checkDependencies($recursive)
                         $plugin->setEnabled(true, true, true);
                     } else {
                         throw new RuntimeException(
-                            "Unable to enable plugin '" . get_called_class() . "': "
+                            "Unable to enable plugin '" . static::class . "': "
                             . "Required plugin '" . $pluginName . "' was disabled manually"
                         );
                     }
                 } else {
                     throw new RuntimeException(
-                        "Unable to enable plugin '" . get_called_class() . "': "
+                        "Unable to enable plugin '" . static::class . "': "
                         . "Required plugin '" . $pluginName . "' is disabled"
                     );
                 }
@@ -289,7 +289,7 @@ protected function checkDependants($recursive)
                             $plugin->setEnabled(false, true, true);
                         } else {
                             throw new RuntimeException(
-                                "Unable to disable plugin '" . get_called_class() . "': "
+                                "Unable to disable plugin '" . static::class . "': "
                                 . "Required by manually enabled plugin '" . $pluginName . "'"
                             );
                         }
@@ -299,7 +299,7 @@ protected function checkDependants($recursive)
                 $dependantsList = 'plugin' . ((count($dependants) > 1) ? 's' : '') . ' '
                     . "'" . implode("', '", array_keys($dependants)) . "'";
                 throw new RuntimeException(
-                    "Unable to disable plugin '" . get_called_class() . "': "
+                    "Unable to disable plugin '" . static::class . "': "
                     . "Required by " . $dependantsList
                 );
             }
@@ -317,7 +317,7 @@ public function getDependants()
                 // only plugins which implement PicoPluginInterface support dependencies
                 if ($plugin instanceof PicoPluginInterface) {
                     $dependencies = $plugin->getDependencies();
-                    if (in_array(get_called_class(), $dependencies)) {
+                    if (in_array(static::class, $dependencies)) {
                         $this->dependants[$pluginName] = $plugin;
                     }
                 }
@@ -351,7 +351,7 @@ protected function checkCompatibility()
 
             if (!$this->nativePlugin && ($pluginApiVersion > $picoApiVersion)) {
                 throw new RuntimeException(
-                    "Unable to enable plugin '" . get_called_class() . "': The plugin's API (version "
+                    "Unable to enable plugin '" . static::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 9b247220f..3fa5bddee 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -575,7 +575,7 @@ protected function loadPlugins(): void
 
         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, "
+                "Plugins using an older API than version " . self::API_VERSION . " found, "
                 . "but PicoDeprecated isn't loaded"
             );
         }
@@ -631,7 +631,7 @@ protected function loadComposerPlugins(array $pluginBlacklist = []): array
 
                 $this->plugins[$className] = $plugin;
 
-                if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
+                if (defined($className . '::API_VERSION') && ($className::API_VERSION >= self::API_VERSION)) {
                     $this->nativePlugins[$className] = $plugin;
                 }
             }
@@ -668,12 +668,9 @@ protected function loadComposerPlugins(array $pluginBlacklist = []): array
     protected function loadLocalPlugins(array $pluginBlacklist = []): void
     {
         // scope isolated require()
-        $includeClosure = function ($pluginFile) {
+        $includeClosure = static function ($pluginFile) {
             require($pluginFile);
         };
-        if (PHP_VERSION_ID >= 50400) {
-            $includeClosure = $includeClosure->bindTo(null);
-        }
 
         $pluginBlacklist = array_fill_keys($pluginBlacklist, true);
 
@@ -714,7 +711,7 @@ protected function loadLocalPlugins(array $pluginBlacklist = []): void
                 $this->plugins[$className] = $plugin;
 
                 if ($plugin instanceof PicoPluginInterface) {
-                    if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
+                    if (defined($className . '::API_VERSION') && ($className::API_VERSION >= self::API_VERSION)) {
                         $this->nativePlugins[$className] = $plugin;
                     }
                 }
@@ -780,7 +777,7 @@ public function loadPlugin($plugin): PicoPluginInterface
 
         $this->plugins[$className] = $plugin;
 
-        if (defined($className . '::API_VERSION') && ($className::API_VERSION >= static::API_VERSION)) {
+        if (defined($className . '::API_VERSION') && ($className::API_VERSION >= self::API_VERSION)) {
             $this->nativePlugins[$className] = $plugin;
         }
 
@@ -1172,10 +1169,10 @@ protected function loadTheme(): void
         }
 
         // check for theme compatibility
-        if (!isset($this->plugins['PicoDeprecated']) && ($this->themeApiVersion < static::API_VERSION)) {
+        if (!isset($this->plugins['PicoDeprecated']) && ($this->themeApiVersion < self::API_VERSION)) {
             throw new RuntimeException(
                 'Current theme "' . $this->theme . '" uses API version ' . $this->themeApiVersion . ', but Pico '
-                . 'provides API version ' . static::API_VERSION . ' and PicoDeprecated isn\'t loaded'
+                . 'provides API version ' . self::API_VERSION . ' and PicoDeprecated isn\'t loaded'
             );
         }
     }
@@ -1651,7 +1648,7 @@ public function substituteFileContent(string $markdown, array $meta = [], string
         $variables = [];
 
         // replace %version%
-        $variables['%version%'] = static::VERSION;
+        $variables['%version%'] = self::VERSION;
 
         // replace %site_title%
         $variables['%site_title%'] = $this->getConfig('site_title');
@@ -2209,7 +2206,7 @@ protected function getTwigVariables(): array
             'previous_page' => $this->previousPage,
             'current_page' => $this->currentPage,
             'next_page' => $this->nextPage,
-            'version' => static::VERSION,
+            'version' => self::VERSION,
         ];
     }
 

From 81c21722d32a37458b26a4434531a2ef016e272f Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 12 Mar 2022 18:02:11 +0100
Subject: [PATCH 62/75] Update CONTRIBUTING.md to include latest changes

---
 CONTRIBUTING.md | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab4456641..acd46f0e4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,7 +92,7 @@ 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!
+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 an [OSI-approved open source license](https://opensource.org/licenses). After all, Pico is open source, too!
 
 ### Prevent `merge-hell`
 
@@ -153,9 +153,13 @@ As soon as development reaches a point where feedback is appreciated, a pull req
 Build & Release process
 -----------------------
 
-We use [GitHub Actions](https://github.com/picocms/Pico/actions) to automate the build & release process of Pico - also called [continous integration](https://en.wikipedia.org/wiki/Continuous_integration), or CI. With our CI pipeline we generate and deploy a [PHP class documentation](https://picocms.org/phpDoc/) (powered by [phpDoc](https://phpdoc.org)) for new releases and on every commit to the `master` branch. Our  CI pipeline 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 the [`deploy-branch.yml` workflow](https://github.com/picocms/Pico/blob/master/.github/workflows/deploy-branch.yml), the [`deploy-release.yml` workflow](https://github.com/picocms/Pico/blob/master/.github/workflows/deploy-release.yml), the [`picocms/ci-tools` repo](https://github.com/picocms/ci-tools) and Pico's [`.build/build.sh` script](https://github.com/picocms/Pico/blob/master/.build/build.sh) for details.
+We use [GitHub Actions](https://github.com/picocms/Pico/actions) to automate the test, build & release process of Pico - also called [continous integration](https://en.wikipedia.org/wiki/Continuous_integration), or CI. With our CI pipeline we perform various tests on every push, including code style checks (powered by [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer)). Due to historical reasons we don't have any unit or integration tests, so you must manually test your changes. Pull requests adding unit or integration tests are very welcome though! Please refer to the [`test.yml` workflow](https://github.com/picocms/Pico/blob/master/.github/workflows/test.yml) 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:
+With our CI pipeline we furthermore generate and deploy a [PHP class documentation](https://picocms.org/phpDoc/) (powered by [phpDoc](https://phpdoc.org)) for new releases and on every push to the `master` branch. Our CI pipeline also prepares new releases by generating 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 the [`deploy-branch.yml`](https://github.com/picocms/Pico/blob/master/.github/workflows/deploy-branch.yml) and [`deploy-release.yml`](https://github.com/picocms/Pico/blob/master/.github/workflows/deploy-release.yml) workflows for details, as well as the [`picocms/ci-tools` repo](https://github.com/picocms/ci-tools).
+
+To build a release package or publish a new release, use Pico's [Makefile](https://github.com/picocms/Pico/blob/master/Makefile) (see [Wikipedia](https://en.wikipedia.org/wiki/Make_(software)) for details), which is more or less a wrapper for Pico's [`.build/build.sh` script](https://github.com/picocms/Pico/blob/master/.build/build.sh). You can build both development versions (like `v1.0.0-dev`) and "actual" releases (both stable and pre-releases, like `v1.0.0` or `v1.0.0-beta.1`). The `build` target builds a development version by default; to build a release, pass the `version` argument (e.g. `make build version=v1.0.0`). Please note that the build script will perform a sophisticated list of sanity checks before actually building a non-development version of Pico (e.g. your Git working tree must be clean, and the Git tag matching the version to build must be checked out). To publish a new release, run the `publish` target. It will build the release packages and push them to GitHub, creating a new release there and triggering the previously mentioned workflow for new releases. You must then manually add the changelog to the release description.
+
+As insinuated above, it is important that each commit to `master` is deployable. Once development of a new Pico release is finished, publish the new release using `make publish version=v1.0.0`. The matching Git tag should reference a (usually empty) commit on `master`, whose message should adhere to the following template:
 
 ```
 Version 1.0.0
@@ -171,39 +175,39 @@ Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico:
 
 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.
 
-Our CI pipeline 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](https://packagist.org/packages/picocms/pico) will be updated automatically.
+The latest Pico version is always available at https://github.com/picocms/Pico/releases/latest, so please make sure to reference this URL rather than version-specific URLs. [Packagist](https://packagist.org/packages/picocms/pico) will be updated automatically.
 
 Labeling of Issues & Pull Requests
 ----------------------------------
 
-Pico makes use of GitHub's label and milestone features, to aide developers in quickly identifying and prioritizing which issues need to be worked on. The starting point for labeling issues and pull requests is the `type` label, which is explained in greater detail below. The `type` label might get combined with a `pri` label, describing the issue's priority, and a `status` label, describing the current status of the issue.
+Pico makes use of GitHub's label and milestone features, to aid developers in quickly identifying and prioritizing which issues need to be worked on. The starting point for labeling issues and pull requests is the `type` label, which is explained in greater detail below. The `type` label might get combined with a `pri` label, describing the issue's priority, and a `status` label, describing the current status of the issue.
 
 Issues and pull requests labeled with `info: Feedback Needed` indicate that feedback from others is highly appreciated. We always appreciate feedback at any time and from anyone, but when this label is present, we explicitly *ask* you to give feedback. It would be great if you leave a comment!
 
-- The `type: Bug` label is assigned to issues or pull requests, which have been identified as bugs or security issues in Pico's core. It might get combined with the `pri: High` label, when the problem was identified as security issue, or as a so-called "show stopper" bug. In contrast, uncritical problems might get labeled with `pri: Low`. `type: Bug` issues and pull requests are usually labeled with one of the following `status` labels when being closed:
-  - `status: Resolved` is used when the issue has been resolved.
+- The `type: Bug` label is assigned to issues or pull requests, which have been identified as bugs or security issues in Pico's core. It might get combined with the `pri: High` label, when the problem was identified as security issue, or as a so-called "show stopper" bug. In contrast, uncritical problems might get labeled with `pri: Low`. If a pull request isn't mergeable at the moment, it is labeled with `status: Work In Progress` until development of the pull request is finished. `type: Bug` issues and pull requests are usually labeled with one of the following `status` labels when being closed:
+  - `status: Resolved` is used when the issue has been resolved (used with issues only).
   - `status: Conflict` indicates a conflict with another issue or behavior of Pico, making it impossible to resolve the problem at the moment.
   - `status: Won't Fix` means, that there is indeed a problem, but for some reason we made the decision that resolving it isn't reasonable, making it intended behavior.
   - `status: Rejected` is used when the issue was rejected for another reason.
 
-- The `type: Enhancement` and `type: Feature` labels are used to tag pull requests, which introduce either a comparatively small enhancement, or a "big" new feature. As with the `type: Bug` label, they might get combined with the `pri: High` or `pri: Low` labels to indicate the pull request's priority. If a pull request isn't mergeable at the moment, it is labeled with `status: Work In Progress` until development of the pull request is finished. After merging or closing the pull request, it is labeled with one of the `status` labels as described above for the `type: Bug` label.
+- The `type: Enhancement` and `type: Feature` labels are used to tag pull requests, which introduce either a comparatively small enhancement, or a "big" new feature. As with the `type: Bug` label, they might get combined with the `pri: High` or `pri: Low` labels to indicate the pull request's priority. They might also be labeled with `status: Work In Progress`. After merging or closing the pull request, it is labeled with one of the `status` labels as described above for the `type: Bug` label.
 
-- The `type: Idea` label is similar to the `type: Enhancement` and `type: Feature` labels, but is used for issues or incomplete and abandoned pull requests. It is otherwise used in the exact same way as `type: Enhancement` and `type: Feature`.
+- The `type: Idea` label is similar to the `type: Enhancement` and `type: Feature` labels, but is used for issues, or incomplete and abandoned pull requests. It is otherwise used in the exact same way as `type: Enhancement` and `type: Feature`.
 
 - The `type: Release` label is used in the exact same way as `type: Feature` and indicates the primary pull request of a new Pico release (please refer to the *Branching* and *Build & Release process* sections above).
 
-- The `type: Notice`, `type: Support` and `type: Discussion` labels are used to indicate "fyi" issues, support-related issues (e.g. issues opened by users or developers asking questions), and issues with disucssions about arbitrary topics related to Pico. They are neither combined with `pri` labels, nor with `status` labels.
+- The `type: Notice`, `type: Support` and `type: Discussion` labels are used to indicate "fyi" issues, support-related issues (e.g. issues opened by users or developers asking questions), and issues with discussions about arbitrary topics related to Pico. They are neither combined with `pri` labels, nor with `status` labels.
 
 - The `type: Duplicate` label is used when there is already another issue or pull request related to this problem or feature request. Issues labeled with `type: Duplicate` are immediately closed.
 
-- The `type: Invalid` label is used for everything else, e.g. issues or pull requests not related to Pico, or invalid bug reports. This includes supposed bug reports that concern actually intended behavior.
+- The `type: Invalid` label is used for everything else, e.g. issues or pull requests not related to Pico, or invalid bug reports. This includes supposed bug reports that concern actually intended behavior, unless the report isn't rather considered a support request (also see `type: Support`).
 
-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. This is also true for the `info: Pinned` label: It indicates a important issue or pull request that remains open on purpose.
+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. This is also true for the `info: Pinned` label: It indicates an important issue or pull request that remains open on purpose.
 
-After resolving a issue, we usually keep it open for about a week to give users some more time for feedback and further questions. This is especially true for issues with the `type: Notice`, `type: Support`, `type: Discussion` and `type: Invalid` labels. After 7 days with no interaction, the [GitHub Actions](https://github.com/picocms/Pico/actions/workflows/stale.yml) bot adds the `info: Stale` label to the issue to ask the participants whether the issue has been resolved. If no more activity occurs, the issue will be automatically closed by Stale bot 2 days later.
+After resolving an issue, we usually keep it open for about a week to give users some more time for feedback and further questions. This is especially true for issues with the `type: Notice`, `type: Support`, `type: Discussion` and `type: Invalid` labels. After 7 days with no interaction, the [GitHub Actions](https://github.com/picocms/Pico/actions/workflows/stale.yml) bot adds the `info: Stale` label to the issue to ask the participants whether the issue has been resolved. If no more activity occurs, the issue will be automatically closed by Stale bot 2 days later.
 
-Issues and pull requests labeled with `info: Information Needed` indicate that we have asked one of the participants for further information and didn't receive any feedback yet. It is usually added after Stale bot adds the `info: Stale` label to give the participants some more days to give the necessary information.
+Issues and pull requests labeled with `info: Information Needed` indicate that we have asked one of the participants for further information and didn't receive any feedback yet. It is usually added after Stale bot adds the `info: Stale` label to give the participants some more days to provide the necessary information, unless it is automatically closed due to inactivity.
 
 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`.
 
-When a issue or pull request isn't directly related to Pico's core, but the project as a whole, it is labeled with `info: Meta`. Issues labeled with `info: Website` are related to [Pico's website](https://picocms.org), however, in this case it is usually expedient to move the issue to the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io) instead. The same applies to the `info: Pico CMS for Nextcloud` label; these issues are related to [Pico CMS for Nextcloud](https://apps.nextcloud.com/apps/cms_pico).
+If an issue or pull request isn't directly related to Pico's core, but the project as a whole, it is labeled with `info: Meta`. Issues labeled with `info: Website` are related to [Pico's website](https://picocms.org), however, in this case it is usually expedient to move the issue to the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io) instead. The same applies to the `info: Pico CMS for Nextcloud` label; these issues are related to [Pico CMS for Nextcloud](https://apps.nextcloud.com/apps/cms_pico).

From 0068406e23dd60569a91f25b0f2805767b4c57b2 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 13 Mar 2022 12:16:50 +0100
Subject: [PATCH 63/75] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d2fed319..d4c487838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,46 @@ Pico Changelog
           `PicoDeprecated`'s changelog. Please note that BC-breaking changes
           are only possible with a new major version.
 
+### Version 3.0.0-beta.1
+Released: -
+
+```
+* [New] Pico 3.0 is a major release, but comes with relatively small changes
+        to Pico's core; its major change are updated dependencies (see below)
+* [New] Introduce API version 4 (with barely noticable changes, see below)
+* [New] Add new continous integration (CI) pipeline using GitHub Actions
+* [New] Add new build script and Makefile to simplify Pico's build and release
+        process; see `CONTRIBUTING.md` for details
+* [New] Add `%page_id%`, `%page_url%` and `%page_path%` Markdown placeholders
+        to replace the current page's ID, URL, and containing directory resp.
+* [New] `Pico::prepareFileContent()` and `Pico::substituteFileContent()` both
+        now receive the (optional) `$pageId` argument for the new `%page_*%`
+        Markdown placeholders
+* [Changed] ! Pico now requires PHP 7.2.5 or later (this includes full PHP 8
+            support, also see #528, #534, #608)
+* [Changed] ! Pico now depends on Twig 3.3, skipping Twig 2.x altogether; this
+            is a BC-breaking change, as Twig 2.x and 3.x changed and removed
+            some commonly used features; check out Twig's changelog and
+            deprecation notices for details
+* [Changed] ! Pico now depends on Symfony YAML 5.4, skipping various milestones
+            in between; this is a BC-breaking change, because Symfony YAML
+            changed its behaviour multiple times in between; check out Symfony
+            YAML's changelog for details
+* [Changed] ! Pico downgrades to Parsedown 1.7.4 and Parsedown Extra 0.8.1;
+            this is a BC-breaking change in theory, but shouldn't have much of
+            an impact in real-life scenarios
+* [Changed] #603: Pico's `markdown` Twig filter now raises an error if an
+            invalid variable type (e.g. an array) is passed
+* [Changed] Enable PHP strict typing for Pico's internal classes; Pico's
+            `PicoPluginInterface` interface and `AbstractPicoPlugin` class
+            don't use strict typing to maintain BC, but you can (and should)
+            enable it for your plugin (see `DummyPlugin` for an example)
+* [Changed] Various other code improvements due to the upgrade to PHP 7.2
+* [Fixed] #602: Fix contents and meta data of meta pages (pages starting with
+          an `_`) getting replaced by the 404 page when being requested
+* [Fixed] Add a proper error message for a missing theme directory
+```
+
 ### Version 3.0.0-alpha.2
 Released: 2020-12-24
 

From 6698130b0f01cf5b449020df5c333114a0411ebf Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 13 Mar 2022 12:17:15 +0100
Subject: [PATCH 64/75] Update dependencies in composer.json

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

diff --git a/composer.json b/composer.json
index 8e124f5bf..ff92e9df5 100644
--- a/composer.json
+++ b/composer.json
@@ -33,8 +33,8 @@
     "require": {
         "php": ">=7.2.5",
         "ext-mbstring": "*",
-        "twig/twig": "^3.0",
-        "symfony/yaml" : "^5.0",
+        "twig/twig": "^3.3.8",
+        "symfony/yaml" : "^5.4.3",
         "erusev/parsedown": "1.7.4",
         "erusev/parsedown-extra": "0.8.1"
     },

From 1da5e26d57fafb023782f86ffe5ce9211762b04a Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 21 Mar 2022 01:49:27 +0100
Subject: [PATCH 65/75] Remove Pico's `map` Twig filter

Fixes #623
---
 CHANGELOG.md              |  2 ++
 lib/PicoTwigExtension.php | 33 ---------------------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4c487838..8162bf76a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,8 @@ Released: -
 * [Fixed] #602: Fix contents and meta data of meta pages (pages starting with
           an `_`) getting replaced by the 404 page when being requested
 * [Fixed] Add a proper error message for a missing theme directory
+* [Removed] ! Remove Pico's `map` Twig filter; it conflicts with Twig's `map`
+            filter and can be replaced by Twig's `column` or `map` filter
 ```
 
 ### Version 3.0.0-alpha.2
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index f85dc8664..428dc034a 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -81,7 +81,6 @@ public function getFilters(): array
     {
         return [
             'markdown' => new TwigFilter('markdown', [ $this, 'markdownFilter' ], [ 'is_safe' => [ 'html' ] ]),
-            'map' => new TwigFilter('map', [ $this, 'mapFilter' ]),
             'sort_by' => new TwigFilter('sort_by', [ $this, 'sortByFilter' ]),
             'link' => new TwigFilter('link', [ $this->pico, 'getPageUrl' ]),
             'url' => new TwigFilter('url', [ $this->pico, 'substituteUrl' ]),
@@ -127,38 +126,6 @@ public function markdownFilter(string $markdown, array $meta = [], bool $singleL
         return $this->getPico()->parseFileContent($markdown, $singleLine);
     }
 
-    /**
-     * Returns a array with the values of the given key or key path
-     *
-     * 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
-     *     array interpreted as key path (i.e. ['foo', 'bar'] will return all
-     *     $item['foo']['bar'] values)
-     *
-     * @return array mapped values
-     *
-     * @throws TwigRuntimeError
-     */
-    public function mapFilter($var, $mapKeyPath): array
-    {
-        if (!is_array($var) && (!is_object($var) || !($var instanceof Traversable))) {
-            throw new TwigRuntimeError(sprintf(
-                'The map filter only works with arrays or "Traversable", got "%s"',
-                is_object($var) ? get_class($var) : gettype($var)
-            ));
-        }
-
-        $result = [];
-        foreach ($var as $key => $value) {
-            $mapValue = $this->getKeyOfVar($value, $mapKeyPath);
-            $result[$key] = ($mapValue !== null) ? $mapValue : $value;
-        }
-        return $result;
-    }
-
     /**
      * Sorts an array by one of its keys or a arbitrary deep sub-key
      *

From 268f4033f1a63cf4d57166e4fe117b6d5a852854 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 21 Mar 2022 01:59:44 +0100
Subject: [PATCH 66/75] Sample contents: Remove Pico's `map` Twig filter

---
 content-sample/index.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/content-sample/index.md b/content-sample/index.md
index 36d564c6a..4a0574055 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -347,8 +347,6 @@ even easier.
   the array; you can specify `bottom` (move items to bottom; default), `top`
   (move items to top), `keep` (keep original order) or `remove` (remove items)
   as second parameter to change this behavior.
-* You can return all values of a given array key using the `map` filter
-  (e.g. `{{ pages|map("title") }}` returns all page titles).
 * Use the `url_param` and `form_param` Twig functions to access HTTP GET (i.e.
   a URL's query string like `?some-variable=my-value`) and HTTP POST (i.e. data
   of a submitted form) parameters. This allows you to implement things like

From a178e85c079c65a0b4af1d7c755a3d4f290d32be Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 3 Apr 2022 17:08:01 +0200
Subject: [PATCH 67/75] Update sample contents for Pico 3.0

---
 CONTRIBUTING.md         |   2 +-
 content-sample/index.md | 414 ++++++++++------------------------------
 2 files changed, 98 insertions(+), 318 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index acd46f0e4..2a38aaec5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -110,7 +110,7 @@ Please keep in mind that pull requests should be small (i.e. one feature per req
 
 Pico uses the [PSR-2 Coding Standard](https://www.php-fig.org/psr/psr-2/) as defined by the [PHP Framework Interoperability Group (PHP-FIG)](https://www.php-fig.org/).
 
-For historical reasons we don't use formal namespaces. Markdown files in the `content-sample` folder (the inline documentation) must follow a hard limit of 80 characters line length.
+For historical reasons we don't use formal namespaces.
 
 It is recommended to check your code using [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) using Pico's `.phpcs.xml` standard. Use the following command:
 
diff --git a/content-sample/index.md b/content-sample/index.md
index 4a0574055..b8c209c9b 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -5,29 +5,15 @@ Description: Pico is a stupidly simple, blazing fast, flat file CMS.
 
 ## Welcome to Pico
 
-Congratulations, you have successfully installed [Pico][] %version%.
-%meta.description% <!-- replaced by the above Description header -->
+Congratulations, you have successfully installed [Pico][] %version%. %meta.description% <!-- replaced by the above Description header -->
 
 ## Creating Content
 
-Pico is a flat file CMS. This means there is no administration backend or
-database to deal with. You simply create `.md` files in the `content` folder
-and those files become your pages. For example, this file is called `index.md`
-and is shown as the main landing page.
-
-When you install Pico, it comes with some sample contents that will display
-until you add your own content. 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`. Just check out [Pico's sample contents][SampleContents] for an
-example!
-
-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:
+Pico is a flat file CMS. This means there is no administration backend or database to deal with. You simply create `.md` files in the `content` folder and those files become your pages. For example, this file is called `index.md` and is shown as the main landing page.
+
+When you install Pico, it comes with some sample contents that will display until you add your own content. 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`. Just check out [Pico's sample contents][SampleContents] for an example!
+
+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>
@@ -67,35 +53,17 @@ Below we've shown some examples of locations and their corresponding URLs:
     </tbody>
 </table>
 
-If a file cannot be found, the file `content/404.md` will be shown. You can add
-`404.md` files to any directory. So, for example, if you wanted to use a special
-error page for your blog, you could simply create `content/blog/404.md`.
-
-Pico strictly separates contents of your website (the Markdown files in your
-`content` directory) and how these contents should be displayed (the Twig
-templates in your `themes` directory). However, not every file in your `content`
-directory might actually be a distinct page. For example, some themes (including
-Pico's default theme) use some special "hidden" file to manage meta data (like
-`_meta.md` in Pico's sample contents). Some other themes use a `_footer.md` to
-represent the contents of the website's footer. The common point is the `_`: all
-files and directories prefixed by a `_` in your `content` directory are hidden.
-These pages can't be accessed from a web browser, Pico will show a 404 error
-page instead.
-
-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, use Pico's `assets` folder. You can then access them in your Markdown
-using the <code>&#37;assets_url&#37;</code> placeholder, for example:
-<code>!\[Image Title\](&#37;assets_url&#37;/image.png)</code>
+If a file cannot be found, the file `content/404.md` will be shown. You can add `404.md` files to any directory. So, for example, if you wanted to use a special error page for your blog, you could simply create `content/blog/404.md`.
+
+Pico strictly separates contents of your website (the Markdown files in your `content` directory) and how these contents should be displayed (the Twig templates in your `themes` directory). However, not every file in your `content` directory might actually be a distinct page. For example, some themes (including Pico's default theme) use some special "hidden" file to manage meta data (like `_meta.md` in Pico's sample contents). Some other themes use a `_footer.md` to represent the contents of the website's footer. The common point is the `_`: all files and directories prefixed by a `_` in your `content` directory are hidden. These pages can't be accessed from a web browser, Pico will show a 404 error page instead.
+
+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. an image) in one of your content files, use Pico's `assets` folder. You can then access them in your Markdown using the <code>&#37;assets_url&#37;</code> placeholder, for example: <code>!\[Image Title\](&#37;assets_url&#37;/image.png)</code>
 
 ### Text File Markup
 
-Text files are marked up using [Markdown][] and [Markdown Extra][MarkdownExtra].
-They can also contain regular HTML.
+Text files are marked up using [Markdown][] and [Markdown Extra][MarkdownExtra]. They can also contain regular HTML.
 
-At the top of text files you can place a block comment and specify certain meta
-attributes of the page using [YAML][] (the "YAML header"). For example:
+At the top of text files you can place a block comment and specify certain meta attributes of the page using [YAML][] (the "YAML Front Matter", or "YAML header"). For example:
 
     ---
     Title: Welcome
@@ -106,113 +74,66 @@ attributes of the page using [YAML][] (the "YAML header"). For example:
     Template: index
     ---
 
-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`).
-
-In an attempt to separate contents and styling, we recommend you to not use
-inline CSS in your Markdown files. You should rather add appropriate CSS
-classes to your theme. For example, you might want to add some CSS classes to
-your theme to rule how much of the available space a image should use (e.g.
-`img.small { width: 80%; }`). You can then use these CSS classes in your
-Markdown files, for example:
-<code>!\[Image Title\](&#37;assets_url&#37;/image.png) {.small}</code>
+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` instead of the default `index.twig`).
+
+In an attempt to separate contents and styling, we recommend you to not use inline CSS in your Markdown files. You should rather add appropriate CSS classes to your theme. For example, you might want to add some CSS classes to your theme to rule how much of the available space a image should use (e.g. `img.small { width: 80%; }`). You can then use these CSS classes in your Markdown files, for example: <code>!\[Image Title\](&#37;assets_url&#37;/image.png) {.small}</code>
 
 There are also certain variables that you can use in your text files:
 
 * <code>&#37;site_title&#37;</code> - The title of your Pico site
-* <code>&#37;base_url&#37;</code> - The URL to your Pico site; internal links
-  can be specified using <code>&#37;base_url&#37;?sub/page</code>
+* <code>&#37;base_url&#37;</code> - The URL to your Pico site; internal links can be specified using <code>&#37;base_url&#37;?sub/page</code>
 * <code>&#37;theme_url&#37;</code> - The URL to the currently used theme
 * <code>&#37;assets_url&#37;</code> - The URL to Pico's `assets` directory
-* <code>&#37;themes_url&#37;</code> - The URL to Pico's `themes` directory;
-  don't confuse this with <code>&#37;theme_url&#37;</code>
+* <code>&#37;themes_url&#37;</code> - The URL to Pico's `themes` directory; don't confuse this with <code>&#37;theme_url&#37;</code>
 * <code>&#37;plugins_url&#37;</code> - The URL to Pico's `plugins` directory
 * <code>&#37;version&#37;</code> - Pico's current version string (e.g. `2.0.0`)
-* <code>&#37;meta.&#42;&#37;</code> - Access any meta variable of the current
-  page, e.g. <code>&#37;meta.author&#37;</code> is replaced with `Joe Bloggs`
-* <code>&#37;config.&#42;&#37;</code> - Access any scalar config variable,
-  e.g. <code>&#37;config.theme&#37;</code> is replaced with `default`
+* <code>&#37;page_id&#37;</code>, <code>&#37;page_url&#37;</code>, and <code>&#37;page_path&#37;</code> - The current page's ID (e.g. `sub/index` for `content/sub/index.md`, `sub/page` for `content/sub/page.md`, …), its URL (`sub` resp. `sub/page` in our examples), or its directory path (`sub` in both examples) respectively
+* <code>&#37;meta.&#42;&#37;</code> - Access any meta variable of the current page, e.g. <code>&#37;meta.author&#37;</code> is replaced with `Joe Bloggs`
+* <code>&#37;config.&#42;&#37;</code> - Access any scalar config variable, e.g. <code>&#37;config.theme&#37;</code> is replaced by `default`
 
 ### Blogging
 
-Pico is not blogging software - but makes it very easy for you to use it as a
-blog. You can find many plugins out there implementing typical blogging
-features like authentication, tagging, pagination and social plugins. See the
-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 a `Date` meta header.
-2. Create a `blog.md` or `blog/index.md` in your `content` directory. Add
-   `Template: blog-index` to the YAML header of this page. It will later show a
-   list of all your blog articles (see step 3).
-3. Create the new Twig template `blog-index.twig` (the file name must match the
-   `Template` meta header from Step 2) in your theme directory. This template
-   probably isn't very different from your default `index.twig` (i.e. copy
-   `index.twig`), it will create a list of all your blog articles. Add the
-   following Twig snippet to `blog-index.twig` near `{{ content }}`:
-   ```
-    {% for page in pages("blog")|sort_by("time")|reverse if not page.hidden %}
-        <div class="post">
-            <h3><a href="{{ page.url }}">{{ page.title }}</a></h3>
-            <p class="date">{{ page.date_formatted }}</p>
-            <p class="excerpt">{{ page.description }}</p>
-        </div>
+Pico is not blogging software - but makes it very easy for you to use it as a blog. You can find many plugins out there implementing typical blogging features like authentication, tagging, pagination and social plugins. See the "Plugins" section below 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 a `Date` meta header.
+2. Create a `blog.md` or `blog/index.md` in your `content` directory. Add `Template: blog` to the YAML header of this page. It will later show a list of all your blog articles (see step 3).
+3. Create the new Twig template `blog.twig` (the file name must match the `Template` meta header from Step 2) in your theme directory. This template probably isn't very different from your default `index.twig` (i.e. copy `index.twig`), it will create a list of all your blog articles. Add the following Twig snippet to `blog.twig` near `{{ content }}`:
+    ```
+    {% for page in pages("blog")|sort_by("time")|reverse %}
+        {% if not page.hidden %}
+            <div class="post">
+                <h3><a href="{{ page.url }}">{{ page.title }}</a></h3>
+                <p class="date">{{ page.date_formatted }}</p>
+                <p class="excerpt">{{ page.description }}</p>
+            </div>
+        {% endif %}
     {% endfor %}
-   ```
+    ```
 
 ## Customization
 
-Pico is highly customizable in two different ways: On the one hand you can
-change Pico's appearance by using themes, on the other hand you can add new
-functionality by using plugins. Doing the former includes changing Pico's HTML,
-CSS and JavaScript, the latter mostly consists of PHP programming.
+Pico is highly customizable in two different ways: On the one hand you can change Pico's appearance by using themes, on the other hand you can add new functionality by using plugins. Doing the former includes changing Pico's HTML, CSS and JavaScript, the latter mostly consists of PHP programming.
 
-This is all Greek to you? Don't worry, you don't have to spend time on these
-techie talk - it's very easy to use one of the great themes or plugins others
-developed and released to the public. Please refer to the next sections for
-details.
+This is all Greek to you? Don't worry, you don't have to spend time on these techie talk - it's very easy to use one of the great themes or plugins others developed and released to the public. Please refer to the next sections for details.
 
 ### Themes
 
-You can create themes for your Pico installation in the `themes` folder. 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.
+You can create themes for your Pico installation in the `themes` folder. 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.
 
-[Pico's default theme][PicoTheme] 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 on [our website][OfficialThemes].
+[Pico's default theme][PicoTheme] 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 on [our website][OfficialThemes].
 
-All themes must include an `index.twig` file to define the HTML structure of
-the theme, and a `pico-theme.yml` to set the necessary config parameters. Just
-refer to Pico's default theme as an example. You can use different templates
-for different content files by specifying the `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.
+All themes must include an `index.twig` file to define the HTML structure of the theme, and a `pico-theme.yml` to set the necessary config parameters. Just refer to Pico's default theme as an example. You can use different templates for different content files by specifying the `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.
 
-Below are the Twig variables that are available to use in themes. Please note
-that URLs (e.g. `{{ base_url }}`) never include a trailing slash.
+Below are the Twig variables that are available to use in themes. Please note that URLs (e.g. `{{ base_url }}`) never include a trailing slash.
 
 * `{{ site_title }}` - Shortcut to the site title (see `config/config.yml`)
-* `{{ config }}` - Contains the values you set in `config/config.yml`
-                   (e.g. `{{ config.theme }}` becomes `default`)
-* `{{ 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
+* `{{ config }}` - Contains the values you set in `config/config.yml` (e.g. `{{ config.theme }}` becomes `default`)
+* `{{ 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_url }}` - The URL to the currently active theme
 * `{{ assets_url }}` - The URL to Pico's `assets` directory
-* `{{ themes_url }}` - The URL to Pico's `themes` directory; don't confuse this
-                       with `{{ theme_url }}`
+* `{{ themes_url }}` - The URL to Pico's `themes` directory; don't confuse this with `{{ theme_url }}`
 * `{{ plugins_url }}` - The URL to Pico's `plugins` directory
 * `{{ version }}` - Pico's current version string (e.g. `%version%`)
 * `{{ meta }}` - Contains the meta values of the current page
@@ -220,44 +141,22 @@ that URLs (e.g. `{{ base_url }}`) never include a trailing slash.
     * `{{ meta.description }}` - The `Description` YAML header
     * `{{ meta.author }}` - The `Author` YAML header
     * `{{ meta.date }}` - The `Date` YAML header
-    * `{{ meta.date_formatted }}` - The formatted date of the page as specified
-                                    by the `date_format` parameter in your
-                                    `config/config.yml`
-    * `{{ meta.time }}` - The [Unix timestamp][UnixTimestamp] derived from the
-                          `Date` YAML header
+    * `{{ meta.date_formatted }}` - The formatted date of the page as specified by the `date_format` parameter in your `config/config.yml`
+    * `{{ meta.time }}` - The [Unix timestamp][UnixTimestamp] derived from the `Date` YAML header
     * `{{ meta.robots }}` - The `Robots` YAML header
     * ...
-* `{{ content }}` - The content of the current page after it has been processed
-                    through Markdown
-* `{{ previous_page }}` - The data of the previous page, relative to
-                          `current_page`
-* `{{ current_page }}` - The data of the current page; refer to the "Pages"
-                         section below for details
+* `{{ content }}` - The content of the current page after it has been processed through Markdown
+* `{{ previous_page }}` - The data of the previous page, relative to `current_page`
+* `{{ current_page }}` - The data of the current page; refer to the "Pages" section below for details
 * `{{ next_page }}` - The data of the next page, relative to `current_page`
 
-To call assets from your theme, use `{{ theme_url }}`. For instance, to include
-the CSS file `themes/my_theme/example.css`, add
-`<link rel="stylesheet" href="{{ theme_url }}/example.css" type="text/css" />`
-to your `index.twig`. This works for arbitrary files in your theme's folder,
-including images and JavaScript files.
-
-Please note that Twig escapes HTML in all strings before outputting them. So
-for example, if you add `headline: My <strong>favorite</strong> color` to the
-YAML header of a page and output it using `{{ meta.headline }}`, you'll end up
-seeing `My <strong>favorite</strong> color` - yes, including the markup! To
-actually get it parsed, you must use `{{ meta.headline|raw }}` (resulting in
-the expected <code>My **favorite** color</code>). Notable exceptions to this
-are Pico's `content` variable (e.g. `{{ content }}`), Pico's `content` filter
-(e.g. `{{ "sub/page"|content }}`), and Pico's `markdown` filter, they all are
-marked as HTML safe.
+To call assets from your theme, use `{{ theme_url }}`. For instance, to include the CSS file `themes/my_theme/example.css`, add `<link rel="stylesheet" href="{{ theme_url }}/example.css" type="text/css" />` to your `index.twig`. This works for arbitrary files in your theme's folder, including images and JavaScript files.
+
+Please note that Twig escapes HTML in all strings before outputting them. So for example, if you add `headline: My <strong>favorite</strong> color` to the YAML header of a page and output it using `{{ meta.headline }}`, you'll end up seeing `My <strong>favorite</strong> color` - yes, including the markup! To actually get it parsed, you must use `{{ meta.headline|raw }}` (resulting in the expected <code>My **favorite** color</code>). Notable exceptions to this are Pico's `content` variable (e.g. `{{ content }}`), Pico's `content` filter (e.g. `{{ "sub/page"|content }}`), and Pico's `markdown` filter, they all are marked as HTML safe.
 
 #### Dealing with pages
 
-There are several ways to access Pico's pages list. You can access the current
-page's data using the `current_page` variable, or use the `prev_page` and/or
-`next_page` variables to access the respective previous/next page in Pico's
-pages list. But more importantly there's the `pages()` function. No matter how
-you access a page, it will always consist of the following data:
+There are several ways to access Pico's pages list. You can access the current page's data using the `current_page` variable, or use the `prev_page` and/or `next_page` variables to access the respective previous/next page in Pico's pages list. But more importantly there's the `pages()` function. No matter how you access a page, it will always consist of the following data:
 
 * `{{ id }}` - The relative path to the content file (unique ID)
 * `{{ url }}` - The URL to the page
@@ -265,190 +164,77 @@ you access a page, it will always consist of the following data:
 * `{{ description }}` - The description of the page (`Description` YAML header)
 * `{{ author }}` - The author of the page (`Author` YAML header)
 * `{{ date }}` - The date of the page (`Date` YAML header)
-* `{{ date_formatted }}` - The formatted date of the page as specified by the
-                           `date_format` parameter in your `config/config.yml`
-* `{{ time }}` - The [Unix timestamp][UnixTimestamp] derived from the page's
-                 date
-* `{{ raw_content }}` - The raw, not yet parsed contents of the page; use the
-                        filter to get the parsed contents of a page by passing
-                        its unique ID (e.g. `{{ "sub/page"|content }}`)
+* `{{ date_formatted }}` - The formatted date of the page as specified by the `date_format` parameter in your `config/config.yml`
+* `{{ time }}` - The [Unix timestamp][UnixTimestamp] derived from the page's date
+* `{{ raw_content }}` - The raw, not yet parsed contents of the page; use the filter to get the parsed contents of a page by passing its unique ID (e.g. `{{ "sub/page"|content }}`)
 * `{{ meta }}` - The meta values of the page (see global `{{ meta }}` above)
 * `{{ prev_page }}` - The data of the respective previous page
 * `{{ next_page }}` - The data of the respective next page
-* `{{ tree_node }}` - The page's node in Pico's page tree; check out Pico's
-                      [page tree documentation][FeaturesPageTree] for details
-
-Pico's `pages()` function is the best way to access all of your site's pages.
-It uses Pico's page tree to easily traverse a subset of Pico's pages list. It
-allows you to filter pages and to build recursive menus (like dropdowns). By
-default, `pages()` returns a list of all main pages (e.g. `content/page.md` and
-`content/sub/index.md`, but not `content/sub/page.md` or `content/index.md`).
-If you want to return all pages below a specific folder (e.g. `content/blog/`),
-pass the folder name as first parameter to the function (e.g. `pages("blog")`).
-Naturally you can also pass variables to the function. For example, to return a
-list of all child pages of the current page, use `pages(current_page.id)`.
-Check out the following code snippet:
+* `{{ tree_node }}` - The page's node in Pico's page tree; check out Pico's [page tree documentation][FeaturesPageTree] for details
+
+Pico's `pages()` function is the best way to access all of your site's pages. It uses Pico's page tree to easily traverse a subset of Pico's pages list. It allows you to filter pages and to build recursive menus (like dropdowns). By default, `pages()` returns a list of all main pages (e.g. `content/page.md` and `content/sub/index.md`, but not `content/sub/page.md` or `content/index.md`). If you want to return all pages below a specific folder (e.g. `content/blog/`), pass the folder name as first parameter to the function (e.g. `pages("blog")`). Naturally you can also pass variables to the function. For example, to return a list of all child pages of the current page, use `pages(current_page.id)`. Check out the following code snippet:
 
     <section class="articles">
-        {% for page in pages(current_page.id) if not page.hidden %}
-            <article>
-                <h2><a href="{{ page.url }}">{{ page.title }}</a></h2>
-                {{ page.id|content }}
-            </article>
+        {% for page in pages(current_page.id) %}
+            {% if not page.hidden %}
+                <article>
+                    <h2><a href="{{ page.url }}">{{ page.title }}</a></h2>
+                    {{ page.id|content }}
+                </article>
+            {% endif %}
         {% endfor %}
     </section>
 
-The `pages()` function is very powerful and also allows you to return not just
-a page's child pages by passing the `depth` and `depthOffset` params. For
-example, if you pass `pages(depthOffset=-1)`, the list will also include Pico's
-main index page (i.e. `content/index.md`). This one is commonly used to create
-a theme's main navigation. If you want to learn more, head over to Pico's
-complete [`pages()` function documentation][FeaturesPagesFunction].
-
-If you want to access the data of a particular page, use Pico's `pages`
-variable. Just take `content/_meta.md` in Pico's sample contents for an
-example: `content/_meta.md` contains some meta data you might want to use in
-your theme. If you want to output the page's `tagline` meta value, use
-`{{ pages["_meta"].meta.logo }}`. Don't ever try to use Pico's `pages` variable
-as an replacement for Pico's `pages()` function. Its usage looks very similar,
-it will kinda work and you might even see it being used in old themes, but be
-warned: It slows down Pico. Always use Pico's `pages()` function when iterating
-Pico's page list (e.g. `{% for page in pages() %}…{% endfor %}`).
+The `pages()` function is very powerful and also allows you to return not just a page's child pages by passing the `depth` and `depthOffset` params. For example, if you pass `pages(depthOffset=-1)`, the list will also include Pico's main index page (i.e. `content/index.md`). This one is commonly used to create a theme's main navigation. If you want to learn more, head over to Pico's complete [`pages()` function documentation][FeaturesPagesFunction].
+
+If you want to access the data of a particular page, use Pico's `pages` variable. Just take `content/_meta.md` in Pico's sample contents for an example: `content/_meta.md` contains some meta data you might want to use in your theme. If you want to output the page's `tagline` meta value, use `{{ pages["_meta"].meta.logo }}`. Don't ever try to use Pico's `pages` variable as an replacement for Pico's `pages()` function. Its usage looks very similar, it will kinda work and you might even see it being used in old themes, but be warned: It slows down Pico. Always use Pico's `pages()` function when iterating Pico's page list (e.g. `{% for page in pages() %}…{% endfor %}`).
 
 #### Twig filters and functions
 
-Additional to [Twig][]'s extensive list of filters, functions and tags, Pico
-also provides some useful additional filters and functions to make theming
-even 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`).
-* You can replace URL placeholders (like <code>&#37;base_url&#37;</code>) in
-  arbitrary strings using the `url` filter. This is helpful together with meta
-  variables, e.g. if you add <code>image: &#37;assets_url&#37;/stock.jpg</code>
-  to the YAML header of a page, `{{ meta.image|url }}` will return
-  `%assets_url%/stock.jpg`.
-* 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. For example,
-  you might use Markdown in the `description` meta variable and later parse it
-  in your theme using `{{ meta.description|markdown }}`. You can also pass meta
-  data as parameter to replace <code>&#37;meta.&#42;&#37;</code> placeholders
-  (e.g. `{{ "Written by *%meta.author%*"|markdown(meta) }}` yields "Written by
-  *John Doe*"). However, please note that all contents will be wrapped inside
-  HTML paragraph elements (i.e. `<p>…</p>`). If you want to parse just a single
-  line of Markdown markup, pass the `singleLine` param to the `markdown` filter
-  (e.g. `{{ "This really is a *single* line"|markdown(singleLine=true) }}`).
-* 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`). Items which couldn't be sorted are moved to the bottom of
-  the array; you can specify `bottom` (move items to bottom; default), `top`
-  (move items to top), `keep` (keep original order) or `remove` (remove items)
-  as second parameter to change this behavior.
-* Use the `url_param` and `form_param` Twig functions to access HTTP GET (i.e.
-  a URL's query string like `?some-variable=my-value`) and HTTP POST (i.e. data
-  of a submitted form) parameters. This allows you to implement things like
-  pagination, tags and categories, dynamic pages, and even more - with pure
-  Twig! Simply head over to our [introductory page for accessing HTTP
-  parameters][FeaturesHttpParams] for details.
+Additional to [Twig][]'s extensive list of filters, functions and tags, Pico also provides some useful additional filters and functions to make theming even 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`).
+* You can replace URL placeholders (like <code>&#37;base_url&#37;</code>) in arbitrary strings using the `url` filter. This is helpful together with meta variables, e.g. if you add <code>image: "&#37;assets_url&#37;/stock.jpg"</code> to the YAML header of a page, `{{ meta.image|url }}` will return `%assets_url%/stock.jpg`.
+* 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. For example, you might use Markdown in the `description` meta variable and later parse it in your theme using `{{ meta.description|markdown }}`. You can also pass meta data as parameter to replace <code>&#37;meta.&#42;&#37;</code> placeholders (e.g. `{{ "Written by *%meta.author%*"|markdown(meta) }}` yields "Written by *John Doe*"). However, please note that all contents will be wrapped inside HTML paragraph elements (i.e. `<p>…</p>`). If you want to parse just a single line of Markdown markup, pass the `singleLine` param to the `markdown` filter (e.g. `{{ "This really is a *single* line"|markdown(singleLine=true) }}`).
+* 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`). Items which couldn't be sorted are moved to the bottom of the array; you can specify `bottom` (move items to bottom; default), `top` (move items to top), `keep` (keep original order) or `remove` (remove items) as second parameter to change this behavior.
+* Use the `url_param` and `form_param` Twig functions to access HTTP GET (i.e. a URL's query string like `?some-variable=my-value`) and HTTP POST (i.e. data of a submitted form) parameters. This allows you to implement things like pagination, tags and categories, dynamic pages, and even more - with pure Twig! Simply head over to our [introductory page for accessing HTTP parameters][FeaturesHttpParams] for details.
 
 ### Plugins
 
 #### Plugins for users
 
-Officially tested plugins can be found at https://picocms.org/plugins/, but
-there are many awesome third-party plugins out there! A good start point for
-discovery is [our Wiki][WikiPlugins].
-
-Pico makes it very easy for you to add new features to your website using
-plugins. Just like Pico, you can install plugins either using [Composer][]
-(e.g. `composer require phrozenbyte/pico-file-prefixes`), or manually by
-uploading the plugin's file (just for small plugins consisting of a single file,
-e.g. `PicoFilePrefixes.php`) or directory (e.g. `PicoFilePrefixes`) to your
-`plugins` directory. We always recommend you to use Composer whenever possible,
-because it makes updating both Pico and your plugins way easier. Anyway,
-depending on the plugin you want to install, you may have to go through some
-more steps (e.g. specifying config variables) to make the plugin work. Thus you
-should always check out the plugin's docs or `README.md` file to learn the
-necessary steps.
-
-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`.
+Officially tested plugins can be found at https://picocms.org/plugins/, but there are many awesome third-party plugins out there! A good start point for discovery is [our Wiki][WikiPlugins].
+
+Pico makes it very easy for you to add new features to your website using plugins. Just like Pico, you can install plugins either using [Composer][] (e.g. `composer require phrozenbyte/pico-file-prefixes`), or manually by uploading the plugin's file (just for small plugins consisting of a single file, e.g. `PicoFilePrefixes.php`) or directory (e.g. `PicoFilePrefixes`) to your `plugins` directory. We always recommend you to use Composer whenever possible, because it makes updating both Pico and your plugins way easier. Anyway, depending on the plugin you want to install, you may have to go through some more steps (e.g. specifying config variables) to make the plugin work. Thus you should always check out the plugin's docs or `README.md` file to learn the necessary steps.
+
+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 https://picocms.org/development/. If you've
-developed a plugin before and want to upgrade it to Pico 2.0, refer to the
-[upgrade section of the docs][PluginUpgrade].
+You're a plugin developer? We love you people! Check out Pico's `DummyPlugin` for the complete list of events Pico provides. If you've developed a plugin before and want to upgrade it to Pico's latest version, refer to the upgrade docs.
 
 ## Config
 
-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: Config 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.
+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 an 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. 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: Config 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). Below you'll find some basic info
-about how to configure your webserver proberly to enable 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). 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
-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).
+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 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 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].
+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(/|$))) {
@@ -463,12 +249,7 @@ location /pico/ {
 
 #### Lighttpd
 
-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.
+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 = (
@@ -499,7 +280,6 @@ For more help have a look at the Pico documentation at https://picocms.org/docs/
 [FeaturesPagesFunction]: https://picocms.org/in-depth/features/pages-function/
 [WikiPlugins]: https://github.com/picocms/Pico/wiki/Pico-Plugins
 [OfficialThemes]: https://picocms.org/themes/
-[PluginUpgrade]: https://picocms.org/development/#migrating-plugins
 [ModRewrite]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html
 [AllowOverride]: https://httpd.apache.org/docs/current/mod/core.html#allowoverride
 [NginxConfig]: https://picocms.org/in-depth/nginx/

From a5fefa46fb8406047be4c44ce9d6b738aab874c1 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 3 Apr 2022 17:47:24 +0200
Subject: [PATCH 68/75] Update README.md and sample contents for Pico 3.0

---
 README.md               | 10 +++++-----
 content-sample/index.md |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e1b7712be..b857f1e6c 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ 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!
 
-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.
+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 appropriate 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].
 
@@ -181,11 +181,11 @@ 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 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.
+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 to a new Pico version. You can find officially supported [plugins][OfficialPlugins] and [themes][OfficialThemes] on our website. A greater choice of third-party plugins can be found in our [Wiki][WikiPlugins]. 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 [developer 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, check out Pico's [`DummyPlugin`][PicoDummyPlugin], and [Pico's default theme][PicoThemeGit].
 
 #### You still need help or experience a problem with Pico?
 
@@ -198,7 +198,7 @@ Contributing
 
 You want to contribute to Pico? We really appreciate that! You can help make Pico better by [contributing code][PullRequests] or [reporting issues][Issues], but please take note of our [contribution guidelines][ContributionGuidelines]. In general you can contribute in three different areas:
 
-1. Plugins & Themes: You're a plugin developer or theme designer? We love you folks! You can find tons of information about how to develop plugins and themes at https://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!
+1. Plugins & Themes: You're a plugin developer or theme designer? We love you folks! To get you started with creating a plugin or theme, check out Pico's [`DummyPlugin`][PicoDummyPlugin], and [Pico's default theme][PicoThemeGit]. If you have created a plugin or theme, please add it to our [Wiki][] and [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 our website's Git repository from https://github.com/picocms/picocms.github.io, change the Markdown files and open a [pull request][PullRequestsWebsite].
 
@@ -227,6 +227,7 @@ Official Pico Contributors won't claim bounties on their own behalf, Pico will n
 [PicoThemeGit]: https://github.com/picocms/pico-theme
 [PicoDeprecatedGit]: https://github.com/picocms/pico-deprecated
 [PicoComposerGit]: https://github.com/picocms/pico-composer
+[PicoDummyPlugin]: https://github.com/picocms/Pico/blob/master/plugins/DummyPlugin.php
 [Packagist]: https://packagist.org/
 [PicoPackagist]: https://packagist.org/packages/picocms/pico
 [PicoThemePackagist]: https://packagist.org/packages/picocms/pico-theme
@@ -242,7 +243,6 @@ Official Pico Contributors won't claim bounties on their own behalf, Pico will n
 [OfficialThemes]: https://picocms.org/themes/
 [Wiki]: https://github.com/picocms/Pico/wiki
 [WikiPlugins]: https://github.com/picocms/Pico/wiki/Pico-Plugins
-[WikiThemes]: https://github.com/picocms/Pico/wiki/Pico-Themes
 [Issues]: https://github.com/picocms/Pico/issues
 [IssuesSearch]: https://github.com/picocms/Pico/search?type=Issues
 [LiberaChat]: https://web.libera.chat/#picocms
diff --git a/content-sample/index.md b/content-sample/index.md
index b8c209c9b..cbb907d1d 100644
--- a/content-sample/index.md
+++ b/content-sample/index.md
@@ -74,7 +74,12 @@ At the top of text files you can place a block comment and specify certain meta
     Template: index
     ---
 
-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` instead of the default `index.twig`).
+These values will be contained in the `{{ meta }}` variable in themes (see below). Meta headers can sometimes have special functions. For example:
+
+- `Date` tells Pico when the page was created, letting you sort your pages not just alphabetically, but by date. Pico furthermore not only passes through the `Date` meta header, but rather evaluates it to really "understand" when this page was created.
+- `Template` controls what Twig template Pico uses to display the page. For example, if you add `Template: blog`, Pico uses `blog.twig` to render this page instead of the default `index.twig`.
+
+You can even create your own meta attributes and use them in your content or when modifying a theme. For example, if you create an `Order` attribute, you can set `pages_order_by_meta: Order` and `pages_order_by: meta ` in `config.yml` to sort pages in the navigation menu in a custom order.
 
 In an attempt to separate contents and styling, we recommend you to not use inline CSS in your Markdown files. You should rather add appropriate CSS classes to your theme. For example, you might want to add some CSS classes to your theme to rule how much of the available space a image should use (e.g. `img.small { width: 80%; }`). You can then use these CSS classes in your Markdown files, for example: <code>!\[Image Title\](&#37;assets_url&#37;/image.png) {.small}</code>
 

From 35d894ec1a87447c7e9a23fde89d0f6391302a8d Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 5 Jan 2023 21:50:42 +0100
Subject: [PATCH 69/75] Add 'page' Twig function to return a single page

---
 CHANGELOG.md              |  1 +
 lib/PicoTwigExtension.php | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8162bf76a..43ade98e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ Released: -
 * [New] `Pico::prepareFileContent()` and `Pico::substituteFileContent()` both
         now receive the (optional) `$pageId` argument for the new `%page_*%`
         Markdown placeholders
+* [New] Add `page()` Twig function to access a page's data
 * [Changed] ! Pico now requires PHP 7.2.5 or later (this includes full PHP 8
             support, also see #528, #534, #608)
 * [Changed] ! Pico now depends on Twig 3.3, skipping Twig 2.x altogether; this
diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 428dc034a..61da55073 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -99,6 +99,7 @@ public function getFunctions(): array
         return [
             'url_param' => new TwigFunction('url_param', [ $this, 'urlParamFunction' ]),
             'form_param' => new TwigFunction('form_param', [ $this, 'formParamFunction' ]),
+            'page' => new TwigFunction('page', [ $this, 'pageFunction' ]),
             'pages' => new TwigFunction('pages', [ $this, 'pagesFunction' ]),
         ];
     }
@@ -322,6 +323,19 @@ public function formParamFunction(string $name, $filter = '', $options = null, $
         return $this->pico->getFormParameter($name, $filter, $options, $flags);
     }
 
+    /**
+     * Returns the data of a single page
+     *
+     * @param string $id identifier of the page to return
+     *
+     * @return array|null the data of the page, or NULL
+     */
+    public function pageFunction(string $id): ?array
+    {
+        $pages = $this->getPico()->getPages();
+        return $pages[$id] ?? null;
+    }
+
     /**
      * Returns all pages within a particular branch of Pico's page tree
      *

From 311e21bcf30b7c37993a23c6668e9bcf7a0d03db Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 5 Jan 2023 22:17:37 +0100
Subject: [PATCH 70/75] Allow $markdown = null in 'markdown' Twig filter

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

diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php
index 61da55073..9c6d7b70c 100644
--- a/lib/PicoTwigExtension.php
+++ b/lib/PicoTwigExtension.php
@@ -115,15 +115,15 @@ public function getFunctions(): array
      * @see Pico::substituteFileContent()
      * @see Pico::parseFileContent()
      *
-     * @param string $markdown   markdown to parse
-     * @param array  $meta       meta data to use for %meta.*% replacement
-     * @param bool   $singleLine whether to parse just a single line of markup
+     * @param string|null $markdown   markdown to parse
+     * @param array       $meta       meta data to use for %meta.*% replacement
+     * @param bool        $singleLine whether to parse a single line of markup
      *
      * @return string parsed HTML
      */
-    public function markdownFilter(string $markdown, array $meta = [], bool $singleLine = false): string
+    public function markdownFilter(?string $markdown, array $meta = [], bool $singleLine = false): string
     {
-        $markdown = $this->getPico()->substituteFileContent($markdown, $meta);
+        $markdown = $this->getPico()->substituteFileContent($markdown ?? '', $meta);
         return $this->getPico()->parseFileContent($markdown, $singleLine);
     }
 

From 0c87fae09b9dee569db22d93ee24dcc622af378d Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 5 Jan 2023 22:32:10 +0100
Subject: [PATCH 71/75] Various small improvements

---
 .build/build.sh | 4 ++--
 CONTRIBUTING.md | 2 +-
 lib/Pico.php    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.build/build.sh b/.build/build.sh
index 02693b30c..24a54b0dc 100755
--- a/.build/build.sh
+++ b/.build/build.sh
@@ -464,10 +464,10 @@ find . -mindepth 1 -maxdepth 1 -printf '%f\0' \
 echo "Creating release archive '$ARCHIVE_FILENAME.zip'..."
 zip -q -r "$APP_DIR/$ARCHIVE_FILENAME.zip" .
 
-echo
-
 # publish release
 if [ -n "$PUBLISH" ]; then
+    echo
+
     # switch to app dir
     cd "$APP_DIR"
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2a38aaec5..5c4444ab2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -188,7 +188,7 @@ Issues and pull requests labeled with `info: Feedback Needed` indicate that feed
   - `status: Resolved` is used when the issue has been resolved (used with issues only).
   - `status: Conflict` indicates a conflict with another issue or behavior of Pico, making it impossible to resolve the problem at the moment.
   - `status: Won't Fix` means, that there is indeed a problem, but for some reason we made the decision that resolving it isn't reasonable, making it intended behavior.
-  - `status: Rejected` is used when the issue was rejected for another reason.
+  - `status: Rejected` is used when the issue was rejected for another reason (used with issues only).
 
 - The `type: Enhancement` and `type: Feature` labels are used to tag pull requests, which introduce either a comparatively small enhancement, or a "big" new feature. As with the `type: Bug` label, they might get combined with the `pri: High` or `pri: Low` labels to indicate the pull request's priority. They might also be labeled with `status: Work In Progress`. After merging or closing the pull request, it is labeled with one of the `status` labels as described above for the `type: Bug` label.
 
diff --git a/lib/Pico.php b/lib/Pico.php
index 3fa5bddee..4c3b0abba 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -370,7 +370,7 @@ public function __construct(
         $this->configDir = $this->getAbsolutePath($configDir);
         $this->pluginsDir = $this->getAbsolutePath($pluginsDir);
         $this->themesDir = $this->getAbsolutePath($themesDir);
-        $this->enableLocalPlugins = (bool) $enableLocalPlugins;
+        $this->enableLocalPlugins = $enableLocalPlugins;
     }
 
     /**
@@ -2450,7 +2450,7 @@ public function substituteUrl(string $url): string
     /**
      * Returns the URL of a given absolute path within this Pico instance
      *
-     * We assume that the given path is a arbitrary deep sub folder of the
+     * We assume that the given path is an arbitrary deep sub folder of the
      * script's base path (i.e. the directory {@path "index.php"} is in resp.
      * the `httpdocs` directory). If this isn't the case, we check whether it's
      * a sub folder of {@see Pico::$rootDir} (what is often identical to the
@@ -2741,7 +2741,7 @@ public function getAbsolutePath(string $path, string $basePath = null, bool $end
      *
      * @return string normalized path
      *
-     * @throws UnexpectedValueException thrown when a absolute path is passed
+     * @throws UnexpectedValueException thrown when an absolute path is passed
      *     although absolute paths aren't allowed
      */
     public function getNormalizedPath(string $path, bool $allowAbsolutePath = false, bool $endSlash = true): string

From efa51f66b1168ee198e48534b86cc524f0adfc82 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 5 Jan 2023 22:34:31 +0100
Subject: [PATCH 72/75] CI: Add bouncer step to PR testing

---
 .github/workflows/test-pr.yml | 27 +++++++++++++++++++++++++++
 .github/workflows/test.yml    |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/test-pr.yml

diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
new file mode 100644
index 000000000..93b50a46c
--- /dev/null
+++ b/.github/workflows/test-pr.yml
@@ -0,0 +1,27 @@
+name: Test Pico CMS pull request
+
+on:
+    pull_request: {}
+
+jobs:
+    test:
+        name: Test Pico CMS
+        uses: ./.github/workflows/test.yml
+
+    bouncer:
+        name: Bouncer
+
+        needs: test
+        if: ${{ always() }}
+
+        runs-on: ubuntu-latest
+        permissions: {}
+
+        steps:
+            - name: Check build matrix status
+              if: ${{ needs.test.result != 'success' }}
+              run: |
+                  :
+                  echo "Some tests of Pico CMS failed." >&2
+                  echo "Please check the GitHub workflow logs for details." >&2
+                  exit 1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bddc9a93c..e25e0f271 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
             - 'master'
             - 'pico-3.0'
         tags: [ 'v*.*.*' ]
-    pull_request: {}
+    workflow_call: {}
 
 jobs:
     test:

From a3dd0b9fbd2f12ec4da9caa5faef57e426733749 Mon Sep 17 00:00:00 2001
From: dkyme <cornelius20@posteo.de>
Date: Mon, 14 Aug 2023 10:58:36 +0200
Subject: [PATCH 73/75] replace strlen in readPages() with variables

see issue #671
---
 lib/Pico.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 4c3b0abba..ae303854a 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1771,6 +1771,8 @@ protected function readPages(): void
     {
         $contentDir = $this->getConfig('content_dir');
         $contentExt = $this->getConfig('content_ext');
+        $contentDirLen = strlen($contentDir);
+        $contentExtLen = strlen($contentExt);
 
         $this->pages = [];
         $files = $this->getFiles($contentDir, $contentExt, self::SORT_NONE);
@@ -1781,7 +1783,7 @@ protected function readPages(): void
                 continue;
             }
 
-            $id = substr($file, strlen($contentDir), -strlen($contentExt));
+            $id = substr($file, $contentDirLen, -$contentExtLen);
 
             // trigger onSinglePageLoading event
             // skip inaccessible pages (e.g. drop "sub.md" if "sub/index.md" exists) by default

From 869ab1f2e031a53f47e6cbccc71cb5d7910757e0 Mon Sep 17 00:00:00 2001
From: Max P <46793832+PxaMMaxP@users.noreply.github.com>
Date: Sat, 2 Dec 2023 14:35:38 +0100
Subject: [PATCH 74/75] Enhanced Sorting by Nested Meta Values in Pages (#681)

* Added functionality for sorting pages by nested meta values.

* Additional variables removed.

* Added comment to the config template file about the possibility to access nested metadata with a dot as separator for sorting.

* Added entry in the changelog about the possibility to access nested metadata with a dot as separator for sorting.

* Changelog and config template adapted according to the suggestions.

* Added old entry back in the Config template.
---
 CHANGELOG.md               |  2 ++
 config/config.yml.template |  1 +
 lib/Pico.php               | 15 +++++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43ade98e9..307109810 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,8 @@ Released: -
         now receive the (optional) `$pageId` argument for the new `%page_*%`
         Markdown placeholders
 * [New] Add `page()` Twig function to access a page's data
+* [New] Enhance `pages_order_by_meta` functionality to allow sorting by 
+            nested meta values using '.' notation (e.g., 'author.info')
 * [Changed] ! Pico now requires PHP 7.2.5 or later (this includes full PHP 8
             support, also see #528, #534, #608)
 * [Changed] ! Pico now depends on Twig 3.3, skipping Twig 2.x altogether; this
diff --git a/config/config.yml.template b/config/config.yml.template
index 2a5647d6f..37d06ebb4 100644
--- a/config/config.yml.template
+++ b/config/config.yml.template
@@ -31,6 +31,7 @@ twig_config:                        # Twig template engine config
 date_format: "%D %T"                # Pico's default date format;
                                     #     See https://php.net/manual/en/function.strftime.php for more info
 pages_order_by_meta: author         # Sort pages by meta value "author" (set "pages_order_by" to "meta")
+                                    #     Use '.' notation for nested meta keys (e.g. 'author.info')
 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: ~                      # The path to Pico's content directory
diff --git a/lib/Pico.php b/lib/Pico.php
index ae303854a..653380f36 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1877,11 +1877,18 @@ protected function sortPages(): void
         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);
+            $orderByMetaKeys = explode('.', $orderByMeta);
+
+            uasort($this->pages, function ($a, $b) use ($alphaSortClosure, $order, $orderByMetaKeys) {
+                $aSortValue = $a['meta'];
+                $bSortValue = $b['meta'];
+                
+                foreach ($orderByMetaKeys as $key) {
+                    $aSortValue = isset($aSortValue[$key]) ? $aSortValue[$key] : null;
+                    $bSortValue = isset($bSortValue[$key]) ? $bSortValue[$key] : null;
+                }
 
-                $bSortValue = isset($b['meta'][$orderByMeta]) ? $b['meta'][$orderByMeta] : null;
+                $aSortValueNull = ($aSortValue === null);
                 $bSortValueNull = ($bSortValue === null);
 
                 $cmp = 0;

From 914dd9453c09e920a49ae46a263ccf6586196ad3 Mon Sep 17 00:00:00 2001
From: Cornelius <cornelius20@posteo.de>
Date: Sat, 30 Dec 2023 12:20:20 +0100
Subject: [PATCH 75/75] fix Wrong config keys in discoverPageSiblings #675

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

diff --git a/lib/Pico.php b/lib/Pico.php
index 653380f36..f820065cb 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1940,7 +1940,7 @@ protected function sortPages(): void
      */
     protected function discoverPageSiblings(): void
     {
-        if (($this->getConfig('order_by') === 'date') && ($this->getConfig('order') === 'desc')) {
+        if (($this->getConfig('pages_order_by') === 'date') && ($this->getConfig('pages_order') === 'desc')) {
             $precedingPageKey = 'next_page';
             $succeedingPageKey = 'previous_page';
         } else {