From 69c66d1e7f8fdfb83d890a58f5694faa4e67bd28 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Fri, 24 Nov 2023 09:19:34 +0100 Subject: [PATCH 1/2] Fix MariaDB Tests with changed query --- tests/Integration/Database/SchemaBuilderTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/Integration/Database/SchemaBuilderTest.php b/tests/Integration/Database/SchemaBuilderTest.php index 0a13f5812b18..f736f493a916 100644 --- a/tests/Integration/Database/SchemaBuilderTest.php +++ b/tests/Integration/Database/SchemaBuilderTest.php @@ -132,9 +132,10 @@ public function testChangeTextColumnToTextColumn() $uppercase = strtoupper($type); - $expected = ["ALTER TABLE test CHANGE test_column test_column $uppercase NOT NULL"]; - - $this->assertEquals($expected, $queries); + $this->assertContains($queries, [ + ["ALTER TABLE test CHANGE test_column test_column $uppercase NOT NULL"], // MySQL + ["ALTER TABLE test CHANGE test_column test_column $uppercase NOT NULL COLLATE `utf8mb4_uca1400_ai_ci`"], // MariaDB + ]); } } } From ac05660c7e93ecaa3be60f3229e539c4671c4d9f Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Fri, 24 Nov 2023 09:26:53 +0100 Subject: [PATCH 2/2] Fix Testbench version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 439d904e1aa3..a0b7ac8a0e7d 100644 --- a/composer.json +++ b/composer.json @@ -105,7 +105,7 @@ "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", "nyholm/psr7": "^1.2", - "orchestra/testbench-core": "^9.0", + "orchestra/testbench-core": "dev-next/slim-skeleton", "pda/pheanstalk": "^4.0", "phpstan/phpstan": "^1.4.7", "phpunit/phpunit": "^10.1",