Merge branch 'master' into query-builder-grammar-fixes

Author: stevebauman

src/Connection.php

@@ -153,14 +153,11 @@ protected function configure(): void
             $this->ldap->setStartTLS();
         }
 
-        $this->ldap->setOptions(array_replace(
-            $this->configuration->get('options'),
-            [
-                LDAP_OPT_PROTOCOL_VERSION => $this->configuration->get('version'),
-                LDAP_OPT_NETWORK_TIMEOUT => $this->configuration->get('timeout'),
-                LDAP_OPT_REFERRALS => $this->configuration->get('follow_referrals'),
-            ]
-        ));
+        $this->ldap->setOptions(array_replace($this->configuration->get('options'), [
+            LDAP_OPT_PROTOCOL_VERSION => $this->configuration->get('version'),
+            LDAP_OPT_NETWORK_TIMEOUT => $this->configuration->get('timeout'),
+            LDAP_OPT_REFERRALS => $this->configuration->get('follow_referrals'),
+        ]));
     }
 
     /**

src/Models/Attributes/Timestamp.php

@@ -190,7 +190,7 @@ protected function convertWindowsIntegerTimeToDateTime(string|int|null $value =
         }
 
         return (new DateTime)->setTimestamp(
-            round($value / 10000000) - 11644473600
+            (int) ($value / 10000000) - 11644473600
         );
     }
 

src/Query/Builder.php

@@ -948,6 +948,15 @@ public function whereNotContains(string $attribute, string $value): static
      */
     public function whereIn(string $attribute, array $values): static
     {
+        if (empty($values)) {
+            // If the array of values is empty, we will
+            // add an empty OR filter to the query to
+            // ensure that no results are returned.
+            $this->addFilter(new OrGroup());
+
+            return $this;
+        }
+
         $query = $this->newNestedInstance(function (Builder $query) use ($attribute, $values) {
             foreach ($values as $value) {
                 $query->orWhereEquals($attribute, $value);

tests/Integration/QueryTest.php

@@ -64,4 +64,15 @@ public function test_it_cannot_override_limit_when_chunking()
 
         $this->assertEquals(2, $pages);
     }
+
+    public function test_it_returns_no_results_with_empty_where_in_array()
+    {
+        $user = $this->makeUser($this->ou);
+
+        $user->save();
+
+        $this->assertCount(1, User::get());
+        $this->assertCount(1, User::whereIn('cn', [$user->getFirstAttribute('cn')])->get());
+        $this->assertEmpty(User::whereIn('cn', [])->get());
+    }
 }

tests/Unit/Models/Attributes/TimestampTest.php

@@ -146,4 +146,17 @@ public function test_windows_int_type_properly_handles_minimum()
         $this->assertSame($min, $timestamp->toDateTime($min));
         $this->assertSame($min, $timestamp->toDateTime((string) $min));
     }
+
+    public function test_windows_int_type_rounds_correctly()
+    {
+        $timestamp = new Timestamp('windows-int');
+
+        foreach (['133692539995000000', '133692539999500000'] as $windowsIntegerTime) {
+            $dateTime = $timestamp->toDateTime($windowsIntegerTime);
+
+            $expectedUnixTimestamp = (int) ($windowsIntegerTime / 10000000) - 11644473600;
+
+            $this->assertEquals($expectedUnixTimestamp, $dateTime->getTimestamp());
+        }
+    }
 }

tests/Unit/Query/BuilderTest.php

@@ -542,6 +542,15 @@ public function test_built_where_in()
         $this->assertEquals('(|(name=john)(name=mary)(name=sue))', $b->getUnescapedQuery());
     }
 
+    public function test_built_where_in_with_empty_array()
+    {
+        $b = $this->newBuilder();
+
+        $b->whereIn('name', []);
+
+        $this->assertEquals('(|)', $b->getUnescapedQuery());
+    }
+
     public function test_built_where_approximately_equals()
     {
         $b = $this->newBuilder();