Skip to content

Commit 38b99e7

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 5778e38 + d783990 commit 38b99e7

File tree

6 files changed

+24
-23
lines changed

6 files changed

+24
-23
lines changed

src/Filament/Resources/UserResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static function form(Form $form): Form
6060
})
6161
->multiple()
6262
->preload()
63-
->searchable()
63+
->searchable(),
6464
]);
6565
}
6666

src/Providers/AdminPanelProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public function panel(Panel $panel): Panel
6666
])
6767
->topNavigation()
6868
->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
69-
->discoverResources(in: $package_src . 'Filament/Resources', for: 'Eclipse\\Core\\Filament\\Resources')
69+
->discoverResources(in: $package_src.'Filament/Resources', for: 'Eclipse\\Core\\Filament\\Resources')
7070
->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
71-
->discoverPages(in: $package_src . 'Filament/Pages', for: 'Eclipse\\Core\\Filament\\Pages')
71+
->discoverPages(in: $package_src.'Filament/Pages', for: 'Eclipse\\Core\\Filament\\Pages')
7272
->pages([
7373
Pages\Dashboard::class,
7474
])

tests/Feature/Console/Commands/ClearCommandTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
// TODO Fix mocking, does not work for some reason
99
// Set up the mock command
10-
// $this->partialMock(ClearCommand::class, function (\Mockery\MockInterface $mock) {
11-
// $mock->expects('call')->with('optimize:clear')->once();
12-
// $mock->expects('call')->with('filament:optimize-clear')->once();
13-
// });
14-
//
15-
// // Run the command
16-
// $this->artisan('eclipse:clear')
17-
// ->expectsOutput('Clearing caches...')
18-
// ->expectsOutput('Cache cleared!')
19-
// ->assertExitCode(0);
10+
// $this->partialMock(ClearCommand::class, function (\Mockery\MockInterface $mock) {
11+
// $mock->expects('call')->with('optimize:clear')->once();
12+
// $mock->expects('call')->with('filament:optimize-clear')->once();
13+
// });
14+
//
15+
// // Run the command
16+
// $this->artisan('eclipse:clear')
17+
// ->expectsOutput('Clearing caches...')
18+
// ->expectsOutput('Cache cleared!')
19+
// ->assertExitCode(0);
2020
});

tests/Feature/Console/Commands/DeployCommandTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
// TODO Fix mocking, does not work for some reason
66

77
// Set up the mock command
8-
// $this->partialMock(\Eclipse\Core\Console\Commands\DeployCommand::class, function (\Mockery\MockInterface $mock) {
9-
// $mock->expects('call')->with('optimize')->once();
10-
// $mock->expects('call')->with('filament:optimize')->once();
11-
// });
12-
//
13-
// $this->artisan('eclipse:deploy')
14-
// ->expectsOutput('Running deployment procedure...')
15-
// ->expectsOutput('Deployment procedure complete!')
16-
// ->assertExitCode(0);
8+
// $this->partialMock(\Eclipse\Core\Console\Commands\DeployCommand::class, function (\Mockery\MockInterface $mock) {
9+
// $mock->expects('call')->with('optimize')->once();
10+
// $mock->expects('call')->with('filament:optimize')->once();
11+
// });
12+
//
13+
// $this->artisan('eclipse:deploy')
14+
// ->expectsOutput('Running deployment procedure...')
15+
// ->expectsOutput('Deployment procedure complete!')
16+
// ->assertExitCode(0);
1717
});

tests/Feature/Filament/Resources/UserResourceTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Filament\Tables\Actions\DeleteAction;
88
use Filament\Tables\Actions\DeleteBulkAction;
99
use Illuminate\Support\Facades\Hash;
10+
1011
use function Pest\Livewire\livewire;
1112

1213
beforeEach(function () {

tests/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected function setUp(): void
2424

2525
$this->withoutVite();
2626

27-
require_once __DIR__ .'/../src/Helpers/helpers.php';
27+
require_once __DIR__.'/../src/Helpers/helpers.php';
2828
}
2929

3030
public function ignorePackageDiscoveriesFrom(): array

0 commit comments

Comments
 (0)