Merge branch 'main' into feat/process

Author: innocenzi

.github/workflows/create-gh-release.yml

@@ -23,6 +23,8 @@ jobs:
         id: generate_release_notes
         with:
           args: -v --latest --strip header
+        env:
+          GITHUB_REPO: ${{ github.repository }}
 
       - name: Clean up release notes
         run: |

packages/cryptography/tests/Encryption/EncryptionTest.php

@@ -13,11 +13,13 @@
 use Tempest\Cryptography\Signing\SigningAlgorithm;
 use Tempest\Cryptography\Signing\SigningConfig;
 use Tempest\Cryptography\Tests\CreatesSigner;
+use Tempest\Cryptography\Tests\HasMoreIntegerAssertions;
 use Tempest\DateTime\Duration;
 
 final class EncryptionTest extends TestCase
 {
     use CreatesSigner;
+    use HasMoreIntegerAssertions;
 
     private function createEncrypter(?string $key = null, false|Duration $minimumExecutionDuration = false): GenericEncrypter
     {
@@ -60,8 +62,7 @@ public function test_time_protection(): void
         $this->assertSame('important data', $encrypter->decrypt($encrypted));
         $elapsed = microtime(true) - $start;
 
-        $this->assertGreaterThanOrEqual(0.29, $elapsed);
-        $this->assertLessThanOrEqual(0.311, $elapsed);
+        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015);
     }
 
     public function test_wrong_key(): void

packages/cryptography/tests/HasMoreIntegerAssertions.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Tempest\Cryptography\Tests;
+
+use PHPUnit\Framework\ExpectationFailedException;
+
+trait HasMoreIntegerAssertions
+{
+    private function assertEqualsToMoreOrLess(int|float $expected, int|float $actual, int|float $margin): void
+    {
+        try {
+            $this->assertGreaterThanOrEqual($expected - $margin, $actual);
+            $this->assertLessThanOrEqual($expected + $margin, $actual);
+        } catch (ExpectationFailedException $e) {
+            throw new ExpectationFailedException(
+                message: sprintf('Expected value to be within %s of %s, but got %s', $margin, $expected, $actual),
+                comparisonFailure: $e->getComparisonFailure(),
+            );
+        }
+    }
+}

packages/cryptography/tests/Signing/SignerTest.php

@@ -2,17 +2,20 @@
 
 namespace Tempest\Cryptography\Tests\Signing;
 
+use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 use Tempest\Clock\MockClock;
 use Tempest\Cryptography\Signing\Exceptions\SigningKeyWasInvalid;
 use Tempest\Cryptography\Signing\SigningAlgorithm;
 use Tempest\Cryptography\Signing\SigningConfig;
 use Tempest\Cryptography\Tests\CreatesSigner;
+use Tempest\Cryptography\Tests\HasMoreIntegerAssertions;
 use Tempest\DateTime\Duration;
 
 final class SignerTest extends TestCase
 {
     use CreatesSigner;
+    use HasMoreIntegerAssertions;
 
     public function test_good_signature(): void
     {
@@ -163,8 +166,7 @@ public function test_time_protection(): void
         $this->assertTrue($signer->verify($data, $signature));
         $elapsed = microtime(true) - $start;
 
-        $this->assertGreaterThanOrEqual(0.29, $elapsed);
-        $this->assertLessThanOrEqual(0.311, $elapsed);
+        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015);
     }
 
     public function test_time_protection_with_mock_clock(): void
@@ -182,7 +184,6 @@ public function test_time_protection_with_mock_clock(): void
         $this->assertTrue($signer->verify($data, $signature));
         $elapsed = $clock->timestamp()->getMilliseconds() - $ms;
 
-        $this->assertLessThanOrEqual(1_001, $elapsed);
-        $this->assertGreaterThanOrEqual(999, $elapsed);
+        $this->assertEqualsToMoreOrLess(1000, $elapsed, margin: 10);
     }
 }

packages/cryptography/tests/TimelockTest.php

@@ -11,6 +11,8 @@
 
 final class TimelockTest extends TestCase
 {
+    use HasMoreIntegerAssertions;
+
     public function test_callback_is_executed(): void
     {
         $clock = new GenericClock();
@@ -29,8 +31,7 @@ public function test_locks_for_duration(): void
 
         $elapsed = microtime(true) - $start;
 
-        $this->assertGreaterThanOrEqual(0.1, $elapsed, 'The timelock did not wait for the specified duration.');
-        $this->assertLessThan(0.2, $elapsed, 'The timelock waited for too long.');
+        $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015);
     }
 
     public function test_return_early(): void
@@ -62,7 +63,7 @@ public function test_throws_exception_after_delay(): void
             );
         } catch (\RuntimeException) {
             $elapsed = microtime(true) - $start;
-            $this->assertGreaterThanOrEqual(0.1, $elapsed, 'The exception was thrown before the timelock duration elapsed.');
+            $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015);
         }
     }
 

packages/database/src/Builder/ModelInspector.php

@@ -12,6 +12,7 @@
 use Tempest\Database\Relation;
 use Tempest\Database\Table;
 use Tempest\Database\Virtual;
+use Tempest\Mapper\SerializeAs;
 use Tempest\Mapper\SerializeWith;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Reflection\PropertyReflector;
@@ -149,7 +150,11 @@ public function getBelongsTo(string $name): ?BelongsTo
             return null;
         }
 
