Updated contract classes

LaravelRUS · Feb 28, 2016 · 1c4e21d · 1c4e21d
1 parent a7d4c7b
commit 1c4e21d
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 49 deletions.
diff --git a/src/Contracts/ColumnFilterInterface.php b/src/Contracts/ColumnFilterInterface.php
@@ -4,13 +4,8 @@
 
 use Illuminate\Database\Eloquent\Builder;
 
-interface ColumnFilterInterface
+interface ColumnFilterInterface extends Initializable
 {
-    /**
-     * Initialize column filter.
-     */
-    public function initialize();
-
     /**
      * @param RepositoryInterface  $repository
      * @param NamedColumnInterface $column

diff --git a/src/Contracts/ColumnInterface.php b/src/Contracts/ColumnInterface.php
@@ -4,13 +4,8 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-interface ColumnInterface
+interface ColumnInterface extends Initializable
 {
-    /**
-     * Initialize column.
-     */
-    public function initialize();
-
     /**
      * @param Model $model
      *

diff --git a/src/Contracts/DisplayInterface.php b/src/Contracts/DisplayInterface.php
@@ -3,14 +3,10 @@
 namespace SleepingOwl\Admin\Contracts;
 
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Renderable;
 
-interface DisplayInterface extends Arrayable
+interface DisplayInterface extends Arrayable, Renderable, Initializable
 {
-    /**
-     * Initialize display.
-     */
-    public function initialize();
-
     /**
      * Set display class.
      *

diff --git a/src/Contracts/FilterInterface.php b/src/Contracts/FilterInterface.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 
-interface FilterInterface
+interface FilterInterface extends Initializable
 {
     /**
      * Initialize filter.

diff --git a/src/Contracts/FormButtonsInterface.php b/src/Contracts/FormButtonsInterface.php
@@ -2,9 +2,11 @@
 
 namespace SleepingOwl\Admin\Contracts;
 
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Renderable;
 use SleepingOwl\Admin\Model\ModelConfiguration;
 
-interface FormButtonsInterface
+interface FormButtonsInterface extends Renderable, Arrayable
 {
     /**
      * @param ModelConfiguration $modelConfiguration

diff --git a/src/Contracts/FormElementInterface.php b/src/Contracts/FormElementInterface.php
@@ -3,14 +3,11 @@
 namespace SleepingOwl\Admin\Contracts;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Renderable;
 
-interface FormElementInterface
+interface FormElementInterface extends Renderable, Arrayable, Initializable
 {
-    /**
-     * Initialize form item.
-     */
-    public function initialize();
-
     /**
      * Set currently rendered instance.
      *

diff --git a/src/Contracts/Initializable.php b/src/Contracts/Initializable.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace SleepingOwl\Admin\Contracts;
+
+use Illuminate\Contracts\Validation\Validator;
+use SleepingOwl\Admin\Model\ModelConfiguration;
+
+interface Initializable
+{
+    /**
+     * Initialize class
+     */
+    public function initialize();
+}
diff --git a/src/Display/DisplayDatatables.php b/src/Display/DisplayDatatables.php
@@ -2,6 +2,7 @@
 
 namespace SleepingOwl\Admin\Display;
 
+use SleepingOwl\Admin\Contracts\Initializable;
 use SleepingOwl\Admin\Contracts\ColumnFilterInterface;
 
 class DisplayDatatables extends DisplayTable
