From 9b4731d138d349612d9b9ab9da7044270439f9a6 Mon Sep 17 00:00:00 2001
From: Dave <aioslike@gmail.com>
Date: Fri, 18 May 2018 14:51:04 +0000
Subject: [PATCH 1/4] Apply fixes from StyleCI

---
 src/Display/Extension/ColumnsTotal.php | 3 +--
 src/Traits/ElementPlacementTrait.php   | 3 ---
 src/Traits/ElementViewTrait.php        | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Display/Extension/ColumnsTotal.php b/src/Display/Extension/ColumnsTotal.php
index 14f3b1236..ff017c742 100644
--- a/src/Display/Extension/ColumnsTotal.php
+++ b/src/Display/Extension/ColumnsTotal.php
@@ -5,9 +5,9 @@
 use Illuminate\Support\Collection;
 use SleepingOwl\Admin\Display\Element;
 use KodiComponents\Support\HtmlAttributes;
+use SleepingOwl\Admin\Traits\ElementViewTrait;
 use SleepingOwl\Admin\Contracts\Display\Placable;
 use SleepingOwl\Admin\Traits\ElementPlacementTrait;
-use SleepingOwl\Admin\Traits\ElementViewTrait;
 
 class ColumnsTotal extends Extension implements Placable
 {
@@ -33,7 +33,6 @@ public function __construct()
         $this->elements = new Collection();
     }
 
-
     public function set(array $elements, $columnsNumber = 0)
     {
         array_map(function ($element) {
diff --git a/src/Traits/ElementPlacementTrait.php b/src/Traits/ElementPlacementTrait.php
index 9fb050f64..395b1dff7 100644
--- a/src/Traits/ElementPlacementTrait.php
+++ b/src/Traits/ElementPlacementTrait.php
@@ -4,7 +4,6 @@
 
 trait ElementPlacementTrait
 {
-
     /**
      * @return string
      */
@@ -44,6 +43,4 @@ public function setPosition($position)
     {
         return $this->setPlacement($position);
     }
-
-
 }
diff --git a/src/Traits/ElementViewTrait.php b/src/Traits/ElementViewTrait.php
index e5a37390a..e9150a5bd 100644
--- a/src/Traits/ElementViewTrait.php
+++ b/src/Traits/ElementViewTrait.php
@@ -4,7 +4,6 @@
 
 trait ElementViewTrait
 {
-
     /**
      * @return string|\Illuminate\View\View
      */

From 12bd96697544d7472e16486cf1dc88b5afaf0421 Mon Sep 17 00:00:00 2001
From: Dave <aioslike@gmail.com>
Date: Sat, 19 May 2018 16:25:32 +0300
Subject: [PATCH 2/4] Update FormPanel.php

---
 src/Form/FormPanel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Form/FormPanel.php b/src/Form/FormPanel.php
index c3b80c125..ad5e431f3 100644
--- a/src/Form/FormPanel.php
+++ b/src/Form/FormPanel.php
@@ -93,7 +93,7 @@ public function addBody($items)
         }
 
         $class = $this->getElements()->last();
-        if (is_object($class) and get_class($class) === Body::class) {
+        if (is_object($class) && get_class($class) === Body::class) {
             $this->addElement(new Html('<hr />'));
         }
 

From fb820be1a7f1b2c32c30b0944f776740d2497cdb Mon Sep 17 00:00:00 2001
From: Dave <aioslike@gmail.com>
Date: Sat, 19 May 2018 16:26:32 +0300
Subject: [PATCH 3/4] Update Page.php

---
 src/Navigation/Page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Navigation/Page.php b/src/Navigation/Page.php
index ba7d64ee4..6f4b87235 100644
--- a/src/Navigation/Page.php
+++ b/src/Navigation/Page.php
@@ -131,7 +131,7 @@ public function getAccessLogic()
      */
     public function render($view = null)
     {
-        if ($this->hasChild() and ! $this->hasClassProperty($class = config('navigation.class.has_child', 'treeview'))) {
+        if ($this->hasChild() && ! $this->hasClassProperty($class = config('navigation.class.has_child', 'treeview'))) {
             $this->setHtmlAttribute('class', $class);
         }
 

From d2272eaa380d010c6a121d43d99637172ea55ce0 Mon Sep 17 00:00:00 2001
From: Dave <aioslike@gmail.com>
Date: Sat, 19 May 2018 16:27:34 +0300
Subject: [PATCH 4/4] Update wysiwyg.blade.php

---
 resources/views/default/form/element/wysiwyg.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/default/form/element/wysiwyg.blade.php b/resources/views/default/form/element/wysiwyg.blade.php
index f5f94638b..72205e2c7 100644
--- a/resources/views/default/form/element/wysiwyg.blade.php
+++ b/resources/views/default/form/element/wysiwyg.blade.php
@@ -18,4 +18,4 @@
     {!! Form::textarea($name, $value, $attributes) !!}
 
     @include(app('sleeping_owl.template')->getViewPath('form.element.partials.errors'))
-</div>
\ No newline at end of file
+</div>