Small refactors

src/Exceptions/ConstraintViolationException.php

@@ -14,18 +14,14 @@ class ConstraintViolationException extends LdapRecordException
      */
     public function causedByPasswordPolicy(): bool
     {
-        return isset($this->detailedError)
-                ? $this->errorContainsMessage($this->detailedError->getDiagnosticMessage(), '0000052D')
-                : false;
+        return isset($this->detailedError) && $this->errorContainsMessage($this->detailedError->getDiagnosticMessage(), '0000052D');
     }
 
     /**
      * Determine if the exception was generated due to an incorrect password.
      */
     public function causedByIncorrectPassword(): bool
     {
-        return isset($this->detailedError)
-                ? $this->errorContainsMessage($this->detailedError->getDiagnosticMessage(), '00000056')
-                : false;
+        return isset($this->detailedError) && $this->errorContainsMessage($this->detailedError->getDiagnosticMessage(), '00000056');
     }
 }

src/Ldap.php

@@ -417,7 +417,7 @@ public function extractDiagnosticCode(string $message): string|false
     {
         preg_match('/^([\da-fA-F]+):/', $message, $matches);
 
-        return isset($matches[1]) ? $matches[1] : false;
+        return $matches[1] ?? false;
     }
 
     /**

src/Models/Attributes/Guid.php

@@ -45,7 +45,7 @@ class Guid
      */
     public static function isValid(string $guid): bool
     {
-        return (bool) preg_match('/^([0-9a-fA-F]){8}(-([0-9a-fA-F]){4}){3}-([0-9a-fA-F]){12}$/', (string) $guid);
+        return (bool) preg_match('/^([0-9a-fA-F]){8}(-([0-9a-fA-F]){4}){3}-([0-9a-fA-F]){12}$/', $guid);
     }
 
     /**

src/Models/Attributes/Sid.php

@@ -91,7 +91,7 @@ protected function binarySidToString(string $binary): string
 
         $identifierAuthority = $sid['id'];
 
-        $subs = isset($sid['count']) ? $sid['count'] : 0;
+        $subs = $sid['count'] ?? 0;
 
         $sidHex = $subs ? bin2hex($binary) : '';
 

src/Models/BatchModification.php

@@ -92,7 +92,7 @@ public function setValues(array $values = []): static
         // modification. Passing null or empty values will result
         // in an exception when trying to save the modification.
         $this->values = array_filter($this->normalizeAttributeValues($values), function ($value) {
-            return is_numeric($value) && $this->valueIsResetInteger((int) $value) ?: ! empty($value);
+            return is_numeric($value) && $this->valueIsResetInteger((int) $value) || ! empty($value);
         });
 
         return $this;

src/Models/Concerns/HasAttributes.php

@@ -498,15 +498,15 @@ public function toJson(): string
     /**
      * Encode the given value as JSON.
      */
-    protected function asJson(mixed $value): string
+    protected function asJson(mixed $value): string|false
     {
         return json_encode($value);
     }
 
     /**
      * Decode the given JSON back into an array or object.
      */
-    public function fromJson(string $value, bool $asObject = false)
+    public function fromJson(string $value, bool $asObject = false): mixed
     {
         return json_decode($value, ! $asObject);
     }
@@ -567,7 +567,7 @@ protected function getArrayableItems(array $values): array
     }
 
     /**
-     * Get all of the appendable values that are arrayable.
+     * Get all the appendable values that are arrayable.
      */
     protected function getArrayableAppends(): array
     {

src/Query/Grammar.php

@@ -172,18 +172,13 @@ protected function has(Builder $query, array|string $type, string $operator = '>
             $filters += count($query->filters[$type]);
         }
 
-        switch ($operator) {
-            case '>':
-                return $filters > $count;
-            case '>=':
-                return $filters >= $count;
-            case '<':
-                return $filters < $count;
-            case '<=':
-                return $filters <= $count;
-            default:
-                return $filters == $count;
-        }
+        return match ($operator) {
+            '>' => $filters > $count,
+            '>=' => $filters >= $count,
+            '<' => $filters < $count,
+            '<=' => $filters <= $count,
+            default => $filters == $count,
+        };
     }
 
     /**

src/Query/Pagination/AbstractPaginator.php

@@ -65,7 +65,7 @@ public function execute(LdapInterface $ldap): mixed
     }
 
     /**
-     * Whether the paginater should continue iterating.
+     * Whether the paginator should continue iterating.
      */
     protected function shouldContinue(): bool
     {

src/Support/Str.php

@@ -47,7 +47,7 @@ public static function afterLast(string $subject, string $search): string
             return $subject;
         }
 
-        $position = strrpos($subject, (string) $search);
+        $position = strrpos($subject, $search);
 
         if ($position === false) {
             return $subject;

src/Testing/LdapExpectation.php

@@ -31,7 +31,7 @@ class LdapExpectation
     /**
      * The method that the expectation belongs to.
      */
-    protected string $method;
+    protected ?string $method = null;
 
     /**
      * The methods argument's.
@@ -50,8 +50,6 @@ class LdapExpectation
 
     /**
      * The error number to return.
-     *
-     * @var int
      */
     protected ?string $errorCode = null;