wip

z-song · z-song · commit 5e56162f68bb · 2020-03-06T14:49:39.000+08:00
diff --git a/src/Auth/Database/Administrator.php b/src/Auth/Database/Administrator.php
@@ -19,6 +19,7 @@ class Administrator extends Model implements AuthenticatableContract
     use Authenticatable;
     use AdminBuilder;
     use HasPermissions;
+
     protected $fillable = ['username', 'password', 'name', 'avatar'];
 
     /**
diff --git a/src/Form/Field/Tags.php b/src/Form/Field/Tags.php
@@ -163,6 +163,7 @@ public function value($value = null)
         return $this;
     }
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Grid.php b/src/Grid.php
@@ -681,7 +681,8 @@ public function getCreateUrl()
             $queryString = http_build_query($constraints);
         }
 
-        return sprintf('%s/create%s',
+        return sprintf(
+            '%s/create%s',
             $this->resource(),
             $queryString ? ('?'.$queryString) : ''
         );
diff --git a/src/Grid/Displayers/QRCode.php b/src/Grid/Displayers/QRCode.php
@@ -33,7 +33,11 @@ public function display($formatter = null, $width = 150, $height = 150)
 
         $img = sprintf(
             "<img src='https://api.qrserver.com/v1/create-qr-code/?size=%sx%s&data=%s' style='height:%spx;width:%spx;'/>",
-            $width, $height, $content, $height, $width
+            $width,
+            $height,
+            $content,
+            $height,
+            $width
         );
 
         return <<<HTML
diff --git a/src/Grid/Tools/Selector.php b/src/Grid/Tools/Selector.php
@@ -73,9 +73,7 @@ protected function addSelector($column, $label, $options = [], $query = null, $t
             $label = __(Str::title($column));
         }
 
-        $this->selectors[$column] = compact(
-            'label', 'options', 'type', 'query'
-        );
+        $this->selectors[$column] = compact('label', 'options', 'type', 'query');
 
         return $this;
     }
diff --git a/src/Traits/HasAssets.php b/src/Traits/HasAssets.php
@@ -275,7 +275,8 @@ protected static function getManifestData($key)
         }
 
         static::$manifestData = json_decode(
-            file_get_contents(public_path(static::$manifest)), true
+            file_get_contents(public_path(static::$manifest)),
+            true
         );
 
         return static::$manifestData[$key];
diff --git a/src/Widgets/ContainsForms.php b/src/Widgets/ContainsForms.php
@@ -4,15 +4,28 @@
 
 trait ContainsForms
 {
+    /**
+     * @var string
+     */
     protected $activeName = 'active';
 
+    /**
+     * @param array $forms
+     * @param null $active
+     * @return mixed
+     */
     public static function forms($forms, $active = null)
     {
         $tab = new static();
 
         return $tab->buildTabbedForms($forms, $active);
     }
 
+    /**
+     * @param array $forms
+     * @param null $active
+     * @return $this
+     */
     protected function buildTabbedForms($forms, $active = null)
     {
         $active = $active ?: request($this->activeName);
@@ -40,6 +53,10 @@ protected function buildTabbedForms($forms, $active = null)
         return $this;
     }
 
+    /**
+     * @param string $name
+     * @return string
+     */
     protected function getTabUrl($name)
     {
         $query = [$this->activeName => $name];
diff --git a/src/Widgets/Form.php b/src/Widgets/Form.php
@@ -121,7 +121,7 @@ public function __construct($data = [])
      *
      * @return mixed
      */
-    protected function title()
+    public function title()
     {
         return $this->title;
     }
@@ -454,6 +454,9 @@ public function fieldset(string $title, Closure $setCallback)
         return $fieldset;
     }
 
