Merge pull request #29 from nlemoine/fix/template-filter

Fix `${type}_template` filter
Brain-WP · Nov 30, 2022 · f4ec0ab · f4ec0ab
2 parents 15564dc + 043b93c
commit f4ec0ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/QueryTemplate.php b/src/QueryTemplate.php
@@ -84,8 +84,14 @@ public function findTemplate(?\WP_Query $query = null, bool $filters = true): st
         $found = '';
         while ($types && !$found) {
             $type = array_shift($types);
-            $found = $this->finder->findFirst($leaves[$type], (string)$type);
-            $filters and $found = $this->applyFilter("{$type}_template", $found, $query);
+            $templates = $leaves[$type];
+            $found = $this->finder->findFirst($templates, (string) $type);
+            $filters and $found = $this->applyFilter(
+                "{$type}_template",
+                $found,
+                $query,
+                [$type, $templates]
+            );
         }
 
         return $found;
@@ -121,9 +127,10 @@ public function loadTemplate(
      * @param string $filter
      * @param string $value
      * @param \WP_Query|null $query
+     * @param array $moreArgs
      * @return string
      */
-    protected function applyFilter(string $filter, string $value, ?\WP_Query $query = null): string
+    protected function applyFilter(string $filter, string $value, ?\WP_Query $query = null, array $moreArgs = []): string
     {
         /** @var array{\WP_Query, \WP_Query}|null $backup */
         $backup = null;
@@ -141,7 +148,7 @@ protected function applyFilter(string $filter, string $value, ?\WP_Query $query
             $wp_the_query = $query;
         }
 
-        $filtered = apply_filters($filter, $value);
+        $filtered = apply_filters($filter, $value, ...$moreArgs);
         is_string($filtered) and $value = $filtered;
 
         if ($custom && $backup) {

diff --git a/tests/src/Unit/QueryTemplateTest.php b/tests/src/Unit/QueryTemplateTest.php
@@ -146,7 +146,7 @@ public function testApplyFilters(): void
 
         Filters\expectApplied('foo_template')
             ->once()
-            ->with('found!')
+            ->with(...['found!', 'foo', ['foo', 'bar']])
             ->andReturnUsing(
                 static function () use ($customQuery): string {
                     // during filter, globals `$wp_query` and `$wp_the_query` are equal to custom