[5.x] Corrects issue returning some collections from tags (#10113)

Co-authored-by: Jason Varga <[email protected]>
statamic · May 20, 2024 · c84a8a7 · c84a8a7
1 parent bad5b3a
commit c84a8a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php b/src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php
@@ -15,7 +15,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
     {
         GlobalRuntimeState::$requiresRuntimeIsolation = true;
         try {
-            if ($augmentable instanceof Collection && $augmentable->count() && $augmentable[0] instanceof Augmentable) {
+            if ($augmentable instanceof Collection && $augmentable->first() instanceof Augmentable) {
                 $value = BulkAugmentor::make($augmentable)->toArray();
             } else {
                 $value = $augmentable->toDeferredAugmentedArray();

diff --git a/tests/Antlers/Runtime/TagsTest.php b/tests/Antlers/Runtime/TagsTest.php
@@ -31,4 +31,19 @@ public function index()
 
         $this->assertSame('Test: test valuetest value - ', $result);
     }
+
+    public function test_collections_returned_from_tags()
+    {
+        (new class extends Tags
+        {
+            public static $handle = 'test_tag';
+
+            public function index()
+            {
+                return collect(['a' => 'b']);
+            }
+        })::register();
+
+        $this->assertSame('b', $this->renderString('{{ test_tag }}{{ a }}{{ /test_tag }}', [], true));
+    }
 }