Add "init" in WildfireTrait

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to `Wildfire` will be documented in this file.
 
 ### Added
 - `$pagee` variable for pagination customization in `PaginateTrait`
+- `init` in `WildfireTrait` to initialize `Wildfire` without specifying
 
 ### Changed
 - Code documentation by `php-cs-fixer`, code quality by `phpstan`

src/Traits/WildfireTrait.php

@@ -5,6 +5,8 @@
 use Rougin\Wildfire\Wildfire;
 
 /**
+ * @property \CI_DB_result $db
+ *
  * @method string table()
  *
  * @package Wildfire
@@ -49,7 +51,7 @@ public function __call($method, $params)
      */
     public function find($id)
     {
-        return $this->wildfire->find($this->table(), $id);
+        return $this->init()->find($this->table(), $id);
     }
 
     /**
@@ -62,7 +64,7 @@ public function find($id)
      */
     public function get($limit = null, $offset = null)
     {
-        return $this->wildfire->get($this->table(), $limit, $offset);
+        return $this->init()->get($this->table(), $limit, $offset);
     }
 
     /**
@@ -74,8 +76,29 @@ public function get($limit = null, $offset = null)
      */
     public function wildfire(Wildfire $wildfire)
     {
-        $this->wildfire = $wildfire;
+        $this->init($wildfire);
 
         return $this;
     }
+
+    /**
+     * Initializes the Wildfire instance.
+     *
+     * @param \Rougin\Wildfire\Wildfire|null $wildfire
+     *
+     * @return \Rougin\Wildfire\Wildfire
+     */
+    private function init(Wildfire $wildfire = null)
+    {
+        if ($wildfire)
+        {
+            $this->wildfire = $wildfire;
+        }
+        else
+        {
+            $this->wildfire = new Wildfire($this->db);
+        }
+
+        return $this->wildfire;
+    }
 }

src/Wildfire.php

@@ -5,8 +5,6 @@
 use CI_DB_result as QueryResult;
 
 /**
- * @method \Rougin\Wildfire\Wildfire where(mixed $key, mixed $value = null, bool $escape = null)
- *
  * @package Wildfire
  *
  * @author Rougin Gutib <[email protected]>
@@ -120,7 +118,7 @@ public function find($table, $id)
 
         $data = array($model->primary() => $id);
 
-        $this->builder->where((array) $data);
+        $this->builder->where($data);
 
         $items = $this->get($table)->result();
 
@@ -138,7 +136,7 @@ public function find($table, $id)
      */
     public function get($table = '', $limit = null, $offset = null)
     {
-        $this->table = (string) ucwords((string) singular($table));
+        $this->table = ucwords(singular($table));
 
         $this->result = $this->builder->get($table, $limit, $offset);
 
@@ -164,12 +162,12 @@ public function result($model = '')
 
         for ($i = 0; $i < (int) $length; $i++)
         {
-            $item = (array) $items[(int) $i];
+            $item = $items[$i];
 
-            $items[$i] = new $model((array) $item);
+            $items[$i] = new $model($item);
         }
 
-        return (array) $items;
+        return $items;
     }
 
     /**

tests/Weblog/application/models/Comment.php

@@ -6,7 +6,9 @@ class Comment extends Rougin\Wildfire\Model
 
     /**
      * An array of validation rules. This needs to be the same format
-     * as validation rules passed to the Form_validation library.
+     * as validation rules passed to the Form Validation library.
+     *
+     * @link https://codeigniter.com/userguide3/libraries/form_validation.html#setting-rules-using-an-array
      *
      * @var array<string, string>[]
      */