Fix Antlers Array Access (#2663)

Author: jasonvarga

…Exceptions/ArrayKeyNotFoundException.php …ew/Antlers/ArrayKeyNotFoundException.phpsrc/Exceptions/ArrayKeyNotFoundException.php renamed to src/View/Antlers/ArrayKeyNotFoundException.php src/Exceptions/ArrayKeyNotFoundException.php renamed to src/View/Antlers/ArrayKeyNotFoundException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Statamic\Exceptions;
+namespace Statamic\View\Antlers;
 
 class ArrayKeyNotFoundException extends \Exception
 {

src/View/Antlers/Parser.php

@@ -14,7 +14,6 @@
 use ReflectionProperty;
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Query\Builder;
-use Statamic\Exceptions\ArrayKeyNotFoundException;
 use Statamic\Facades\Config;
 use Statamic\Fields\LabeledValue;
 use Statamic\Fields\Value;
@@ -816,7 +815,7 @@ public function processCondition($condition, $data, $isTagPair = true)
         // also pass in the current callback (for later processing callback tags); also setting
         // $ref so that we can use it within the anonymous function
         $ref = $this;
-        $condition = $this->preg_replace_callback('/(\b'.$this->variableRegex.'[\b\]])/', function ($match) use ($ref) {
+        $condition = $this->preg_replace_callback('/\b('.$this->variableRegex.'\b]?)/', function ($match) use ($ref) {
             return $ref->processConditionVar($match);
         }, $condition);
 
@@ -980,7 +979,7 @@ public function injectNoparse($text)
      */
     public function processConditionVar($match)
     {
-        $var = trim(is_array($match) ? $match[0] : $match);
+        $var = is_array($match) ? $match[0] : $match;
 
         if (in_array(strtolower($var), ['true', 'false', 'null', 'or', 'and']) or
             strpos($var, '__cond_str') === 0 or

tests/View/Antlers/ParserTest.php

@@ -1896,6 +1896,87 @@ public function it_automatically_augments_augmentable_objects_when_looping_with_
             (string) Antlers::parse('{{ augmentables limit="1" }}<{{ one }}><{{ two }}>{{ /augmentables }}', ['augmentables' => $loop])
         );
     }
+
+    /** @test */
+    public function it_uses_tags_with_single_part_in_conditions()
+    {
+        (new class extends Tags {
+            public static $handle = 'truthy';
+
+            public function index()
+            {
+                return true;
+            }
+        })::register();
+
+        (new class extends Tags {
+            public static $handle = 'falsey';
+
+            public function index()
+            {
+                return false;
+            }
+        })::register();
+
+        $this->assertEquals('yes', $this->parse('{{ if {truthy} }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('yes', $this->parse('{{ if {truthy} == true }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('no', $this->parse('{{ if {truthy} == false }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('no', $this->parse('{{ if {falsey} }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('no', $this->parse('{{ if {falsey} == true }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('yes', $this->parse('{{ if {falsey} == false }}yes{{ else }}no{{ /if }}'));
+    }
+
+    /** @test */
+    public function it_uses_tags_with_multiple_parts_in_conditions()
+    {
+        (new class extends Tags {
+            public static $handle = 'truthy';
+
+            public function test()
+            {
+                return true;
+            }
+        })::register();
+
+        (new class extends Tags {
+            public static $handle = 'falsey';
+
+            public function test()
+            {
+                return false;
+            }
+        })::register();
+
+        $this->assertEquals('yes', $this->parse('{{ if {truthy:test} }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('yes', $this->parse('{{ if {truthy:test} == true }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('no', $this->parse('{{ if {truthy:test} == false }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('no', $this->parse('{{ if {falsey:test} }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('no', $this->parse('{{ if {falsey:test} == true }}yes{{ else }}no{{ /if }}'));
+        $this->assertEquals('yes', $this->parse('{{ if {falsey:test} == false }}yes{{ else }}no{{ /if }}'));
+    }
+
+    /** @test */
+    public function it_does_stuff_in_issue_2537()
+    {
+        $template = '{{ if noindex || segment_1 == "mobile" || get:page > 0 }}yes{{ else }}no{{ /if }}';
+
+        $this->assertEquals('yes', $this->parse($template, ['noindex' => true]));
+    }
+
+    /** @test */
+    public function it_does_stuff_in_issue_2456()
+    {
+        $template = '{{ if publication_venue:publication_venue_types:slug !== "journal" and publication_venue:first_year }}yes{{ else }}no{{ /if }}';
+
+        $this->assertEquals('yes', $this->parse($template, [
+            'publication_venue' => [
+                'first_year' => true,
+                'publication_venue_types' => [
+                    'slug' => 'notjournal',
+                ],
+            ],
+        ]));
+    }
 }
 
 class NonArrayableObject