Merge pull request #788 from DirectoryTree/query-builder-grammar-fixes

Refactor query filters to use composable filter objects

Author: stevebauman

src/Ldap.php

@@ -62,7 +62,7 @@ public function getAttributes(mixed $entry): array|false
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function countEntries(mixed $result): int
     {
@@ -72,7 +72,7 @@ public function countEntries(mixed $result): int
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function compare(string $dn, string $attribute, string $value, ?array $controls = null): bool|int
     {
@@ -108,7 +108,7 @@ public function getDetailedError(): ?DetailedError
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getValuesLen(mixed $entry, string $attribute): array|false
     {
@@ -285,7 +285,7 @@ public function bind(?string $dn = null, ?string $password = null, ?array $contr
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function saslBind(?string $dn = null, ?string $password = null, array $options = []): bool
     {

src/Models/Attributes/TSProperty.php

@@ -282,7 +282,7 @@ protected function packBitString(string $bits, int $len): string
             $nibbles[$i] = base_convert($nibble, 2, 16);
         }
 
-        return pack('H*', implode('', $nibbles));
+        return pack('H*', implode($nibbles));
     }
 
     /**

src/Models/Model.php

@@ -375,33 +375,38 @@ public static function unsetConnectionContainer(): void
      */
     public function registerModelScopes(Builder $query): Builder
     {
-        $this->applyObjectClassScopes($query);
+        $this->registerObjectClassScopes($query);
 
         $this->registerGlobalScopes($query);
 
         return $query;
     }
 
     /**
-     * Register the global model scopes.
+     * Register the object class scopes for this builder instance.
      */
-    public function registerGlobalScopes(Builder $query): Builder
+    public function registerObjectClassScopes(Builder $query): Builder
     {
-        foreach ($this->getGlobalScopes() as $identifier => $scope) {
-            $query->withGlobalScope($identifier, $scope);
+        if (static::$objectClasses) {
+            $query->withGlobalScope(
+                Scopes\HasObjectClasses::class,
+                new Scopes\HasObjectClasses
+            );
         }
 
         return $query;
     }
 
     /**
-     * Apply the model object class scopes to the given builder instance.
+     * Register the global model scopes.
      */
-    public function applyObjectClassScopes(Builder $query): void
+    public function registerGlobalScopes(Builder $query): Builder
     {
-        foreach (static::$objectClasses as $objectClass) {
-            $query->where('objectclass', '=', $objectClass);
+        foreach ($this->getGlobalScopes() as $identifier => $scope) {
+            $query->withGlobalScope($identifier, $scope);
         }
+
+        return $query;
     }
 
     /**

src/Models/Scopes/HasObjectClasses.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace LdapRecord\Models\Scopes;
+
+use LdapRecord\Models\Model;
+use LdapRecord\Models\Scope;
+use LdapRecord\Query\Model\Builder;
+
+class HasObjectClasses implements Scope
+{
+    /**
+     * Restrict the query to the model's object classes.
+     */
+    public function apply(Builder $query, Model $model): void
+    {
+        foreach ($model::$objectClasses as $objectClass) {
+            $query->where('objectclass', '=', $objectClass);
+        }
+    }
+}