Fix types

Author: abnegate

composer.lock

@@ -693,7 +693,7 @@ abstract public function updateDocuments(string $collection, Document $updates,
      *
      * @param string $collection
      * @param string $attribute
-     * @param array<Document> $documents
+     * @param array<string|int, array{old: Document, new: Document}> $documents
      * @return array<Document>
      */
     abstract public function createOrUpdateDocuments(

src/Database/Adapter.php

@@ -1333,7 +1333,7 @@ public function updateDocument(string $collection, string $id, Document $documen
     /**
      * @param string $collection
      * @param string $attribute
-     * @param array<Document> $documents
+     * @param array<string|int, array{old: Document, new: Document}> $documents
      * @return array<Document>
      * @throws DatabaseException
      */
@@ -1379,6 +1379,9 @@ public function createOrUpdateDocuments(
 
                 $columns = [];
                 foreach (\array_keys($attributes) as $key => $attr) {
+                    /**
+                     * @var string $attr
+                     */
                     $columns[$key] = "{$this->quote($this->filter($attr))}";
                 }
                 $columns = '(' . \implode(', ', $columns) . ')';
@@ -1425,6 +1428,9 @@ public function createOrUpdateDocuments(
                 // Update all columns
                 $updateColumns = [];
                 foreach (\array_keys($attributes) as $attr) {
+                    /**
+                     * @var string $attr
+                     */
                     $updateColumns[] = $getUpdateClause($this->filter($attr));
                 }
             }
@@ -1455,12 +1461,12 @@ public function createOrUpdateDocuments(
 
                 $current = [];
                 foreach (Database::PERMISSIONS as $type) {
-                    $current[$type] = $old->getPermissionsByType($type) ?? [];
+                    $current[$type] = $old->getPermissionsByType($type);
                 }
 
                 // Calculate removals
                 foreach (Database::PERMISSIONS as $type) {
-                    $toRemove = \array_diff($current[$type] ?? [], $document->getPermissionsByType($type));
+                    $toRemove = \array_diff($current[$type], $document->getPermissionsByType($type));
                     if (!empty($toRemove)) {
                         $removeQueries[] = "(
                             _document = :_uid_{$index}
@@ -1478,7 +1484,7 @@ public function createOrUpdateDocuments(
 
                 // Calculate additions
                 foreach (Database::PERMISSIONS as $type) {
-                    $toAdd = \array_diff($document->getPermissionsByType($type), $current[$type] ?? []);
+                    $toAdd = \array_diff($document->getPermissionsByType($type), $current[$type]);
 
                     foreach ($toAdd as $i => $permission) {
                         $addQuery = "(:_uid_{$index}, '{$type}', :add_{$type}_{$index}_{$i}";
@@ -1533,7 +1539,7 @@ public function createOrUpdateDocuments(
             throw $this->processException($e);
         }
 
-        return $documents;
+        return \array_map(fn ($document) => $document['new'], $documents);
     }
 
     /**

src/Database/Adapter/MariaDB.php

@@ -1378,6 +1378,12 @@ public function updateDocument(string $collection, string $id, Document $documen
         return $document;
     }
 
+    /**
+     * @param string $collection
+     * @param string $attribute
+     * @param array<array{old: Document, new: Document}> $documents
+     * @return array<Document>
+     */
     public function createOrUpdateDocuments(string $collection, string $attribute, array $documents): array
     {
         return $documents;

src/Database/Adapter/Postgres.php

@@ -4748,10 +4748,16 @@ public function createOrUpdateDocumentsWithIncrease(
             ];
         }
 
+        /**
+         * @var array<int|string, array{old: Document, new: Document}> $documents
+         */
         $documents = $this->withTransaction(function () use ($collection, $attribute, $documents, $batchSize) {
             $stack = [];
 
             foreach (\array_chunk($documents, $batchSize) as $chunk) {
+                /**
+                 * @var array<int|string, array{old: Document, new: Document}> $chunk
+                 */
                 \array_push(
                     $stack,
                     ...Authorization::skip(fn () => $this->adapter->createOrUpdateDocuments(
@@ -4766,8 +4772,6 @@ public function createOrUpdateDocumentsWithIncrease(
         });
 
         foreach ($documents as $key => $document) {
-            $document = $document['new'];
-
             if ($this->resolveRelationships) {
                 $document = $this->silent(fn () => $this->populateDocumentRelationships($collection, $document));
             }