fix(repository): hydrate enum columns instead of failing on read
Tests / PHP 8.4 (push) Failing after 4m31s
Tests / PHP 8.4 (push) Failing after 4m31s
Repository::castDatabaseValue() called TypeCaster::cast() with the enum's class name as the "type", so any row of a model declaring #[Enum] threw "Cannot assign string to property X of type Y" the moment it was read. Writes worked, which is why this survived 1.0.0: the select path is only exercised on read. castDatabaseValue() now delegates to TypeCaster::castEnum() when the property declares one, and keeps the null passthrough. Covered by EnumHydrationTest with a scalar value and a null.
This commit is contained in:
1 parent
a655a6f3ae
commit
4faad2c46e
3 files changed
+77
No files matched your search
@@ -329,6 +329,10 @@ final class Repository
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($definition->enumClass !== null) {
|
||||
return TypeCaster::castEnum($value, $definition->enumClass, true, $definition->name);
|
||||
}
|
||||
|
||||
return TypeCaster::cast($value, $definition->type, true, $definition->name);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Camelia\Orm\Tests\Fixture;
|
||||
|
||||
use Camelia\Orm\Attribute\AutoIncrement;
|
||||
use Camelia\Orm\Attribute\Enum;
|
||||
use Camelia\Orm\Attribute\PrimaryKey;
|
||||
use Camelia\Orm\Attribute\TableName;
|
||||
use Camelia\Orm\Model;
|
||||
|
||||
enum EstadoArticulo: string
|
||||
{
|
||||
case Borrador = 'borrador';
|
||||
case Publicado = 'publicado';
|
||||
}
|
||||
|
||||
#[TableName('articulos_estado')]
|
||||
final class ArticuloConEstado extends Model
|
||||
{
|
||||
#[PrimaryKey, AutoIncrement]
|
||||
public ?int $codigo = null;
|
||||
|
||||
public string $nombre = '';
|
||||
|
||||
#[Enum(EstadoArticulo::class)]
|
||||
public ?EstadoArticulo $estado = EstadoArticulo::Borrador;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Camelia\Orm\Tests\Unit;
|
||||
|
||||
use Camelia\Orm\Orm;
|
||||
use Camelia\Orm\Tests\Fixture\ArticuloConEstado;
|
||||
use Camelia\Orm\Tests\Fixture\EstadoArticulo;
|
||||
use Camelia\Orm\Tests\Support\FakeConnection;
|
||||
use PHPUnit\Framework\Attributes\Test;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
/**
|
||||
* Regression: reading a row whose model declares #[Enum] threw a TypeError because
|
||||
* Repository::castDatabaseValue() called TypeCaster::cast() instead of castEnum().
|
||||
*/
|
||||
final class EnumHydrationTest extends TestCase
|
||||
{
|
||||
#[Test]
|
||||
public function it_hydrates_an_enum_column_from_its_scalar_value(): void
|
||||
{
|
||||
$connection = new FakeConnection();
|
||||
$connection->rows = [['codigo' => '3', 'nombre' => 'Taladro', 'estado' => 'publicado']];
|
||||
|
||||
$models = Orm::fromConnection($connection)->repository(ArticuloConEstado::class)->find();
|
||||
|
||||
self::assertCount(1, $models);
|
||||
self::assertInstanceOf(ArticuloConEstado::class, $models[0]);
|
||||
self::assertSame(EstadoArticulo::Publicado, $models[0]->estado);
|
||||
}
|
||||
|
||||
#[Test]
|
||||
public function it_hydrates_a_nullable_enum_column_as_null(): void
|
||||
{
|
||||
$connection = new FakeConnection();
|
||||
$connection->rows = [['codigo' => '4', 'nombre' => 'Sierra', 'estado' => null]];
|
||||
|
||||
$models = Orm::fromConnection($connection)->repository(ArticuloConEstado::class)->find();
|
||||
|
||||
self::assertCount(1, $models);
|
||||
self::assertNull($models[0]->estado);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user