Fixed PHP 8.4 deprecations

Author: Radiergummi

composer.lock

@@ -151,7 +151,7 @@ protected function getIndex(): string|null
     #[Deprecated(reason: 'Mapping types are deprecated as of Elasticsearch 7.0.0')]
     protected function getType(): string|null
     {
-        return $this->type ?: $this->query->getType();
+        return $this->type;
     }
 
     /**

src/Classes/Bulk.php

@@ -62,7 +62,7 @@ class Search
     public function __construct(
         Query $query,
         string $queryString,
-        callable|array $settings = null
+        callable|array|null $settings = null
     ) {
         $this->query = $query;
         $this->queryString = $queryString;

src/Classes/Search.php

@@ -191,7 +191,7 @@ public function withGlobalScope(
      *
      * @return $this
      */
-    public function withoutGlobalScopes(array $scopes = null): static
+    public function withoutGlobalScopes(array|null $scopes = null): static
     {
         if (!is_array($scopes)) {
             $scopes = array_keys($this->scopes);

src/Concerns/AppliesScopes.php

@@ -384,7 +384,7 @@ public function id(string|null $id = null): static
      */
     public function aggregate(
         string $name,
-        array|string $settings = null
+        array|string|null $settings = null
     ): static {
         $field = is_string($settings) ? $settings : $name;
         $settings = is_array($settings)
@@ -1007,7 +1007,7 @@ public function scrollId(string|null $scroll): static
      */
     public function search(
         string|null $queryString = null,
-        callable|array $settings = null,
+        callable|array|null $settings = null,
         int|null $boost = null
     ): static {
         if ($queryString) {

src/Concerns/BuildsFluentQueries.php

@@ -213,7 +213,7 @@ private function addBaseParams(array $params): array
      */
     public function update(
         array $attributes,
-        int|string $id = null
+        int|string|null $id = null
     ): object {
         if ($id) {
             $this->id((string)$id);
@@ -280,7 +280,7 @@ public function delete(string|null $id = null): object
      * @noinspection PhpDocSignatureInspection
      */
     public function firstOr(
-        callable|string $scrollId = null,
+        callable|string|null $scrollId = null,
         callable|null $callback = null
     ): Model|null {
         if (is_callable($scrollId)) {
@@ -480,7 +480,6 @@ protected function createModelInstance(array $document): Model
             $metadata,
             true,
             $document[Query::FIELD_INDEX] ?? null,
-            $document[Query::FIELD_TYPE] ?? null,
         );
     }
 

src/Concerns/ExecutesQueries.php

@@ -53,7 +53,7 @@ class Connection implements ConnectionInterface
      * @todo remove in next major version
      */
     #[Deprecated]
-    private static Resolver $resolver;
+    protected static Resolver $resolver;
 
     /**
      * Cache instance to be used for this connection. In Laravel applications,

src/Connection.php

@@ -58,11 +58,11 @@
 /**
  * Elasticsearch data model
  *
- * @property-read string|null _id
- * @property-read string|null _index
- * @property-read string|null _type
- * @property-read float|null _score
- * @property-read array|null highlight
+ * @property-read string|null $_id
+ * @property-read string|null $_index
+ * @property-read string|null $_type
+ * @property-read float|null $_score
+ * @property-read array|null $highlight
  *
  * @package Matchory\Elasticsearch
  */
@@ -1556,7 +1556,7 @@ public function offsetSet(mixed $offset, mixed $value): void
      *
      * @return static
      */
-    public function replicate(array $except = null): self
+    public function replicate(array|null $except = null): self
     {
         $defaults = [
             self::FIELD_ID,