Primary attribute integer representation

phpunit.xml

@@ -7,7 +7,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="true"
+    stopOnFailure="false"
 >
     <testsuites>
         <testsuite name="unit">

src/Database/Adapter.php

@@ -747,7 +747,7 @@ abstract public function deleteDocument(string $collection, string $id): bool;
      * Delete Documents
      *
      * @param string $collection
-     * @param array<string> $sequences
+     * @param array<int|string|null> $sequences
      * @param array<string> $permissionIds
      *
      * @return int

src/Database/Adapter/MariaDB.php

@@ -1644,7 +1644,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
                 unset($results[$index]['_id']);
             }
             if (\array_key_exists('_tenant', $document)) {
-                $results[$index]['$tenant'] = $document['_tenant'] === null ? null : (int)$document['_tenant'];
+                $results[$index]['$tenant'] = $document['_tenant'];
                 unset($results[$index]['_tenant']);
             }
             if (\array_key_exists('_createdAt', $document)) {

src/Database/Adapter/Postgres.php

@@ -1529,7 +1529,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
                 unset($results[$index]['_id']);
             }
             if (\array_key_exists('_tenant', $document)) {
-                $results[$index]['$tenant'] = $document['_tenant'] === null ? null : (int)$document['_tenant'];
+                $results[$index]['$tenant'] = $document['_tenant'];
                 unset($results[$index]['_tenant']);
             }
             if (\array_key_exists('_createdAt', $document)) {

src/Database/Adapter/SQL.php

@@ -369,15 +369,15 @@ public function getDocument(string $collection, string $id, array $queries = [],
         $document = $document[0];
 
         if (\array_key_exists('_id', $document)) {
-            $document['$sequence'] = $document['_id'];
+            $document['$sequence'] = (int)$document['_id'];
             unset($document['_id']);
         }
         if (\array_key_exists('_uid', $document)) {
             $document['$id'] = $document['_uid'];
             unset($document['_uid']);
         }
         if (\array_key_exists('_tenant', $document)) {
-            $document['$tenant'] = $document['_tenant'] === null ? null : (int)$document['_tenant'];
+            $document['$tenant'] = $document['_tenant'];
             unset($document['_tenant']);
         }
         if (\array_key_exists('_createdAt', $document)) {
@@ -642,7 +642,7 @@ public function updateDocuments(string $collection, Document $updates, array $do
      * Delete Documents
      *
      * @param string $collection
-     * @param array<string> $sequences
+     * @param array<int|string|null> $sequences
      * @param array<string> $permissionIds
      *
      * @return int

src/Database/Database.php

@@ -189,7 +189,7 @@ class Database
         ],
         [
             '$id' => '$tenant',
-            'type' => self::VAR_INTEGER,
+            'type' => self::VAR_ID,
             'size' => 0,
             'required' => false,
             'default' => null,
@@ -3673,6 +3673,7 @@ public function createDocument(string $collection, Document $document): Document
             $document = $this->silent(fn () => $this->populateDocumentRelationships($collection, $document));
         }
 
+        $document = $this->casting($collection, $document);
         $document = $this->decode($collection, $document);
 
         $this->trigger(self::EVENT_DOCUMENT_CREATE, $document);
@@ -3739,6 +3740,7 @@ public function createDocuments(
                 }
             }
 
+            $document = $this->casting($collection, $document);
             $document = $this->encode($collection, $document);
 
             $validator = new Structure(
@@ -6488,6 +6490,8 @@ public function casting(Document $collection, Document $document): Document
 
         $attributes = $collection->getAttribute('attributes', []);
 
+        $attributes = \array_merge($attributes, $this->getInternalAttributes());
+
         foreach ($attributes as $attribute) {
             $key = $attribute['$id'] ?? '';
             $type = $attribute['type'] ?? '';
@@ -6510,6 +6514,14 @@ public function casting(Document $collection, Document $document): Document
                     case self::VAR_BOOLEAN:
                         $node = (bool)$node;
                         break;
+                    case self::VAR_ID:
+                        if ($this->adapter->getIdAttributeType() === Database::VAR_ID_INT) {
+                            $node = (int)$node;
+                        }
+                        else {
+                            $node = (string)$node;
+                        }
+                        break;
                     case self::VAR_INTEGER:
                         $node = (int)$node;
                         break;

src/Database/Document.php

@@ -62,11 +62,11 @@ public function getId(): string
     }
 
     /**
-     * @return string
+     * @return int|string|null
      */
-    public function getSequence(): string
+    public function getSequence(): int|string|null
     {
-        return $this->getAttribute('$sequence', '');
+        return $this->getAttribute('$sequence');
     }
 
     /**

src/Database/Validator/Sequence.php

@@ -42,15 +42,15 @@ public function isValid($value): bool
             return false;
         }
 
-        if (gettype($value) !== 'string') {
-            return false;
-        }
-
         switch ($this->idAttributeType) {
             case Database::VAR_ID_MONGO:
                 return preg_match('/^[a-f0-9]{24}$/i', $value) === 1;
 
             case Database::VAR_ID_INT:
+                if (gettype($value) !== 'integer') {
+                    return false;
+                }
+
                 $validator = new Integer(loose: true);
                 if (!$validator->isValid($value)) {
                     return false;

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -67,7 +67,7 @@ public function testCreateDocument(): Document
             'colors' => ['pink', 'green', 'blue'],
             'empty' => [],
             'with-dash' => 'Works',
-            'id' => '1000000',
+            'id' => 1000000,
         ]));
 
         $this->assertNotEmpty(true, $document->getId());
@@ -91,13 +91,13 @@ public function testCreateDocument(): Document
         $this->assertEquals(['pink', 'green', 'blue'], $document->getAttribute('colors'));
         $this->assertEquals([], $document->getAttribute('empty'));
         $this->assertEquals('Works', $document->getAttribute('with-dash'));
-        $this->assertIsString($document->getAttribute('id'));
-        $this->assertEquals('1000000', $document->getAttribute('id'));
+        $this->assertIsInt($document->getAttribute('id'));
+        $this->assertEquals(1000000, $document->getAttribute('id'));
 
         // Test create document with manual internal id
         $manualIdDocument = $database->createDocument('documents', new Document([
             '$id' => '56000',
-            '$sequence' => '56000',
+            '$sequence' => 56000,
             '$permissions' => [
                 Permission::read(Role::any()),
                 Permission::read(Role::user(ID::custom('1'))),
@@ -214,7 +214,7 @@ public function testCreateDocument(): Document
 
         try {
             $database->createDocument('documents', new Document([
-                '$sequence' => '0',
+                '$sequence' => 0,
                 '$permissions' => [],
                 'string' => '',
                 'integer_signed' => 1,
@@ -253,7 +253,7 @@ public function testCreateDocument(): Document
             'empty' => [],
             'with-dash' => '',
         ]));
-        $this->assertNotEmpty(true, $documentIdNull->getSequence());
+        $this->assertArrayHasKey('$sequence', $documentIdNull);
         $this->assertNull($documentIdNull->getAttribute('id'));
 
         $documentIdNull = $database->getDocument('documents', $documentIdNull->getId());
@@ -270,7 +270,7 @@ public function testCreateDocument(): Document
          * Insert ID attribute with '0'
          */
         $documentId0 = $database->createDocument('documents', new Document([
-            'id' => '0',
+            'id' => 0,
             '$permissions' => [Permission::read(Role::any())],
             'string' => '',
             'integer_signed' => 1,
@@ -284,22 +284,21 @@ public function testCreateDocument(): Document
             'empty' => [],
             'with-dash' => '',
         ]));
-        $this->assertNotEmpty(true, $documentId0->getSequence());
-        $this->assertIsString($documentId0->getAttribute('id'));
-        $this->assertEquals('0', $documentId0->getAttribute('id'));
+        $this->assertArrayHasKey('$sequence', $documentId0);
+        $this->assertIsInt($documentId0->getAttribute('id'));
+        $this->assertEquals(0, $documentId0->getAttribute('id'));
 
         $documentId0 = $database->getDocument('documents', $documentId0->getId());
-        $this->assertNotEmpty(true, $documentId0->getSequence());
-        $this->assertIsString($documentId0->getAttribute('id'));
-        $this->assertEquals('0', $documentId0->getAttribute('id'));
+        $this->assertArrayHasKey('$sequence', $documentId0);
+        $this->assertIsInt($documentId0->getAttribute('id'));
+        $this->assertEquals(0, $documentId0->getAttribute('id'));
 
         $documentId0 = $database->findOne('documents', [
-            query::equal('id', ['0'])
+            query::equal('id', [0])
         ]);
-        $this->assertNotEmpty(true, $documentId0->getSequence());
-        $this->assertIsString($documentId0->getAttribute('id'));
-        $this->assertEquals('0', $documentId0->getAttribute('id'));
-
+        $this->assertArrayHasKey('$sequence', $documentId0);
+        $this->assertIsInt($documentId0->getAttribute('id'));
+        $this->assertEquals(0, $documentId0->getAttribute('id'));
 
         return $document;
     }
@@ -386,7 +385,7 @@ public function testCreateDocumentsWithAutoIncrement(): void
 
         for ($i = $sequence; $i <= ($sequence + $count); $i++) {
             $documents[] = new Document([
-                '$sequence' => (string)$i,
+                '$sequence' => $i,
                 '$permissions' => [
                     Permission::read(Role::any()),
                     Permission::create(Role::any()),
@@ -4371,7 +4370,7 @@ public function testExceptionCaseInsensitiveDuplicate(Document $document): Docum
         $database = static::getDatabase();
 
         $document->setAttribute('$id', 'caseSensitive');
-        $document->setAttribute('$sequence', '200');
+        $document->setAttribute('$sequence', 200);
         $database->createDocument($document->getCollection(), $document);
 
         $document->setAttribute('$id', 'CaseSensitive');

tests/unit/Validator/DocumentsQueriesTest.php

@@ -130,7 +130,7 @@ public function testValidQueries(): void
         );
 
         $queries = [
-            Query::notEqual('id', '1000000'),
+            Query::notEqual('id', 1000000),
             Query::equal('description', ['Best movie ever']),
             Query::equal('description', ['']),
             Query::equal('is_bool', [false]),

tests/unit/Validator/StructureTest.php

@@ -213,7 +213,7 @@ public function testNullValues(): void
             'published' => true,
             'tags' => ['dog', 'cat', 'mouse'],
             'feedback' => '[email protected]',
-            'id' => '1000',
+            'id' => 1000,
         ])));
 
         $this->assertEquals(true, $validator->isValid(new Document([
@@ -659,7 +659,7 @@ public function testId(): void
             Database::VAR_ID_INT
         );
 
-        $id = '1000';
+        $id = 1000;
         $mongoid = '507f1f77bcf86cd799439011';
 
         /**