From 60c67ccd6884b80a6282ec99f42985b80ec52b74 Mon Sep 17 00:00:00 2001 From: Alexandr Chernyaev Date: Wed, 6 Nov 2024 23:17:54 +0300 Subject: [PATCH] Revert `testbench` conflict --- composer.json | 2 +- src/Screen/Concerns/Makeable.php | 5 +---- tests/Feature/Platform/SearchTest.php | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index a1afb129f8..c5c4d4b08a 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ }, "conflict": { "laravel/framework": "<10.48.8", - "orchestra/testbench-core": "<8.23.9 || (>9.0 <9.5.2)", + "orchestra/testbench-core": "<8.23.9", "nesbot/carbon": "<2.66.0" }, "autoload": { diff --git a/src/Screen/Concerns/Makeable.php b/src/Screen/Concerns/Makeable.php index 7e55067a7b..4a995516a3 100644 --- a/src/Screen/Concerns/Makeable.php +++ b/src/Screen/Concerns/Makeable.php @@ -8,11 +8,8 @@ trait Makeable { /** * Create a new Field element. - * - * - * @return static */ - public static function make(?string $name = null): self + public static function make(?string $name = null): static { return (new static)->name($name); } diff --git a/tests/Feature/Platform/SearchTest.php b/tests/Feature/Platform/SearchTest.php index fedc98a1ac..33d3e4ad58 100644 --- a/tests/Feature/Platform/SearchTest.php +++ b/tests/Feature/Platform/SearchTest.php @@ -4,14 +4,11 @@ namespace Orchid\Tests\Feature\Platform; -use Illuminate\Foundation\Testing\RefreshDatabase; use Orchid\Tests\App\SearchUser; use Orchid\Tests\TestFeatureCase; class SearchTest extends TestFeatureCase { - use RefreshDatabase; - public function testSearchCompactNotRecords(): void { $this