Merge branch 'develop' of https://github.com/rappasoft/laravel-livewire-tables into develop

rappasoft · rappasoft · commit a99723842f1e · 2020-04-03T21:35:26.000-04:00
diff --git a/src/Traits/CanBeHidden.php b/src/Traits/CanBeHidden.php
@@ -7,7 +7,6 @@
  */
 trait CanBeHidden
 {
-
     /**
      * @var bool
      */
@@ -18,7 +17,8 @@ trait CanBeHidden
      *
      * @return $this
      */
-    public function hideIf($condition) : self {
+    public function hideIf($condition): self
+    {
         $this->hidden = $condition === true;
 
         return $this;
@@ -29,7 +29,8 @@ public function hideIf($condition) : self {
      *
      * @return $this
      */
-    public function hide($hidden = true) : self {
+    public function hide($hidden = true): self
+    {
         $this->hidden = $hidden;
 
         return $this;
@@ -38,7 +39,8 @@ public function hide($hidden = true) : self {
     /**
      * @return bool
      */
-    public function isHidden() : bool {
+    public function isHidden(): bool
+    {
         return $this->hidden;
     }
 }
diff --git a/src/Traits/Checkboxes.php b/src/Traits/Checkboxes.php
@@ -46,9 +46,6 @@ trait Checkboxes
      */
     public $checkboxValues = [];
 
-    /**
-     *
-     */
     public function updatedCheckboxAll()
     {
         $this->checkboxValues = [];
@@ -60,9 +57,6 @@ public function updatedCheckboxAll()
         }
     }
 
-    /**
-     *
-     */
     public function updatedCheckboxValues()
     {
         $this->checkboxAll = false;
diff --git a/src/Traits/HasComponents.php b/src/Traits/HasComponents.php
@@ -7,7 +7,6 @@
  */
 trait HasComponents
 {
-
     /**
      * @var array
      */
@@ -30,7 +29,8 @@ trait HasComponents
      *
      * @return $this
      */
-    public function components(array $components = [], $hidden = false, $hiddenMessage = false) : self {
+    public function components(array $components = [], $hidden = false, $hiddenMessage = false): self
+    {
         $this->components = $components;
         $this->hidden = $hidden;
         $this->hiddenMessage = $hiddenMessage;
@@ -43,7 +43,8 @@ public function components(array $components = [], $hidden = false, $hiddenMessa
      *
      * @return $this
      */
-    public function addComponent($component) : self {
+    public function addComponent($component): self
+    {
         $this->components[] = $component;
 
         return $this;
@@ -52,14 +53,16 @@ public function addComponent($component) : self {
     /**
      * @return bool
      */
-    public function hasComponents() : bool {
+    public function hasComponents(): bool
+    {
         return count($this->components) > 0;
     }
 
     /**
      * @return array
      */
-    public function getComponents() : array {
+    public function getComponents(): array
+    {
         return $this->components;
     }
 
@@ -68,7 +71,8 @@ public function getComponents() : array {
      *
      * @return mixed
      */
-    public function componentsAreHiddenForModel($model) {
+    public function componentsAreHiddenForModel($model)
+    {
         if (is_callable($this->hidden)) {
             return app()->call($this->hidden, ['model' => $model]);
         }
@@ -81,7 +85,8 @@ public function componentsAreHiddenForModel($model) {
      *
      * @return bool|mixed
      */
-    public function componentsHiddenMessageForModel($model) {
+    public function componentsHiddenMessageForModel($model)
+    {
         if (is_callable($this->hiddenMessage)) {
             return app()->call($this->hiddenMessage, ['model' => $model]);
         }
diff --git a/src/Views/Button.php b/src/Views/Button.php
@@ -5,8 +5,8 @@
 /**
  * Class Button.
  */
-class Button extends Component {
-
+class Button extends Component
+{
     /**
      * Component constructor.
      *
@@ -24,7 +24,8 @@ public function __construct($text = false)
      *
      * @return self
      */
-    public static function make($text) : self {
+    public static function make($text): self
+    {
         return new static($text);
     }
 
@@ -33,7 +34,8 @@ public static function make($text) : self {
      *
      * @return self
      */
-    public function text($text) : self {
+    public function text($text): self
+    {
         return $this->setAttribute('text', $text);
     }
 
@@ -42,7 +44,8 @@ public function text($text) : self {
      *
      * @return $this
      */
-    public function class($class) : self {
+    public function class($class): self
+    {
         return $this->setAttribute('class', $class);
     }
 
@@ -51,7 +54,8 @@ public function class($class) : self {
      *
      * @return $this
      */
-    public function id($id) : self {
+    public function id($id): self
+    {
         return $this->setAttribute('id', $id);
     }
 
@@ -60,14 +64,16 @@ public function id($id) : self {
      *
      * @return $this
      */
-    public function icon($icon) : self {
+    public function icon($icon): self
+    {
         return $this->setOption('icon', $icon);
     }
 
     /**
      * @return string
      */
-    public function view() : string {
+    public function view(): string
+    {
         return 'laravel-livewire-tables::components.button';
     }
 }
diff --git a/src/Views/Column.php b/src/Views/Column.php
@@ -10,7 +10,6 @@
  */
 class Column
 {
-
     use HasComponents;
 
     /**
diff --git a/src/Views/Component.php b/src/Views/Component.php
@@ -10,7 +10,6 @@
  */
 abstract class Component implements ComponentContract
 {
-
     use CanBeHidden;
 
     /**
@@ -29,7 +28,8 @@ abstract class Component implements ComponentContract
      *
      * @return $this
      */
-    public function setAttribute($attribute, $value) : self {
+    public function setAttribute($attribute, $value): self
+    {
         $this->attributes[$attribute] = $value;
 
         return $this;
@@ -40,7 +40,8 @@ public function setAttribute($attribute, $value) : self {
      *
      * @return $this
      */
-    public function setAttributes(array $attributes = []) : self {
+    public function setAttributes(array $attributes = []): self
+    {
         $this->attributes = array_merge($this->attributes, $attributes);
 
         return $this;
@@ -49,7 +50,8 @@ public function setAttributes(array $attributes = []) : self {
     /**
      * @return array
      */
-    public function getAttributes() : array {
+    public function getAttributes(): array
+    {
         return $this->attributes;
     }
 
@@ -59,7 +61,8 @@ public function getAttributes() : array {
      *
      * @return $this
      */
-    public function setOption($option, $value) : self {
+    public function setOption($option, $value): self
+    {
         $this->options[$option] = $value;
 
         return $this;
@@ -70,7 +73,8 @@ public function setOption($option, $value) : self {
      *
      * @return $this
      */
-    public function setOptions(array $options = []) : self {
+    public function setOptions(array $options = []): self
+    {
         $this->options = array_merge($this->options, $options);
 
         return $this;
@@ -79,7 +83,8 @@ public function setOptions(array $options = []) : self {
     /**
      * @return array
      */
-    public function getOptions() : array {
+    public function getOptions(): array
+    {
         return $this->options;
     }
 }
diff --git a/src/Views/Contracts/ComponentContract.php b/src/Views/Contracts/ComponentContract.php
@@ -3,15 +3,12 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Contracts;
 
 /**
- * Interface Component
- *
- * @package Rappasoft\LaravelLivewireTables\Views\Contracts
+ * Interface Component.
  */
 interface ComponentContract
 {
-
     /**
      * @return string
      */
-    public function view() : string;
+    public function view(): string;
 }
diff --git a/src/Views/Link.php b/src/Views/Link.php
@@ -5,8 +5,8 @@
 /**
  * Class Link.
  */
-class Link extends Component {
-
+class Link extends Component
+{
     /**
      * Link constructor.
      *
@@ -24,7 +24,8 @@ public function __construct($text = false)
      *
      * @return self
      */
-    public static function make($text) : self {
+    public static function make($text): self
+    {
         return new static($text);
     }
 
@@ -33,7 +34,8 @@ public static function make($text) : self {
      *
      * @return self
      */
-    public function text($text) : self {
+    public function text($text): self
+    {
         return $this->setAttribute('text', $text);
     }
 
@@ -42,7 +44,8 @@ public function text($text) : self {
      *
      * @return $this
      */
-    public function class($class) : self {
+    public function class($class): self
+    {
         return $this->setAttribute('class', $class);
     }
 
@@ -51,7 +54,8 @@ public function class($class) : self {
      *
      * @return $this
      */
-    public function id($id) : self {
+    public function id($id): self
+    {
         return $this->setAttribute('id', $id);
     }
 
@@ -60,7 +64,8 @@ public function id($id) : self {
      *
      * @return $this
      */
-    public function icon($icon) : self {
+    public function icon($icon): self
+    {
         return $this->setOption('icon', $icon);
     }
 
@@ -69,14 +74,16 @@ public function icon($icon) : self {
      *
      * @return $this
      */
-    public function href($href) : self {
+    public function href($href): self
+    {
         return $this->setAttribute('href', $href);
     }
 
     /**
      * @return string
      */
-    public function view() : string {
+    public function view(): string
+    {
         return 'laravel-livewire-tables::components.link';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,6 @@ trait Checkboxes`
`46`	`46`	`*/`
`47`	`47`	`public $checkboxValues = [];`
`48`	`48`
`49`		`- /**`
`50`		`- *`
`51`		`- */`
`52`	`49`	`public function updatedCheckboxAll()`
`53`	`50`	`{`
`54`	`51`	`$this->checkboxValues = [];`
`@@ -60,9 +57,6 @@ public function updatedCheckboxAll()`
`60`	`57`	`}`
`61`	`58`	`}`
`62`	`59`
`63`		`- /**`
`64`		`- *`
`65`		`- */`
`66`	`60`	`public function updatedCheckboxValues()`
`67`	`61`	`{`
`68`	`62`	`$this->checkboxAll = false;`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`/**`
`6`	`6`	`* Class Button.`
`7`	`7`	`*/`
`8`		`-class Button extends Component {`
`9`		`-`
	`8`	`+class Button extends Component`
	`9`	`+{`
`10`	`10`	`/**`
`11`	`11`	`* Component constructor.`
`12`	`12`	`*`
`@@ -24,7 +24,8 @@ public function __construct($text = false)`
`24`	`24`	`*`
`25`	`25`	`* @return self`
`26`	`26`	`*/`
`27`		`- public static function make($text) : self {`
	`27`	`+ public static function make($text): self`
	`28`	`+ {`
`28`	`29`	`return new static($text);`
`29`	`30`	`}`
`30`	`31`
`@@ -33,7 +34,8 @@ public static function make($text) : self {`
`33`	`34`	`*`
`34`	`35`	`* @return self`
`35`	`36`	`*/`
`36`		`- public function text($text) : self {`
	`37`	`+ public function text($text): self`
	`38`	`+ {`
`37`	`39`	`return $this->setAttribute('text', $text);`
`38`	`40`	`}`
`39`	`41`
`@@ -42,7 +44,8 @@ public function text($text) : self {`
`42`	`44`	`*`
`43`	`45`	`* @return $this`
`44`	`46`	`*/`
`45`		`- public function class($class) : self {`
	`47`	`+ public function class($class): self`
	`48`	`+ {`
`46`	`49`	`return $this->setAttribute('class', $class);`
`47`	`50`	`}`
`48`	`51`
`@@ -51,7 +54,8 @@ public function class($class) : self {`
`51`	`54`	`*`
`52`	`55`	`* @return $this`
`53`	`56`	`*/`
`54`		`- public function id($id) : self {`
	`57`	`+ public function id($id): self`
	`58`	`+ {`
`55`	`59`	`return $this->setAttribute('id', $id);`
`56`	`60`	`}`
`57`	`61`
`@@ -60,14 +64,16 @@ public function id($id) : self {`
`60`	`64`	`*`
`61`	`65`	`* @return $this`
`62`	`66`	`*/`
`63`		`- public function icon($icon) : self {`
	`67`	`+ public function icon($icon): self`
	`68`	`+ {`
`64`	`69`	`return $this->setOption('icon', $icon);`
`65`	`70`	`}`
`66`	`71`
`67`	`72`	`/**`
`68`	`73`	`* @return string`
`69`	`74`	`*/`
`70`		`- public function view() : string {`
	`75`	`+ public function view(): string`
	`76`	`+ {`
`71`	`77`	`return 'laravel-livewire-tables::components.button';`
`72`	`78`	`}`
`73`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`*/`
`11`	`11`	`class Column`
`12`	`12`	`{`
`13`		`-`
`14`	`13`	`use HasComponents;`
`15`	`14`
`16`	`15`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`/**`
`6`	`6`	`* Class Link.`
`7`	`7`	`*/`
`8`		`-class Link extends Component {`
`9`		`-`
	`8`	`+class Link extends Component`
	`9`	`+{`
`10`	`10`	`/**`
`11`	`11`	`* Link constructor.`
`12`	`12`	`*`
`@@ -24,7 +24,8 @@ public function __construct($text = false)`
`24`	`24`	`*`
`25`	`25`	`* @return self`
`26`	`26`	`*/`
`27`		`- public static function make($text) : self {`
	`27`	`+ public static function make($text): self`
	`28`	`+ {`
`28`	`29`	`return new static($text);`
`29`	`30`	`}`
`30`	`31`
`@@ -33,7 +34,8 @@ public static function make($text) : self {`
`33`	`34`	`*`
`34`	`35`	`* @return self`
`35`	`36`	`*/`
`36`		`- public function text($text) : self {`
	`37`	`+ public function text($text): self`
	`38`	`+ {`
`37`	`39`	`return $this->setAttribute('text', $text);`
`38`	`40`	`}`
`39`	`41`
`@@ -42,7 +44,8 @@ public function text($text) : self {`
`42`	`44`	`*`
`43`	`45`	`* @return $this`
`44`	`46`	`*/`
`45`		`- public function class($class) : self {`
	`47`	`+ public function class($class): self`
	`48`	`+ {`
`46`	`49`	`return $this->setAttribute('class', $class);`
`47`	`50`	`}`
`48`	`51`
`@@ -51,7 +54,8 @@ public function class($class) : self {`
`51`	`54`	`*`
`52`	`55`	`* @return $this`
`53`	`56`	`*/`
`54`		`- public function id($id) : self {`
	`57`	`+ public function id($id): self`
	`58`	`+ {`
`55`	`59`	`return $this->setAttribute('id', $id);`
`56`	`60`	`}`
`57`	`61`
`@@ -60,7 +64,8 @@ public function id($id) : self {`
`60`	`64`	`*`
`61`	`65`	`* @return $this`
`62`	`66`	`*/`
`63`		`- public function icon($icon) : self {`
	`67`	`+ public function icon($icon): self`
	`68`	`+ {`
`64`	`69`	`return $this->setOption('icon', $icon);`
`65`	`70`	`}`
`66`	`71`
`@@ -69,14 +74,16 @@ public function icon($icon) : self {`
`69`	`74`	`*`
`70`	`75`	`* @return $this`
`71`	`76`	`*/`
`72`		`- public function href($href) : self {`
	`77`	`+ public function href($href): self`
	`78`	`+ {`
`73`	`79`	`return $this->setAttribute('href', $href);`
`74`	`80`	`}`
`75`	`81`
`76`	`82`	`/**`
`77`	`83`	`* @return string`
`78`	`84`	`*/`
`79`		`- public function view() : string {`
	`85`	`+ public function view(): string`
	`86`	`+ {`
`80`	`87`	`return 'laravel-livewire-tables::components.link';`
`81`	`88`	`}`
`82`	`89`	`}`