Merge pull request #656 from DirectoryTree/BUG-655

Bug 655 - Groups relation Builder TypeError

Author: stevebauman

src/Query/Builder.php

@@ -156,7 +156,7 @@ public function setCache(Cache $cache = null): static
     /**
      * Returns a new Query Builder instance.
      */
-    public function newInstance(string $baseDn = null): static
+    public function newInstance(string $baseDn = null): Builder
     {
         return (new static($this->connection))->setDn(
             is_null($baseDn) ? $this->getDn() : $baseDn
@@ -166,7 +166,7 @@ public function newInstance(string $baseDn = null): static
     /**
      * Returns a new nested Query Builder instance.
      */
-    public function newNestedInstance(Closure $closure = null): static
+    public function newNestedInstance(Closure $closure = null): Builder
     {
         $query = $this->newInstance()->nested();
 
@@ -1026,7 +1026,7 @@ public function whereNotContains(string $field, string $value): static
      */
     public function whereIn(string $field, array $values): static
     {
-        return $this->orFilter(function (self $query) use ($field, $values) {
+        return $this->orFilter(function (Builder $query) use ($field, $values) {
             foreach ($values as $value) {
                 $query->whereEquals($field, $value);
             }

src/Query/Model/Builder.php

@@ -91,7 +91,7 @@ public function getModel(): Model
     /**
      * Get a new model query builder instance.
      */
-    public function newInstance(string $baseDn = null): static
+    public function newInstance(string $baseDn = null): BaseBuilder
     {
         return parent::newInstance($baseDn)->model($this->model);
     }
@@ -236,7 +236,7 @@ public function findManyByAnr(array $values = [], array|string $columns = ['*'])
      */
     protected function prepareAnrEquivalentQuery(string $value): static
     {
-        return $this->orFilter(function (self $query) use ($value) {
+        return $this->orFilter(function (BaseBuilder $query) use ($value) {
             foreach ($this->model->getAnrAttributes() as $attribute) {
                 $query->whereEquals($attribute, $value);
             }

tests/Unit/Models/ActiveDirectory/ModelTest.php

@@ -2,7 +2,11 @@
 
 namespace LdapRecord\Tests\Unit\Models\ActiveDirectory;
 
+use LdapRecord\Connection;
+use LdapRecord\Container;
 use LdapRecord\Models\ActiveDirectory\Entry;
+use LdapRecord\Models\Relations\HasMany;
+use LdapRecord\Query\Model\ActiveDirectoryBuilder;
 use LdapRecord\Query\Model\Builder;
 use LdapRecord\Tests\TestCase;
 use Mockery as m;
@@ -88,6 +92,26 @@ public function test_restore()
 
         $this->assertEquals('CN=John Doe,DC=local,DC=com', $m->getDn());
     }
+
+    public function test_relation_query_can_be_created()
+    {
+        Container::addConnection(new Connection);
+
+        $entry = new class extends Entry
+        {
+            public function relation(): HasMany
+            {
+                return $this->hasMany(Entry::class, 'dn');
+            }
+        };
+
+        /** @var HasMany $relation */
+        $relation = $entry->relation()->whereIn('foo', ['foo']);
+
+        $this->assertInstanceOf(HasMany::class, $relation);
+        $this->assertInstanceOf(ActiveDirectoryBuilder::class, $query = $relation->getQuery());
+        $this->assertEquals('(|(foo=\66\6f\6f))', $query->getQuery());
+    }
 }
 
 class TestModelRestoreStub extends Entry