Merge pull request #5 from php-panel/develop

Develop

Author: leeqvip

resources/views/dashboard/title.blade.php

@@ -29,7 +29,7 @@
     Laravel-admin
 </div>
 <div class="links">
-    <a href="https://github.com/z-song/laravel-admin" target="_blank">Github</a>
+    <a href="https://github.com/php-panel/laravel-admin" target="_blank">Github</a>
     <a href="http://laravel-admin.org/docs"  target="_blank">Documentation</a>
     <a href="http://laravel-admin.org/demo"  target="_blank">Demo</a>
 </div>

resources/views/partials/footer.blade.php

@@ -14,5 +14,5 @@
 
     </div>
     <!-- Default to the left -->
-    <strong>Powered by <a href="https://github.com/z-song/laravel-admin" target="_blank">laravel-admin</a></strong>
+    <strong>Powered by <a href="https://github.com/php-panel/laravel-admin" target="_blank">laravel-admin</a></strong>
 </footer>

src/Admin.php

@@ -117,7 +117,7 @@ public function form($model, Closure $callable)
      *
      * @return \Ladmin\Tree
      */
-    public function tree($model, Closure $callable = null)
+    public function tree($model, ?Closure $callable = null)
     {
         return new Tree($this->getModel($model), $callable);
     }
@@ -144,7 +144,7 @@ public function show($model, $callable = null)
      *
      * @deprecated since v1.6.1
      */
-    public function content(Closure $callable = null)
+    public function content(?Closure $callable = null)
     {
         return new Content($callable);
     }
@@ -275,7 +275,7 @@ public function guard()
      *
      * @return Navbar
      */
-    public function navbar(Closure $builder = null)
+    public function navbar(?Closure $builder = null)
     {
         if (is_null($builder)) {
             return $this->getNavbar();

src/Console/stubs/bootstrap.stub

@@ -2,7 +2,7 @@
 
 /**
  * Laravel-admin - admin builder based on Laravel.
- * @author z-song <https://github.com/z-song>
+ * @author leeqvip <https://github.com/leeqvip>
  *
  * Bootstraper for Admin.
  *

src/Form.php

@@ -121,7 +121,7 @@ class Form implements Renderable
      * @param $model
      * @param \Closure $callback
      */
-    public function __construct($model, Closure $callback = null)
+    public function __construct($model, ?Closure $callback = null)
     {
         $this->model = $model;
 
@@ -1316,7 +1316,7 @@ public function tools(Closure $callback)
      *
      * @return Form\Tools
      */
-    public function header(Closure $callback = null)
+    public function header(?Closure $callback = null)
     {
         if (func_num_args() === 0) {
             return $this->builder->getTools();
@@ -1426,7 +1426,7 @@ public function disableCreatingCheck(bool $disable = true): self
      *
      * @return \Ladmin\Form\Footer
      */
-    public function footer(Closure $callback = null)
+    public function footer(?Closure $callback = null)
     {
         if (func_num_args() === 0) {
             return $this->builder()->getFooter();

src/Form/Builder.php

@@ -230,7 +230,7 @@ public function getResourceId()
      *
      * @return string
      */
-    public function getResource(int $slice = null): string
+    public function getResource(?int $slice = null): string
     {
         if ($this->mode === self::MODE_CREATE) {
             return $this->form->resource(-1);

src/Form/Concerns/HasHooks.php

@@ -27,7 +27,7 @@ trait HasHooks
      *
      * @param Closure $callback
      */
-    public static function init(Closure $callback = null)
+    public static function init(?Closure $callback = null)
     {
         static::$initCallbacks[] = $callback;
     }

src/Form/Field.php

@@ -495,7 +495,7 @@ public function setOriginal($data)
      *
      * @return $this
      */
-    public function setForm(Form $form = null)
+    public function setForm(?Form $form = null)
     {
         $this->form = $form;
 
@@ -867,7 +867,7 @@ public function value($value = null)
      *
      * @return mixed
      */
-    public function data(array $data = null)
+    public function data(?array $data = null)
     {
         if ($data === null) {
             return $this->data;

src/Form/Field/Captcha.php

@@ -20,7 +20,7 @@ public function __construct($column, $arguments = [])
         $this->label = trans('admin.captcha');
     }
 
-    public function setForm(Form $form = null)
+    public function setForm(?Form $form = null)
     {
         $this->form = $form;
 

src/Form/Field/HasValuePicker.php

@@ -45,7 +45,7 @@ public function pickMany($picker, $column = '', $separator = ';')
      *
      * @return $this
      */
-    protected function mountPicker(\Closure $callback = null)
+    protected function mountPicker(?\Closure $callback = null)
     {
         $this->picker && $this->picker->mount($this, $callback);