Update to Symfony YAML 5.0 and Twig 3.0

Author: PhrozenByte

composer.json

@@ -26,7 +26,7 @@
         "source": "https://github.com/picocms/pico-deprecated"
     },
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.2.5",
         "picocms/pico": "self.version"
     },
     "autoload": {

plugins/PluginApi0Plugin.php

@@ -23,6 +23,7 @@
 use picocms\Pico\Pico;
 use picocms\PicoDeprecated\AbstractPluginApiPlugin;
 use PicoDeprecated;
+use Twig\Environment as TwigEnvironment;
 
 /**
  * Maintains backward compatibility with plugins using API version 0, written
@@ -258,11 +259,11 @@ public function onPagesLoaded(
      * Please note that the `before_render` event gets `$templateName` passed
      * without its file extension. The file extension is re-added later.
      *
-     * @param \Twig_Environment &$twig         Twig instance
-     * @param string           &$templateName  file name of the template
-     * @param array            &$twigVariables template variables
+     * @param TwigEnvironment &$twig          Twig instance
+     * @param string          &$templateName  file name of the template
+     * @param array           &$twigVariables template variables
      */
-    public function onPageRendering(\Twig_Environment &$twig, array &$twigVariables, &$templateName)
+    public function onPageRendering(TwigEnvironment &$twig, array &$twigVariables, &$templateName)
     {
         $templateNameInfo = pathinfo($templateName) + [ 'extension' => '' ];
 

plugins/PluginApi1Plugin.php

@@ -22,6 +22,7 @@
 
 use picocms\PicoDeprecated\AbstractPluginApiPlugin;
 use PicoDeprecated;
+use Twig\Environment as TwigEnvironment;
 
 /**
  * Maintains backward compatibility with plugins using API version 1, written
@@ -107,7 +108,7 @@ class PluginApi1Plugin extends AbstractPluginApiPlugin
      * @see Pico::$twig
      * @see PluginApi1Plugin::onTwigRegistered()
      *
-     * @var \Twig_Environment|null
+     * @var TwigEnvironment|null
      */
     protected $twig;
 
@@ -286,9 +287,9 @@ public function onMetaHeaders(array &$headers)
      *
      * @see PluginApi1Plugin::$twig
      *
-     * @param \Twig_Environment &$twig Twig instance
+     * @param TwigEnvironment &$twig Twig instance
      */
-    public function onTwigRegistered(\Twig_Environment &$twig)
+    public function onTwigRegistered(TwigEnvironment &$twig)
     {
         $this->twig = $twig;
     }

plugins/ThemeApi1Plugin.php

@@ -22,6 +22,7 @@
 
 use picocms\PicoDeprecated\AbstractPlugin;
 use PicoDeprecated;
+use Twig\Error\LoaderError as TwigLoaderError;
 
 /**
  * Maintains backward compatibility with themes using API version 1, written
@@ -98,14 +99,14 @@ public function onPageRendering(&$templateName, array &$twigVariables)
 
         try {
             $twig->loadTemplate($templateName);
-        } catch (\Twig_Error_Loader $e) {
+        } catch (TwigLoaderError $e) {
             if ($templateNameInfo['extension'] === 'twig') {
                 try {
                     $twig->loadTemplate($templateNameInfo['filename'] . '.html');
 
                     $templateName = $templateNameInfo['filename'] . '.html';
                     $templateNameInfo['extension'] = 'html';
-                } catch (\Twig_Error_Loader $e) {
+                } catch (TwigLoaderError $e) {
                     // template doesn't exist, Twig will very likely fail later
                 }
             }

plugins/ThemeApi2Plugin.php

@@ -22,6 +22,10 @@
 
 use picocms\PicoDeprecated\AbstractPlugin;
 use PicoDeprecated;
+use Twig\Environment as TwigEnvironment;
+use Twig\Error\LoaderError as TwigLoaderError;
+use Twig\Extension\EscaperExtension as TwigEscaperExtension;
+use Twig\Loader\LoaderInterface as TwigLoaderInterface;
 
 /**
  * Maintains backward compatibility with themes using API version 2, written
@@ -81,13 +85,13 @@ public function onPageRendering(&$templateName, array &$twigVariables)
      *
      * @see PluginApi2Plugin::twigEscapeStrategy()
      *
-     * @param \Twig_Environment &$twig Twig instance
+     * @param TwigEnvironment &$twig Twig instance
      */
-    public function onTwigRegistered(\Twig_Environment &$twig)
+    public function onTwigRegistered(TwigEnvironment &$twig)
     {
-        if ($twig->hasExtension('Twig_Extension_Escaper')) {
-            /** @var \Twig_Extension_Escaper $escaperExtension */
-            $escaperExtension = $twig->getExtension('Twig_Extension_Escaper');
+        if ($twig->hasExtension(TwigEscaperExtension::class)) {
+            /** @var TwigEscaperExtension $escaperExtension */
+            $escaperExtension = $twig->getExtension(TwigEscaperExtension::class);
             $escaperExtension->setDefaultStrategy([ $this, 'twigEscapeStrategy' ]);
         }
     }
@@ -123,18 +127,12 @@ public function twigEscapeStrategy($templateName)
             return false;
         }
 
-        /** @var \Twig_SourceContextLoaderInterface $twigLoader */
+        /** @var TwigLoaderInterface $twigLoader */
         $twigLoader = $this->getPico()->getTwig()->getLoader();
-        if (!$twigLoader instanceof \Twig_SourceContextLoaderInterface) {
-            throw new \RuntimeException(
-                "PicoDeprecated compat plugin '" . __CLASS__ . "' requires a 'Twig_SourceContextLoaderInterface' "
-                . "Twig loader, '" . get_class($twigLoader) . "' given"
-            );
-        }
 
         try {
             $templatePath = $twigLoader->getSourceContext($templateName)->getPath();
-        } catch (\Twig\Error\LoaderError $e) {
+        } catch (TwigLoaderError $e) {
             $templatePath = '';
         }