Skip to content

Commit 47caebb

Browse files
committed
removed dependency to Illuminate\Request and modified tests| configured install command
1 parent 823d39f commit 47caebb

File tree

6 files changed

+131
-98
lines changed

6 files changed

+131
-98
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
namespace App\Providers;
4+
5+
use HamidRrj\LaravelDatatable\Facades\Datatable;
6+
use Illuminate\Support\ServiceProvider;
7+
8+
class DatatableServiceProvider extends ServiceProvider
9+
{
10+
/**
11+
* Register services.
12+
*/
13+
public function register(): void
14+
{
15+
$this->app->bind('datatable', function () {
16+
return new Datatable();
17+
});
18+
}
19+
20+
/**
21+
* Bootstrap services.
22+
*/
23+
public function boot(): void
24+
{
25+
}
26+
}

src/DatatableInput.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public function getFilters(): array
3636

3737
foreach ($this->filters as $filter) {
3838
$filters[] = new Filter(
39-
$filter->id,
40-
$filter->value,
41-
$filter->fn,
42-
$filter->datatype,
39+
$filter['id'],
40+
$filter['value'],
41+
$filter['fn'],
42+
$filter['datatype'],
4343
$this->allowedFilters
4444
);
4545
}
@@ -50,7 +50,7 @@ public function getFilters(): array
5050
public function getSorting(): ?Sort
5151
{
5252
return ! empty($this->sorting) ?
53-
new Sort($this->sorting[0]->id, $this->sorting[0]->desc, $this->allowedSortings) : null;
53+
new Sort($this->sorting[0]['id'], $this->sorting[0]['desc'], $this->allowedSortings) : null;
5454
}
5555

5656
public function getRelations(): array

src/DatatableServiceProvider.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace HamidRrj\LaravelDatatable;
44

5+
use Spatie\LaravelPackageTools\Commands\InstallCommand;
56
use Spatie\LaravelPackageTools\Package;
67
use Spatie\LaravelPackageTools\PackageServiceProvider;
78

@@ -16,6 +17,12 @@ public function configurePackage(Package $package): void
1617
*/
1718
$package
1819
->name('laravel-datatable')
19-
->hasConfigFile();
20+
->hasConfigFile()
21+
->publishesServiceProvider('DatatableServiceProvider')
22+
->hasInstallCommand(function(InstallCommand $command){
23+
$command
24+
->copyAndRegisterServiceProviderInApp()
25+
->askToStarRepoOnGitHub('hamidrezarj/laravel-datatable');
26+
});
2027
}
2128
}

src/Facades/Datatable.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ public function run(
3232
): array
3333
{
3434

35-
$filters = json_decode($requestParameters['filters']);
36-
$sorting = json_decode($requestParameters['sorting']);
35+
// $filters = json_decode($requestParameters['filters']);
36+
// $sorting = json_decode($requestParameters['sorting']);
3737
$rels = array_key_exists('rels', $requestParameters) ? $requestParameters['rels'] : array();
3838

3939
$dataTableInput = new DataTableInput(
4040
$requestParameters['start'],
4141
$requestParameters['size'],
42-
$filters,
43-
$sorting,
42+
$requestParameters['filters'],
43+
$requestParameters['sorting'],
4444
$rels,
4545
$allowedFilters,
4646
$allowedSortings

src/Facades/DatatableFacade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ class DatatableFacade extends Facade
1111
{
1212
protected static function getFacadeAccessor(): string
1313
{
14-
return \HamidRrj\LaravelDatatable\Facades\Datatable::class;
14+
return 'datatable';
1515
}
1616
}

0 commit comments

Comments
 (0)