From 3a830270c2ade758dac6b97cba72b87a0061eba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rabbi=20Islam=20Rony=20=E2=9A=A1=EF=B8=8F?=
 <35329385+RabbiIslamRony@users.noreply.github.com>
Date: Mon, 24 Aug 2026 19:52:17 +0600
Subject: [PATCH] fix: preserve taxonomy subterm depth per root

---
 includes/model/ListingTaxonomy.php      |  14 +-
 tests/php/listing-taxonomy-subterms.php | 184 ++++++++++++++++++++++++
 2 files changed, 192 insertions(+), 6 deletions(-)
 create mode 100644 tests/php/listing-taxonomy-subterms.php

diff --git a/includes/model/ListingTaxonomy.php b/includes/model/ListingTaxonomy.php
index 5e6ba59167..b3f4d0b721 100644
--- a/includes/model/ListingTaxonomy.php
+++ b/includes/model/ListingTaxonomy.php
@@ -184,10 +184,12 @@ public function list_count_html( $term, $total ) {
         return $html;
     }
 
-    public function subterms_html( $term ) {
+    public function subterms_html( $term, $depth = null ) {
 
-        if ( $this->depth <= 0 ) {
-            return;
+        $depth = is_null( $depth ) ? $this->depth : $depth;
+
+        if ( $depth <= 0 ) {
+            return '';
         }
 
         $args = [
@@ -204,7 +206,7 @@ public function subterms_html( $term ) {
 
         if ( count( $terms ) > 0 ) {
 
-            --$this->depth;
+            --$depth;
 
             $html .= '<ul class="directorist-taxonomy-list__sub-item">';
 
@@ -234,7 +236,7 @@ public function subterms_html( $term ) {
                     $html .= ' (' . $count . ')' . $plus_icon;
                 }
                 $html .= "</a>";
-                $html .= $this->subterms_html( $term );
+                $html .= $this->subterms_html( $term, $depth );
                 $html .= '</li>';
             }
 
@@ -459,4 +461,4 @@ public static function archive_type( $listings ) {
             Helper::get_template( 'archive/directory-type-nav', ['listings' => $listings, 'all_types' => true ] );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/php/listing-taxonomy-subterms.php b/tests/php/listing-taxonomy-subterms.php
new file mode 100644
index 0000000000..210d6bf80a
--- /dev/null
+++ b/tests/php/listing-taxonomy-subterms.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Regression test for taxonomy list subterm depth handling.
+ *
+ * Run with: php tests/php/listing-taxonomy-subterms.php
+ *
+ * @package Directorist
+ */
+
+define( 'ABSPATH', dirname( __DIR__, 2 ) . '/' );
+define( 'ATBDP_LOCATION', 'at_biz_dir-location' );
+
+/**
+ * Minimal permalink stub used by the taxonomy model.
+ */
+class ATBDP_Permalink {
+    /**
+     * Return a location permalink.
+     *
+     * @param object $term           Location term.
+     * @param string $directory_type Directory type.
+     * @return string
+     */
+    public static function atbdp_get_location_page( $term, $directory_type = '' ) {
+        unset( $directory_type );
+
+        return '/location/' . $term->term_id;
+    }
+
+    /**
+     * Return a category permalink.
+     *
+     * @param object $term           Category term.
+     * @param string $directory_type Directory type.
+     * @return string
+     */
+    public static function atbdp_get_category_page( $term, $directory_type = '' ) {
+        unset( $directory_type );
+
+        return '/category/' . $term->term_id;
+    }
+}
+
+/**
+ * Stores the taxonomy fixtures used by the WordPress function stubs.
+ */
+class Directorist_Taxonomy_Test_Data {
+    /**
+     * Child terms keyed by parent ID.
+     *
+     * @var array
+     */
+    public static $children = [];
+}
+
+/**
+ * Minimal get_terms() stub.
+ *
+ * @param array $args Query arguments.
+ * @return array
+ */
+function get_terms( $args ) {
+    return isset( Directorist_Taxonomy_Test_Data::$children[ $args['parent'] ] )
+        ? Directorist_Taxonomy_Test_Data::$children[ $args['parent'] ]
+        : [];
+}
+
+/**
+ * Minimal get_term_children() stub.
+ *
+ * @param int    $term_id  Parent term ID.
+ * @param string $taxonomy Taxonomy name.
+ * @return array
+ */
+function get_term_children( $term_id, $taxonomy ) {
+    unset( $taxonomy );
+
+    if ( empty( Directorist_Taxonomy_Test_Data::$children[ $term_id ] ) ) {
+        return [];
+    }
+
+    return array_map(
+        function( $term ) {
+            return $term->term_id;
+        },
+        Directorist_Taxonomy_Test_Data::$children[ $term_id ]
+    );
+}
+
+require ABSPATH . 'includes/model/ListingTaxonomy.php';
+
+/**
+ * Create a term fixture.
+ *
+ * @param int    $term_id Term ID.
+ * @param string $name    Term name.
+ * @return object
+ */
+function directorist_test_term( $term_id, $name ) {
+    return (object) [
+        'term_id' => $term_id,
+        'name'    => $name,
+    ];
+}
+
+/**
+ * Create a taxonomy model without loading WordPress.
+ *
+ * @param int $depth Maximum subterm depth.
+ * @return Directorist\Directorist_Listing_Taxonomy
+ */
+function directorist_test_taxonomy( $depth ) {
+    $reflection = new ReflectionClass( 'Directorist\\Directorist_Listing_Taxonomy' );
+    $taxonomy   = $reflection->newInstanceWithoutConstructor();
+
+    $taxonomy->depth                = $depth;
+    $taxonomy->tax                  = ATBDP_LOCATION;
+    $taxonomy->orderby              = 'id';
+    $taxonomy->order                = 'asc';
+    $taxonomy->hide_empty           = false;
+    $taxonomy->show_count           = false;
+    $taxonomy->type                 = 'location';
+    $taxonomy->directory_type       = [];
+    $taxonomy->directory_type_count = 0;
+
+    return $taxonomy;
+}
+
+/**
+ * Stop the test when an assertion fails.
+ *
+ * @param bool   $condition Assertion result.
+ * @param string $message   Failure message.
+ * @return void
+ */
+function directorist_test_assert( $condition, $message ) {
+    if ( $condition ) {
+        return;
+    }
+
+    fwrite( STDERR, "FAIL: {$message}\n" );
+    exit( 1 );
+}
+
+Directorist_Taxonomy_Test_Data::$children = [
+    1 => [ directorist_test_term( 101, 'USA child' ) ],
+    2 => [ directorist_test_term( 201, 'South Africa child' ) ],
+    3 => [ directorist_test_term( 301, 'Australia child' ) ],
+    4 => [ directorist_test_term( 401, 'Africa child' ) ],
+];
+
+$taxonomy = directorist_test_taxonomy( 2 );
+$roots    = [
+    directorist_test_term( 1, 'USA' ),
+    directorist_test_term( 2, 'South Africa' ),
+    directorist_test_term( 3, 'Australia' ),
+    directorist_test_term( 4, 'Africa' ),
+];
+
+foreach ( $roots as $root ) {
+    $html = $taxonomy->subterms_html( $root );
+
+    directorist_test_assert(
+        false !== strpos( $html, $root->name . ' child' ),
+        "{$root->name} should render its child list."
+    );
+}
+
+directorist_test_assert( 2 === $taxonomy->depth, 'Rendering one root must not reduce the depth available to another root.' );
+
+Directorist_Taxonomy_Test_Data::$children = [
+    10 => [ directorist_test_term( 11, 'Level 1' ) ],
+    11 => [ directorist_test_term( 12, 'Level 2' ) ],
+    12 => [ directorist_test_term( 13, 'Level 3' ) ],
+];
+
+$taxonomy = directorist_test_taxonomy( 2 );
+$html     = $taxonomy->subterms_html( directorist_test_term( 10, 'Root' ) );
+
+directorist_test_assert( false !== strpos( $html, 'Level 1' ), 'The first configured subterm level should render.' );
+directorist_test_assert( false !== strpos( $html, 'Level 2' ), 'The second configured subterm level should render.' );
+directorist_test_assert( false === strpos( $html, 'Level 3' ), 'Terms deeper than the configured depth should not render.' );
+
+echo "PASS: taxonomy subterm depth is isolated per root.\n";