Fix remaining conflicts and tests

Author: stevebauman

src/Models/Model.php

@@ -1146,9 +1146,9 @@ public function delete(bool $recursive = false): void
      */
     protected function deleteLeafNodes(): void
     {
-        Entry::query()
-            ->list()
+        $this->newQueryWithoutScopes()
             ->in($this->dn)
+            ->list()
             ->each(function (Model $model) {
                 $model->delete(recursive: true);
             });

src/Query/Filter/Parser.php

@@ -48,7 +48,10 @@ protected static function match(string $string): array
      */
     public static function assemble(Filter|array $filters = []): string
     {
-        return implode(Arr::wrap($filters));
+        return implode(array_map(
+            fn (Filter $filter) => (string) $filter,
+            Arr::wrap($filters)
+        ));
     }
 
     /**

src/Query/Model/Builder.php

@@ -831,7 +831,7 @@ public function newQueryWithoutScopes(): static
      */
     protected function newNestedModelInstance(Closure $closure): static
     {
-        $query = $this->model->newQueryWithoutScopes()->nested();
+        $query = (new static($this->model, $this->query->newInstance()))->nested();
 
         $closure($query);
 

tests/Unit/Query/Model/BuilderScopeTest.php

@@ -33,7 +33,8 @@ public function test_class_scopes_can_be_applied()
 
         $b->withGlobalScope('foo', new TestModelScope);
 
-        $this->assertEquals('(foo=LdapRecord\Models\Entry)', $b->getUnescapedQuery());
+        // Scopes are wrapped in an AndGroup to prevent negation
+        $this->assertEquals('(&(foo=LdapRecord\Models\Entry))', $b->getUnescapedQuery());
 
         $this->assertCount(1, $b->appliedScopes());
         $this->assertArrayHasKey('foo', $b->appliedScopes());