fix(Pico::loadPlugins): use require once to be able to reload Pico

composer.json

@@ -31,12 +31,12 @@
         "source": "https://github.com/picocms/Pico"
     },
     "require": {
-        "php": "^7.0.8",
+        "php": "^7.0.8 || ^8.0",
         "ext-mbstring": "*",
         "twig/twig": "^2.12",
         "symfony/yaml" : "^3.4",
-        "erusev/parsedown": "1.7.4",
+        "erusev/parsedown": "^2.0.0-beta-1",
-        "erusev/parsedown-extra": "0.8.1"
+        "erusev/parsedown-extra": "^2.0.0-beta-1"
     },
     "suggest": {
         "picocms/pico-theme": "Pico requires a theme to actually display the contents of your website. This is Pico's official default theme.",

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

lib/Pico.php

@@ -42,6 +42,12 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  * @version 3.0
  */
+
+use Erusev\Parsedown\Configurables\Breaks;
+use Erusev\Parsedown\Parsedown;
+use Erusev\Parsedown\State;
+use Erusev\ParsedownExtra\ParsedownExtra;
+
 class Pico
 {
     /**
@@ -63,7 +69,7 @@ class Pico
      *
      * @var int
      */
-    const API_VERSION = 3;
+    const API_VERSION = 4;
 
     /**
      * Sort files in alphabetical ascending order
@@ -648,7 +654,7 @@ class Pico
     {
         // scope isolated require()
         $includeClosure = function ($pluginFile) {
-            require($pluginFile);
+            require_once($pluginFile);
         };
         if (PHP_VERSION_ID >= 50400) {
             $includeClosure = $includeClosure->bindTo(null);
@@ -1561,12 +1567,13 @@ class Pico
     public function getParsedown()
     {
         if ($this->parsedown === null) {
-            $className = $this->config['content_config']['extra'] ? 'ParsedownExtra' : 'Parsedown';
+            $state = new State([
-            $this->parsedown = new $className();
+                new Breaks((bool) $this->config['content_config']['breaks'])
-
+            ]);
-            $this->parsedown->setBreaksEnabled((bool) $this->config['content_config']['breaks']);
+            if ($this->config['content_config']['extra']){
-            $this->parsedown->setMarkupEscaped((bool) $this->config['content_config']['escape']);
+                $state = new ParsedownExtra($state);
-            $this->parsedown->setUrlsLinked((bool) $this->config['content_config']['auto_urls']);
+            }
+            $this->parsedown = new Parsedown($state);
 
             $this->triggerEvent('onParsedownRegistered', array(&$this->parsedown));
         }
@@ -1666,14 +1673,13 @@ class Pico
      * @see Pico::getFileContent()
      *
      * @param string $markdown   Markdown contents of a page
-     * @param bool   $singleLine whether to parse just a single line of markup
      *
      * @return string parsed contents (HTML)
      */
-    public function parseFileContent($markdown, $singleLine = false)
+    public function parseFileContent($markdown)
     {
         $markdownParser = $this->getParsedown();
-        return !$singleLine ? @$markdownParser->text($markdown) : @$markdownParser->line($markdown);
+        return @$markdownParser->toHtml($markdown);
     }
 
     /**
@@ -2102,12 +2108,12 @@ class Pico
         if ($this->twig === null) {
             $twigConfig = $this->getConfig('twig_config');
 
-            $twigLoader = new Twig_Loader_Filesystem($this->getThemesDir() . $this->getTheme());
+            $twigLoader = new \Twig\Loader\FilesystemLoader($this->getThemesDir() . $this->getTheme());
-            $this->twig = new Twig_Environment($twigLoader, $twigConfig);
+            $this->twig = new \Twig\Environment($twigLoader, $twigConfig);
             $this->twig->addExtension(new PicoTwigExtension($this));
 
             if (!empty($twigConfig['debug'])) {
-                $this->twig->addExtension(new Twig_Extension_Debug());
+                $this->twig->addExtension(new Twig\Extension\DebugExtension());
             }
 
             // register content filter
@@ -2115,7 +2121,7 @@ class Pico
             // 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\TwigFilter(
                 'content',
                 function ($page) use ($pico, &$pages) {
                     if (isset($pages[$page])) {
@@ -2156,7 +2162,7 @@ class Pico
             '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,

lib/PicoTwigExtension.php

@@ -67,20 +67,20 @@ class PicoTwigExtension extends Twig_Extension
      *
      * @see Twig_ExtensionInterface::getFilters()
      *
-     * @return Twig_SimpleFilter[] array of Pico's Twig filters
+     * @return \Twig\TwigFilter[] array of Pico's Twig filters
      */
     public function getFilters()
     {
         return array(
-            'markdown' => new Twig_SimpleFilter(
+            'markdown' => new \Twig\TwigFilter(
                 'markdown',
                 array($this, 'markdownFilter'),
                 array('is_safe' => array('html'))
             ),
-            'map' => new Twig_SimpleFilter('map', array($this, 'mapFilter')),
+            'map' => new \Twig\TwigFilter('map', array($this, 'mapFilter')),
-            'sort_by' => new Twig_SimpleFilter('sort_by', array($this, 'sortByFilter')),
+            'sort_by' => new \Twig\TwigFilter('sort_by', array($this, 'sortByFilter')),
-            'link' => new Twig_SimpleFilter('link', array($this->pico, 'getPageUrl')),
+            'link' => new \Twig\TwigFilter('link', array($this->pico, 'getPageUrl')),
-            'url' => new Twig_SimpleFilter('url', array($this->pico, 'substituteUrl'))
+            'url' => new \Twig\TwigFilter('url', array($this->pico, 'substituteUrl'))
         );
     }