Skip to content

Commit

Permalink
Revert testbench conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
tabuna committed Nov 6, 2024
1 parent e0e0659 commit 60c67cc
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
5 changes: 1 addition & 4 deletions src/Screen/Concerns/Makeable.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 0 additions & 3 deletions tests/Feature/Platform/SearchTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 60c67cc

Please sign in to comment.