Fixed The "Grav/Common/Twig/TwigExtension" extension is not enabled when using markdown twig tag [#3317]

This commit is contained in:
Matias Griese
2021-04-19 10:20:26 +03:00
parent fb8d76922a
commit 5efe447861
5 changed files with 17 additions and 11 deletions

View File

@@ -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

View File

@@ -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
{

View File

@@ -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()
{

View File

@@ -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);
}
}

View File

@@ -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