+    /**
+     * @return $this
+     */
     public function unbox()
     {
         $this->inbox = false;
diff --git a/tests/ImageUploadTest.php b/tests/ImageUploadTest.php
@@ -176,9 +176,7 @@ public function testUploadMultipleImage()
 
         $path = __DIR__.'/assets/test.jpg';
 
-        $file = new \Illuminate\Http\UploadedFile(
-            $path, 'test.jpg', 'image/jpeg', null, true
-        );
+        $file = new \Illuminate\Http\UploadedFile($path, 'test.jpg', 'image/jpeg', null, true);
 
         $size = rand(10, 20);
         $files = ['pictures' => array_pad([], $size, $file)];
@@ -212,9 +210,7 @@ public function testRemoveMultipleFiles()
         // upload files
         $path = __DIR__.'/assets/test.jpg';
 
-        $file = new \Illuminate\Http\UploadedFile(
-            $path, 'test.jpg', 'image/jpeg', null, true
-        );
+        $file = new \Illuminate\Http\UploadedFile($path, 'test.jpg', 'image/jpeg', null, true);
 
         $size = rand(10, 20);
         $files = ['pictures' => array_pad([], $size, $file)];
diff --git a/tests/models/Tree.php b/tests/models/Tree.php
@@ -10,6 +10,7 @@ class Tree extends Model
 {
     use AdminBuilder;
     use ModelTree;
+
     /**
      * Create a new Eloquent model instance.
      *

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ public function value($value = null)`
`163`	`163`	`return $this;`
`164`	`164`	`}`
`165`	`165`
	`166`	`+`
`166`	`167`	`/**`
`167`	`168`	`* {@inheritdoc}`
`168`	`169`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,8 @@ public function getCreateUrl()`
`681`	`681`	`$queryString = http_build_query($constraints);`
`682`	`682`	`}`
`683`	`683`
`684`		`- return sprintf('%s/create%s',`
	`684`	`+ return sprintf(`
	`685`	`+ '%s/create%s',`
`685`	`686`	`$this->resource(),`
`686`	`687`	`$queryString ? ('?'.$queryString) : ''`
`687`	`688`	`);`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,7 @@ protected function addSelector($column, $label, $options = [], $query = null, $t`
`73`	`73`	`$label = __(Str::title($column));`
`74`	`74`	`}`
`75`	`75`
`76`		`- $this->selectors[$column] = compact(`
`77`		`- 'label', 'options', 'type', 'query'`
`78`		`- );`
	`76`	`+ $this->selectors[$column] = compact('label', 'options', 'type', 'query');`
`79`	`77`
`80`	`78`	`return $this;`
`81`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,8 @@ protected static function getManifestData($key)`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`static::$manifestData = json_decode(`
`278`		`- file_get_contents(public_path(static::$manifest)), true`
	`278`	`+ file_get_contents(public_path(static::$manifest)),`
	`279`	`+ true`
`279`	`280`	`);`
`280`	`281`
`281`	`282`	`return static::$manifestData[$key];`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,28 @@`
`4`	`4`
`5`	`5`	`trait ContainsForms`
`6`	`6`	`{`
	`7`	`+ /**`
	`8`	`+ * @var string`
	`9`	`+ */`
`7`	`10`	`protected $activeName = 'active';`
`8`	`11`
	`12`	`+ /**`
	`13`	`+ * @param array $forms`
	`14`	`+ * @param null $active`
	`15`	`+ * @return mixed`
	`16`	`+ */`
`9`	`17`	`public static function forms($forms, $active = null)`
`10`	`18`	`{`
`11`	`19`	`$tab = new static();`
`12`	`20`
`13`	`21`	`return $tab->buildTabbedForms($forms, $active);`
`14`	`22`	`}`
`15`	`23`
	`24`	`+ /**`
	`25`	`+ * @param array $forms`
	`26`	`+ * @param null $active`
	`27`	`+ * @return $this`
	`28`	`+ */`
`16`	`29`	`protected function buildTabbedForms($forms, $active = null)`
`17`	`30`	`{`
`18`	`31`	`$active = $active ?: request($this->activeName);`
`@@ -40,6 +53,10 @@ protected function buildTabbedForms($forms, $active = null)`
`40`	`53`	`return $this;`
`41`	`54`	`}`
`42`	`55`
	`56`	`+ /**`
	`57`	`+ * @param string $name`
	`58`	`+ * @return string`
	`59`	`+ */`
`43`	`60`	`protected function getTabUrl($name)`
`44`	`61`	`{`
`45`	`62`	`$query = [$this->activeName => $name];`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function __construct($data = [])`
`121`	`121`	`*`
`122`	`122`	`* @return mixed`
`123`	`123`	`*/`
`124`		`- protected function title()`
	`124`	`+ public function title()`
`125`	`125`	`{`
`126`	`126`	`return $this->title;`
`127`	`127`	`}`
`@@ -454,6 +454,9 @@ public function fieldset(string $title, Closure $setCallback)`
`454`	`454`	`return $fieldset;`
`455`	`455`	`}`
`456`	`456`
	`457`	`+ /**`
	`458`	`+ * @return $this`
	`459`	`+ */`
`457`	`460`	`public function unbox()`
`458`	`461`	`{`
`459`	`462`	`$this->inbox = false;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ class Tree extends Model`
`10`	`10`	`{`
`11`	`11`	`use AdminBuilder;`
`12`	`12`	`use ModelTree;`
	`13`	`+`
`13`	`14`	`/**`
`14`	`15`	`* Create a new Eloquent model instance.`
`15`	`16`	`*`