@@ -43,7 +44,7 @@ public function initialize()
     {
         parent::initialize();
         foreach ($this->getColumnFilters() as $columnFilter) {
-            if ($columnFilter instanceof ColumnFilterInterface) {
+            if ($columnFilter instanceof Initializable) {
                 $columnFilter->initialize();
             }
         }

diff --git a/src/Display/DisplayTab.php b/src/Display/DisplayTab.php
@@ -2,14 +2,14 @@
 
 namespace SleepingOwl\Admin\Display;
 
-use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Contracts\Validation\Validator;
-use SleepingOwl\Admin\Contracts\DisplayInterface;
 use SleepingOwl\Admin\Contracts\FormInterface;
+use SleepingOwl\Admin\Contracts\Initializable;
 use SleepingOwl\Admin\Model\ModelConfiguration;
+use SleepingOwl\Admin\Contracts\DisplayInterface;
 
 // TODO: починить указание активности таба
-class DisplayTab implements Renderable, DisplayInterface, FormInterface
+class DisplayTab implements DisplayInterface, FormInterface
 {
 
     /**
@@ -156,7 +156,7 @@ public function setClass($class)
      */
     public function initialize()
     {
-        if ($this->getContent() instanceof DisplayInterface) {
+        if ($this->getContent() instanceof Initializable) {
             $this->getContent()->initialize();
         }
 

diff --git a/src/Display/DisplayTabbed.php b/src/Display/DisplayTabbed.php
@@ -3,13 +3,13 @@
 namespace SleepingOwl\Admin\Display;
 
 use Closure;
-use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Contracts\Validation\Validator;
 use SleepingOwl\Admin\Contracts\FormInterface;
+use SleepingOwl\Admin\Contracts\Initializable;
 use SleepingOwl\Admin\Model\ModelConfiguration;
 use SleepingOwl\Admin\Contracts\DisplayInterface;
 
-class DisplayTabbed implements Renderable, DisplayInterface, FormInterface
+class DisplayTabbed implements DisplayInterface, FormInterface
 {
     /**
      * Added tabs.
@@ -20,7 +20,7 @@ class DisplayTabbed implements Renderable, DisplayInterface, FormInterface
     public function initialize()
     {
         foreach ($this->getTabs() as $tab) {
-            if ($tab instanceof DisplayInterface) {
+            if ($tab instanceof Initializable) {
                 $tab->initialize();
             }
         }

diff --git a/src/Display/DisplayTable.php b/src/Display/DisplayTable.php
@@ -8,7 +8,7 @@
 use SleepingOwl\Admin\TableColumn;
 use Illuminate\Database\Eloquent\Builder;
 use SleepingOwl\Admin\Traits\HtmlAttributes;
-use Illuminate\Contracts\Support\Renderable;
+use SleepingOwl\Admin\Contracts\Initializable;
 use SleepingOwl\Admin\Model\ModelConfiguration;
 use SleepingOwl\Admin\Repository\BaseRepository;
 use SleepingOwl\Admin\Contracts\FilterInterface;
@@ -18,7 +18,7 @@
 use SleepingOwl\Admin\Contracts\NamedColumnInterface;
 use SleepingOwl\Admin\Contracts\ColumnActionInterface;
 
-class DisplayTable implements Renderable, DisplayInterface
+class DisplayTable implements DisplayInterface
 {
     use HtmlAttributes;
 
@@ -143,7 +143,7 @@ public function initialize()
         $this->repository->setWith($this->getWith());
         $this->initializeFilters();
         foreach ($this->getAllColumns() as $column) {
-            if ($column instanceof ColumnInterface) {
+            if ($column instanceof Initializable) {
                 $column->initialize();
             }
         }
@@ -533,9 +533,11 @@ protected function initializeFilters()
         $this->initializeAction();
 
         foreach ($this->getFilters() as $filter) {
-            $filter->initialize();
-            if ($filter->isActive()) {
-                $this->activeFilters[] = $filter;
+            if ($filter instanceof FilterInterface) {
+                $filter->initialize();
+                if ($filter->isActive()) {
+                    $this->activeFilters[] = $filter;
+                }
             }
         }
     }

diff --git a/src/Display/DisplayTree.php b/src/Display/DisplayTree.php
@@ -5,14 +5,13 @@
 use Meta;
 use Route;
 use Request;
-use SleepingOwl\Admin\Model\ModelConfiguration;
 use SleepingOwl\Admin\TableColumn;
-use Illuminate\Contracts\Support\Renderable;
+use SleepingOwl\Admin\Model\ModelConfiguration;
 use SleepingOwl\Admin\Repository\TreeRepository;
 use SleepingOwl\Admin\Contracts\DisplayInterface;
 use SleepingOwl\Admin\Contracts\WithRoutesInterface;
 
-class DisplayTree implements Renderable, DisplayInterface, WithRoutesInterface
+class DisplayTree implements DisplayInterface, WithRoutesInterface
 {
     public static function registerRoutes()
     {
@@ -73,6 +72,7 @@ public function initialize()
 
         $this->repository = new TreeRepository($this->class);
         $this->repository->with($this->getWith());
+
         TableColumn::treeControl()->initialize();
     }
 

diff --git a/src/Form/FormButtons.php b/src/Form/FormButtons.php
@@ -2,13 +2,11 @@
 
 namespace SleepingOwl\Admin\Form;
 
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Contracts\Support\Renderable;
 use SleepingOwl\Admin\Model\ModelConfiguration;
 use SleepingOwl\Admin\Traits\HtmlAttributes;
 use SleepingOwl\Admin\Contracts\FormButtonsInterface;
 
-class FormButtons implements Renderable, Arrayable, FormButtonsInterface
+class FormButtons implements FormButtonsInterface
 {
     use HtmlAttributes;
 

diff --git a/src/Form/FormDefault.php b/src/Form/FormDefault.php
@@ -6,7 +6,7 @@
 use Request;
 use Validator;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Contracts\Support\Renderable;
+use SleepingOwl\Admin\Contracts\Initializable;
 use SleepingOwl\Admin\Contracts\FormInterface;
 use SleepingOwl\Admin\Model\ModelConfiguration;
 use SleepingOwl\Admin\Repository\BaseRepository;
@@ -19,7 +19,7 @@
 use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
-class FormDefault implements Renderable, DisplayInterface, FormInterface
+class FormDefault implements DisplayInterface, FormInterface
 {
     /**
      * View to render.
@@ -399,7 +399,7 @@ protected function initializeItems()
         $items = $this->getItems();
 
         array_walk_recursive($items, function ($item) {
-            if ($item instanceof FormElementInterface) {
+            if ($item instanceof Initializable) {
                 $item->initialize();
             }
         });