-        if ($property->hasAttribute(SerializeWith::class) || $property->getType()->asClass()->haSAttribute(SerializeWith::class)) {
+        if ($property->hasAttribute(SerializeWith::class) || $property->getType()->asClass()->hasAttribute(SerializeWith::class)) {
+            return null;
+        }
+
+        if ($property->getType()->asClass()->hasAttribute(SerializeAs::class)) {
             return null;
         }
 

packages/database/src/Builder/QueryBuilders/CountQueryBuilder.php

@@ -15,9 +15,9 @@
 use function Tempest\Database\model;
 
 /**
- * @template TModelClass of object
- * @implements \Tempest\Database\Builder\QueryBuilders\BuildsQuery<TModelClass>
- * @uses \Tempest\Database\Builder\QueryBuilders\HasWhereQueryBuilderMethods<TModelClass>
+ * @template T of object
+ * @implements \Tempest\Database\Builder\QueryBuilders\BuildsQuery<T>
+ * @uses \Tempest\Database\Builder\QueryBuilders\HasWhereQueryBuilderMethods<T>
  */
 final class CountQueryBuilder implements BuildsQuery
 {
@@ -29,11 +29,11 @@ final class CountQueryBuilder implements BuildsQuery
 
     private ModelInspector $model;
 
-    public function __construct(
-        /** @var class-string<TModelClass>|string|TModelClass $model */
-        string|object $model,
-        ?string $column = null,
-    ) {
+    /**
+     * @param class-string<T>|string|T $model
+     */
+    public function __construct(string|object $model, ?string $column = null)
+    {
         $this->model = model($model);
 
         $this->count = new CountStatement(
@@ -47,7 +47,7 @@ public function execute(mixed ...$bindings): int
         return $this->build()->fetchFirst(...$bindings)[$this->count->getKey()];
     }
 
-    /** @return self<TModelClass> */
+    /** @return self<T> */
     public function distinct(): self
     {
         if ($this->count->column === null || $this->count->column === '*') {
@@ -59,7 +59,7 @@ public function distinct(): self
         return $this;
     }
 
-    /** @return self<TModelClass> */
+    /** @return self<T> */
     public function bind(mixed ...$bindings): self
     {
         $this->bindings = [...$this->bindings, ...$bindings];

packages/database/src/Builder/QueryBuilders/DeleteQueryBuilder.php

@@ -26,10 +26,11 @@ final class DeleteQueryBuilder implements BuildsQuery
 
     private ModelInspector $model;
 
-    public function __construct(
-        /** @var class-string<TModelClass>|string|TModelClass $model */
-        string|object $model,
-    ) {
+    /**
+     * @param class-string<TModelClass>|string|TModelClass $model
+     */
+    public function __construct(string|object $model)
+    {
         $this->model = model($model);
         $this->delete = new DeleteStatement($this->model->getTableDefinition());
     }

packages/database/src/Builder/QueryBuilders/InsertQueryBuilder.php

@@ -17,6 +17,10 @@
 
 use function Tempest\Database\model;
 
+/**
+ * @template T of object
+ * @implements \Tempest\Database\Builder\QueryBuilders\BuildsQuery<T>
+ */
 final class InsertQueryBuilder implements BuildsQuery
 {
     use HasConditions, OnDatabase;
@@ -29,8 +33,10 @@ final class InsertQueryBuilder implements BuildsQuery
 
     private ModelInspector $model;
 
+    /**
+     * @param class-string<T>|string|T $model
+     */
     public function __construct(
-        /** @var class-string|string $model */
         string|object $model,
         private readonly array $rows,
         private readonly SerializerFactory $serializerFactory,

packages/database/src/Builder/QueryBuilders/QueryBuilder.php

@@ -7,12 +7,21 @@
 use function Tempest\get;
 use function Tempest\Support\arr;
 
+/**
+ * @template T of object
+ */
 final readonly class QueryBuilder
 {
+    /**
+     * @param class-string<T>|string|T $model
+     */
     public function __construct(
         private string|object $model,
     ) {}
 
+    /**
+     * @return SelectQueryBuilder<T>
+     */
     public function select(string ...$columns): SelectQueryBuilder
     {
         return new SelectQueryBuilder(
@@ -21,6 +30,9 @@ public function select(string ...$columns): SelectQueryBuilder
         );
     }
 
+    /**
+     * @return InsertQueryBuilder<T>
+     */
     public function insert(mixed ...$values): InsertQueryBuilder
     {
         if (! array_is_list($values)) {
@@ -34,6 +46,9 @@ public function insert(mixed ...$values): InsertQueryBuilder
         );
     }
 
+    /**
+     * @return UpdateQueryBuilder<T>
+     */
     public function update(mixed ...$values): UpdateQueryBuilder
     {
         return new UpdateQueryBuilder(
@@ -43,11 +58,17 @@ public function update(mixed ...$values): UpdateQueryBuilder
         );
     }
 
+    /**
+     * @return DeleteQueryBuilder<T>
+     */
     public function delete(): DeleteQueryBuilder
     {
         return new DeleteQueryBuilder($this->model);
     }
 
+    /**
+     * @return CountQueryBuilder<T>
+     */
     public function count(?string $column = null): CountQueryBuilder
     {
         return new CountQueryBuilder(