From 5efe4478616b4fcb25b8156f42d869c7bd0803b4 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Mon, 19 Apr 2021 10:20:26 +0300
Subject: [PATCH] Fixed `The "Grav/Common/Twig/TwigExtension" extension is not
 enabled` when using markdown twig tag [#3317]

---
 CHANGELOG.md                                           |  6 ++++++
 .../Grav/Common/Twig/Extension/FilesystemExtension.php |  4 ++--
 .../src/Grav/Common/Twig/Extension/GravExtension.php   |  6 +++---
 system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php  |  2 +-
 .../GravExtensionTest.php}                             | 10 +++++-----
 5 files changed, 17 insertions(+), 11 deletions(-)
 rename tests/unit/Grav/Common/Twig/{TwigExtensionTest.php => Extensions/GravExtensionTest.php} (96%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23ce18779..5a2655cf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.7.13
+## mm/dd/2021
+
+1. [](#bugfix)
+    * Fixed `The "Grav/Common/Twig/TwigExtension" extension is not enabled` when using markdown twig tag [#3317](https://github.com/getgrav/grav/issues/3317)
+
 # v1.7.12
 ## 04/15/2021
 
diff --git a/system/src/Grav/Common/Twig/Extension/FilesystemExtension.php b/system/src/Grav/Common/Twig/Extension/FilesystemExtension.php
index bdebae217..a44ad3c52 100644
--- a/system/src/Grav/Common/Twig/Extension/FilesystemExtension.php
+++ b/system/src/Grav/Common/Twig/Extension/FilesystemExtension.php
@@ -16,8 +16,8 @@ use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 /**
- * Class TwigExtension
- * @package Grav\Common\Twig
+ * Class FilesystemExtension
+ * @package Grav\Common\Twig\Extension
  */
 class FilesystemExtension extends AbstractExtension
 {
diff --git a/system/src/Grav/Common/Twig/Extension/GravExtension.php b/system/src/Grav/Common/Twig/Extension/GravExtension.php
index febdeded7..d07697339 100644
--- a/system/src/Grav/Common/Twig/Extension/GravExtension.php
+++ b/system/src/Grav/Common/Twig/Extension/GravExtension.php
@@ -63,8 +63,8 @@ use function is_string;
 use function strlen;
 
 /**
- * Class TwigExtension
- * @package Grav\Common\Twig
+ * Class GravExtension
+ * @package Grav\Common\Twig\Extension
  */
 class GravExtension extends AbstractExtension implements GlobalsInterface
 {
@@ -76,7 +76,7 @@ class GravExtension extends AbstractExtension implements GlobalsInterface
     protected $config;
 
     /**
-     * TwigExtension constructor.
+     * GravExtension constructor.
      */
     public function __construct()
     {
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php b/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php
index 38194e669..81cecaeaf 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php
@@ -47,6 +47,6 @@ class TwigNodeMarkdown extends Node implements NodeOutputInterface
             ->write('$lines = explode("\n", $content);' . PHP_EOL)
             ->write('$content = preg_replace(\'/^\' . $matches[0]. \'/\', "", $lines);' . PHP_EOL)
             ->write('$content = join("\n", $content);' . PHP_EOL)
-            ->write('echo $this->env->getExtension(\'Grav\Common\Twig\TwigExtension\')->markdownFunction($context, $content);' . PHP_EOL);
+            ->write('echo $this->env->getExtension(\'Grav\Common\Twig\Extension\GravExtension\')->markdownFunction($context, $content);' . PHP_EOL);
     }
 }
diff --git a/tests/unit/Grav/Common/Twig/TwigExtensionTest.php b/tests/unit/Grav/Common/Twig/Extensions/GravExtensionTest.php
similarity index 96%
rename from tests/unit/Grav/Common/Twig/TwigExtensionTest.php
rename to tests/unit/Grav/Common/Twig/Extensions/GravExtensionTest.php
index 4062675d2..2adb02378 100644
--- a/tests/unit/Grav/Common/Twig/TwigExtensionTest.php
+++ b/tests/unit/Grav/Common/Twig/Extensions/GravExtensionTest.php
@@ -2,23 +2,23 @@
 
 use Codeception\Util\Fixtures;
 use Grav\Common\Grav;
-use Grav\Common\Twig\TwigExtension;
+use Grav\Common\Twig\Extension\GravExtension;
 
 /**
- * Class TwigExtensionTest
+ * Class GravExtensionTest
  */
-class TwigExtensionTest extends \Codeception\TestCase\Test
+class GravExtensionTest extends \Codeception\TestCase\Test
 {
     /** @var Grav $grav */
     protected $grav;
 
-    /** @var  TwigExtension $twig_ext */
+    /** @var  GravExtension $twig_ext */
     protected $twig_ext;
 
     protected function _before(): void
     {
         $this->grav = Fixtures::get('grav');
-        $this->twig_ext = new TwigExtension();
+        $this->twig_ext = new GravExtension();
     }
 
     public function testInflectorFilter(): void