Skip to content

Commit 9dcc0db

Browse files
authored
Merge pull request #236 from 64robots/update/support-nova-v4
Update/support nova v4
2 parents d3492da + ecd6a15 commit 9dcc0db

19 files changed

+70
-68
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
],
88
"license": "MIT",
99
"require": {
10-
"php": ">=7.1.0"
10+
"php": "^7.1|^8.0"
1111
},
1212
"autoload": {
1313
"psr-4": {

src/BelongsTo.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class BelongsTo extends NovaBelongsTo
5454
* @param mixed $resource
5555
* @return array
5656
*/
57-
public function formatAssociatableResource(NovaRequest $request, $resource)
57+
public function formatAssociatableResource(NovaRequest $request, $resource): array
5858
{
5959
$relation = explode(".", $this->groupedBy);
6060

@@ -76,7 +76,7 @@ public function formatAssociatableResource(NovaRequest $request, $resource)
7676
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
7777
* @return array
7878
*/
79-
public function getRules(NovaRequest $request)
79+
public function getRules(NovaRequest $request): array
8080
{
8181
$rules = parent::getRules($request);
8282

@@ -96,7 +96,7 @@ public function getRules(NovaRequest $request)
9696
* @param string $field
9797
* @return $this
9898
*/
99-
public function groupedBy($field)
99+
public function groupedBy($field): BelongsTo
100100
{
101101
$this->groupedBy = $field;
102102

@@ -109,7 +109,7 @@ public function groupedBy($field)
109109
* @param string $name
110110
* @return $this
111111
*/
112-
public function displayName($name)
112+
public function displayName($name): BelongsTo
113113
{
114114
$this->displayName = $name;
115115

@@ -121,7 +121,7 @@ public function displayName($name)
121121
*
122122
* @return $this
123123
*/
124-
public function disableRelatableRule()
124+
public function disableRelatableRule(): BelongsTo
125125
{
126126
$this->disableRelatableRule = true;
127127

@@ -133,7 +133,7 @@ public function disableRelatableRule()
133133
*
134134
* @return $this
135135
*/
136-
public function quickCreate($fillValues = [])
136+
public function quickCreate($fillValues = []): BelongsTo
137137
{
138138
$this->withMeta(['quickCreate' => true, 'fillValues' => $fillValues]);
139139

@@ -145,7 +145,7 @@ public function quickCreate($fillValues = [])
145145
*
146146
* @return $this
147147
*/
148-
public function disableTrashed()
148+
public function disableTrashed(): BelongsTo
149149
{
150150
$this->withMeta(['disableTrashed' => true]);
151151

@@ -157,7 +157,7 @@ public function disableTrashed()
157157
*
158158
* @return array
159159
*/
160-
public function meta()
160+
public function meta(): array
161161
{
162162
return array_merge([
163163
'wrapperClasses' => $this->wrapperClasses,

src/Boolean.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Boolean extends NovaBoolean
3535
* @param string $classes
3636
* @return $this
3737
*/
38-
public function dotClasses($classes)
38+
public function dotClasses($classes): Boolean
3939
{
4040
return $this->withMeta(['dotClasses' => $classes]);
4141
}
@@ -46,7 +46,7 @@ public function dotClasses($classes)
4646
* @param string $class
4747
* @return $this
4848
*/
49-
public function successClass($class)
49+
public function successClass($class): Boolean
5050
{
5151
return $this->withMeta(['successClass' => $class]);
5252
}
@@ -57,7 +57,7 @@ public function successClass($class)
5757
* @param string $class
5858
* @return $this
5959
*/
60-
public function dangerClass($class)
60+
public function dangerClass($class): Boolean
6161
{
6262
return $this->withMeta(['dangerClass' => $class]);
6363
}
@@ -68,7 +68,7 @@ public function dangerClass($class)
6868
* @param string $label
6969
* @return $this
7070
*/
71-
public function yesLabel($label)
71+
public function yesLabel($label): Boolean
7272
{
7373
return $this->withMeta(['yesLabel' => $label]);
7474
}
@@ -79,7 +79,7 @@ public function yesLabel($label)
7979
* @param string $label
8080
* @return $this
8181
*/
82-
public function noLabel($label)
82+
public function noLabel($label): Boolean
8383
{
8484
return $this->withMeta(['noLabel' => $label]);
8585
}
@@ -89,7 +89,7 @@ public function noLabel($label)
8989
*
9090
* @return $this
9191
*/
92-
public function hideBooleanLabel()
92+
public function hideBooleanLabel(): Boolean
9393
{
9494
return $this->withMeta(['hideBooleanLabel' => true]);
9595
}

src/Currency.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Currency extends NovaCurrency
3535
*
3636
* @return $this
3737
*/
38-
public function colors()
38+
public function colors(): Currency
3939
{
4040
return $this->withMeta(['colors' => true]);
4141
}

src/DateTime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class DateTime extends NovaDateTime
3434
*
3535
* @return $this
3636
*/
37-
public function hideTimezone()
37+
public function hideTimezone(): DateTime
3838
{
3939
return $this->withMeta(['hideTimezone' => true]);
4040
}

src/FieldServiceProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class FieldServiceProvider extends ServiceProvider
1515
*
1616
* @return void
1717
*/
18-
public function boot()
18+
public function boot(): void
1919
{
2020
Nova::serving(function (ServingNova $event) {
2121
Nova::script('nova-fields', __DIR__.'/../dist/js/field.js');
@@ -31,7 +31,7 @@ public function boot()
3131
*
3232
* @return void
3333
*/
34-
public function register()
34+
public function register(): void
3535
{
3636
//
3737
}
@@ -41,7 +41,7 @@ public function register()
4141
*
4242
* @return array
4343
*/
44-
protected function routeConfiguration()
44+
protected function routeConfiguration(): array
4545
{
4646
return [
4747
'namespace' => 'R64\NovaFields\Http\Controllers',

src/File.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function __construct($name, $attribute = null, $disk = 'public', $storage
5858
*
5959
* @return $this
6060
*/
61-
public function draggable()
61+
public function draggable(): File
6262
{
6363
return $this->withMeta(['draggable' => true]);
6464
}
@@ -68,7 +68,7 @@ public function draggable()
6868
*
6969
* @return $this
7070
*/
71-
public function previewBeforeUpload()
71+
public function previewBeforeUpload(): File
7272
{
7373
return $this->withMeta(['previewBeforeUpload' => true]);
7474
}
@@ -78,7 +78,7 @@ public function previewBeforeUpload()
7878
*
7979
* @return array
8080
*/
81-
public function meta()
81+
public function meta(): array
8282
{
8383
return array_merge([
8484
'wrapperClasses' => $this->wrapperClasses,

src/HasChilds.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function childConfig($childConfig)
2323
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
2424
* @return array
2525
*/
26-
public function getRules(NovaRequest $request)
26+
public function getRules(NovaRequest $request): array
2727
{
2828
$result = [];
2929

@@ -46,7 +46,7 @@ public function getRules(NovaRequest $request)
4646
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
4747
* @return array|string
4848
*/
49-
public function getCreationRules(NovaRequest $request)
49+
public function getCreationRules(NovaRequest $request): array
5050
{
5151
$result = [];
5252

@@ -69,7 +69,7 @@ public function getCreationRules(NovaRequest $request)
6969
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
7070
* @return array
7171
*/
72-
public function getUpdateRules(NovaRequest $request)
72+
public function getUpdateRules(NovaRequest $request): array
7373
{
7474
$result = [];
7575

src/Http/Controllers/AssociatableController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ class AssociatableController extends Controller
1010
/**
1111
* List the available related resources for a given resource.
1212
*
13-
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
14-
* @return \Illuminate\Http\Response
13+
* @param Laravel\Nova\Http\Requests\NovaRequest $request
14+
* @return array
1515
*/
16-
public function index(NovaRequest $request)
16+
public function index(NovaRequest $request): array
1717
{
1818
$fields = $request->newResource()
1919
->availableFields($request);

src/Http/Controllers/ComputedController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ class ComputedController
1010
/**
1111
* Compute the value.
1212
*
13-
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
13+
* @param Laravel\Nova\Http\Requests\NovaRequest $request
1414
* @return mixed
1515
*/
16-
public function index(NovaRequest $request)
16+
public function index(NovaRequest $request): mixed
1717
{
1818
$resourceId = $request->input('resourceId');
1919
$resourceClass = Nova::resourceForKey($request->resource);

0 commit comments

Comments
 (0)