Twig-extensions namespacing

OleVik · OleVik · commit 3d6510957214 · 2020-07-15T21:54:16.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v4.0.0-beta.2
+## 15-07-2020
+
+1. [](#improved)
+   - Twig-extensions namespacing
+
 # v4.0.0-beta.1
 ## 12-07-2020
 
diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Presentation
-version: 4.0.0-beta.1
+version: 4.0.0-beta.2
 testing: true
 description: Responsive navigational slideshows with Reveal.js
 icon: arrows-alt
diff --git a/presentation.php b/presentation.php
@@ -354,9 +354,9 @@ public function onShutdown()
     public function onTwigExtensions()
     {
         include_once __DIR__ . '/twig/CallStaticExtension.php';
-        $this->grav['twig']->twig->addExtension(new CallStaticTwigExtension());
+        $this->grav['twig']->twig->addExtension(new PresentationPlugin\CallStaticTwigExtension());
         include_once __DIR__ . '/twig/FileFinderExtension.php';
-        $this->grav['twig']->twig->addExtension(new FileFinderTwigExtension());
+        $this->grav['twig']->twig->addExtension(new PresentationPlugin\FileFinderTwigExtension());
     }
 
     /**
diff --git a/twig/CallStaticExtension.php b/twig/CallStaticExtension.php
@@ -1,5 +1,5 @@
 <?php
-namespace Grav\Plugin;
+namespace Grav\Plugin\PresentationPlugin;
 
 class CallStaticTwigExtension extends \Twig_Extension
 {
diff --git a/twig/FileFinderExtension.php b/twig/FileFinderExtension.php
@@ -1,5 +1,5 @@
 <?php
-namespace Grav\Plugin;
+namespace Grav\Plugin\PresentationPlugin;
 
 /**
  * Search for a file in multiple locations

Original file line number	Diff line number	Diff line change
`@@ -354,9 +354,9 @@ public function onShutdown()`
`354`	`354`	`public function onTwigExtensions()`
`355`	`355`	`{`
`356`	`356`	`include_once __DIR__ . '/twig/CallStaticExtension.php';`
`357`		`- $this->grav['twig']->twig->addExtension(new CallStaticTwigExtension());`
	`357`	`+ $this->grav['twig']->twig->addExtension(new PresentationPlugin\CallStaticTwigExtension());`
`358`	`358`	`include_once __DIR__ . '/twig/FileFinderExtension.php';`
`359`		`- $this->grav['twig']->twig->addExtension(new FileFinderTwigExtension());`
	`359`	`+ $this->grav['twig']->twig->addExtension(new PresentationPlugin\FileFinderTwigExtension());`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<?php`
`2`		`-namespace Grav\Plugin;`
	`2`	`+namespace Grav\Plugin\PresentationPlugin;`
`3`	`3`
`4`	`4`	`class CallStaticTwigExtension extends \Twig_Extension`
`5`	`5`	`{`