[4.x] Make tags with old __call methods macroable by using wildcard method instead.

src/Events/CollectionTagFetchedEntries.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Statamic\Events;
+
+use Statamic\Entries\EntryCollection;
+use Statamic\Extensions\Pagination\LengthAwarePaginator;
+use Statamic\Tags\Collection\Collection;
+
+class CollectionTagFetchedEntries extends Event
+{
+    public EntryCollection|LengthAwarePaginator $entries;
+    public Collection $tag;
+
+    public function __construct(EntryCollection|LengthAwarePaginator $entries, Collection $tag)
+    {
+        $this->entries = $entries;
+        $this->tag = $tag;
+    }
+}

src/Events/CollectionTagFetchingEntries.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Events;
+
+use Statamic\Tags\Collection\Collection;
+
+class CollectionTagFetchingEntries extends Event
+{
+    public Collection $tag;
+
+    public function __construct(Collection $tag)
+    {
+        $this->tag = $tag;
+    }
+}

src/Tags/Asset.php

@@ -21,7 +21,7 @@ class Asset extends Assets
      *
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         $value = Arr::get($this->context, $this->method);
         $value = (array) $value;

src/Tags/Assets.php

@@ -27,7 +27,7 @@ class Assets extends Tags
      *
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         $value = Arr::get($this->context, $this->method);
 

src/Tags/Collection/Collection.php

@@ -2,6 +2,8 @@
 
 namespace Statamic\Tags\Collection;
 
+use Statamic\Events\CollectionTagFetchedEntries;
+use Statamic\Events\CollectionTagFetchingEntries;
 use Statamic\Facades\Entry;
 use Statamic\Tags\Concerns;
 use Statamic\Tags\Tags;
@@ -15,13 +17,11 @@ class Collection extends Tags
     /**
      * {{ collection:* }} ... {{ /collection:* }}.
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $this->params['from'] = $this->method;
 
-        return $this->output(
-            $this->entries()->get()
-        );
+        return $this->index();
     }
 
     /**
@@ -33,8 +33,11 @@ public function index()
             return $this->context->value('collection');
         }
 
+        $entries = $this->entries()->get();
+        CollectionTagFetchedEntries::dispatch($entries, $this);
+
         return $this->output(
-            $this->entries()->get()
+            $entries
         );
     }
 
@@ -96,6 +99,8 @@ public function newer()
 
     protected function entries()
     {
+        CollectionTagFetchingEntries::dispatch($this);
+
         return new Entries($this->params);
     }
 

src/Tags/Glide.php

@@ -28,7 +28,7 @@ class Glide extends Tags
      * @param  array  $args
      * @return string
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $tag = explode(':', $this->tag, 2)[1];
 

src/Tags/ParentTags.php

@@ -22,7 +22,7 @@ class ParentTags extends Tags
      * @param  array  $args
      * @return mixed
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $var_name = Stringy::removeLeft($this->tag, 'parent:');
 

src/Tags/Scope.php

@@ -6,7 +6,7 @@
 
 class Scope extends Tags
 {
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         throw_unless($this->isPair, new \Exception('Scope tag must be a pair'));
 

src/Tags/Section.php

@@ -6,7 +6,7 @@
 
 class Section extends Tags
 {
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $name = explode(':', $this->tag)[1];
 

src/Tags/Tags.php

@@ -137,7 +137,7 @@ public function __call($method, $args)
         if (static::hasMacro($method)) {
             $macro = static::$macros[$method];
 
-            if ($macro instanceof Closure) {
+            if ($macro instanceof \Closure) {
                 $macro = $macro->bindTo($this, static::class);
             }
 

src/Tags/Theme.php

@@ -20,7 +20,7 @@ class Theme extends Tags
      * @param  array  $arguments  Unused
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         return $this->path($method);
     }

src/Tags/Yields.php

@@ -8,7 +8,7 @@ class Yields extends Tags
 {
     protected static $aliases = ['yield'];
 
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $name = explode(':', $this->tag)[1];