From 0e756e45c7c307a720a61b385847ff17f8b7325f Mon Sep 17 00:00:00 2001 From: Dario Garcia Date: Sun, 15 Nov 2026 10:58:11 -0300 Subject: [PATCH] refactor!: require PHP 8.4 Drop support for PHP 8.3 and lower. The package now declares >=8.4, and CI runs only on 8.4. - composer.json: require php >=8.4. - mago.toml: php-version = "8.4", matching the minimum supported version. - phpstan.neon: phpVersion 80400. - Upgrade phpstan/phpstan to ^2.3: 1.x cannot parse `new Foo()->bar()`, which the 8.4 formatter now emits. - Fix the type errors PHPStan 2 reports: class-string variance, optional array offsets in fromEnvironment, list vs array for PdoConnection::$lru, ReflectionClass docblocks, Repository made covariant in T, and a redundant null comparison in validateRelationPath. - CI: single PHP 8.4 job using the php:8.4-cli container instead of setup-php, which failed with a TLS handshake timeout on the runner. BREAKING CHANGE: PHP 8.4 is now required. --- .gitea/workflows/tests.yml | 22 ++++------------- AGENTS.md | 10 ++++---- README.md | 8 +++---- composer.json | 4 ++-- composer.lock | 25 ++++++++++++++------ mago.toml | 5 ++-- phpstan.neon | 5 ++-- src/Connection/ConnectionFactory.php | 1 + src/Connection/PdoConnection.php | 2 +- src/Metadata/MetadataFactory.php | 6 ++--- src/Model.php | 12 +++------- src/Orm.php | 9 ++++--- src/Persistence/Persister.php | 5 +--- src/Query/QueryBuilder.php | 6 ++--- src/Repository.php | 14 ++++------- tests/Unit/Metadata/MetadataFactoryTest.php | 24 +++++++++---------- tests/Unit/ModelTest.php | 26 ++++++++++----------- tests/Unit/PersisterTest.php | 14 +++++------ tests/Unit/Query/CriteriaCompilerTest.php | 2 +- tests/Unit/Query/QueryBuilderTest.php | 4 ++-- 20 files changed, 97 insertions(+), 107 deletions(-) diff --git a/.gitea/workflows/tests.yml b/.gitea/workflows/tests.yml index 8002514..ef5e66d 100644 --- a/.gitea/workflows/tests.yml +++ b/.gitea/workflows/tests.yml @@ -6,40 +6,28 @@ on: pull_request: branches: [main] +# The PHP version comes from the job container image instead of shivammathur/setup-php: +# the runner in this Gitea instance reaches github.com intermittently and setup-php +# failed with "TLS handshake timeout". Fewer external actions, fewer failure modes. jobs: check: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - php: ['8.3', '8.4'] - - name: PHP ${{ matrix.php }} - - # The PHP version comes from the job container image instead of shivammathur/setup-php: - # the runner in this Gitea instance reaches github.com intermittently and setup-php - # failed with "TLS handshake timeout". Fewer external actions, fewer failure modes. - container: php:${{ matrix.php }}-cli - + name: PHP 8.4 + container: php:8.4-cli steps: - name: Install system packages run: | apt-get update -qq apt-get install -y -qq --no-install-recommends git unzip libonig-dev libxml2-dev > /dev/null docker-php-ext-install -j"$(nproc)" mbstring pdo pdo_mysql > /dev/null - - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Install Composer run: | curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --quiet - composer --version - - name: Install dependencies run: composer update --prefer-dist --no-interaction --no-progress - - name: Run gate run: composer check diff --git a/AGENTS.md b/AGENTS.md index 34efc07..1444631 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -26,8 +26,8 @@ Si tu memoria sugiere alguno de esos nombres, está obsoleta. ## Entorno local -- PHP: `C:\php8.4\php.exe` (8.4.19). La librería declara `>=8.2`, así que **no** uses sintaxis de - 8.3/8.4 (y por eso `(new Foo())->bar()` conserva los paréntesis). +- PHP: `C:\php8.4\php.exe` (8.4.19). La librería declara `>=8.4`, así que toda la sintaxis de 8.4 + está disponible y el formatter puede emitir `new Foo()->bar()`. - `declare(strict_types=1)` en todo archivo. - Sin `.env` ni base configurada. Los tests unitarios usan `FakeConnection`; la integración requiere `CAMELIA_TEST_DSN` y se **salta** si falta. @@ -44,8 +44,10 @@ Nunca mergees con uno en rojo. Orden obligatorio. `mago.toml` configura formatter, linter y analyzer. Notas que ahorran tiempo: -- **`php-version = "8.2"` en `mago.toml` es obligatorio.** Si se sube a 8.4, `mago fmt` reescribe - `(new X())->m()` como `new X()->m()`, que rompe el soporte declarado de 8.2. +- **`php-version = "8.4"` en `mago.toml` debe coincidir con el mínimo declarado.** El paquete + promete `>=8.4`, así que `mago fmt` puede emitir `new X()->m()`. Si el soporte mínimo bajara, + `php-version` tendría que bajar con él: con 8.4 el formatter elimina los paréntesis de + `(new X())->m()`, sintaxis que no parsea en 8.3 ni inferiores. - `mago analyze` excluye `tests/`: no carga el autoloader de Composer, así que reportaría `PHPUnit\Framework\TestCase` como clase inexistente. PHPStan sí cubre los tests. - `mago-baseline.toml` acepta los hallazgos de `mixed` inherentes a valores que vienen de PDO. diff --git a/README.md b/README.md index 10b81c0..0b3bab0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Lightweight attribute-mapped Active Record ORM for MariaDB/MySQL over PDO. - **Package:** `camelia/orm` · **Namespace:** `Camelia\Orm` -- **PHP** `>=8.3`, extensions `pdo_mysql` and `mbstring` +- **PHP** `>=8.4`, extensions `pdo_mysql` and `mbstring` - **Runtime dependencies:** `psr/log` (PSR-3, optional usage). `brick/math` is a suggestion for `BigDecimal` properties. @@ -140,12 +140,12 @@ Configuration: |---|---| | `mago.toml` | formatter, linter, analyzer | | `mago-baseline.toml` | accepted analyzer findings (values coming from PDO) | -| `phpstan.neon` | level 8, `phpVersion: 80300` | +| `phpstan.neon` | level 8, `phpVersion: 80400` | | `phpunit.xml.dist` | unit suite | | `phpunit.integration.xml.dist` | integration suite, skipped without `CAMELIA_TEST_DSN` | -`mago.toml` pins `php-version = "8.3"`. Do not raise it to 8.4: with 8.4 the formatter emits -`new Foo()->bar()`, which the package cannot ship because it promises PHP 8.3 support. +`mago.toml` pins `php-version = "8.4"`, matching the minimum supported version, so `mago fmt` and +the runtime agree on which syntax the package may ship. ## License diff --git a/composer.json b/composer.json index 87feb20..d308561 100644 --- a/composer.json +++ b/composer.json @@ -11,14 +11,14 @@ } ], "require": { - "php": ">=8.3", + "php": ">=8.4", "ext-mbstring": "*", "ext-pdo": "*", "psr/log": "^3.0" }, "require-dev": { "carthage-software/mago": "^1.60", - "phpstan/phpstan": "^1.11", + "phpstan/phpstan": "2.3", "phpunit/phpunit": "^10.5 || ^11.0" }, "suggest": { diff --git a/composer.lock b/composer.lock index fae0311..feafc6d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "995f47882c4069e4904f4637e3219078", + "content-hash": "d7369cefc9ff778b213f99238b1f8f2d", "packages": [ { "name": "psr/log", @@ -359,15 +359,15 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.34", + "version": "2.3.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4dd89ca7aa30fdc6760be21550d583bcc32e8476", - "reference": "4dd89ca7aa30fdc6760be21550d583bcc32e8476", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b1f9890d9af53a25c58129e78f0aadd31f90d7f4", + "reference": "b1f9890d9af53a25c58129e78f0aadd31f90d7f4", "shasum": "" }, "require": { - "php": "^7.2|^8.0" + "php": "^7.4|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -386,6 +386,17 @@ "license": [ "MIT" ], + "authors": [ + { + "name": "Ondřej Mirtes" + }, + { + "name": "Markus Staab" + }, + { + "name": "Vincent Langlet" + } + ], "description": "PHPStan - PHP Static Analysis Tool", "keywords": [ "dev", @@ -408,7 +419,7 @@ "type": "github" } ], - "time": "2026-07-28T10:04:39+00:00" + "time": "2026-10-06T06:15:36+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2018,7 +2029,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=8.3", + "php": ">=8.4", "ext-mbstring": "*", "ext-pdo": "*" }, diff --git a/mago.toml b/mago.toml index c72b3ea..ffc14bf 100644 --- a/mago.toml +++ b/mago.toml @@ -1,9 +1,8 @@ # Mago toolchain configuration — camelia/orm # Docs: https://mago.carthage.software -# The library promises PHP >= 8.3. Pinning the parser to 8.3 keeps the formatter from emitting -# syntax the package cannot ship (for example `new Foo()->bar()`, which needs 8.4). -php-version = "8.3" +# The library promises PHP >= 8.4. +php-version = "8.4" [source] paths = ["src", "tests"] diff --git a/phpstan.neon b/phpstan.neon index 301f186..25b234e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,8 +1,7 @@ parameters: level: 8 - # The library promises PHP >= 8.3, so analysis targets the oldest supported version. - # This is why `(new Foo())->bar()` keeps its parentheses: `new Foo()->bar()` only parses on 8.4+. - phpVersion: 80300 + # The library promises PHP >= 8.4, so analysis targets the only supported version. + phpVersion: 80400 paths: - src - tests diff --git a/src/Connection/ConnectionFactory.php b/src/Connection/ConnectionFactory.php index ba9f778..642b466 100644 --- a/src/Connection/ConnectionFactory.php +++ b/src/Connection/ConnectionFactory.php @@ -68,6 +68,7 @@ final class ConnectionFactory public static function fromEnvironment(): Connection { + /** @var array $values */ $values = []; $missing = []; diff --git a/src/Connection/PdoConnection.php b/src/Connection/PdoConnection.php index 8b7835c..40e51eb 100644 --- a/src/Connection/PdoConnection.php +++ b/src/Connection/PdoConnection.php @@ -23,7 +23,7 @@ final class PdoConnection implements Connection /** @var array */ private array $statements = []; - /** @var list LRU order, most recent last */ + /** @var array LRU order, most recent last; reindexed after eviction */ private array $lru = []; /** @var list savepoint names for nested transactions */ diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php index 600d5ea..74fac32 100644 --- a/src/Metadata/MetadataFactory.php +++ b/src/Metadata/MetadataFactory.php @@ -113,7 +113,7 @@ final class MetadataFactory /** * @param class-string<\Camelia\Orm\Model> $class - * @param ReflectionClass $reflection + * @param ReflectionClass<\Camelia\Orm\Model> $reflection */ private function buildProperty( string $class, @@ -169,7 +169,7 @@ final class MetadataFactory /** * @param class-string<\Camelia\Orm\Model> $class - * @param ReflectionClass $reflection + * @param ReflectionClass<\Camelia\Orm\Model> $reflection */ private function buildRelation( string $class, @@ -238,7 +238,7 @@ final class MetadataFactory /** * @param class-string<\Camelia\Orm\Model> $class - * @param ReflectionClass $reflection + * @param ReflectionClass<\Camelia\Orm\Model> $reflection * @return class-string<\Camelia\Orm\Model> */ private function resolveRelatedClass( diff --git a/src/Model.php b/src/Model.php index 8c9c934..2c7fee5 100644 --- a/src/Model.php +++ b/src/Model.php @@ -56,10 +56,7 @@ abstract class Model public static function metadata(): ClassMetadata { - /** @var class-string<\Camelia\Orm\Model> $class */ - $class = static::class; - - return self::metadataFor($class); + return self::metadataFor(static::class); } /** @@ -193,7 +190,7 @@ abstract class Model */ public function validate(): array { - return (new Validator())->validate($this); + return new Validator()->validate($this); } public function isValid(): bool @@ -286,10 +283,7 @@ abstract class Model $errors = $this->validate(); if ($errors !== []) { - /** @var class-string<\Camelia\Orm\Model> $class */ - $class = static::class; - - throw new ValidationException($errors, $class); + throw new ValidationException($errors, static::class); } } diff --git a/src/Orm.php b/src/Orm.php index 431d916..7017fdf 100644 --- a/src/Orm.php +++ b/src/Orm.php @@ -82,14 +82,17 @@ final class Orm */ public function repository(string $class): Repository { - /** @var Repository $repository */ - $repository = - $this->repositories[$class] ??= new Repository( + if (!isset($this->repositories[$class])) { + $this->repositories[$class] = new Repository( $this->connection, $class, $this->dialect, $this->persister(), ); + } + + /** @var Repository $repository */ + $repository = $this->repositories[$class]; return $repository; } diff --git a/src/Persistence/Persister.php b/src/Persistence/Persister.php index 9647bbf..6ffff9b 100644 --- a/src/Persistence/Persister.php +++ b/src/Persistence/Persister.php @@ -303,10 +303,7 @@ final class Persister private function assertNotPartial(Model $model, string $operation): void { if ($model->isPartial()) { - /** @var class-string<\Camelia\Orm\Model> $class */ - $class = $model::class; - - throw PartialModelException::onWrite($class, $operation); + throw PartialModelException::onWrite($model::class, $operation); } } } diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php index 43679db..f190410 100644 --- a/src/Query/QueryBuilder.php +++ b/src/Query/QueryBuilder.php @@ -35,7 +35,7 @@ final class QueryBuilder $table = $this->dialect->quoteIdentifier($metadata->table()); $list = $this->compileSelectList($metadata, $columns); - [$where, $params] = (new CriteriaCompiler($this->dialect))->compile($metadata, $criteria); + [$where, $params] = new CriteriaCompiler($this->dialect)->compile($metadata, $criteria); $sql = 'SELECT ' . $list . ' FROM ' . $table; @@ -56,7 +56,7 @@ final class QueryBuilder public function count(ClassMetadata $metadata, array $criteria): array { $table = $this->dialect->quoteIdentifier($metadata->table()); - [$where, $params] = (new CriteriaCompiler($this->dialect))->compile($metadata, $criteria); + [$where, $params] = new CriteriaCompiler($this->dialect)->compile($metadata, $criteria); $sql = 'SELECT COUNT(*) AS aggregate FROM ' . $table; @@ -89,7 +89,7 @@ final class QueryBuilder $quoted = $this->dialect->quoteIdentifier($metadata->propertyMetadata($property)->column); $table = $this->dialect->quoteIdentifier($metadata->table()); - [$where, $params] = (new CriteriaCompiler($this->dialect))->compile($metadata, $criteria); + [$where, $params] = new CriteriaCompiler($this->dialect)->compile($metadata, $criteria); $sql = 'SELECT ' . $function . '(' . $quoted . ') AS aggregate FROM ' . $table; diff --git a/src/Repository.php b/src/Repository.php index f521aaa..acf5101 100644 --- a/src/Repository.php +++ b/src/Repository.php @@ -25,7 +25,7 @@ use Camelia\Orm\Support\TypeCaster; * Public read and write API for one model class. * * @api - * @template T of Model + * @template-covariant T of Model */ final class Repository { @@ -34,7 +34,7 @@ final class Repository private readonly QueryBuilder $builder; /** - * @param class-string $class + * @param class-string $class Not a field of the covariant template; kept for IDE inference. */ public function __construct( private readonly Connection $connection, @@ -726,7 +726,9 @@ final class Repository throw ConfigurationException::relationDepthExceeded(self::MAX_RELATION_DEPTH); } - if (!$metadata->hasProperty($name) || $metadata->properties()[$name]->relation === null) { + $relation = $metadata->hasProperty($name) ? $metadata->properties()[$name]->relation : null; + + if ($relation === null) { throw MetadataException::unknownRelation($metadata->class, $name); } @@ -734,12 +736,6 @@ final class Repository return; } - $relation = $metadata->properties()[$name]->relation; - - if ($relation === null) { - return; - } - $next = $this->relatedRepository($relation->relatedClass)->metadata(); foreach ($nested as $key => $value) { diff --git a/tests/Unit/Metadata/MetadataFactoryTest.php b/tests/Unit/Metadata/MetadataFactoryTest.php index 8a7bb72..1d1ae7e 100644 --- a/tests/Unit/Metadata/MetadataFactoryTest.php +++ b/tests/Unit/Metadata/MetadataFactoryTest.php @@ -23,7 +23,7 @@ final class MetadataFactoryTest extends TestCase #[Test] public function it_reads_table_and_primary_key(): void { - $metadata = (new MetadataFactory())->forClass(Usuario::class); + $metadata = new MetadataFactory()->forClass(Usuario::class); self::assertSame('usuarios', $metadata->table()); self::assertSame('codigo', $metadata->primaryKey()); @@ -33,7 +33,7 @@ final class MetadataFactoryTest extends TestCase #[Test] public function it_converts_property_names_to_columns(): void { - $metadata = (new MetadataFactory())->forClass(Usuario::class); + $metadata = new MetadataFactory()->forClass(Usuario::class); self::assertSame('password_hash', $metadata->column('passwordHash')); self::assertSame('passwordHash', $metadata->property('password_hash')); @@ -43,7 +43,7 @@ final class MetadataFactoryTest extends TestCase #[Test] public function it_honours_an_explicit_column_name(): void { - $metadata = (new MetadataFactory())->forClass(Factura::class); + $metadata = new MetadataFactory()->forClass(Factura::class); self::assertSame('importe_total', $metadata->column('total')); } @@ -51,7 +51,7 @@ final class MetadataFactoryTest extends TestCase #[Test] public function it_excludes_relations_from_writable_columns(): void { - $metadata = (new MetadataFactory())->forClass(Factura::class); + $metadata = new MetadataFactory()->forClass(Factura::class); self::assertSame(['usuarioCodigo', 'total'], $metadata->writable()); self::assertCount(2, $metadata->relations()); @@ -60,7 +60,7 @@ final class MetadataFactoryTest extends TestCase #[Test] public function it_resolves_belongs_to_metadata(): void { - $metadata = (new MetadataFactory())->forClass(Factura::class); + $metadata = new MetadataFactory()->forClass(Factura::class); $relation = $metadata->properties()['usuario']->relation; self::assertNotNull($relation); @@ -72,7 +72,7 @@ final class MetadataFactoryTest extends TestCase #[Test] public function it_resolves_belongs_to_many_pivot_metadata(): void { - $metadata = (new MetadataFactory())->forClass(Articulo::class); + $metadata = new MetadataFactory()->forClass(Articulo::class); $relation = $metadata->properties()['etiquetas']->relation; self::assertNotNull($relation); @@ -89,7 +89,7 @@ final class MetadataFactoryTest extends TestCase $this->expectException(MetadataException::class); $this->expectExceptionMessage('[M2]'); - (new MetadataFactory())->forClass(SinTableName::class); + new MetadataFactory()->forClass(SinTableName::class); } #[Test] @@ -98,7 +98,7 @@ final class MetadataFactoryTest extends TestCase $this->expectException(MetadataException::class); $this->expectExceptionMessage('[M3]'); - (new MetadataFactory())->forClass(SinPrimaryKey::class); + new MetadataFactory()->forClass(SinPrimaryKey::class); } #[Test] @@ -107,7 +107,7 @@ final class MetadataFactoryTest extends TestCase $this->expectException(MetadataException::class); $this->expectExceptionMessage('[M3]'); - (new MetadataFactory())->forClass(DosPrimaryKeys::class); + new MetadataFactory()->forClass(DosPrimaryKeys::class); } #[Test] @@ -116,7 +116,7 @@ final class MetadataFactoryTest extends TestCase $this->expectException(MetadataException::class); $this->expectExceptionMessage('[M4]'); - (new MetadataFactory())->forClass(SinTipo::class); + new MetadataFactory()->forClass(SinTipo::class); } #[Test] @@ -125,7 +125,7 @@ final class MetadataFactoryTest extends TestCase $this->expectException(MetadataException::class); $this->expectExceptionMessage('[M7]'); - (new MetadataFactory())->forClass(ColumnaDuplicada::class); + new MetadataFactory()->forClass(ColumnaDuplicada::class); } #[Test] @@ -134,6 +134,6 @@ final class MetadataFactoryTest extends TestCase $this->expectException(MetadataException::class); $this->expectExceptionMessage('[M5]'); - (new MetadataFactory())->forClass(RelacionNoNulable::class); + new MetadataFactory()->forClass(RelacionNoNulable::class); } } diff --git a/tests/Unit/ModelTest.php b/tests/Unit/ModelTest.php index b1f4fc1..703632c 100644 --- a/tests/Unit/ModelTest.php +++ b/tests/Unit/ModelTest.php @@ -33,7 +33,7 @@ final class ModelTest extends TestCase #[Test] public function it_hydrates_by_property_name(): void { - $usuario = (new Usuario())->hydrate(['nombre' => 'Ana', 'activo' => false]); + $usuario = new Usuario()->hydrate(['nombre' => 'Ana', 'activo' => false]); self::assertSame('Ana', $usuario->nombre); self::assertFalse($usuario->activo); @@ -42,7 +42,7 @@ final class ModelTest extends TestCase #[Test] public function it_hydrates_by_column_name(): void { - $factura = (new Factura())->hydrate(['importe_total' => '12.5']); + $factura = new Factura()->hydrate(['importe_total' => '12.5']); self::assertSame(12.5, $factura->total); } @@ -50,7 +50,7 @@ final class ModelTest extends TestCase #[Test] public function it_prefers_the_property_when_both_forms_are_present(): void { - $factura = (new Factura())->hydrate(['total' => 1.0, 'importe_total' => 2.0]); + $factura = new Factura()->hydrate(['total' => 1.0, 'importe_total' => 2.0]); self::assertSame(1.0, $factura->total); } @@ -58,7 +58,7 @@ final class ModelTest extends TestCase #[Test] public function it_skips_guarded_properties(): void { - $usuario = (new Usuario())->hydrate(['passwordHash' => 'secreto']); + $usuario = new Usuario()->hydrate(['passwordHash' => 'secreto']); self::assertSame('', $usuario->passwordHash); } @@ -68,13 +68,13 @@ final class ModelTest extends TestCase { $this->expectException(\InvalidArgumentException::class); - (new Usuario())->hydrateStrict(['passwordHash' => 'secreto']); + new Usuario()->hydrateStrict(['passwordHash' => 'secreto']); } #[Test] public function it_ignores_unknown_keys(): void { - $usuario = (new Usuario())->hydrate(['inexistente' => 1, 'nombre' => 'Ana']); + $usuario = new Usuario()->hydrate(['inexistente' => 1, 'nombre' => 'Ana']); self::assertSame('Ana', $usuario->nombre); } @@ -82,7 +82,7 @@ final class ModelTest extends TestCase #[Test] public function it_never_hydrates_the_primary_key(): void { - $usuario = (new Usuario())->hydrate(['codigo' => 99]); + $usuario = new Usuario()->hydrate(['codigo' => 99]); self::assertNull($usuario->codigo); } @@ -92,13 +92,13 @@ final class ModelTest extends TestCase { $this->expectException(\InvalidArgumentException::class); - (new Usuario())->hydrate(['activo' => 'no-es-bool']); + new Usuario()->hydrate(['activo' => 'no-es-bool']); } #[Test] public function it_serializes_writable_columns_by_column_name(): void { - $usuario = (new Usuario())->hydrate(['nombre' => 'Ana']); + $usuario = new Usuario()->hydrate(['nombre' => 'Ana']); $array = $usuario->toArray(); self::assertSame('Ana', $array['nombre']); @@ -109,7 +109,7 @@ final class ModelTest extends TestCase #[Test] public function it_serializes_json(): void { - $json = (new Usuario())->hydrate(['nombre' => 'Ana'])->toJson(); + $json = new Usuario()->hydrate(['nombre' => 'Ana'])->toJson(); $decoded = json_decode($json, true); self::assertIsArray($decoded); @@ -129,7 +129,7 @@ final class ModelTest extends TestCase #[Test] public function it_reports_a_too_long_value(): void { - $usuario = (new Usuario())->hydrate(['clave' => 'supercalifragilistico']); + $usuario = new Usuario()->hydrate(['clave' => 'supercalifragilistico']); self::assertStringContainsString('10', $usuario->validate()['clave'][0]); } @@ -137,7 +137,7 @@ final class ModelTest extends TestCase #[Test] public function it_is_valid_when_no_rule_fails(): void { - $usuario = (new Usuario())->hydrate(['clave' => 'abc']); + $usuario = new Usuario()->hydrate(['clave' => 'abc']); self::assertTrue($usuario->isValid()); } @@ -145,7 +145,7 @@ final class ModelTest extends TestCase #[Test] public function it_replicates_without_the_primary_key(): void { - $usuario = (new Usuario())->hydrate(['nombre' => 'Ana']); + $usuario = new Usuario()->hydrate(['nombre' => 'Ana']); $usuario->codigo = 5; $copy = $usuario->replicate(); diff --git a/tests/Unit/PersisterTest.php b/tests/Unit/PersisterTest.php index ca1128f..eb53d86 100644 --- a/tests/Unit/PersisterTest.php +++ b/tests/Unit/PersisterTest.php @@ -31,7 +31,7 @@ final class PersisterTest extends TestCase public function it_inserts_and_assigns_the_generated_key(): void { $this->connection->lastInsertId = '42'; - $usuario = (new Usuario())->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); + $usuario = new Usuario()->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); $key = $this->persister->insert($usuario); @@ -44,7 +44,7 @@ final class PersisterTest extends TestCase public function it_only_writes_writable_columns(): void { $this->connection->lastInsertId = '1'; - $usuario = (new Usuario())->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); + $usuario = new Usuario()->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); $this->persister->insert($usuario); @@ -57,7 +57,7 @@ final class PersisterTest extends TestCase #[Test] public function it_saves_as_update_when_the_key_is_present(): void { - $usuario = (new Usuario())->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); + $usuario = new Usuario()->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); $usuario->codigo = 9; $this->persister->save($usuario); @@ -69,7 +69,7 @@ final class PersisterTest extends TestCase public function it_saves_as_insert_when_the_key_is_absent(): void { $this->connection->lastInsertId = '3'; - $usuario = (new Usuario())->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); + $usuario = new Usuario()->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); $this->persister->save($usuario); @@ -81,13 +81,13 @@ final class PersisterTest extends TestCase { $this->expectException(ValidationException::class); - $this->persister->insert((new Usuario())->hydrate(['nombre' => 'Ana'])); + $this->persister->insert(new Usuario()->hydrate(['nombre' => 'Ana'])); } #[Test] public function it_refuses_to_write_a_partial_model(): void { - $usuario = (new Usuario())->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); + $usuario = new Usuario()->hydrate(['nombre' => 'Ana', 'clave' => 'abc']); $usuario->codigo = 1; $usuario->markPartial(); @@ -149,7 +149,7 @@ final class PersisterTest extends TestCase $listener, ); - $persister->insert((new Usuario())->hydrate(['nombre' => 'Ana', 'clave' => 'abc'])); + $persister->insert(new Usuario()->hydrate(['nombre' => 'Ana', 'clave' => 'abc'])); self::assertSame([['action' => 'insert', 'pk' => 7]], $listener->calls); } diff --git a/tests/Unit/Query/CriteriaCompilerTest.php b/tests/Unit/Query/CriteriaCompilerTest.php index cedb0e6..0f7e9c1 100644 --- a/tests/Unit/Query/CriteriaCompilerTest.php +++ b/tests/Unit/Query/CriteriaCompilerTest.php @@ -143,6 +143,6 @@ final class CriteriaCompilerTest extends TestCase private function metadata(): \Camelia\Orm\Metadata\ClassMetadata { - return (new MetadataFactory())->forClass(Usuario::class); + return new MetadataFactory()->forClass(Usuario::class); } } diff --git a/tests/Unit/Query/QueryBuilderTest.php b/tests/Unit/Query/QueryBuilderTest.php index a18789f..d47a8b1 100644 --- a/tests/Unit/Query/QueryBuilderTest.php +++ b/tests/Unit/Query/QueryBuilderTest.php @@ -23,7 +23,7 @@ final class QueryBuilderTest extends TestCase protected function setUp(): void { $this->builder = new QueryBuilder(new MySqlDialect()); - $this->usuarios = (new MetadataFactory())->forClass(Usuario::class); + $this->usuarios = new MetadataFactory()->forClass(Usuario::class); } #[Test] @@ -42,7 +42,7 @@ final class QueryBuilderTest extends TestCase #[Test] public function it_excludes_relations_from_the_select_list(): void { - $metadata = (new MetadataFactory())->forClass(Factura::class); + $metadata = new MetadataFactory()->forClass(Factura::class); $compiled = $this->builder->select($metadata, []); self::assertStringNotContainsString('`usuario`', $compiled['sql']);