Runtime: fixes raw modifier on fields with antlers: true (#6484)

Co-authored-by: StyleCI Bot <[email protected]> Co-authored-by: Jason Varga <[email protected]>
statamic · Aug 12, 2022 · 294b5de · 294b5de
1 parent f7c410e
commit 294b5de
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/src/View/Antlers/Language/Runtime/Sandbox/Environment.php b/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
@@ -1277,7 +1277,7 @@ private function adjustValue($value, $originalNode)
     {
         if ($originalNode instanceof AbstractNode && $originalNode->modifierChain != null) {
             if (! empty($originalNode->modifierChain->modifierChain)) {
-                $value = $this->checkForFieldValue($value, true);
+                $value = $this->checkForFieldValue($value, true, $originalNode->modifierChain->modifierChain);
 
                 return $this->applyModifiers($value, $originalNode->modifierChain);
             }
@@ -1292,17 +1292,19 @@ private function adjustValue($value, $originalNode)
         return $this->checkForFieldValue($value);
     }
 
-    private function checkForFieldValue($value, $hasModifiers = false)
+    private function checkForFieldValue($value, $hasModifiers = false, $modifierChain = null)
     {
         if ($value instanceof Value) {
             GlobalRuntimeState::$isEvaluatingUserData = true;
             if ($value->shouldParseAntlers()) {
-                GlobalRuntimeState::$userContentEvalState = [
-                    $value,
-                    $this->nodeProcessor->getActiveNode(),
-                ];
-                $value = $value->antlersValue($this->nodeProcessor->getAntlersParser(), $this->data);
-                GlobalRuntimeState::$userContentEvalState = null;
+                if (! $hasModifiers || ($modifierChain != null && $modifierChain[0]->nameNode->name != 'raw')) {
+                    GlobalRuntimeState::$userContentEvalState = [
+                        $value,
+                        $this->nodeProcessor->getActiveNode(),
+                    ];
+                    $value = $value->antlersValue($this->nodeProcessor->getAntlersParser(), $this->data);
+                    GlobalRuntimeState::$userContentEvalState = null;
+                }
             } else {
                 if (! $hasModifiers) {
                     $value = $value->value();

diff --git a/tests/Antlers/ParserTestCase.php b/tests/Antlers/ParserTestCase.php
@@ -229,6 +229,7 @@ protected function renderString($text, $data = [], $withCoreTagsAndModifiers = f
         $processor->setData($data);
 
         $runtimeParser = new RuntimeParser($documentParser, $processor, new AntlersLexer(), new LanguageParser());
+        $processor->setAntlersParserInstance($runtimeParser);
 
         if ($withCoreTagsAndModifiers) {
             $runtimeParser->cascade(app(Cascade::class));

diff --git a/tests/Antlers/Runtime/CoreModifiersTest.php b/tests/Antlers/Runtime/CoreModifiersTest.php
@@ -3,7 +3,9 @@
 namespace Tests\Antlers\Runtime;
 
 use Carbon\Carbon;
+use Facades\Statamic\Fields\FieldtypeRepository;
 use Illuminate\Contracts\Support\Arrayable;
+use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
 use Statamic\Fields\Value;
 use Tests\Antlers\ParserTestCase;
@@ -401,6 +403,26 @@ public function shallowAugment($data)
         $this->assertSame('test', $this->renderString('{{ variable | raw }}', ['variable' => $value], true));
     }
 
+    public function test_raw_modifier_returns_raw_value_on_antlers_enabled_field()
+    {
+        // using markdown in this test just because its augmentation is simple.
+        $fieldtype = FieldtypeRepository::find('markdown');
+        $fieldtype->setField(new Field('test', ['antlers' => true]));
+
+        $value = new Value("# heading\nparagraph {{ foo }}", 'test', $fieldtype);
+
+        $vars = [
+            'test' => $value,
+            'foo' => 'bar',
+        ];
+
+        $this->assertSame("<h1>heading</h1>\n<p>paragraph bar</p>\n", $this->renderString('{{ test }}', $vars));
+        $this->assertSame("# heading\nparagraph {{ foo }}", $this->renderString('{{ test | raw }}', $vars));
+        // Ensure other modifiers still work
+        $this->assertSame("<H1>HEADING</H1>\n<P>PARAGRAPH BAR</P>\n", $this->renderString('{{ test | upper }}', $vars));
+        $this->assertSame("# HEADING\nPARAGRAPH {{ FOO }}", $this->renderString('{{ test | raw | upper }}', $vars));
+    }
+
     public function test_explode_on_tag_pairs()
     {
         // Issue: https://github.com/statamic/cms/issues/4979