Merge branch 'master' of github.com:Brain-WP/Hierarchy

Brain-WP · Feb 24, 2022 · 78f113e · 78f113e
2 parents b7e7be7 + 8e7dc5d
commit 78f113e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/QueryTemplate.php b/src/QueryTemplate.php
@@ -84,7 +84,7 @@ 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], $type);
+            $found = $this->finder->findFirst($leaves[$type], (string) $type);
             $filters and $found = $this->applyFilter("{$type}_template", $found, $query);
         }
 

diff --git a/tests/src/Unit/QueryTemplateTest.php b/tests/src/Unit/QueryTemplateTest.php
@@ -183,6 +183,24 @@ public function find(string $template, string $type): string
         unset($wp_query, $wp_the_query);
     }
 
+    /**
+     * @test
+     */
+    public function testFindTemplateWhen404(): void
+    {
+        $wpQuery = new \WP_Query([
+            'is_404' => true,
+        ]);
+
+        $finder = \Mockery::mock(TemplateFinder::class);
+        $finder->expects('findFirst')->andReturn('foo');
+
+        $loader = new QueryTemplate($finder);
+        $loaded = $loader->findTemplate($wpQuery);
+
+        static::assertSame('foo', $loaded);
+    }
+
     /**
      * @test
      */