Created initializeBlocks method so we can use the Trait everywhere

ciricihq · Jul 1, 2016 · 795e72e · 795e72e
1 parent 401d30f
commit 795e72e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/src/Controller/Component/BlockComponent.php b/src/Controller/Component/BlockComponent.php
@@ -23,12 +23,6 @@ public function __construct(ComponentRegistry $registry, array $config = [])
     {
         parent::__construct($registry, $config);
 
-        $this->table = Configure::read('Blocks.table');
-
-        if ($this->config('table')) {
-            $this->table = $this->config('table');
-        }
-
-        $this->Blocks = TableRegistry::get($this->table);
+        $this->initializeBlocks($config);
     }
 }
diff --git a/src/Utility/BlocksTrait.php b/src/Utility/BlocksTrait.php
@@ -1,6 +1,9 @@
 <?php
 namespace Cirici\Blocks\Utility;
 
+use Cake\Core\Configure;
+use Cake\ORM\TableRegistry;
+
 trait BlocksTrait
 {
     /**
@@ -16,6 +19,23 @@ trait BlocksTrait
      */
     protected $Blocks;
 
+    /**
+     * Used to initialize the BlocksTable instance.
+     *
+     * @param  array  $config Array of additional configuration options.
+     * @return void
+     */
+    public function initializeBlocks(array $config = [])
+    {
+        $this->table = Configure::read('Blocks.table');
+
+        if (isset($config['table'])) {
+            $this->table = $config['table'];
+        }
+
+        $this->Blocks = TableRegistry::get($this->table);
+    }
+
     /**
      * Retrieves an entire block from given identifier
      *

diff --git a/src/View/Helper/BlockHelper.php b/src/View/Helper/BlockHelper.php
@@ -21,12 +21,6 @@ public function __construct(View $view, array $config = [])
     {
         parent::__construct($view, $config);
 
-        $this->table = Configure::read('Blocks.table');
-
-        if ($this->config('table')) {
-            $this->table = $this->config('table');
-        }
-
-        $this->Blocks = TableRegistry::get($this->table);
+        $this->initializeBlocks($config);
     }
 }