Merge pull request #792 from DirectoryTree/fix-select-v4

Bug 790 - select('cn', 'description') does not return 'description' attribute in v4

Author: stevebauman

src/Query/Model/Builder.php

@@ -569,13 +569,20 @@ public function get(array|string $selects = ['*']): Collection
     /**
      * Select the given attributes to retrieve.
      */
-    public function select(array|string $selects): static
+    public function select(array|string $selects = ['*']): static
     {
+        $selects = is_array($selects) ? $selects : func_get_args();
+
+        // Default to all attributes if empty.
+        if (empty($selects)) {
+            $selects = ['*'];
+        }
+
         // If selects are being overridden, then we need to ensure
         // the GUID key is always selected so that it may be
         // returned in the results for model hydration.
         $selects = array_values(array_unique(
-            array_merge([$this->model->getGuidKey()], (array) $selects)
+            array_merge([$this->model->getGuidKey()], $selects)
         ));
 
         $this->query->select($selects);
@@ -588,6 +595,8 @@ public function select(array|string $selects): static
      */
     public function addSelect(array|string $select): static
     {
+        $select = is_array($select) ? $select : func_get_args();
+
         $this->query->addSelect($select);
 
         return $this;

tests/Unit/Query/Model/ActiveDirectoryBuilderTest.php

@@ -121,4 +121,48 @@ public function test_built_where_disabled()
 
         $this->assertEquals('(UserAccountControl:1.2.840.113556.1.4.803:=2)', $b->getQuery()->getQuery());
     }
+
+    public function test_select_with_variadic_arguments()
+    {
+        $b = $this->newBuilder();
+
+        $selects = $b->select('cn', 'description')->getSelects();
+
+        $this->assertContains('cn', $selects);
+        $this->assertContains('description', $selects);
+        $this->assertContains('objectguid', $selects); // GUID key always included
+    }
+
+    public function test_select_with_array_argument()
+    {
+        $b = $this->newBuilder();
+
+        $selects = $b->select(['cn', 'description'])->getSelects();
+
+        $this->assertContains('cn', $selects);
+        $this->assertContains('description', $selects);
+        $this->assertContains('objectguid', $selects);
+    }
+
+    public function test_select_with_empty_array_defaults_to_all()
+    {
+        $b = $this->newBuilder();
+
+        $selects = $b->select([])->getSelects();
+
+        $this->assertContains('*', $selects);
+        $this->assertContains('objectguid', $selects);
+    }
+
+    public function test_add_select_with_variadic_arguments()
+    {
+        $b = $this->newBuilder();
+
+        $selects = $b->select('cn')->addSelect('description', 'mail')->getSelects();
+
+        $this->assertContains('cn', $selects);
+        $this->assertContains('description', $selects);
+        $this->assertContains('mail', $selects);
+        $this->assertContains('objectguid', $selects);
+    }
 }