From 1140d9c75bdc67e2bf4d950f8db49c56ec7c1a28 Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Fri, 13 Dec 2024 21:00:42 +0400 Subject: [PATCH] Fix failing tests --- composer.json | 9 +++++---- .../Driver/Common/Inheritance/JoinedTableTestCase.php | 2 +- .../Driver/Common/Inheritance/SingleTableTestCase.php | 1 + .../Functional/Driver/Common/InheritanceTestCase.php | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 9238416..b40a043 100644 --- a/composer.json +++ b/composer.json @@ -38,8 +38,8 @@ ], "require": { "php": ">=8.1", - "cycle/orm": "^2.7", - "cycle/schema-builder": "^2.8", + "cycle/orm": "^2.9.1", + "cycle/schema-builder": "^2.11.1", "spiral/attributes": "^2.8|^3.0", "spiral/tokenizer": "^2.8|^3.0", "doctrine/inflector": "^2.0" @@ -47,8 +47,9 @@ "require-dev": { "doctrine/annotations": "^1.14.3 || ^2.0.1", "phpunit/phpunit": "^10.1", - "vimeo/psalm": "^5.11", - "spiral/code-style": "^2.2" + "vimeo/psalm": "^5.26", + "spiral/code-style": "^2.2", + "spiral/dumper": "^3.3" }, "autoload": { "psr-4": { diff --git a/tests/Annotated/Functional/Driver/Common/Inheritance/JoinedTableTestCase.php b/tests/Annotated/Functional/Driver/Common/Inheritance/JoinedTableTestCase.php index 32c6046..83d6bfd 100644 --- a/tests/Annotated/Functional/Driver/Common/Inheritance/JoinedTableTestCase.php +++ b/tests/Annotated/Functional/Driver/Common/Inheritance/JoinedTableTestCase.php @@ -136,7 +136,7 @@ public function testJtiParentColumns(ReaderInterface $reader): void $this->assertArrayHasKey(SchemaInterface::COLUMNS, $schema['person']); // assert that parent doesn't have jti columns - $this->assertSame([ + $this->assertEquals([ 'id' => 'id', 'name' => 'name', 'type' => 'type', diff --git a/tests/Annotated/Functional/Driver/Common/Inheritance/SingleTableTestCase.php b/tests/Annotated/Functional/Driver/Common/Inheritance/SingleTableTestCase.php index ba325eb..a06b543 100644 --- a/tests/Annotated/Functional/Driver/Common/Inheritance/SingleTableTestCase.php +++ b/tests/Annotated/Functional/Driver/Common/Inheritance/SingleTableTestCase.php @@ -318,6 +318,7 @@ public function testSingleTableInheritanceWithDifferentColumnDeclaration( SchemaInterface::SCOPE => null, SchemaInterface::TYPECAST => [ 'id' => 'int', + 'body' => 'string', ], SchemaInterface::SCHEMA => [], SchemaInterface::TYPECAST_HANDLER => null, diff --git a/tests/Annotated/Functional/Driver/Common/InheritanceTestCase.php b/tests/Annotated/Functional/Driver/Common/InheritanceTestCase.php index 134fded..83d1803 100644 --- a/tests/Annotated/Functional/Driver/Common/InheritanceTestCase.php +++ b/tests/Annotated/Functional/Driver/Common/InheritanceTestCase.php @@ -125,7 +125,7 @@ public function testTableInheritance(ReaderInterface $reader): void $this->assertEmpty($schema['beaver'][SchemaInterface::PARENT_KEY] ?? null); $this->assertEmpty($schema['beaver'][SchemaInterface::CHILDREN] ?? null); $this->assertSame('beavers', $schema['beaver'][SchemaInterface::TABLE]); - $this->assertSame([ + $this->assertEquals([ 'teethAmount' => 'teeth_amount', 'foo_id' => 'id', 'name' => 'name',