Updates for twig 3

1 files changed, 12 insertions, 7 deletions

diff --git a/lib/twig.php b/lib/twig.php
index 7de451e..dfe735b 100644
--- a/lib/twig.php
+++ b/lib/twig.php
@@ -2,13 +2,18 @@
 
 require_once('Twig/autoload.php');
 
-class Twig_Loader_Dokuwiki implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
+use Twig\Loader\LoaderInterface;
+use Twig\Source;
+use Twig\Extension\AbstractExtension;
+use Twig\Environment;
+
+class Twig_Loader_Dokuwiki implements LoaderInterface
 {
     private function build_pagename($name) {
         return 'hostinfo:templates:' . cleanID($name);
     }
 
-    public function getSourceContext($name)
+    public function getSourceContext(string $name): Source
     {
         $page = $this->build_pagename($name);
         $source = rawWiki($page);
@@ -20,26 +25,26 @@ class Twig_Loader_Dokuwiki implements Twig_LoaderInterface, Twig_ExistsLoaderInt
         return new \Twig\Source($source, $name);
     }
 
-    public function getCacheKey($name)
+    public function getCacheKey(string $name): string
     {
         return $this->build_pagename($name);
     }
 
-    public function isFresh($name, $time)
+    public function isFresh(string $name, int $time): bool
     {
         $page = $this->build_pagename($name);
         $last_change = p_get_metadata($page, 'last_change date');
         return $last_change < $time;
     }
 
-    public function exists($name)
+    public function exists(string $name)
     {
         $page = $this->build_pagename($name);
         return page_exists($page);
     }
 }
 
-class Hostinfo_Twig_Extension extends Twig_Extension
+class Hostinfo_Twig_Extension extends AbstractExtension
 {
     public function getFilters()
     {
@@ -117,7 +122,7 @@ class Twig
     function __construct()
     {
         $loader = new Twig_Loader_Dokuwiki();
-        $this->twig = new Twig_Environment($loader, array(
+        $this->twig = new Environment($loader, array(
             'cache' => __DIR__ . '/../templates_c/',
             'auto_reload' => true,
         ));