Skip to content

Commit 67ff342

Browse files
committed
fix: implicitly nullable parameters are deprecated in php8.4
1 parent 1257df2 commit 67ff342

22 files changed

+34
-34
lines changed

src/Admin.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function form($model, Closure $callable)
117117
*
118118
* @return \Ladmin\Tree
119119
*/
120-
public function tree($model, Closure $callable = null)
120+
public function tree($model, ?Closure $callable = null)
121121
{
122122
return new Tree($this->getModel($model), $callable);
123123
}
@@ -144,7 +144,7 @@ public function show($model, $callable = null)
144144
*
145145
* @deprecated since v1.6.1
146146
*/
147-
public function content(Closure $callable = null)
147+
public function content(?Closure $callable = null)
148148
{
149149
return new Content($callable);
150150
}
@@ -275,7 +275,7 @@ public function guard()
275275
*
276276
* @return Navbar
277277
*/
278-
public function navbar(Closure $builder = null)
278+
public function navbar(?Closure $builder = null)
279279
{
280280
if (is_null($builder)) {
281281
return $this->getNavbar();

src/Form.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class Form implements Renderable
121121
* @param $model
122122
* @param \Closure $callback
123123
*/
124-
public function __construct($model, Closure $callback = null)
124+
public function __construct($model, ?Closure $callback = null)
125125
{
126126
$this->model = $model;
127127

@@ -1316,7 +1316,7 @@ public function tools(Closure $callback)
13161316
*
13171317
* @return Form\Tools
13181318
*/
1319-
public function header(Closure $callback = null)
1319+
public function header(?Closure $callback = null)
13201320
{
13211321
if (func_num_args() === 0) {
13221322
return $this->builder->getTools();
@@ -1426,7 +1426,7 @@ public function disableCreatingCheck(bool $disable = true): self
14261426
*
14271427
* @return \Ladmin\Form\Footer
14281428
*/
1429-
public function footer(Closure $callback = null)
1429+
public function footer(?Closure $callback = null)
14301430
{
14311431
if (func_num_args() === 0) {
14321432
return $this->builder()->getFooter();

src/Form/Builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public function getResourceId()
230230
*
231231
* @return string
232232
*/
233-
public function getResource(int $slice = null): string
233+
public function getResource(?int $slice = null): string
234234
{
235235
if ($this->mode === self::MODE_CREATE) {
236236
return $this->form->resource(-1);

src/Form/Concerns/HasHooks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ trait HasHooks
2727
*
2828
* @param Closure $callback
2929
*/
30-
public static function init(Closure $callback = null)
30+
public static function init(?Closure $callback = null)
3131
{
3232
static::$initCallbacks[] = $callback;
3333
}

src/Form/Field.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ public function setOriginal($data)
495495
*
496496
* @return $this
497497
*/
498-
public function setForm(Form $form = null)
498+
public function setForm(?Form $form = null)
499499
{
500500
$this->form = $form;
501501

@@ -867,7 +867,7 @@ public function value($value = null)
867867
*
868868
* @return mixed
869869
*/
870-
public function data(array $data = null)
870+
public function data(?array $data = null)
871871
{
872872
if ($data === null) {
873873
return $this->data;

src/Form/Field/Captcha.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function __construct($column, $arguments = [])
2020
$this->label = trans('admin.captcha');
2121
}
2222

23-
public function setForm(Form $form = null)
23+
public function setForm(?Form $form = null)
2424
{
2525
$this->form = $form;
2626

src/Form/Field/HasValuePicker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function pickMany($picker, $column = '', $separator = ';')
4545
*
4646
* @return $this
4747
*/
48-
protected function mountPicker(\Closure $callback = null)
48+
protected function mountPicker(?\Closure $callback = null)
4949
{
5050
$this->picker && $this->picker->mount($this, $callback);
5151

src/Form/Field/ImageField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function render()
104104
*
105105
* @return $this
106106
*/
107-
public function thumbnail($name, int $width = null, int $height = null)
107+
public function thumbnail($name, ?int $width = null, ?int $height = null)
108108
{
109109
if (func_num_args() == 1 && is_array($name)) {
110110
foreach ($name as $key => $size) {

src/Form/Field/MultipleFile.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public function original()
176176
*
177177
* @return mixed|string
178178
*/
179-
protected function prepareForeach(UploadedFile $file = null)
179+
protected function prepareForeach(?UploadedFile $file = null)
180180
{
181181
$this->name = $this->getStoreName($file);
182182

src/Form/Field/MultipleImage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MultipleImage extends MultipleFile
2727
*
2828
* @return mixed|string
2929
*/
30-
protected function prepareForeach(UploadedFile $image = null)
30+
protected function prepareForeach(?UploadedFile $image = null)
3131
{
3232
$this->name = $this->getStoreName($image);
3333

0 commit comments

Comments
 (0)