ci-bonfire / Sprint

myth/Mail/Mail.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      * @param $mailer_name
      * @param array $params
      * @param array $options
-     * @return mixed
+     * @return boolean
      */
     public static function deliver($mailer_name, $params=[], $options=[])
     {

Indentation +165 added lines, -165 removed lines

@@ -1,172 +1,172 @@
 <?php namespace Myth\Mail;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 class Mail {
 
-    /**
-     * Sends an email, using an existing Mailer, which can
-     * be found in application/mailers/. The mailer is the one responsible
-     * for determining whether the email will be sent immediately or queued
-     * to be sent later.
-     *
-     * The $mailer_name must include both the mailer name as well as the
-     * task, separated by a single colon:
-     *      'UserMailer:newUser'
-     *
-     * @param $mailer_name
-     * @param array $params
-     * @param array $options
-     * @return mixed
-     */
-    public static function deliver($mailer_name, $params=[], $options=[])
-    {
-        // Protect users from themselves here.
-        str_replace('::', ':', $mailer_name);
-
-        // Try to load our mailer class.
-        list($class, $method) = explode(':', $mailer_name);
-
-        if (! is_file(APPPATH .'mailers/'. $class .'.php'))
-        {
-            throw new \RuntimeException( sprintf( lang('mail.cant_find_mailer'), $class) );
-        }
-
-        require_once APPPATH .'mailers/'. $class .'.php';
-
-        if (! class_exists($class, false))
-        {
-            throw new \RuntimeException( sprintf( lang('errors.cant_instantiate'), $class) );
-        }
-
-        $mailer = new $class( $options );
-
-        if (! method_exists($mailer, $method))
-        {
-            throw new \BadMethodCallException( sprintf( lang('mail.invalid_mailer_method'), $class, $method) );
-        }
-
-        // try to deliver the mail, but don't send back the contents
-        // since we don't want to force the mailers to return anything.
-        if (call_user_func_array([$mailer, $method], $params) )
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an item to the email queue to be sent out next time.
-     *
-     * @param string $mailer_name
-     * @param array $params
-     * @param array $options
-     * @param \Myth\Mail\Queue $queue
-     *
-     * @return mixed
-     */
-    public static function queue($mailer_name, $params=[], $options=[], &$queue=null)
-    {
-        $data = [
-            'mailer'    => $mailer_name,
-            'params'    => serialize($params),
-            'options'   => serialize($options)
-        ];
-
-        if (empty($queue))
-        {
-            $queue = new \Myth\Mail\Queue();
-        }
-
-        return $queue->insert($data);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Processes the Email queue sending out emails in chunks.
-     * Typically used in a cronjob to send out all queued emails.
-     *
-     * @param int $chunk_size   // How many emails to send per batch.
-     * @return string           // The output of the cronjob...
-     */
-    public static function process($chunk_size=50, &$db=null)
-    {
-        if (empty($db))
-        {
-            $db = new \Myth\Mail\Queue();
-        }
-
-        // Grab our batch of emails to process
-        $queue = $db->find_many_by('sent', 0);
-
-        if (! $queue)
-        {
-            // We didn't have an error, we simply
-            // didn't have anything to do.
-            return true;
-        }
-
-        $output = 'Started processing email Queue at '. date('Y-m-d H:i:s') .".\n\n";
-
-        foreach ($queue as $item)
-        {
-            try {
-                if (! Mail::deliver($item->mailer, unserialize($item->params), unserialize($item->options))) {
-                    $output .= '[FAILED] ';
-                } else {
-                    $data = [
-                        'sent'    => 1,
-                        'sent_on' => date('Y-m-d H:i:s')
-                    ];
-
-                    $db->update($item->id, $data);
-                }
-
-                $output .= "ID: {$item->id}, Mailer: {$item->mailer}. \n";
-            }
-            catch (\Exception $e)
-            {
-                $output .= "[EXCEPTION] ". $e->getMessage() ."\n";
-            }
-        }
-
-        $output .= "Done processing email Queue at ". date('H:i:s') .".\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Sends an email, using an existing Mailer, which can
+	 * be found in application/mailers/. The mailer is the one responsible
+	 * for determining whether the email will be sent immediately or queued
+	 * to be sent later.
+	 *
+	 * The $mailer_name must include both the mailer name as well as the
+	 * task, separated by a single colon:
+	 *      'UserMailer:newUser'
+	 *
+	 * @param $mailer_name
+	 * @param array $params
+	 * @param array $options
+	 * @return mixed
+	 */
+	public static function deliver($mailer_name, $params=[], $options=[])
+	{
+		// Protect users from themselves here.
+		str_replace('::', ':', $mailer_name);
+
+		// Try to load our mailer class.
+		list($class, $method) = explode(':', $mailer_name);
+
+		if (! is_file(APPPATH .'mailers/'. $class .'.php'))
+		{
+			throw new \RuntimeException( sprintf( lang('mail.cant_find_mailer'), $class) );
+		}
+
+		require_once APPPATH .'mailers/'. $class .'.php';
+
+		if (! class_exists($class, false))
+		{
+			throw new \RuntimeException( sprintf( lang('errors.cant_instantiate'), $class) );
+		}
+
+		$mailer = new $class( $options );
+
+		if (! method_exists($mailer, $method))
+		{
+			throw new \BadMethodCallException( sprintf( lang('mail.invalid_mailer_method'), $class, $method) );
+		}
+
+		// try to deliver the mail, but don't send back the contents
+		// since we don't want to force the mailers to return anything.
+		if (call_user_func_array([$mailer, $method], $params) )
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an item to the email queue to be sent out next time.
+	 *
+	 * @param string $mailer_name
+	 * @param array $params
+	 * @param array $options
+	 * @param \Myth\Mail\Queue $queue
+	 *
+	 * @return mixed
+	 */
+	public static function queue($mailer_name, $params=[], $options=[], &$queue=null)
+	{
+		$data = [
+			'mailer'    => $mailer_name,
+			'params'    => serialize($params),
+			'options'   => serialize($options)
+		];
+
+		if (empty($queue))
+		{
+			$queue = new \Myth\Mail\Queue();
+		}
+
+		return $queue->insert($data);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Processes the Email queue sending out emails in chunks.
+	 * Typically used in a cronjob to send out all queued emails.
+	 *
+	 * @param int $chunk_size   // How many emails to send per batch.
+	 * @return string           // The output of the cronjob...
+	 */
+	public static function process($chunk_size=50, &$db=null)
+	{
+		if (empty($db))
+		{
+			$db = new \Myth\Mail\Queue();
+		}
+
+		// Grab our batch of emails to process
+		$queue = $db->find_many_by('sent', 0);
+
+		if (! $queue)
+		{
+			// We didn't have an error, we simply
+			// didn't have anything to do.
+			return true;
+		}
+
+		$output = 'Started processing email Queue at '. date('Y-m-d H:i:s') .".\n\n";
+
+		foreach ($queue as $item)
+		{
+			try {
+				if (! Mail::deliver($item->mailer, unserialize($item->params), unserialize($item->options))) {
+					$output .= '[FAILED] ';
+				} else {
+					$data = [
+						'sent'    => 1,
+						'sent_on' => date('Y-m-d H:i:s')
+					];
+
+					$db->update($item->id, $data);
+				}
+
+				$output .= "ID: {$item->id}, Mailer: {$item->mailer}. \n";
+			}
+			catch (\Exception $e)
+			{
+				$output .= "[EXCEPTION] ". $e->getMessage() ."\n";
+			}
+		}
+
+		$output .= "Done processing email Queue at ". date('H:i:s') .".\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +17 added lines, -17 removed lines

@@ -47,7 +47,7 @@ 
      * @param array $options
      * @return mixed
      */
-    public static function deliver($mailer_name, $params=[], $options=[])
+    public static function deliver($mailer_name, $params = [], $options = [])
     {
         // Protect users from themselves here.
         str_replace('::', ':', $mailer_name);
@@ -55,28 +55,28 @@ 
         // Try to load our mailer class.
         list($class, $method) = explode(':', $mailer_name);
 
-        if (! is_file(APPPATH .'mailers/'. $class .'.php'))
+        if ( ! is_file(APPPATH.'mailers/'.$class.'.php'))
         {
-            throw new \RuntimeException( sprintf( lang('mail.cant_find_mailer'), $class) );
+            throw new \RuntimeException(sprintf(lang('mail.cant_find_mailer'), $class));
         }
 
-        require_once APPPATH .'mailers/'. $class .'.php';
+        require_once APPPATH.'mailers/'.$class.'.php';
 
-        if (! class_exists($class, false))
+        if ( ! class_exists($class, false))
         {
-            throw new \RuntimeException( sprintf( lang('errors.cant_instantiate'), $class) );
+            throw new \RuntimeException(sprintf(lang('errors.cant_instantiate'), $class));
         }
 
-        $mailer = new $class( $options );
+        $mailer = new $class($options);
 
-        if (! method_exists($mailer, $method))
+        if ( ! method_exists($mailer, $method))
         {
-            throw new \BadMethodCallException( sprintf( lang('mail.invalid_mailer_method'), $class, $method) );
+            throw new \BadMethodCallException(sprintf(lang('mail.invalid_mailer_method'), $class, $method));
         }
 
         // try to deliver the mail, but don't send back the contents
         // since we don't want to force the mailers to return anything.
-        if (call_user_func_array([$mailer, $method], $params) )
+        if (call_user_func_array([$mailer, $method], $params))
         {
             return true;
         }
@@ -96,7 +96,7 @@ 
      *
      * @return mixed
      */
-    public static function queue($mailer_name, $params=[], $options=[], &$queue=null)
+    public static function queue($mailer_name, $params = [], $options = [], &$queue = null)
     {
         $data = [
             'mailer'    => $mailer_name,
@@ -121,7 +121,7 @@ 
      * @param int $chunk_size   // How many emails to send per batch.
      * @return string           // The output of the cronjob...
      */
-    public static function process($chunk_size=50, &$db=null)
+    public static function process($chunk_size = 50, &$db = null)
     {
         if (empty($db))
         {
@@ -131,19 +131,19 @@ 
         // Grab our batch of emails to process
         $queue = $db->find_many_by('sent', 0);
 
-        if (! $queue)
+        if ( ! $queue)
         {
             // We didn't have an error, we simply
             // didn't have anything to do.
             return true;
         }
 
-        $output = 'Started processing email Queue at '. date('Y-m-d H:i:s') .".\n\n";
+        $output = 'Started processing email Queue at '.date('Y-m-d H:i:s').".\n\n";
 
         foreach ($queue as $item)
         {
             try {
-                if (! Mail::deliver($item->mailer, unserialize($item->params), unserialize($item->options))) {
+                if ( ! Mail::deliver($item->mailer, unserialize($item->params), unserialize($item->options))) {
                     $output .= '[FAILED] ';
                 } else {
                     $data = [
@@ -158,11 +158,11 @@ 
             }
             catch (\Exception $e)
             {
-                $output .= "[EXCEPTION] ". $e->getMessage() ."\n";
+                $output .= "[EXCEPTION] ".$e->getMessage()."\n";
             }
         }
 
-        $output .= "Done processing email Queue at ". date('H:i:s') .".\n";
+        $output .= "Done processing email Queue at ".date('H:i:s').".\n";
 
         return $output;
     }

Braces +1 added lines, -2 removed lines

@@ -155,8 +155,7 @@
                 }
 
                 $output .= "ID: {$item->id}, Mailer: {$item->mailer}. \n";
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 $output .= "[EXCEPTION] ". $e->getMessage() ."\n";
             }

myth/Models/CIDbModel.php

Doc Comments +2 added lines, -2 removed lines

@@ -740,7 +740,6 @@ 
      * $this->update_by($wheres, $data);
      * $this->update_by('user_id', 15, $data);
      *
-     * @param array $data An array of data pairs to update
      * @param one or more WHERE-acceptable entries.
      * @return bool
      */
@@ -1119,7 +1118,7 @@ 
      *
      * @param $field
      *
-     * @return mixed
+     * @return CIDbModel
      */
     public function protect($field)
     {
@@ -1380,6 +1379,7 @@ 
      *
      * @param  array $data An array of validation rules
      * @param  string $type Either 'update' or 'insert'.
+     * @param boolean $skip_validation
      * @return array/bool       The original data or FALSE
      */
     public function validate($data, $type = 'update', $skip_validation = null)

Spacing +40 added lines, -40 removed lines

@@ -301,7 +301,7 @@ 
         $this->temp_return_type = $this->return_type;
 
         // Make sure our database is loaded
-        if (!is_null($db)) {
+        if ( ! is_null($db)) {
             $this->db = $db;
         }
         else {
@@ -310,7 +310,7 @@ 
         }
 
         // Do we have a form_validation library?
-        if (! is_null($form_validation)) {
+        if ( ! is_null($form_validation)) {
             $this->form_validation = $form_validation;
         }
         else {
@@ -480,7 +480,7 @@ 
 
         if (is_array($rows)) {
             foreach ($rows as $key => &$row) {
-                $row = $this->trigger('after_find', ['method' => 'find_all', 'fields' => $row] );
+                $row = $this->trigger('after_find', ['method' => 'find_all', 'fields' => $row]);
             }
         }
 
@@ -510,7 +510,7 @@ 
         if ($data !== FALSE) {
             $data = $this->trigger('before_insert', ['method' => 'insert', 'fields' => $data]);
 
-            $this->db->insert($this->table_name, $this->prep_data($data) );
+            $this->db->insert($this->table_name, $this->prep_data($data));
 
             if ($this->return_insert_id) {
                 $id = $this->db->insert_id();
@@ -555,7 +555,7 @@ 
 
         if ($data !== FALSE) {
             $data['batch'] = true;
-            $data = $this->trigger('before_insert', ['method' => 'insert_batch', 'fields' => $data] );
+            $data = $this->trigger('before_insert', ['method' => 'insert_batch', 'fields' => $data]);
             unset($data['batch']);
 
             return $this->db->insert_batch($this->table_name, $data);
@@ -577,7 +577,7 @@ 
      * @param null $skip_validation
      * @return bool
      */
-    public function replace($data, $skip_validation=null)
+    public function replace($data, $skip_validation = null)
     {
         $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
 
@@ -624,10 +624,10 @@ 
         // Will be false if it didn't validate.
         if ($data !== FALSE) {
             
-            $data = $this->trigger('before_update', ['id' => $id, 'method' =>'update', 'fields' => $data] );
+            $data = $this->trigger('before_update', ['id' => $id, 'method' =>'update', 'fields' => $data]);
             
             $this->db->where($this->primary_key, $id);
-            $this->db->set( $this->prep_data($data) );
+            $this->db->set($this->prep_data($data));
             $result = $this->db->update($this->table_name);
 
             $this->trigger('after_update', ['id' => $id, 'fields' => $data, 'result' => $result, 'method' => 'update']);
@@ -666,7 +666,7 @@ 
     public function update_batch($data, $where_key)
     {
         foreach ($data as &$row) {
-            $row = $this->trigger('before_update', ['method' => 'update_batch', 'fields' => $row] );
+            $row = $this->trigger('before_update', ['method' => 'update_batch', 'fields' => $row]);
         }
 
         $result = $this->db->update_batch($this->table_name, $data, $where_key);
@@ -700,7 +700,7 @@ 
      */
     public function update_many($ids, $data, $skip_validation = null)
     {
-        if (!is_array($ids) || count($ids) == 0) return NULL;
+        if ( ! is_array($ids) || count($ids) == 0) return NULL;
 
         $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
 
@@ -754,10 +754,10 @@ 
 
         // Will be false if it didn't validate.
         if ($this->validate($data) !== FALSE) {
-            $this->db->set( $this->prep_data($data) );
+            $this->db->set($this->prep_data($data));
             $result = $this->db->update($this->table_name);
 
-            $this->trigger('after_update', ['method' => 'update_by', 'fields' => $data, 'result' => $result] );
+            $this->trigger('after_update', ['method' => 'update_by', 'fields' => $data, 'result' => $result]);
 
             return $result;
         } else {
@@ -776,7 +776,7 @@ 
      */
     public function update_all($data, $skip_validation = FALSE)
     {
-        $data = $this->trigger('before_update', ['method' => 'update_all', 'fields' => $data] );
+        $data = $this->trigger('before_update', ['method' => 'update_all', 'fields' => $data]);
 
         $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
 
@@ -786,10 +786,10 @@ 
 
         // Will be false if it didn't validate.
         if ($data !== FALSE) {
-            $this->db->set( $this->prep_data($data) );
+            $this->db->set($this->prep_data($data));
             $result = $this->db->update($this->table_name);
 
-            $this->trigger('after_update', ['method' => 'update_all', 'fields' => $data, 'result' => $result] );
+            $this->trigger('after_update', ['method' => 'update_all', 'fields' => $data, 'result' => $result]);
 
             return $result;
         } else {
@@ -808,9 +808,9 @@ 
      * @param int $value
      * @return mixed
      */
-    public function increment($id, $field, $value=1)
+    public function increment($id, $field, $value = 1)
     {
-        $value = (int)abs($value);
+        $value = (int) abs($value);
 
         $this->db->where($this->primary_key, $id);
         $this->db->set($field, "{$field}+{$value}", false);
@@ -829,9 +829,9 @@ 
      * @param int $value
      * @return mixed
      */
-    public function decrement($id, $field, $value=1)
+    public function decrement($id, $field, $value = 1)
     {
-        $value = (int)abs($value);
+        $value = (int) abs($value);
 
         $this->db->where($this->primary_key, $id);
         $this->db->set($field, "{$field}-{$value}", false);
@@ -849,7 +849,7 @@ 
      */
     public function delete($id)
     {
-        $this->trigger('before_delete', ['id' => $id, 'method' => 'delete'] );
+        $this->trigger('before_delete', ['id' => $id, 'method' => 'delete']);
 
         $this->db->where($this->primary_key, $id);
 
@@ -864,7 +864,7 @@ 
             $result = $this->db->delete($this->table_name);
         }
 
-        $this->trigger('after_delete', ['id' => $id, 'method' => 'delete', 'result' => $result] );
+        $this->trigger('after_delete', ['id' => $id, 'method' => 'delete', 'result' => $result]);
 
         return $result;
     }
@@ -888,7 +888,7 @@ 
             $result = $this->db->delete($this->table_name);
         }
 
-        $this->trigger('after_delete', ['method' => 'delete_by', 'fields' => $where, 'result' => $result] );
+        $this->trigger('after_delete', ['method' => 'delete_by', 'fields' => $where, 'result' => $result]);
 
         return $result;
     }
@@ -897,9 +897,9 @@ 
 
     public function delete_many($ids)
     {
-        if (!is_array($ids) || count($ids) == 0) return NULL;
+        if ( ! is_array($ids) || count($ids) == 0) return NULL;
 
-        $ids = $this->trigger('before_delete', ['ids' => $ids, 'method' => 'delete_many'] );
+        $ids = $this->trigger('before_delete', ['ids' => $ids, 'method' => 'delete_many']);
 
         $this->db->where_in($this->primary_key, $ids);
 
@@ -960,7 +960,7 @@ 
      * @param string $class
      * @return $this
      */
-    public function as_object($class=null)
+    public function as_object($class = null)
     {
         $this->temp_return_type = ! empty($class) ? $class : 'object';
 
@@ -1060,7 +1060,7 @@ 
      */
     public function return_insert_id($return = true)
     {
-        $this->return_insert_id = (bool)$return;
+        $this->return_insert_id = (bool) $return;
 
         return $this;
     }
@@ -1170,7 +1170,7 @@ 
 
         // Though the model doesn't support multiple keys well, $this->key
         // could be an array or a string...
-        $skippedFields = array_merge($skippedFields, (array)$this->primary_key);
+        $skippedFields = array_merge($skippedFields, (array) $this->primary_key);
 
         // Remove any protected attributes
         $skippedFields = array_merge($skippedFields, $this->protected_attributes);
@@ -1200,7 +1200,7 @@ 
      *
      * @return string
      */
-    public function last_query ()
+    public function last_query()
     {
         return $this->db->last_query();
     }
@@ -1213,11 +1213,11 @@ 
      *
      * @return mixed
      */
-    public function last_query_time ()
+    public function last_query_time()
     {
         $times = $this->db->query_times;
 
-        if (! is_array($this->db->query_times) || ! count($this->db->query_times))
+        if ( ! is_array($this->db->query_times) || ! count($this->db->query_times))
         {
             return null;
         }
@@ -1249,7 +1249,7 @@ 
         $row = $row['fields'];
 
         // Created_on
-        if (! array_key_exists($this->created_field, $row))
+        if ( ! array_key_exists($this->created_field, $row))
         {
             $row[$this->created_field] = $this->set_date();
         }
@@ -1260,7 +1260,7 @@ 
             // If you're here because of an error with $this->authenticate
             // not being available, it's likely due to you not using
             // the AuthTrait and/or setting log_user after model is instantiated.
-            $row[$this->created_by_field] = (int)$this->authenticate->id();
+            $row[$this->created_by_field] = (int) $this->authenticate->id();
         }
 
         return $row;
@@ -1332,7 +1332,7 @@ 
      */
     public function trigger($event, $data = false)
     {
-        if (! isset($this->$event) || ! is_array($this->$event))
+        if ( ! isset($this->$event) || ! is_array($this->$event))
         {
             if (isset($data['fields']))
             {
@@ -1397,18 +1397,18 @@ 
             $this->load->database();
         }
 
-        if (!empty($this->validation_rules)) {
+        if ( ! empty($this->validation_rules)) {
             $this->form_validation->set_data($data);
 
             if (is_array($this->validation_rules)) {
                 // Any insert additions?
                 if ($type == 'insert'
-                    && !empty($this->insert_validate_rules)
+                    && ! empty($this->insert_validate_rules)
                     && is_array($this->insert_validate_rules)
                 ) {
                     foreach ($this->validation_rules as &$row) {
                         if (isset($this->insert_validate_rules[$row['field']])) {
-                            $row ['rules'] .= '|' . $this->insert_validate_rules[$row['field']];
+                            $row ['rules'] .= '|'.$this->insert_validate_rules[$row['field']];
                         }
                     }
                 }
@@ -1475,7 +1475,7 @@ 
      */
     protected function set_date($user_date = NULL)
     {
-        $curr_date = !empty($user_date) ? $user_date : time();
+        $curr_date = ! empty($user_date) ? $user_date : time();
 
         switch ($this->date_format) {
             case 'int':
@@ -1499,7 +1499,7 @@ 
      *
      * @return mixed
      */
-    public function error($db_array_only=false)
+    public function error($db_array_only = false)
     {
         // Send any validation errors if we have any.
         if (function_exists('validation_errors') && validation_errors() && ! $db_array_only)
@@ -1515,7 +1515,7 @@ 
             return $error;
         }
 
-        if (! empty($error['code']))
+        if ( ! empty($error['code']))
         {
             return "Database Error {$error['code']}: {$error['message']}.";
         }
@@ -1565,7 +1565,7 @@ 
      * @param $name
      * @param $params
      */
-    public function __call($name, $params=null)
+    public function __call($name, $params = null)
     {
         if (method_exists($this->db, $name))
         {

Braces +14 added lines, -8 removed lines

@@ -294,8 +294,12 @@ 
 
         // Check our auto-set features and make sure they are part of
         // our observer system.
-        if ($this->set_created === true) array_unshift($this->before_insert, 'created_on');
-        if ($this->set_modified === true) array_unshift($this->before_update, 'modified_on');
+        if ($this->set_created === true) {
+        	array_unshift($this->before_insert, 'created_on');
+        }
+        if ($this->set_modified === true) {
+        	array_unshift($this->before_update, 'modified_on');
+        }
 
         // Make sure our temp return type is correct.
         $this->temp_return_type = $this->return_type;
@@ -303,8 +307,7 @@ 
         // Make sure our database is loaded
         if (!is_null($db)) {
             $this->db = $db;
-        }
-        else {
+        } else {
             // Auto Init the damn database....
             $this->load->database();
         }
@@ -312,8 +315,7 @@ 
         // Do we have a form_validation library?
         if (! is_null($form_validation)) {
             $this->form_validation = $form_validation;
-        }
-        else {
+        } else {
             $this->load->library('form_validation');
         }
         
@@ -700,7 +702,9 @@ 
      */
     public function update_many($ids, $data, $skip_validation = null)
     {
-        if (!is_array($ids) || count($ids) == 0) return NULL;
+        if (!is_array($ids) || count($ids) == 0) {
+        	return NULL;
+        }
 
         $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
 
@@ -897,7 +901,9 @@ 
 
     public function delete_many($ids)
     {
-        if (!is_array($ids) || count($ids) == 0) return NULL;
+        if (!is_array($ids) || count($ids) == 0) {
+        	return NULL;
+        }
 
         $ids = $this->trigger('before_delete', ['ids' => $ids, 'method' => 'delete_many'] );
 

Indentation +1420 added lines, -1420 removed lines

@@ -102,1479 +102,1479 @@
 class CIDbModel
 {
 
-    /**
-     * The model's default table name.
-     *
-     * @var string;
-     */
-    protected $table_name;
-
-    /**
-     * The model's default primary key.
-     *
-     * @var string
-     */
-    protected $primary_key = 'id';
-
-    /**
-     * The type of date/time field used for created_on and modified_on fields.
-     * Valid types are: 'int', 'datetime', 'date'
-     *
-     * @var string
-     * @access protected
-     */
-    protected $date_format = 'datetime';
-
-    /*
+	/**
+	 * The model's default table name.
+	 *
+	 * @var string;
+	 */
+	protected $table_name;
+
+	/**
+	 * The model's default primary key.
+	 *
+	 * @var string
+	 */
+	protected $primary_key = 'id';
+
+	/**
+	 * The type of date/time field used for created_on and modified_on fields.
+	 * Valid types are: 'int', 'datetime', 'date'
+	 *
+	 * @var string
+	 * @access protected
+	 */
+	protected $date_format = 'datetime';
+
+	/*
         Var: $log_user
         If TRUE, will log user id for 'created_by', 'modified_by' and 'deleted_by'.
 
         Access:
             Protected
     */
-    protected $log_user = FALSE;
+	protected $log_user = FALSE;
 
 
 
-    /**
-     * Whether or not to auto-fill a 'created_on' field on inserts.
-     *
-     * @var boolean
-     * @access protected
-     */
-    protected $set_created = TRUE;
+	/**
+	 * Whether or not to auto-fill a 'created_on' field on inserts.
+	 *
+	 * @var boolean
+	 * @access protected
+	 */
+	protected $set_created = TRUE;
 
-    /**
-     * Field name to use to the created time column in the DB table.
-     *
-     * @var string
-     * @access protected
-     */
-    protected $created_field = 'created_on';
+	/**
+	 * Field name to use to the created time column in the DB table.
+	 *
+	 * @var string
+	 * @access protected
+	 */
+	protected $created_field = 'created_on';
 
-    /*
+	/*
         Var: $created_by_field
         Field name to use to the created by column in the DB table.
 
         Access:
             Protected
     */
-    protected $created_by_field = 'created_by';
+	protected $created_by_field = 'created_by';
 
 
 
-    /**
-     * Whether or not to auto-fill a 'modified_on' field on updates.
-     *
-     * @var boolean
-     * @access protected
-     */
-    protected $set_modified = TRUE;
+	/**
+	 * Whether or not to auto-fill a 'modified_on' field on updates.
+	 *
+	 * @var boolean
+	 * @access protected
+	 */
+	protected $set_modified = TRUE;
 
-    /**
-     * Field name to use to the modified time column in the DB table.
-     *
-     * @var string
-     * @access protected
-     */
-    protected $modified_field = 'modified_on';
+	/**
+	 * Field name to use to the modified time column in the DB table.
+	 *
+	 * @var string
+	 * @access protected
+	 */
+	protected $modified_field = 'modified_on';
 
-    /*
+	/*
         Var: $modified_by_field
         Field name to use to the modified by column in the DB table.
 
         Access:
             Protected
     */
-    protected $modified_by_field = 'modified_by';
+	protected $modified_by_field = 'modified_by';
 
 
-    /**
-     * Support for soft_deletes.
-     */
-    protected $soft_deletes = FALSE;
-    protected $soft_delete_key = 'deleted';
-    protected $temp_with_deleted = FALSE;
+	/**
+	 * Support for soft_deletes.
+	 */
+	protected $soft_deletes = FALSE;
+	protected $soft_delete_key = 'deleted';
+	protected $temp_with_deleted = FALSE;
 
-    /*
+	/*
         Var: $deleted_by_field
         Field name to use for the deleted by column in the DB table.
 
         Access:
             Protected
     */
-    protected $deleted_by_field = 'deleted_by';
+	protected $deleted_by_field = 'deleted_by';
 
 
 
-    /**
-     * Various callbacks available to the class. They are simple lists of
-     * method names (methods will be ran on $this).
-     */
-    protected $before_insert = array();
-    protected $after_insert = array();
-    protected $before_update = array();
-    protected $after_update = array();
-    protected $before_find = array();
-    protected $after_find = array();
-    protected $before_delete = array();
-    protected $after_delete = array();
+	/**
+	 * Various callbacks available to the class. They are simple lists of
+	 * method names (methods will be ran on $this).
+	 */
+	protected $before_insert = array();
+	protected $after_insert = array();
+	protected $before_update = array();
+	protected $after_update = array();
+	protected $before_find = array();
+	protected $after_find = array();
+	protected $before_delete = array();
+	protected $after_delete = array();
 
-    protected $callback_parameters = array();
+	protected $callback_parameters = array();
 
 
 
-    /*
+	/*
         If TRUE, inserts will return the last_insert_id. However,
         this can potentially slow down large imports drastically
         so you can turn it off with the return_insert_id(false) method.
      */
-    protected $return_insert_id = true;
-
-    /**
-     * By default, we return items as objects. You can change this for the
-     * entire class by setting this value to 'array' instead of 'object'.
-     * Alternatively, you can do it on a per-instance basis using the
-     * 'as_array()' and 'as_object()' methods.
-     */
-    protected $return_type = 'object';
-    protected $temp_return_type = NULL;
-
-    /**
-     * Protected, non-modifiable attributes
-     */
-    protected $protected_attributes = array();
-
-
-
-    /**
-     * An array of validation rules. This needs to be the same format
-     * as validation rules passed to the Form_validation library.
-     */
-    protected $validation_rules = array();
-
-    /**
-     * Optionally skip the validation. Used in conjunction with
-     * skip_validation() to skip data validation for any future calls.
-     */
-    protected $skip_validation = FALSE;
-
-    /**
-     * An array of extra rules to add to validation rules during inserts only.
-     * Often used for adding 'required' rules to fields on insert, but not udpates.
-     *
-     *   array( 'username' => 'required|strip_tags' );
-     * @var array
-     */
-    protected $insert_validate_rules = array();
-
-
-
-    /**
-     * @var Array Columns for the model's database fields
-     *
-     * This can be set to avoid a database call if using $this->prep_data()
-     */
-    protected $fields = array();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Does basic setup. Can pass the database connection into the constructor
-     * to use that $db instead of the global CI one.
-     *
-     * @param object $db // A database/driver instance
-     * @param object $form_validation // A form_validation library instance
-     */
-    public function __construct($db = null, $form_validation = null)
-    {
-        // Always protect our attributes
-        array_unshift($this->before_insert, 'protect_attributes');
-        array_unshift($this->before_update, 'protect_attributes');
-
-        // Check our auto-set features and make sure they are part of
-        // our observer system.
-        if ($this->set_created === true) array_unshift($this->before_insert, 'created_on');
-        if ($this->set_modified === true) array_unshift($this->before_update, 'modified_on');
-
-        // Make sure our temp return type is correct.
-        $this->temp_return_type = $this->return_type;
-
-        // Make sure our database is loaded
-        if (!is_null($db)) {
-            $this->db = $db;
-        }
-        else {
-            // Auto Init the damn database....
-            $this->load->database();
-        }
-
-        // Do we have a form_validation library?
-        if (! is_null($form_validation)) {
-            $this->form_validation = $form_validation;
-        }
-        else {
-            $this->load->library('form_validation');
-        }
+	protected $return_insert_id = true;
+
+	/**
+	 * By default, we return items as objects. You can change this for the
+	 * entire class by setting this value to 'array' instead of 'object'.
+	 * Alternatively, you can do it on a per-instance basis using the
+	 * 'as_array()' and 'as_object()' methods.
+	 */
+	protected $return_type = 'object';
+	protected $temp_return_type = NULL;
+
+	/**
+	 * Protected, non-modifiable attributes
+	 */
+	protected $protected_attributes = array();
+
+
+
+	/**
+	 * An array of validation rules. This needs to be the same format
+	 * as validation rules passed to the Form_validation library.
+	 */
+	protected $validation_rules = array();
+
+	/**
+	 * Optionally skip the validation. Used in conjunction with
+	 * skip_validation() to skip data validation for any future calls.
+	 */
+	protected $skip_validation = FALSE;
+
+	/**
+	 * An array of extra rules to add to validation rules during inserts only.
+	 * Often used for adding 'required' rules to fields on insert, but not udpates.
+	 *
+	 *   array( 'username' => 'required|strip_tags' );
+	 * @var array
+	 */
+	protected $insert_validate_rules = array();
+
+
+
+	/**
+	 * @var Array Columns for the model's database fields
+	 *
+	 * This can be set to avoid a database call if using $this->prep_data()
+	 */
+	protected $fields = array();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does basic setup. Can pass the database connection into the constructor
+	 * to use that $db instead of the global CI one.
+	 *
+	 * @param object $db // A database/driver instance
+	 * @param object $form_validation // A form_validation library instance
+	 */
+	public function __construct($db = null, $form_validation = null)
+	{
+		// Always protect our attributes
+		array_unshift($this->before_insert, 'protect_attributes');
+		array_unshift($this->before_update, 'protect_attributes');
+
+		// Check our auto-set features and make sure they are part of
+		// our observer system.
+		if ($this->set_created === true) array_unshift($this->before_insert, 'created_on');
+		if ($this->set_modified === true) array_unshift($this->before_update, 'modified_on');
+
+		// Make sure our temp return type is correct.
+		$this->temp_return_type = $this->return_type;
+
+		// Make sure our database is loaded
+		if (!is_null($db)) {
+			$this->db = $db;
+		}
+		else {
+			// Auto Init the damn database....
+			$this->load->database();
+		}
+
+		// Do we have a form_validation library?
+		if (! is_null($form_validation)) {
+			$this->form_validation = $form_validation;
+		}
+		else {
+			$this->load->library('form_validation');
+		}
         
-        log_message('debug', 'CIDbModel Class Initialized');
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // CRUD Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * A simple way to grab the first result of a search only.
-     */
-    public function first()
-    {
-        $rows = $this->limit(1, 0)->find_all();
-
-        if (is_array($rows) && count($rows)) {
-            return $rows[0];
-        }
-
-        return $rows;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Finds a single record based on it's primary key. Will ignore deleted rows.
-     *
-     * @param  mixed $id The primary_key value of the object to retrieve.
-     * @return object
-     */
-    public function find($id)
-    {
-        $this->trigger('before_find', ['id' => $id, 'method' => 'find']);
-
-        // Ignore any soft-deleted rows
-        if ($this->soft_deletes) {
-            // We only need to modify the where statement if
-            // temp_with_deleted is false.
-            if ($this->temp_with_deleted !== true) {
-                $this->db->where($this->soft_delete_key, false);
-            }
-
-            $this->temp_with_deleted = false;
-        }
-
-        $this->db->where($this->primary_key, $id);
-        $row = $this->db->get($this->table_name);
-        $row = $this->temp_return_type == 'array' ? $row->row_array() : $row->row(0, $this->temp_return_type);
-
-        if ( ! empty($row))
-        {
-            $row = $this->trigger('after_find', ['id' => $id, 'method' => 'find', 'fields' => $row]);
-        }
-
-        // Reset our return type
-        $this->temp_return_type = $this->return_type;
-
-        return $row;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Fetch a single record based on an arbitrary WHERE call. Can be
-     * any valid value to $this->db->where(). Will not pull in deleted rows
-     * if using soft deletes.
-     *
-     * @return object
-     */
-    public function find_by()
-    {
-        $where = func_get_args();
-        $this->_set_where($where);
-
-        // Ignore any soft-deleted rows
-        if ($this->soft_deletes) {
-            // We only need to modify the where statement if
-            // temp_with_deleted is false.
-            if ($this->temp_with_deleted !== true) {
-                $this->db->where($this->soft_delete_key, false);
-            }
-
-            $this->temp_with_deleted = false;
-        }
-
-        $this->trigger('before_find', ['method' => 'find_by', 'fields' => $where]);
-
-        $row = $this->db->get($this->table_name);
-        $row = $this->temp_return_type == 'array' ? $row->row_array() : $row->row(0, $this->temp_return_type);
-
-        if ( ! empty($row))
-        {
-            $row = $this->trigger('after_find', ['method' => 'find_by', 'fields' => $row]);
-        }
-
-        // Reset our return type
-        $this->temp_return_type = $this->return_type;
-
-        return $row;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a number of items based on an array of primary_values passed in.
-     *
-     * @param  array $values An array of primary key values to find.
-     *
-     * @return object or FALSE
-     */
-    public function find_many($values)
-    {
-        $this->db->where_in($this->primary_key, $values);
-
-        return $this->find_all();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a number of items based on an arbitrary WHERE call. Can be
-     * any set of parameters valid to $db->where.
-     *
-     * @return object or FALSE
-     */
-    public function find_many_by()
-    {
-        $where = func_get_args();
-        $this->_set_where($where);
-
-        return $this->find_all();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Fetch all of the records in the table. Can be used with scoped calls
-     * to restrict the results.
-     *
-     * @return object or FALSE
-     */
-    public function find_all()
-    {
-        $this->trigger('before_find', ['method' => 'find_all']);
-
-        // Ignore any soft-deleted rows
-        if ($this->soft_deletes) {
-            // We only need to modify the where statement if
-            // temp_with_deleted is false.
-            if ($this->temp_with_deleted !== true) {
-                $this->db->where($this->soft_delete_key, false);
-            }
-
-            $this->temp_with_deleted = false;
-        }
-
-        $rows = $this->db->get($this->table_name);
-        $rows = $this->temp_return_type == 'array' ? $rows->result_array() : $rows->result($this->temp_return_type);
-
-        if (is_array($rows)) {
-            foreach ($rows as $key => &$row) {
-                $row = $this->trigger('after_find', ['method' => 'find_all', 'fields' => $row] );
-            }
-        }
-
-        // Reset our return type
-        $this->temp_return_type = $this->return_type;
-
-        return $rows;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts data into the database.
-     *
-     * @param  array $data An array of key/value pairs to insert to database.
-     * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
-     * @return mixed       The primary_key value of the inserted record, or FALSE.
-     */
-    public function insert($data, $skip_validation = null)
-    {
-        $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
-
-        if ($skip_validation === FALSE) {
-            $data = $this->validate($data, 'insert', $skip_validation);
-        }
-
-        if ($data !== FALSE) {
-            $data = $this->trigger('before_insert', ['method' => 'insert', 'fields' => $data]);
-
-            $this->db->insert($this->table_name, $this->prep_data($data) );
-
-            if ($this->return_insert_id) {
-                $id = $this->db->insert_id();
-
-                $this->trigger('after_insert', ['id' => $id, 'fields' => $data, 'method' => 'insert']);
-
-                return $id;
-            }
-
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts multiple rows into the database at once. Takes an associative
-     * array of value pairs.
-     *
-     * $data = array(
-     *     array(
-     *         'title' => 'My title'
-     *     ),
-     *     array(
-     *         'title'  => 'My Other Title'
-     *     )
-     * );
-     *
-     * @param  array $data An associate array of rows to insert
-     * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
-     * @return bool
-     */
-    public function insert_batch($data, $skip_validation = null)
-    {
-        $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
-
-        if ($skip_validation === FALSE) {
-            $data = $this->validate($data, 'insert', $skip_validation);
-        }
-
-        if ($data !== FALSE) {
-            $data['batch'] = true;
-            $data = $this->trigger('before_insert', ['method' => 'insert_batch', 'fields' => $data] );
-            unset($data['batch']);
-
-            return $this->db->insert_batch($this->table_name, $data);
-        } else {
-            return FALSE;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Performs the SQL standard for a combined DELETE + INSERT, using
-     * PRIMARY and UNIQUE keys to determine which row to replace.
-     *
-     * See CI's documentation for the replace method. We simply wrap
-     * our validation and triggers around their method.
-     *
-     * @param $data
-     * @param null $skip_validation
-     * @return bool
-     */
-    public function replace($data, $skip_validation=null)
-    {
-        $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
-
-        if ($skip_validation === FALSE) {
-            $data = $this->validate($data, 'insert', $skip_validation);
-        }
-
-        if ($data !== FALSE) {
-            $this->db->replace($this->table_name, $this->prep_data($data));
-
-            if ($this->return_insert_id) {
-                $id = $this->db->insert_id();
-
-                $this->trigger('after_insert', ['id' => $id, 'fields' => $data, 'method'=>'replace']);
-
-                return $id;
-            }
-
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Updates an existing record in the database.
-     *
-     * @param  mixed $id The primary_key value of the record to update.
-     * @param  array $data An array of value pairs to update in the record.
-     * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
-     * @return bool
-     */
-    public function update($id, $data, $skip_validation = null)
-    {
-        $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
-
-        if ($skip_validation === FALSE) {
-            $data = $this->validate($data);
-        }
-
-        // Will be false if it didn't validate.
-        if ($data !== FALSE) {
+		log_message('debug', 'CIDbModel Class Initialized');
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// CRUD Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * A simple way to grab the first result of a search only.
+	 */
+	public function first()
+	{
+		$rows = $this->limit(1, 0)->find_all();
+
+		if (is_array($rows) && count($rows)) {
+			return $rows[0];
+		}
+
+		return $rows;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Finds a single record based on it's primary key. Will ignore deleted rows.
+	 *
+	 * @param  mixed $id The primary_key value of the object to retrieve.
+	 * @return object
+	 */
+	public function find($id)
+	{
+		$this->trigger('before_find', ['id' => $id, 'method' => 'find']);
+
+		// Ignore any soft-deleted rows
+		if ($this->soft_deletes) {
+			// We only need to modify the where statement if
+			// temp_with_deleted is false.
+			if ($this->temp_with_deleted !== true) {
+				$this->db->where($this->soft_delete_key, false);
+			}
+
+			$this->temp_with_deleted = false;
+		}
+
+		$this->db->where($this->primary_key, $id);
+		$row = $this->db->get($this->table_name);
+		$row = $this->temp_return_type == 'array' ? $row->row_array() : $row->row(0, $this->temp_return_type);
+
+		if ( ! empty($row))
+		{
+			$row = $this->trigger('after_find', ['id' => $id, 'method' => 'find', 'fields' => $row]);
+		}
+
+		// Reset our return type
+		$this->temp_return_type = $this->return_type;
+
+		return $row;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch a single record based on an arbitrary WHERE call. Can be
+	 * any valid value to $this->db->where(). Will not pull in deleted rows
+	 * if using soft deletes.
+	 *
+	 * @return object
+	 */
+	public function find_by()
+	{
+		$where = func_get_args();
+		$this->_set_where($where);
+
+		// Ignore any soft-deleted rows
+		if ($this->soft_deletes) {
+			// We only need to modify the where statement if
+			// temp_with_deleted is false.
+			if ($this->temp_with_deleted !== true) {
+				$this->db->where($this->soft_delete_key, false);
+			}
+
+			$this->temp_with_deleted = false;
+		}
+
+		$this->trigger('before_find', ['method' => 'find_by', 'fields' => $where]);
+
+		$row = $this->db->get($this->table_name);
+		$row = $this->temp_return_type == 'array' ? $row->row_array() : $row->row(0, $this->temp_return_type);
+
+		if ( ! empty($row))
+		{
+			$row = $this->trigger('after_find', ['method' => 'find_by', 'fields' => $row]);
+		}
+
+		// Reset our return type
+		$this->temp_return_type = $this->return_type;
+
+		return $row;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a number of items based on an array of primary_values passed in.
+	 *
+	 * @param  array $values An array of primary key values to find.
+	 *
+	 * @return object or FALSE
+	 */
+	public function find_many($values)
+	{
+		$this->db->where_in($this->primary_key, $values);
+
+		return $this->find_all();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a number of items based on an arbitrary WHERE call. Can be
+	 * any set of parameters valid to $db->where.
+	 *
+	 * @return object or FALSE
+	 */
+	public function find_many_by()
+	{
+		$where = func_get_args();
+		$this->_set_where($where);
+
+		return $this->find_all();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch all of the records in the table. Can be used with scoped calls
+	 * to restrict the results.
+	 *
+	 * @return object or FALSE
+	 */
+	public function find_all()
+	{
+		$this->trigger('before_find', ['method' => 'find_all']);
+
+		// Ignore any soft-deleted rows
+		if ($this->soft_deletes) {
+			// We only need to modify the where statement if
+			// temp_with_deleted is false.
+			if ($this->temp_with_deleted !== true) {
+				$this->db->where($this->soft_delete_key, false);
+			}
+
+			$this->temp_with_deleted = false;
+		}
+
+		$rows = $this->db->get($this->table_name);
+		$rows = $this->temp_return_type == 'array' ? $rows->result_array() : $rows->result($this->temp_return_type);
+
+		if (is_array($rows)) {
+			foreach ($rows as $key => &$row) {
+				$row = $this->trigger('after_find', ['method' => 'find_all', 'fields' => $row] );
+			}
+		}
+
+		// Reset our return type
+		$this->temp_return_type = $this->return_type;
+
+		return $rows;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts data into the database.
+	 *
+	 * @param  array $data An array of key/value pairs to insert to database.
+	 * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
+	 * @return mixed       The primary_key value of the inserted record, or FALSE.
+	 */
+	public function insert($data, $skip_validation = null)
+	{
+		$skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
+
+		if ($skip_validation === FALSE) {
+			$data = $this->validate($data, 'insert', $skip_validation);
+		}
+
+		if ($data !== FALSE) {
+			$data = $this->trigger('before_insert', ['method' => 'insert', 'fields' => $data]);
+
+			$this->db->insert($this->table_name, $this->prep_data($data) );
+
+			if ($this->return_insert_id) {
+				$id = $this->db->insert_id();
+
+				$this->trigger('after_insert', ['id' => $id, 'fields' => $data, 'method' => 'insert']);
+
+				return $id;
+			}
+
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts multiple rows into the database at once. Takes an associative
+	 * array of value pairs.
+	 *
+	 * $data = array(
+	 *     array(
+	 *         'title' => 'My title'
+	 *     ),
+	 *     array(
+	 *         'title'  => 'My Other Title'
+	 *     )
+	 * );
+	 *
+	 * @param  array $data An associate array of rows to insert
+	 * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
+	 * @return bool
+	 */
+	public function insert_batch($data, $skip_validation = null)
+	{
+		$skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
+
+		if ($skip_validation === FALSE) {
+			$data = $this->validate($data, 'insert', $skip_validation);
+		}
+
+		if ($data !== FALSE) {
+			$data['batch'] = true;
+			$data = $this->trigger('before_insert', ['method' => 'insert_batch', 'fields' => $data] );
+			unset($data['batch']);
+
+			return $this->db->insert_batch($this->table_name, $data);
+		} else {
+			return FALSE;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs the SQL standard for a combined DELETE + INSERT, using
+	 * PRIMARY and UNIQUE keys to determine which row to replace.
+	 *
+	 * See CI's documentation for the replace method. We simply wrap
+	 * our validation and triggers around their method.
+	 *
+	 * @param $data
+	 * @param null $skip_validation
+	 * @return bool
+	 */
+	public function replace($data, $skip_validation=null)
+	{
+		$skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
+
+		if ($skip_validation === FALSE) {
+			$data = $this->validate($data, 'insert', $skip_validation);
+		}
+
+		if ($data !== FALSE) {
+			$this->db->replace($this->table_name, $this->prep_data($data));
+
+			if ($this->return_insert_id) {
+				$id = $this->db->insert_id();
+
+				$this->trigger('after_insert', ['id' => $id, 'fields' => $data, 'method'=>'replace']);
+
+				return $id;
+			}
+
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Updates an existing record in the database.
+	 *
+	 * @param  mixed $id The primary_key value of the record to update.
+	 * @param  array $data An array of value pairs to update in the record.
+	 * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
+	 * @return bool
+	 */
+	public function update($id, $data, $skip_validation = null)
+	{
+		$skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
+
+		if ($skip_validation === FALSE) {
+			$data = $this->validate($data);
+		}
+
+		// Will be false if it didn't validate.
+		if ($data !== FALSE) {
             
-            $data = $this->trigger('before_update', ['id' => $id, 'method' =>'update', 'fields' => $data] );
+			$data = $this->trigger('before_update', ['id' => $id, 'method' =>'update', 'fields' => $data] );
             
-            $this->db->where($this->primary_key, $id);
-            $this->db->set( $this->prep_data($data) );
-            $result = $this->db->update($this->table_name);
-
-            $this->trigger('after_update', ['id' => $id, 'fields' => $data, 'result' => $result, 'method' => 'update']);
-
-            return $result;
-        } else {
-            return FALSE;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Updates multiple records in the database at once.
-     *
-     * $data = array(
-     *     array(
-     *         'title'  => 'My title',
-     *         'body'   => 'body 1'
-     *     ),
-     *     array(
-     *         'title'  => 'Another Title',
-     *         'body'   => 'body 2'
-     *     )
-     * );
-     *
-     * The $where_key should be the name of the column to match the record on.
-     * If $where_key == 'title', then each record would be matched on that
-     * 'title' value of the array. This does mean that the array key needs
-     * to be provided with each row's data.
-     *
-     * @param  array $data An associate array of row data to update.
-     * @param  string $where_key The column name to match on.
-     * @return bool
-     */
-    public function update_batch($data, $where_key)
-    {
-        foreach ($data as &$row) {
-            $row = $this->trigger('before_update', ['method' => 'update_batch', 'fields' => $row] );
-        }
-
-        $result = $this->db->update_batch($this->table_name, $data, $where_key);
-
-        foreach ($data as &$row) {
-            $this->trigger('after_update', ['fields' => $data, 'result' => $result, 'method' => 'update_batch']);
-        }
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Updates many records by an array of ids.
-     *
-     * While update_batch() allows modifying multiple, arbitrary rows of data
-     * on each row, update_many() sets the same values for each row.
-     *
-     * $ids = array(1, 2, 3, 5, 12);
-     * $data = array(
-     *     'deleted_by' => 1
-     * );
-     *
-     * $this->model->update_many($ids, $data);
-     *
-     * @param  array $ids An array of primary_key values to update.
-     * @param  array $data An array of value pairs to modify in each row.
-     * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
-     * @return bool
-     */
-    public function update_many($ids, $data, $skip_validation = null)
-    {
-        if (!is_array($ids) || count($ids) == 0) return NULL;
-
-        $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
-
-        if ($skip_validation === FALSE) {
-            $data = $this->validate($data, 'update', $skip_validation);
-        }
-
-        $data = $this->trigger('before_update', ['ids' => $ids, 'method' => 'update_many', 'fields' => $data]);
-
-        // Will be false if it didn't validate.
-        if ($data !== FALSE) {
-            $this->db->where_in($this->primary_key, $ids);
-            $this->db->set($data);
-            $result = $this->db->update($this->table_name);
-
-            $this->trigger('after_update', ['ids' => $ids, 'fields' => $data, 'result'=>$result, 'method' => 'update_many']);
-
-            return $result;
-        } else {
-            return FALSE;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Update records in the database using a standard WHERE clause.
-     *
-     * Your last parameter should be the $data array with values to update
-     * on the rows. Any additional parameters should be provided to make up
-     * a typical WHERE clause. This could be a single array, or a column name
-     * and a value.
-     *
-     * $data = array('deleted_by' => 1);
-     * $wheres = array('user_id' => 15);
-     *
-     * $this->update_by($wheres, $data);
-     * $this->update_by('user_id', 15, $data);
-     *
-     * @param array $data An array of data pairs to update
-     * @param one or more WHERE-acceptable entries.
-     * @return bool
-     */
-    public function update_by()
-    {
-        $args = func_get_args();
-        $data = array_pop($args);
-        $this->_set_where($args);
-
-        $data = $this->trigger('before_update', ['method' => 'update_by', 'fields' => $data]);
-
-        // Will be false if it didn't validate.
-        if ($this->validate($data) !== FALSE) {
-            $this->db->set( $this->prep_data($data) );
-            $result = $this->db->update($this->table_name);
-
-            $this->trigger('after_update', ['method' => 'update_by', 'fields' => $data, 'result' => $result] );
-
-            return $result;
-        } else {
-            return FALSE;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Updates all records and sets the value pairs passed in the array.
-     *
-     * @param  array $data An array of value pairs with the data to change.
-     * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
-     * @return bool
-     */
-    public function update_all($data, $skip_validation = FALSE)
-    {
-        $data = $this->trigger('before_update', ['method' => 'update_all', 'fields' => $data] );
-
-        $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
-
-        if ($skip_validation === FALSE) {
-            $data = $this->validate($data);
-        }
-
-        // Will be false if it didn't validate.
-        if ($data !== FALSE) {
-            $this->db->set( $this->prep_data($data) );
-            $result = $this->db->update($this->table_name);
-
-            $this->trigger('after_update', ['method' => 'update_all', 'fields' => $data, 'result' => $result] );
-
-            return $result;
-        } else {
-            return FALSE;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Increments the value of field for a given row, selected by the
-     * primary key for the table.
-     *
-     * @param $id
-     * @param $field
-     * @param int $value
-     * @return mixed
-     */
-    public function increment($id, $field, $value=1)
-    {
-        $value = (int)abs($value);
-
-        $this->db->where($this->primary_key, $id);
-        $this->db->set($field, "{$field}+{$value}", false);
-
-        return $this->db->update($this->table_name);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Increments the value of field for a given row, selected by the
-     * primary key for the table.
-     *
-     * @param $id
-     * @param $field
-     * @param int $value
-     * @return mixed
-     */
-    public function decrement($id, $field, $value=1)
-    {
-        $value = (int)abs($value);
-
-        $this->db->where($this->primary_key, $id);
-        $this->db->set($field, "{$field}-{$value}", false);
-
-        return $this->db->update($this->table_name);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a row by it's primary key value.
-     *
-     * @param  mixed $id The primary key value of the row to delete.
-     * @return bool
-     */
-    public function delete($id)
-    {
-        $this->trigger('before_delete', ['id' => $id, 'method' => 'delete'] );
-
-        $this->db->where($this->primary_key, $id);
-
-        if ($this->soft_deletes) {
-            $sets = $this->log_user && is_object($this->authenticate)
-                ? array($this->soft_delete_key => 1, $this->deleted_by_field => $this->authenticate->id())
-                : array($this->soft_delete_key => 1);
-
-            $result = $this->db->update($this->table_name, $sets);
-        } // Hard Delete
-        else {
-            $result = $this->db->delete($this->table_name);
-        }
-
-        $this->trigger('after_delete', ['id' => $id, 'method' => 'delete', 'result' => $result] );
+			$this->db->where($this->primary_key, $id);
+			$this->db->set( $this->prep_data($data) );
+			$result = $this->db->update($this->table_name);
+
+			$this->trigger('after_update', ['id' => $id, 'fields' => $data, 'result' => $result, 'method' => 'update']);
+
+			return $result;
+		} else {
+			return FALSE;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Updates multiple records in the database at once.
+	 *
+	 * $data = array(
+	 *     array(
+	 *         'title'  => 'My title',
+	 *         'body'   => 'body 1'
+	 *     ),
+	 *     array(
+	 *         'title'  => 'Another Title',
+	 *         'body'   => 'body 2'
+	 *     )
+	 * );
+	 *
+	 * The $where_key should be the name of the column to match the record on.
+	 * If $where_key == 'title', then each record would be matched on that
+	 * 'title' value of the array. This does mean that the array key needs
+	 * to be provided with each row's data.
+	 *
+	 * @param  array $data An associate array of row data to update.
+	 * @param  string $where_key The column name to match on.
+	 * @return bool
+	 */
+	public function update_batch($data, $where_key)
+	{
+		foreach ($data as &$row) {
+			$row = $this->trigger('before_update', ['method' => 'update_batch', 'fields' => $row] );
+		}
+
+		$result = $this->db->update_batch($this->table_name, $data, $where_key);
+
+		foreach ($data as &$row) {
+			$this->trigger('after_update', ['fields' => $data, 'result' => $result, 'method' => 'update_batch']);
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Updates many records by an array of ids.
+	 *
+	 * While update_batch() allows modifying multiple, arbitrary rows of data
+	 * on each row, update_many() sets the same values for each row.
+	 *
+	 * $ids = array(1, 2, 3, 5, 12);
+	 * $data = array(
+	 *     'deleted_by' => 1
+	 * );
+	 *
+	 * $this->model->update_many($ids, $data);
+	 *
+	 * @param  array $ids An array of primary_key values to update.
+	 * @param  array $data An array of value pairs to modify in each row.
+	 * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
+	 * @return bool
+	 */
+	public function update_many($ids, $data, $skip_validation = null)
+	{
+		if (!is_array($ids) || count($ids) == 0) return NULL;
+
+		$skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
+
+		if ($skip_validation === FALSE) {
+			$data = $this->validate($data, 'update', $skip_validation);
+		}
+
+		$data = $this->trigger('before_update', ['ids' => $ids, 'method' => 'update_many', 'fields' => $data]);
+
+		// Will be false if it didn't validate.
+		if ($data !== FALSE) {
+			$this->db->where_in($this->primary_key, $ids);
+			$this->db->set($data);
+			$result = $this->db->update($this->table_name);
+
+			$this->trigger('after_update', ['ids' => $ids, 'fields' => $data, 'result'=>$result, 'method' => 'update_many']);
+
+			return $result;
+		} else {
+			return FALSE;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Update records in the database using a standard WHERE clause.
+	 *
+	 * Your last parameter should be the $data array with values to update
+	 * on the rows. Any additional parameters should be provided to make up
+	 * a typical WHERE clause. This could be a single array, or a column name
+	 * and a value.
+	 *
+	 * $data = array('deleted_by' => 1);
+	 * $wheres = array('user_id' => 15);
+	 *
+	 * $this->update_by($wheres, $data);
+	 * $this->update_by('user_id', 15, $data);
+	 *
+	 * @param array $data An array of data pairs to update
+	 * @param one or more WHERE-acceptable entries.
+	 * @return bool
+	 */
+	public function update_by()
+	{
+		$args = func_get_args();
+		$data = array_pop($args);
+		$this->_set_where($args);
+
+		$data = $this->trigger('before_update', ['method' => 'update_by', 'fields' => $data]);
+
+		// Will be false if it didn't validate.
+		if ($this->validate($data) !== FALSE) {
+			$this->db->set( $this->prep_data($data) );
+			$result = $this->db->update($this->table_name);
+
+			$this->trigger('after_update', ['method' => 'update_by', 'fields' => $data, 'result' => $result] );
+
+			return $result;
+		} else {
+			return FALSE;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Updates all records and sets the value pairs passed in the array.
+	 *
+	 * @param  array $data An array of value pairs with the data to change.
+	 * @param  array $skip_validation If TRUE, will skip validation of data for this call only.
+	 * @return bool
+	 */
+	public function update_all($data, $skip_validation = FALSE)
+	{
+		$data = $this->trigger('before_update', ['method' => 'update_all', 'fields' => $data] );
+
+		$skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
+
+		if ($skip_validation === FALSE) {
+			$data = $this->validate($data);
+		}
+
+		// Will be false if it didn't validate.
+		if ($data !== FALSE) {
+			$this->db->set( $this->prep_data($data) );
+			$result = $this->db->update($this->table_name);
+
+			$this->trigger('after_update', ['method' => 'update_all', 'fields' => $data, 'result' => $result] );
+
+			return $result;
+		} else {
+			return FALSE;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Increments the value of field for a given row, selected by the
+	 * primary key for the table.
+	 *
+	 * @param $id
+	 * @param $field
+	 * @param int $value
+	 * @return mixed
+	 */
+	public function increment($id, $field, $value=1)
+	{
+		$value = (int)abs($value);
+
+		$this->db->where($this->primary_key, $id);
+		$this->db->set($field, "{$field}+{$value}", false);
+
+		return $this->db->update($this->table_name);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Increments the value of field for a given row, selected by the
+	 * primary key for the table.
+	 *
+	 * @param $id
+	 * @param $field
+	 * @param int $value
+	 * @return mixed
+	 */
+	public function decrement($id, $field, $value=1)
+	{
+		$value = (int)abs($value);
+
+		$this->db->where($this->primary_key, $id);
+		$this->db->set($field, "{$field}-{$value}", false);
+
+		return $this->db->update($this->table_name);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a row by it's primary key value.
+	 *
+	 * @param  mixed $id The primary key value of the row to delete.
+	 * @return bool
+	 */
+	public function delete($id)
+	{
+		$this->trigger('before_delete', ['id' => $id, 'method' => 'delete'] );
+
+		$this->db->where($this->primary_key, $id);
+
+		if ($this->soft_deletes) {
+			$sets = $this->log_user && is_object($this->authenticate)
+				? array($this->soft_delete_key => 1, $this->deleted_by_field => $this->authenticate->id())
+				: array($this->soft_delete_key => 1);
+
+			$result = $this->db->update($this->table_name, $sets);
+		} // Hard Delete
+		else {
+			$result = $this->db->delete($this->table_name);
+		}
+
+		$this->trigger('after_delete', ['id' => $id, 'method' => 'delete', 'result' => $result] );
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	public function delete_by()
+	{
+		$where = func_get_args();
+		$this->_set_where($where);
+
+		$where = $this->trigger('before_delete', ['method' => 'delete_by', 'fields' => $where]);
+
+		if ($this->soft_deletes) {
+			$sets = $this->log_user && is_object($this->authenticate)
+				? array($this->soft_delete_key => 1, $this->deleted_by_field => $this->authenticate->id())
+				: array($this->soft_delete_key => 1);
+
+			$result = $this->db->update($this->table_name, $sets);
+		} else {
+			$result = $this->db->delete($this->table_name);
+		}
+
+		$this->trigger('after_delete', ['method' => 'delete_by', 'fields' => $where, 'result' => $result] );
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	public function delete_many($ids)
+	{
+		if (!is_array($ids) || count($ids) == 0) return NULL;
+
+		$ids = $this->trigger('before_delete', ['ids' => $ids, 'method' => 'delete_many'] );
+
+		$this->db->where_in($this->primary_key, $ids);
+
+		if ($this->soft_deletes) {
+			$sets = $this->log_user && is_object($this->authenticate)
+				? array($this->soft_delete_key => 1, $this->deleted_by_field => $this->authenticate->id())
+				: array($this->soft_delete_key => 1);
+
+			$result = $this->db->update($this->table_name, $sets);
+		} else {
+			$result = $this->db->delete($this->table_name);
+		}
+
+		$this->trigger('after_delete', ['ids' => $ids, 'method' => 'delete_many', 'result' => $result]);
 
-        return $result;
-    }
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Scope Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the value of the soft deletes flag.
+	 *
+	 * @param  boolean $val If TRUE, should perform a soft delete. If FALSE, a hard delete.
+	 */
+	public function soft_delete($val = TRUE)
+	{
+		$this->soft_deletes = $val;
 
-    //--------------------------------------------------------------------
-
-    public function delete_by()
-    {
-        $where = func_get_args();
-        $this->_set_where($where);
-
-        $where = $this->trigger('before_delete', ['method' => 'delete_by', 'fields' => $where]);
-
-        if ($this->soft_deletes) {
-            $sets = $this->log_user && is_object($this->authenticate)
-                ? array($this->soft_delete_key => 1, $this->deleted_by_field => $this->authenticate->id())
-                : array($this->soft_delete_key => 1);
-
-            $result = $this->db->update($this->table_name, $sets);
-        } else {
-            $result = $this->db->delete($this->table_name);
-        }
-
-        $this->trigger('after_delete', ['method' => 'delete_by', 'fields' => $where, 'result' => $result] );
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    public function delete_many($ids)
-    {
-        if (!is_array($ids) || count($ids) == 0) return NULL;
-
-        $ids = $this->trigger('before_delete', ['ids' => $ids, 'method' => 'delete_many'] );
-
-        $this->db->where_in($this->primary_key, $ids);
-
-        if ($this->soft_deletes) {
-            $sets = $this->log_user && is_object($this->authenticate)
-                ? array($this->soft_delete_key => 1, $this->deleted_by_field => $this->authenticate->id())
-                : array($this->soft_delete_key => 1);
-
-            $result = $this->db->update($this->table_name, $sets);
-        } else {
-            $result = $this->db->delete($this->table_name);
-        }
-
-        $this->trigger('after_delete', ['ids' => $ids, 'method' => 'delete_many', 'result' => $result]);
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Scope Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the value of the soft deletes flag.
-     *
-     * @param  boolean $val If TRUE, should perform a soft delete. If FALSE, a hard delete.
-     */
-    public function soft_delete($val = TRUE)
-    {
-        $this->soft_deletes = $val;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Temporarily sets our return type to an array.
-     */
-    public function as_array()
-    {
-        $this->temp_return_type = 'array';
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Temporarily sets our return type to an object.
-     *
-     * If $class is provided, the rows will be returned as objects that
-     * are instances of that class. $class MUST be an fully qualified
-     * class name, meaning that it must include the namespace, if applicable.
-     *
-     * @param string $class
-     * @return $this
-     */
-    public function as_object($class=null)
-    {
-        $this->temp_return_type = ! empty($class) ? $class : 'object';
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Also fetches deleted items for this request only.
-     */
-    public function with_deleted()
-    {
-        $this->temp_with_deleted = TRUE;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns whether the current setup will return
-     * soft deleted rows.
-     *
-     * @return bool
-     */
-    public function get_with_deleted()
-    {
-        return $this->temp_with_deleted;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Sets the $skip_validation parameter.
-     *
-     * @param bool $skip
-     * @return $this
-     */
-    public function skip_validation($skip = true)
-    {
-        $this->skip_validation = $skip;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    //--------------------------------------------------------------------
-    // Utility Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Counts number of rows modified by an arbitrary WHERE call.
-     * @return INT
-     */
-    public function count_by()
-    {
-        $where = func_get_args();
-        $this->_set_where($where);
-
-        return $this->db->count_all_results($this->table_name);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Counts total number of records, disregarding any previous conditions.
-     *
-     * @return int
-     */
-    public function count_all()
-    {
-        return $this->db->count_all($this->table_name);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Getter for the table name.
-     *
-     * @return string The name of the table used by this class.
-     */
-    public function table()
-    {
-        return $this->table_name;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Set the return_insert_id value.
-     *
-     * @param  boolean $return If TRUE, insert will return the insert_id.
-     */
-    public function return_insert_id($return = true)
-    {
-        $this->return_insert_id = (bool)$return;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A convenience method to return only a single field of the specified row.
-     *
-     * @param mixed $id The primary_key value to match against.
-     * @param string $field The field to search for.
-     *
-     * @return bool|mixed The value of the field.
-     */
-    public function get_field($id = NULL, $field = '')
-    {
-        $this->db->select($field);
-        $this->db->where($this->primary_key, $id);
-        $query = $this->db->get($this->table_name);
-
-        if ($query && $query->num_rows() > 0) {
-            return $query->row()->$field;
-        }
-
-        return FALSE;
-
-    }
-
-    //---------------------------------------------------------------
-
-    /**
-     * Checks whether a field/value pair exists within the table.
-     *
-     * @param string $field The field to search for.
-     * @param string $value The value to match $field against.
-     *
-     * @return bool TRUE/FALSE
-     */
-    public function is_unique($field, $value)
-    {
-        $this->db->where($field, $value);
-        $query = $this->db->get($this->table_name);
-
-        if ($query && $query->num_rows() == 0) {
-            return TRUE;
-        }
-
-        return FALSE;
-
-    }
-
-    //---------------------------------------------------------------
-
-    /**
-     * Adds a field to the protected_attributes array.
-     *
-     * @param $field
-     *
-     * @return mixed
-     */
-    public function protect($field)
-    {
-        $this->protected_attributes[] = $field;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Get the field names for this model's table.
-     *
-     * Returns the model's database fields stored in $this->fields
-     * if set, else it tries to retrieve the field list from
-     * $this->db->list_fields($this->table_name);
-     *
-     * @return array    Returns the database fields for this model
-     */
-    public function get_fields()
-    {
-        if (empty($this->fields)) {
-            $this->fields = $this->db->list_fields($this->table_name);
-        }
-
-        return $this->fields;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Extracts the model's fields (except the key and those handled by
-     * Observers) from the $post_data and returns an array of name => value pairs
-     *
-     * @param Array $post_data The post data, usually $this->input->post() when called from the controller
-     *
-     * @return Array    An array of name => value pairs containing the data for the model's fields
-     */
-    public function prep_data($post_data)
-    {
-        $data = array();
-        $skippedFields = array();
-
-        if (empty($post_data))
-        {
-            return [];
-        }
-
-        // Though the model doesn't support multiple keys well, $this->key
-        // could be an array or a string...
-        $skippedFields = array_merge($skippedFields, (array)$this->primary_key);
-
-        // Remove any protected attributes
-        $skippedFields = array_merge($skippedFields, $this->protected_attributes);
-
-        $fields = $this->get_fields();
-
-        // If the field is the primary key, one of the created/modified/deleted
-        // fields, or has not been set in the $post_data, skip it
-        foreach ($post_data as $field => $value) {
-            if (in_array($field, $skippedFields) ||
-                ! in_array($field, $fields))
-            {
-                continue;
-            }
-
-            $data[$field] = $value;
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the last query string, if available. Simply a wrapper for
-     * CodeIgniter's database method of the same name.
-     *
-     * @return string
-     */
-    public function last_query ()
-    {
-        return $this->db->last_query();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the elapsed time for the last query that was executed, if
-     * available, or NULL if not available, like if debug mode is off.
-     *
-     * @return mixed
-     */
-    public function last_query_time ()
-    {
-        $times = $this->db->query_times;
-
-        if (! is_array($this->db->query_times) || ! count($this->db->query_times))
-        {
-            return null;
-        }
-
-        return end($times);
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Observers
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the created on date for the object based on the
-     * current date/time and date_format. Will not overwrite existing.
-     *
-     * @param array $row The array of data to be inserted
-     *
-     * @return array
-     */
-    public function created_on($row)
-    {
-        if (empty($row['fields']))
-        {
-            return null;
-        }
-
-        $row = $row['fields'];
-
-        // Created_on
-        if (! array_key_exists($this->created_field, $row))
-        {
-            $row[$this->created_field] = $this->set_date();
-        }
-
-        // Created by
-        if ($this->log_user && ! array_key_exists($this->created_by_field, $row) && is_object($this->authenticate))
-        {
-            // If you're here because of an error with $this->authenticate
-            // not being available, it's likely due to you not using
-            // the AuthTrait and/or setting log_user after model is instantiated.
-            $row[$this->created_by_field] = (int)$this->authenticate->id();
-        }
-
-        return $row;
-    } // end created_on()
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the modified_on date for the object based on the
-     * current date/time and date_format. Will not overwrite existing.
-     *
-     * @param array $row The array of data to be inserted
-     *
-     * @return array
-     */
-    public function modified_on($row)
-    {
-        if (empty($row['fields']))
-        {
-            return null;
-        }
-
-        $row = $row['fields'];
-
-        if (is_array($row) && ! array_key_exists($this->modified_field, $row))
-        {
-            $row[$this->modified_field] = $this->set_date();
-        }
-
-        // Modified by
-        if ($this->log_user && ! array_key_exists($this->modified_by_field, $row) && is_object($this->authenticate))
-        {
-            // If you're here because of an error with $this->authenticate
-            // not being available, it's likely due to you not using
-            // the AuthTrait and/or setting log_user after model is instantiated.
-            $row[$this->modified_by_field] = $this->authenticate->id();
-        }
-
-        return $row;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Internal Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Set WHERE parameters
-     */
-    protected function _set_where($params)
-    {
-        if (count($params) == 1) {
-            $this->db->where($params[0]);
-        } else {
-            $this->db->where($params[0], $params[1]);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Triggers a model-specific event and call each of it's observers.
-     *
-     * @param string $event The name of the event to trigger
-     * @param mixed $data The data to be passed to the callback functions.
-     *
-     * @return mixed
-     */
-    public function trigger($event, $data = false)
-    {
-        if (! isset($this->$event) || ! is_array($this->$event))
-        {
-            if (isset($data['fields']))
-            {
-                return $data['fields'];
-            }
-
-            return $data;
-        }
-
-        foreach ($this->$event as $method)
-        {
-            if (strpos($method, '('))
-            {
-                preg_match('/([a-zA-Z0-9\_\-]+)(\(([a-zA-Z0-9\_\-\., ]+)\))?/', $method, $matches);
-                $this->callback_parameters = explode(',', $matches[3]);
-            }
-
-            $data = call_user_func_array(array($this, $method), array($data));
-        }
-
-        // In case no method called or method returned
-        // the entire data array, we typically just need the $fields
-        if (isset($data['fields']))
-        {
-            return $data['fields'];
-        }
-
-        // A few methods might need to return 'ids'
-        if (isset($data['ids']))
-        {
-            return $data['ids'];
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Validates the data passed into it based upon the form_validation rules
-     * setup in the $this->validate property.
-     *
-     * If $type == 'insert', any additional rules in the class var $insert_validate_rules
-     * for that field will be added to the rules.
-     *
-     * @param  array $data An array of validation rules
-     * @param  string $type Either 'update' or 'insert'.
-     * @return array/bool       The original data or FALSE
-     */
-    public function validate($data, $type = 'update', $skip_validation = null)
-    {
-        $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
-
-        if ($skip_validation) {
-            return $data;
-        }
-
-        // We need the database to be loaded up at this point in case
-        // we want to use callbacks that hit the database.
-        if (empty($this->db))
-        {
-            $this->load->database();
-        }
-
-        if (!empty($this->validation_rules)) {
-            $this->form_validation->set_data($data);
-
-            if (is_array($this->validation_rules)) {
-                // Any insert additions?
-                if ($type == 'insert'
-                    && !empty($this->insert_validate_rules)
-                    && is_array($this->insert_validate_rules)
-                ) {
-                    foreach ($this->validation_rules as &$row) {
-                        if (isset($this->insert_validate_rules[$row['field']])) {
-                            $row ['rules'] .= '|' . $this->insert_validate_rules[$row['field']];
-                        }
-                    }
-                }
-
-                $this->form_validation->set_rules($this->validation_rules);
-
-                if ($this->form_validation->run('', $this) === TRUE) {
-                    return $data;
-                } else {
-                    return FALSE;
-                }
-            } else {
-                if ($this->form_validation->run($this->validate, $this) === TRUE) {
-                    return $data;
-                } else {
-                    return FALSE;
-                }
-            }
-        } else {
-            return $data;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Protect attributes by removing them from $row array. Useful for
-     * removing id, or submit buttons names if you simply throw your $_POST
-     * array at your model. :)
-     *
-     * @param object /array $row The value pair item to remove.
-     */
-    public function protect_attributes($row)
-    {
-        foreach ($this->protected_attributes as $attr) {
-            if (is_object($row)) {
-                unset($row->$attr);
-            } else {
-                unset($row[$attr]);
-            }
-        }
-
-        return $row;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A utility function to allow child models to use the type of
-     * date/time format that they prefer. This is primarily used for
-     * setting created_on and modified_on values, but can be used by
-     * inheriting classes.
-     *
-     * The available time formats are:
-     * * 'int'      - Stores the date as an integer timestamp.
-     * * 'datetime' - Stores the date and time in the SQL datetime format.
-     * * 'date'     - Stores teh date (only) in the SQL date format.
-     *
-     * @param mixed $user_date An optional PHP timestamp to be converted.
-     *
-     * @access protected
-     *
-     * @return int|null|string The current/user time converted to the proper format.
-     */
-    protected function set_date($user_date = NULL)
-    {
-        $curr_date = !empty($user_date) ? $user_date : time();
-
-        switch ($this->date_format) {
-            case 'int':
-                return $curr_date;
-                break;
-            case 'datetime':
-                return date('Y-m-d H:i:s', $curr_date);
-                break;
-            case 'date':
-                return date('Y-m-d', $curr_date);
-                break;
-        }
-
-    }//end set_date()
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns an array containing the 'code' and 'message' of the
-     * database's error, as provided by CI's database drivers.
-     *
-     * @return mixed
-     */
-    public function error($db_array_only=false)
-    {
-        // Send any validation errors if we have any.
-        if (function_exists('validation_errors') && validation_errors() && ! $db_array_only)
-        {
-            return validation_errors();
-        }
-
-        // No validation errors? Return the db error.
-        $error = $this->db->error();
-
-        if ($db_array_only)
-        {
-            return $error;
-        }
-
-        if (! empty($error['code']))
-        {
-            return "Database Error {$error['code']}: {$error['message']}.";
-        }
-
-        // No errors found.
-        return '';
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Magic Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * __get magic
-     *
-     * Allows models to access CI's loaded classes using the same
-     * syntax as controllers.
-     *
-     * This is the same as what CI's model uses, but we keep it
-     * here since that's the ONLY thing that CI's model does.
-     *
-     * @param    string $key
-     */
-    public function __get($key)
-    {
-        // Give them first crack at any protected class vars
-        if (isset($this->$key))
-        {
-            return $this->$key;
-        }
-
-        // Debugging note:
-        //	If you're here because you're getting an error message
-        //	saying 'Undefined Property: system/core/Model.php', it's
-        //	most likely a typo in your model code.
-        return get_instance()->$key;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Provide direct access to any of CodeIgniter's DB methods but
-     * make it look like it's part of the class, purely for convenience.
-     *
-     * @param $name
-     * @param $params
-     */
-    public function __call($name, $params=null)
-    {
-        if (method_exists($this->db, $name))
-        {
-            call_user_func_array([$this->db, $name], $params);
-            return $this;
-        }
-    }
-
-    //--------------------------------------------------------------------
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Temporarily sets our return type to an array.
+	 */
+	public function as_array()
+	{
+		$this->temp_return_type = 'array';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Temporarily sets our return type to an object.
+	 *
+	 * If $class is provided, the rows will be returned as objects that
+	 * are instances of that class. $class MUST be an fully qualified
+	 * class name, meaning that it must include the namespace, if applicable.
+	 *
+	 * @param string $class
+	 * @return $this
+	 */
+	public function as_object($class=null)
+	{
+		$this->temp_return_type = ! empty($class) ? $class : 'object';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Also fetches deleted items for this request only.
+	 */
+	public function with_deleted()
+	{
+		$this->temp_with_deleted = TRUE;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns whether the current setup will return
+	 * soft deleted rows.
+	 *
+	 * @return bool
+	 */
+	public function get_with_deleted()
+	{
+		return $this->temp_with_deleted;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Sets the $skip_validation parameter.
+	 *
+	 * @param bool $skip
+	 * @return $this
+	 */
+	public function skip_validation($skip = true)
+	{
+		$this->skip_validation = $skip;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Counts number of rows modified by an arbitrary WHERE call.
+	 * @return INT
+	 */
+	public function count_by()
+	{
+		$where = func_get_args();
+		$this->_set_where($where);
+
+		return $this->db->count_all_results($this->table_name);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Counts total number of records, disregarding any previous conditions.
+	 *
+	 * @return int
+	 */
+	public function count_all()
+	{
+		return $this->db->count_all($this->table_name);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Getter for the table name.
+	 *
+	 * @return string The name of the table used by this class.
+	 */
+	public function table()
+	{
+		return $this->table_name;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set the return_insert_id value.
+	 *
+	 * @param  boolean $return If TRUE, insert will return the insert_id.
+	 */
+	public function return_insert_id($return = true)
+	{
+		$this->return_insert_id = (bool)$return;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A convenience method to return only a single field of the specified row.
+	 *
+	 * @param mixed $id The primary_key value to match against.
+	 * @param string $field The field to search for.
+	 *
+	 * @return bool|mixed The value of the field.
+	 */
+	public function get_field($id = NULL, $field = '')
+	{
+		$this->db->select($field);
+		$this->db->where($this->primary_key, $id);
+		$query = $this->db->get($this->table_name);
+
+		if ($query && $query->num_rows() > 0) {
+			return $query->row()->$field;
+		}
+
+		return FALSE;
+
+	}
+
+	//---------------------------------------------------------------
+
+	/**
+	 * Checks whether a field/value pair exists within the table.
+	 *
+	 * @param string $field The field to search for.
+	 * @param string $value The value to match $field against.
+	 *
+	 * @return bool TRUE/FALSE
+	 */
+	public function is_unique($field, $value)
+	{
+		$this->db->where($field, $value);
+		$query = $this->db->get($this->table_name);
+
+		if ($query && $query->num_rows() == 0) {
+			return TRUE;
+		}
+
+		return FALSE;
+
+	}
+
+	//---------------------------------------------------------------
+
+	/**
+	 * Adds a field to the protected_attributes array.
+	 *
+	 * @param $field
+	 *
+	 * @return mixed
+	 */
+	public function protect($field)
+	{
+		$this->protected_attributes[] = $field;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the field names for this model's table.
+	 *
+	 * Returns the model's database fields stored in $this->fields
+	 * if set, else it tries to retrieve the field list from
+	 * $this->db->list_fields($this->table_name);
+	 *
+	 * @return array    Returns the database fields for this model
+	 */
+	public function get_fields()
+	{
+		if (empty($this->fields)) {
+			$this->fields = $this->db->list_fields($this->table_name);
+		}
+
+		return $this->fields;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Extracts the model's fields (except the key and those handled by
+	 * Observers) from the $post_data and returns an array of name => value pairs
+	 *
+	 * @param Array $post_data The post data, usually $this->input->post() when called from the controller
+	 *
+	 * @return Array    An array of name => value pairs containing the data for the model's fields
+	 */
+	public function prep_data($post_data)
+	{
+		$data = array();
+		$skippedFields = array();
+
+		if (empty($post_data))
+		{
+			return [];
+		}
+
+		// Though the model doesn't support multiple keys well, $this->key
+		// could be an array or a string...
+		$skippedFields = array_merge($skippedFields, (array)$this->primary_key);
+
+		// Remove any protected attributes
+		$skippedFields = array_merge($skippedFields, $this->protected_attributes);
+
+		$fields = $this->get_fields();
+
+		// If the field is the primary key, one of the created/modified/deleted
+		// fields, or has not been set in the $post_data, skip it
+		foreach ($post_data as $field => $value) {
+			if (in_array($field, $skippedFields) ||
+				! in_array($field, $fields))
+			{
+				continue;
+			}
+
+			$data[$field] = $value;
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last query string, if available. Simply a wrapper for
+	 * CodeIgniter's database method of the same name.
+	 *
+	 * @return string
+	 */
+	public function last_query ()
+	{
+		return $this->db->last_query();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the elapsed time for the last query that was executed, if
+	 * available, or NULL if not available, like if debug mode is off.
+	 *
+	 * @return mixed
+	 */
+	public function last_query_time ()
+	{
+		$times = $this->db->query_times;
+
+		if (! is_array($this->db->query_times) || ! count($this->db->query_times))
+		{
+			return null;
+		}
+
+		return end($times);
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Observers
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the created on date for the object based on the
+	 * current date/time and date_format. Will not overwrite existing.
+	 *
+	 * @param array $row The array of data to be inserted
+	 *
+	 * @return array
+	 */
+	public function created_on($row)
+	{
+		if (empty($row['fields']))
+		{
+			return null;
+		}
+
+		$row = $row['fields'];
+
+		// Created_on
+		if (! array_key_exists($this->created_field, $row))
+		{
+			$row[$this->created_field] = $this->set_date();
+		}
+
+		// Created by
+		if ($this->log_user && ! array_key_exists($this->created_by_field, $row) && is_object($this->authenticate))
+		{
+			// If you're here because of an error with $this->authenticate
+			// not being available, it's likely due to you not using
+			// the AuthTrait and/or setting log_user after model is instantiated.
+			$row[$this->created_by_field] = (int)$this->authenticate->id();
+		}
+
+		return $row;
+	} // end created_on()
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the modified_on date for the object based on the
+	 * current date/time and date_format. Will not overwrite existing.
+	 *
+	 * @param array $row The array of data to be inserted
+	 *
+	 * @return array
+	 */
+	public function modified_on($row)
+	{
+		if (empty($row['fields']))
+		{
+			return null;
+		}
+
+		$row = $row['fields'];
+
+		if (is_array($row) && ! array_key_exists($this->modified_field, $row))
+		{
+			$row[$this->modified_field] = $this->set_date();
+		}
+
+		// Modified by
+		if ($this->log_user && ! array_key_exists($this->modified_by_field, $row) && is_object($this->authenticate))
+		{
+			// If you're here because of an error with $this->authenticate
+			// not being available, it's likely due to you not using
+			// the AuthTrait and/or setting log_user after model is instantiated.
+			$row[$this->modified_by_field] = $this->authenticate->id();
+		}
+
+		return $row;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Internal Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set WHERE parameters
+	 */
+	protected function _set_where($params)
+	{
+		if (count($params) == 1) {
+			$this->db->where($params[0]);
+		} else {
+			$this->db->where($params[0], $params[1]);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Triggers a model-specific event and call each of it's observers.
+	 *
+	 * @param string $event The name of the event to trigger
+	 * @param mixed $data The data to be passed to the callback functions.
+	 *
+	 * @return mixed
+	 */
+	public function trigger($event, $data = false)
+	{
+		if (! isset($this->$event) || ! is_array($this->$event))
+		{
+			if (isset($data['fields']))
+			{
+				return $data['fields'];
+			}
+
+			return $data;
+		}
+
+		foreach ($this->$event as $method)
+		{
+			if (strpos($method, '('))
+			{
+				preg_match('/([a-zA-Z0-9\_\-]+)(\(([a-zA-Z0-9\_\-\., ]+)\))?/', $method, $matches);
+				$this->callback_parameters = explode(',', $matches[3]);
+			}
+
+			$data = call_user_func_array(array($this, $method), array($data));
+		}
+
+		// In case no method called or method returned
+		// the entire data array, we typically just need the $fields
+		if (isset($data['fields']))
+		{
+			return $data['fields'];
+		}
+
+		// A few methods might need to return 'ids'
+		if (isset($data['ids']))
+		{
+			return $data['ids'];
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validates the data passed into it based upon the form_validation rules
+	 * setup in the $this->validate property.
+	 *
+	 * If $type == 'insert', any additional rules in the class var $insert_validate_rules
+	 * for that field will be added to the rules.
+	 *
+	 * @param  array $data An array of validation rules
+	 * @param  string $type Either 'update' or 'insert'.
+	 * @return array/bool       The original data or FALSE
+	 */
+	public function validate($data, $type = 'update', $skip_validation = null)
+	{
+		$skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
+
+		if ($skip_validation) {
+			return $data;
+		}
+
+		// We need the database to be loaded up at this point in case
+		// we want to use callbacks that hit the database.
+		if (empty($this->db))
+		{
+			$this->load->database();
+		}
+
+		if (!empty($this->validation_rules)) {
+			$this->form_validation->set_data($data);
+
+			if (is_array($this->validation_rules)) {
+				// Any insert additions?
+				if ($type == 'insert'
+					&& !empty($this->insert_validate_rules)
+					&& is_array($this->insert_validate_rules)
+				) {
+					foreach ($this->validation_rules as &$row) {
+						if (isset($this->insert_validate_rules[$row['field']])) {
+							$row ['rules'] .= '|' . $this->insert_validate_rules[$row['field']];
+						}
+					}
+				}
+
+				$this->form_validation->set_rules($this->validation_rules);
+
+				if ($this->form_validation->run('', $this) === TRUE) {
+					return $data;
+				} else {
+					return FALSE;
+				}
+			} else {
+				if ($this->form_validation->run($this->validate, $this) === TRUE) {
+					return $data;
+				} else {
+					return FALSE;
+				}
+			}
+		} else {
+			return $data;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Protect attributes by removing them from $row array. Useful for
+	 * removing id, or submit buttons names if you simply throw your $_POST
+	 * array at your model. :)
+	 *
+	 * @param object /array $row The value pair item to remove.
+	 */
+	public function protect_attributes($row)
+	{
+		foreach ($this->protected_attributes as $attr) {
+			if (is_object($row)) {
+				unset($row->$attr);
+			} else {
+				unset($row[$attr]);
+			}
+		}
+
+		return $row;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A utility function to allow child models to use the type of
+	 * date/time format that they prefer. This is primarily used for
+	 * setting created_on and modified_on values, but can be used by
+	 * inheriting classes.
+	 *
+	 * The available time formats are:
+	 * * 'int'      - Stores the date as an integer timestamp.
+	 * * 'datetime' - Stores the date and time in the SQL datetime format.
+	 * * 'date'     - Stores teh date (only) in the SQL date format.
+	 *
+	 * @param mixed $user_date An optional PHP timestamp to be converted.
+	 *
+	 * @access protected
+	 *
+	 * @return int|null|string The current/user time converted to the proper format.
+	 */
+	protected function set_date($user_date = NULL)
+	{
+		$curr_date = !empty($user_date) ? $user_date : time();
+
+		switch ($this->date_format) {
+			case 'int':
+				return $curr_date;
+				break;
+			case 'datetime':
+				return date('Y-m-d H:i:s', $curr_date);
+				break;
+			case 'date':
+				return date('Y-m-d', $curr_date);
+				break;
+		}
+
+	}//end set_date()
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array containing the 'code' and 'message' of the
+	 * database's error, as provided by CI's database drivers.
+	 *
+	 * @return mixed
+	 */
+	public function error($db_array_only=false)
+	{
+		// Send any validation errors if we have any.
+		if (function_exists('validation_errors') && validation_errors() && ! $db_array_only)
+		{
+			return validation_errors();
+		}
+
+		// No validation errors? Return the db error.
+		$error = $this->db->error();
+
+		if ($db_array_only)
+		{
+			return $error;
+		}
+
+		if (! empty($error['code']))
+		{
+			return "Database Error {$error['code']}: {$error['message']}.";
+		}
+
+		// No errors found.
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Magic Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * __get magic
+	 *
+	 * Allows models to access CI's loaded classes using the same
+	 * syntax as controllers.
+	 *
+	 * This is the same as what CI's model uses, but we keep it
+	 * here since that's the ONLY thing that CI's model does.
+	 *
+	 * @param    string $key
+	 */
+	public function __get($key)
+	{
+		// Give them first crack at any protected class vars
+		if (isset($this->$key))
+		{
+			return $this->$key;
+		}
+
+		// Debugging note:
+		//	If you're here because you're getting an error message
+		//	saying 'Undefined Property: system/core/Model.php', it's
+		//	most likely a typo in your model code.
+		return get_instance()->$key;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provide direct access to any of CodeIgniter's DB methods but
+	 * make it look like it's part of the class, purely for convenience.
+	 *
+	 * @param $name
+	 * @param $params
+	 */
+	public function __call($name, $params=null)
+	{
+		if (method_exists($this->db, $name))
+		{
+			call_user_func_array([$this->db, $name], $params);
+			return $this;
+		}
+	}
+
+	//--------------------------------------------------------------------
 
 
 }

myth/Modules.php

Doc Comments +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
 	/**
 	 * Load a module file
 	 *
-	 * @param $file
+	 * @param string $file
 	 * @param $path
 	 * @param string $type
 	 * @param bool $result
@@ -333,8 +333,8 @@ 
 	/**
 	 * Returns the path to the module and it's specified folder.
 	 *
-	 * @param $module string The name of the module (must match the folder name)
-	 * @param $folder string The folder name to search for. (Optional)
+	 * @param string $module string The name of the module (must match the folder name)
+	 * @param string $folder string The folder name to search for. (Optional)
 	 *
 	 * @return string The path, relative to the front controller, or false if the folder was not found
 	 */

Spacing +91 added lines, -91 removed lines

@@ -37,20 +37,20 @@ 
  * available within the Router class, before get_instance() is available we'll have to
  * live with it for now.
  */
-include APPPATH . 'config/config.php';
+include APPPATH.'config/config.php';
 
-if ( isset( $config ) )
+if (isset($config))
 {
-	if ( is_array( $config['modules_locations'] ) )
+	if (is_array($config['modules_locations']))
 	{
 		Modules::$locations = $config['modules_locations'];
 	}
 	else
 	{
-		Modules::$locations = array( APPPATH . 'modules/' => '../modules/' );
+		Modules::$locations = array(APPPATH.'modules/' => '../modules/');
 	}
 
-	unset( $config );
+	unset($config);
 }
 
 
@@ -107,17 +107,17 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function load_file( $file, $path, $type = 'other', $result = TRUE )
+	public static function load_file($file, $path, $type = 'other', $result = TRUE)
 	{
 
-		$file     = str_replace( '.php', '', $file );
-		$location = $path . $file . '.php';
+		$file     = str_replace('.php', '', $file);
+		$location = $path.$file.'.php';
 
-		if ( $type === 'other' )
+		if ($type === 'other')
 		{
-			if ( class_exists( $file, FALSE ) )
+			if (class_exists($file, FALSE))
 			{
-				log_message( 'debug', "File already loaded: {$location}" );
+				log_message('debug', "File already loaded: {$location}");
 
 				return $result;
 			}
@@ -129,14 +129,14 @@ 
 			/* load config or language array */
 			include $location;
 
-			if ( ! isset( $$type ) OR ! is_array( $$type ) )
+			if ( ! isset($$type) OR ! is_array($$type))
 			{
-				show_error( "{$location} does not contain a valid {$type} array" );
+				show_error("{$location} does not contain a valid {$type} array");
 			}
 
 			$result = $$type;
 		}
-		log_message( 'debug', "File loaded: {$location}" );
+		log_message('debug', "File loaded: {$location}");
 
 		return $result;
 	}
@@ -156,64 +156,64 @@ 
 	 *
 	 * @return  array           [ {full_path_to_file}, {file} ] or FALSE
 	 */
-	public static function find( $file, $module, $base )
+	public static function find($file, $module, $base)
 	{
-		if (! is_string($module) || ! is_string($file) || ! is_string($base))
+		if ( ! is_string($module) || ! is_string($file) || ! is_string($base))
 		{
 			throw new \InvalidArgumentException('Argument must be a string for Modules::find()');
 		}
 
 		// Find the actual file name. It will always be the last element.
-		$segments = explode( '/', $file );
-		$file     = array_pop( $segments );
-		$file_ext = ( pathinfo( $file, PATHINFO_EXTENSION ) ) ? $file : $file . '.php';
+		$segments = explode('/', $file);
+		$file     = array_pop($segments);
+		$file_ext = (pathinfo($file, PATHINFO_EXTENSION)) ? $file : $file.'.php';
 
 		// Put the pieces back to get the path.
-		$path = implode( '/', $segments ) . '/';
-		$base = rtrim( $base, '/' ) . '/';
+		$path = implode('/', $segments).'/';
+		$base = rtrim($base, '/').'/';
 
 		// Look in any possible module locations based on the string segments.
 		$modules = array();
-		if ( ! empty( $module ) )
+		if ( ! empty($module))
 		{
-			$modules[ $module ] = $path;
+			$modules[$module] = $path;
 		}
 
 		// Collect the modules from the segments
-		if ( ! empty( $segments ) )
+		if ( ! empty($segments))
 		{
-			$modules[ array_shift( $segments ) ] = ltrim( implode( '/', $segments ) . '/', '/' );
+			$modules[array_shift($segments)] = ltrim(implode('/', $segments).'/', '/');
 		}
 
-		foreach ( self::$locations as $location )
+		foreach (self::$locations as $location)
 		{
 
-			foreach ( $modules as $module => $subpath )
+			foreach ($modules as $module => $subpath)
 			{
 				// Combine the elements to make an actual path to the file
-				$fullpath = str_replace( '//', '/', "{$location}{$module}/{$base}{$subpath}" );
+				$fullpath = str_replace('//', '/', "{$location}{$module}/{$base}{$subpath}");
 
 				// If it starts with a '/' assume it's a full path already
-				if ( substr( $path, 0, 1 ) == '/' && strlen( $path ) > 1 )
+				if (substr($path, 0, 1) == '/' && strlen($path) > 1)
 				{
 					$fullpath = $path;
 				}
 
 				// Libraries are a special consideration since they are
 				// frequently ucfirst.
-				if ( $base == 'libraries/' AND is_file( $fullpath . ucfirst( $file_ext ) ) )
+				if ($base == 'libraries/' AND is_file($fullpath.ucfirst($file_ext)))
 				{
-					return array( $fullpath, ucfirst( $file ) );
+					return array($fullpath, ucfirst($file));
 				}
 
-				if ( is_file( $fullpath . $file_ext ) )
+				if (is_file($fullpath.$file_ext))
 				{
-					return array( $fullpath, $file );
+					return array($fullpath, $file);
 				}
 			}
 		}
 
-		return array( FALSE, $file );
+		return array(FALSE, $file);
 	}
 
 	//--------------------------------------------------------------------
@@ -225,33 +225,33 @@ 
 	 */
 	public static function listModules()
 	{
-		if ( ! function_exists( 'directory_map' ) )
+		if ( ! function_exists('directory_map'))
 		{
-			require BASEPATH . 'helpers/directory_helper.php';
+			require BASEPATH.'helpers/directory_helper.php';
 		}
 
 		$map = array();
 
-		foreach ( self::$locations as $folder )
+		foreach (self::$locations as $folder)
 		{
 
-			$dirs = directory_map( $folder, 1 );
-			if ( ! is_array( $dirs ) )
+			$dirs = directory_map($folder, 1);
+			if ( ! is_array($dirs))
 			{
 				$dirs = array();
 			}
 
-			$map = array_merge( $map, $dirs );
+			$map = array_merge($map, $dirs);
 		}
 
 		// Clean out any html or php files
-		if ( $count = count( $map ) )
+		if ($count = count($map))
 		{
-			for ( $i = 0; $i < $count; $i ++ )
+			for ($i = 0; $i < $count; $i++)
 			{
-				if ( strpos( $map[ $i ], '.html' ) !== FALSE || strpos( $map[ $i ], '.php' ) !== FALSE )
+				if (strpos($map[$i], '.html') !== FALSE || strpos($map[$i], '.php') !== FALSE)
 				{
-					unset( $map[ $i ] );
+					unset($map[$i]);
 				}
 			}
 		}
@@ -278,17 +278,17 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function controllerExists($controller, $module )
+	public static function controllerExists($controller, $module)
 	{
-		if (! is_string($module) || ! is_string($controller))
+		if ( ! is_string($module) || ! is_string($controller))
 		{
 			throw new \InvalidArgumentException('Argument must be a string for Modules::controllerExists()');
 		}
 
 		// Look in all module paths
-		foreach ( self::$locations as $folder )
+		foreach (self::$locations as $folder)
 		{
-			if ( is_file( "{$folder}{$module}/controllers/{$controller}.php" ) )
+			if (is_file("{$folder}{$module}/controllers/{$controller}.php"))
 			{
 				return TRUE;
 			}
@@ -308,18 +308,18 @@ 
 	 *
 	 * @return  string          The full path to the file, or false if the file was not found
 	 */
-	public static function filePath( $module, $folder, $file )
+	public static function filePath($module, $folder, $file)
 	{
-		if (! is_string($module) || ! is_string($folder) || ! is_string($file))
+		if ( ! is_string($module) || ! is_string($folder) || ! is_string($file))
 		{
 			throw new \InvalidArgumentException('Argument must be a string for Modules::filePath()');
 		}
 
-		foreach ( self::$locations as $location )
+		foreach (self::$locations as $location)
 		{
 			$test_file = "{$location}{$module}/{$folder}/{$file}";
 
-			if ( is_file( $test_file ) )
+			if (is_file($test_file))
 			{
 				return $test_file;
 			}
@@ -338,23 +338,23 @@ 
 	 *
 	 * @return string The path, relative to the front controller, or false if the folder was not found
 	 */
-	public static function path( $module, $folder = null )
+	public static function path($module, $folder = null)
 	{
-		if (! is_string($module) || (! is_string($folder) && !is_null($folder) ) )
+		if ( ! is_string($module) || ( ! is_string($folder) && ! is_null($folder)))
 		{
 			throw new \InvalidArgumentException('Argument must be a string for Modules::path()');
 		}
 
-		foreach ( self::$locations as $module_folder )
+		foreach (self::$locations as $module_folder)
 		{
-			if ( is_dir( $module_folder . $module ) )
+			if (is_dir($module_folder.$module))
 			{
-				if ( ! empty( $folder ) && is_dir( "{$module_folder}{$module}/{$folder}" ) )
+				if ( ! empty($folder) && is_dir("{$module_folder}{$module}/{$folder}"))
 				{
 					return "{$module_folder}{$module}/{$folder}/";
 				}
 
-				return $module_folder . $module . '/';
+				return $module_folder.$module.'/';
 			}
 		}
 
@@ -372,58 +372,58 @@ 
 	 *
 	 * @return array An associative array, like: array('module_name' => array('folder' => array('file1', 'file2')))
 	 */
-	public static function files( $module_name = NULL, $module_folder = NULL )
+	public static function files($module_name = NULL, $module_folder = NULL)
 	{
-		if ( ! function_exists( 'directory_map' ) )
+		if ( ! function_exists('directory_map'))
 		{
-			require BASEPATH . 'helpers/directory_helper.php';
+			require BASEPATH.'helpers/directory_helper.php';
 		}
 
 		$files = array();
 
-		foreach ( self::$locations as $path )
+		foreach (self::$locations as $path)
 		{
 
 			// Only map the whole modules directory if $module_name isn't passed
-			if ( empty( $module_name ) )
+			if (empty($module_name))
 			{
-				$modules = directory_map( $path );
+				$modules = directory_map($path);
 			}
 			// Only map the $module_name directory if it exists
-			elseif ( is_dir( $path . $module_name ) )
+			elseif (is_dir($path.$module_name))
 			{
-				$path                    = $path . $module_name;
-				$modules[ $module_name ] = directory_map( $path );
+				$path                    = $path.$module_name;
+				$modules[$module_name] = directory_map($path);
 			}
 
 			// If the element is not an array, it's a file, so ignore it.
 			// Otherwise it is assumed to be a module.
-			if ( empty( $modules ) || ! is_array( $modules ) )
+			if (empty($modules) || ! is_array($modules))
 			{
 				continue;
 			}
 
-			foreach ( $modules as $mod_name => $values )
+			foreach ($modules as $mod_name => $values)
 			{
-				if ( is_array( $values ) )
+				if (is_array($values))
 				{
 					// Add just the specified folder for this module
-					if ( ! empty( $module_folder ) && isset( $values[ $module_folder .'/' ] ) && count( $values[ $module_folder .'/' ] ) )
+					if ( ! empty($module_folder) && isset($values[$module_folder.'/']) && count($values[$module_folder.'/']))
 					{
-						$files[ $mod_name ] = array(
-							$module_folder .'/' => $values[ $module_folder .'/' ],
+						$files[$mod_name] = array(
+							$module_folder.'/' => $values[$module_folder.'/'],
 						);
 					}
 					// Add the entire module
-					elseif ( empty( $module_folder ) )
+					elseif (empty($module_folder))
 					{
-						$files[ $mod_name ] = $values;
+						$files[$mod_name] = $values;
 					}
 				}
 			}
 		}
 
-		return count( $files ) ? $files : null;
+		return count($files) ? $files : null;
 	}
 
 	//--------------------------------------------------------------------
@@ -436,37 +436,37 @@ 
 	 *
 	 * @return array
 	 */
-	public static function parse_routes( $module, $uri )
+	public static function parse_routes($module, $uri)
 	{
 
 		/* load the route file */
-		if ( ! isset( self::$routes[ $module ] ) )
+		if ( ! isset(self::$routes[$module]))
 		{
-			if ( list( $path ) = self::find( 'routes', $module, 'config/' ) AND $path )
+			if (list($path) = self::find('routes', $module, 'config/') AND $path)
 			{
-				self::$routes[ $module ] = self::load_file( 'routes', $path, 'route' );
+				self::$routes[$module] = self::load_file('routes', $path, 'route');
 			}
 		}
 
-		if ( ! isset( self::$routes[ $module ] ) )
+		if ( ! isset(self::$routes[$module]))
 		{
 			return;
 		}
 
 		/* parse module routes */
-		foreach ( self::$routes[ $module ] as $key => $val )
+		foreach (self::$routes[$module] as $key => $val)
 		{
 
-			$key = str_replace( array( ':any', ':num' ), array( '.+', '[0-9]+' ), $key );
+			$key = str_replace(array(':any', ':num'), array('.+', '[0-9]+'), $key);
 
-			if ( preg_match( '#^' . $key . '$#', $uri ) )
+			if (preg_match('#^'.$key.'$#', $uri))
 			{
-				if ( strpos( $val, '$' ) !== FALSE AND strpos( $key, '(' ) !== FALSE )
+				if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE)
 				{
-					$val = preg_replace( '#^' . $key . '$#', $val, $uri );
+					$val = preg_replace('#^'.$key.'$#', $val, $uri);
 				}
 
-				return explode( '/', $module . '/' . $val );
+				return explode('/', $module.'/'.$val);
 			}
 		}
 	}
@@ -482,17 +482,17 @@ 
 	 *
 	 * @param $class
 	 */
-	public static function autoload( $class )
+	public static function autoload($class)
 	{
 
 		/* don't autoload CI_ prefixed classes or those using the config subclass_prefix */
-		if ( strstr( $class, 'CI_' ) OR strstr( $class, config_item( 'subclass_prefix' ) ) )
+		if (strstr($class, 'CI_') OR strstr($class, config_item('subclass_prefix')))
 		{
 			return;
 		}
 
 		/* autoload core classes */
-		if ( is_file( $location = APPPATH . 'core/' . $class . '.php' ) )
+		if (is_file($location = APPPATH.'core/'.$class.'.php'))
 		{
 			include_once $location;
 
@@ -500,7 +500,7 @@ 
 		}
 
 		/* autoload library classes */
-		if ( is_file( $location = APPPATH . 'libraries/' . $class . '.php' ) )
+		if (is_file($location = APPPATH.'libraries/'.$class.'.php'))
 		{
 			include_once $location;
 

Braces +2 added lines, -4 removed lines

@@ -44,8 +44,7 @@ 
 	if ( is_array( $config['modules_locations'] ) )
 	{
 		Modules::$locations = $config['modules_locations'];
-	}
-	else
+	} else
 	{
 		Modules::$locations = array( APPPATH . 'modules/' => '../modules/' );
 	}
@@ -122,8 +121,7 @@ 
 				return $result;
 			}
 			include_once $location;
-		}
-		else
+		} else
 		{
 
 			/* load config or language array */

myth/Route.php

Doc Comments +13 added lines, -13 removed lines

@@ -194,8 +194,8 @@ 
      *      // Returns http://mysite.com/news
      *      site_url( Route::named('blog') );
      *
-     * @param  [type] $name [description]
-     * @return [type]       [description]
+     * @param  string $name [description]
+     * @return string       [description]
      */
     public static function named($name)
     {
@@ -279,8 +279,8 @@ 
     /**
      * Specifies a route that is only available to GET requests.
      *
-     * @param       $from
-     * @param       $to
+     * @param       string $from
+     * @param       string $to
      * @param array $options
      */
     public function get($from, $to, $options = [])
@@ -295,8 +295,8 @@ 
     /**
      * Specifies a route that is only available to POST requests.
      *
-     * @param       $from
-     * @param       $to
+     * @param       string $from
+     * @param       string $to
      * @param array $options
      */
     public function post($from, $to, $options = [])
@@ -311,8 +311,8 @@ 
     /**
      * Specifies a route that is only available to PUT requests.
      *
-     * @param       $from
-     * @param       $to
+     * @param       string $from
+     * @param       string $to
      * @param array $options
      */
     public function put($from, $to, $options = [])
@@ -327,8 +327,8 @@ 
     /**
      * Specifies a route that is only available to DELETE requests.
      *
-     * @param       $from
-     * @param       $to
+     * @param       string $from
+     * @param       string $to
      * @param array $options
      */
     public function delete($from, $to, $options = [])
@@ -375,8 +375,8 @@ 
     /**
      * Specifies a route that is only available to OPTIONS requests.
      *
-     * @param       $from
-     * @param       $to
+     * @param       string $from
+     * @param       string $to
      * @param array $options
      */
     public function options($from, $to, $options = [])
@@ -500,7 +500,7 @@ 
      * Limits the routes to a specified ENVIRONMENT or they won't run.
      *
      * @param $env
-     * @param callable $callback
+     * @param \Closure $callback
      *
      * @return bool|null
      */

Indentation +639 added lines, -639 removed lines

@@ -43,644 +43,644 @@
 class Route
 {
 
-    // Our routes, ripe for the picking.
-    public $routes = array();
-
-    // Holds key/value pairs of named routes
-    public static $names = array();
-
-    // Used for grouping routes together.
-    public $group = null;
-
-    // Holds the 'areas' of the site.
-    public static $areas = array();
-
-    // The default controller to use in case
-    // 'default_controller' is not in the routes file.
-    protected $default_home = 'home';
-
-    // The default constraint to use in route building
-    protected $default_constraint = 'any';
-
-    protected $constraints = [
-        'any'  => '(:any)',
-        'num'  => '(:num)',
-        'id'   => '(:num)',
-        'name' => "([a-zA-Z']+)"
-    ];
-
-    protected $current_subdomain = null;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Combines the routes that we've defined with the Route class with the
-     * routes passed in. This is intended to be used  after all routes have been
-     * defined to merge CI's default $route array with our routes.
-     *
-     * Example:
-     *     $route['default_controller'] = 'home';
-     *     Route::resource('posts');
-     *     $route = Route::map($route);
-     *
-     * @param array $routes
-     * @internal param array $route The array to merge
-     * @return array         The merge route array.
-     */
-    public function map($routes = array())
-    {
-        $controller = isset($routes['default_controller']) ? $routes['default_controller'] : $this->default_home;
-
-        $routes = array_merge($routes, $this->routes);
-
-        foreach ($routes as $from => $to) {
-            $routes[$from] = str_ireplace('{default_controller}', $controller, $to);
-        }
-
-        return $routes;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A single point to the basic routing. Can be used in place of CI's $route
-     * array if desired. Used internally by many of the methods.
-     *
-     * Available options are currently:
-     *      'as'        - remembers the route via a name that can be called outside of it.
-     *      'offset'    - Offsets and parameters ($1, $2, etc) in routes by the specified amount.
-     *                    Useful while doing versioning of API's, etc.
-     *
-     * Example:
-     *      $route->any('news', 'posts/index');
-     *
-     * @param string $from
-     * @param string $to
-     * @param array  $options
-     * @return void
-     */
-    public function any($from, $to, $options = array())
-    {
-        $this->create($from, $to, $options);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the default constraint to be used in the system. Typically
-     * for use with the 'resources' method.
-     *
-     * @param $constraint
-     */
-    public function setDefaultConstraint($constraint)
-    {
-        if (array_key_exists($constraint, $this->constraints)) {
-            $this->default_constraint = $constraint;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers a new constraint to be used internally. Useful for creating
-     * very specific regex patterns, or simply to allow your routes to be
-     * a tad more readable.
-     *
-     * Example:
-     *      $route->registerConstraint('hero', '(^.*)');
-     *
-     *      $route->any('home/{hero}', 'heroes/journey');
-     *
-     *      // Route then looks like:
-     *      $route['home/(^.*)'] = 'heroes/journey';
-     *
-     * @param      $name
-     * @param      $pattern
-     * @param bool $overwrite
-     */
-    public function registerConstraint($name, $pattern, $overwrite = false)
-    {
-        // Ensure consistency
-        $name    = trim($name, '{} ');
-        $pattern = '(' . trim($pattern, '() ') . ')';
-
-        // Not here? Add it and leave...
-        if (! array_key_exists($name, $this->constraints)) {
-            $this->constraints[$name] = $pattern;
-
-            return;
-        }
-
-        // Here? Then it exists. Should we overwrite it?
-        if ($overwrite) {
-            $this->constraints[$name] = $pattern;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Named Routes
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the value of a named route. Useful for getting named
-     * routes for use while building with site_url() or in templates
-     * where you don't need to instantiate the route class.
-     *
-     * Example:
-     *      $route->any('news', 'posts/index', ['as' => 'blog']);
-     *
-     *      // Returns http://mysite.com/news
-     *      site_url( Route::named('blog') );
-     *
-     * @param  [type] $name [description]
-     * @return [type]       [description]
-     */
-    public static function named($name)
-    {
-        if (isset(self::$names[$name])) {
-            return self::$names[$name];
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Grouping Routes
-    //--------------------------------------------------------------------
-
-    /**
-     * Group a series of routes under a single URL segment. This is handy
-     * for grouping items into an admin area, like:
-     *
-     * Example:
-     *     $route->group('admin', function() {
-     *            $route->resources('users');
-     *     });
-     *
-     * @param  string   $name     The name to group/prefix the routes with.
-     * @param  \Closure $callback An anonymous function that allows you route inside of this group.
-     * @return void
-     */
-    public function group($name, \Closure $callback)
-    {
-        $old_group = $this->group;
-
-        // To register a route, we'll set a flag so that our router
-        // so it will see the groupname.
-        $this->group = ltrim($old_group . '/' . $name, '/');
-
-        call_user_func($callback);
-
-        // Make sure to clear the group name so we don't accidentally
-        // group any ones we didn't want to.
-        $this->group = $old_group;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // HTTP Verb-based routing
-    //--------------------------------------------------------------------
-    // Routing works here because, as the routes config file is read in,
-    // the various HTTP verb-based routes will only be added to the in-memory
-    // routes if it is a call that should respond to that verb.
-    //
-    // The options array is typically used to pass in an 'as' or var, but may
-    // be expanded in the future. See the docblock for 'any' method above for
-    // current list of globally available options.
-    //
-
-    /**
-     * Specifies a single route to match for multiple HTTP Verbs.
-     *
-     * Example:
-     *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
-     *
-     * @param array $verbs
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function match($verbs = [], $from, $to, $options = [])
-    {
-        foreach ($verbs as $verb) {
-            $verb = strtolower($verb);
-
-            $this->{$verb}($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to GET requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function get($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to POST requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function post($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to PUT requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function put($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'PUT') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to DELETE requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function delete($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'DELETE') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to HEAD requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function head($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'HEAD') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to PATCH requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function patch($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'PATCH') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Specifies a route that is only available to OPTIONS requests.
-     *
-     * @param       $from
-     * @param       $to
-     * @param array $options
-     */
-    public function options($from, $to, $options = [])
-    {
-        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
-            $this->create($from, $to, $options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a collections of HTTP-verb based routes for a controller.
-     *
-     * Possible Options:
-     *      'controller'    - Customize the name of the controller used in the 'to' route
-     *      'module'        - Prepend a module name to the generate 'to' routes
-     *      'constraint'    - The regex used by the Router. Defaults to '(:any)'
-     *
-     * Example:
-     *      $route->resources('photos');
-     *
-     *      // Generates the following routes:
-     *      HTTP Verb | Path        | Action        | Used for...
-     *      ----------+-------------+---------------+-----------------
-     *      GET         /photos             index           display a list of photos
-     *      GET         /photos/new         creation_form   return an HTML form for creating a new photo
-     *      GET         /photos/{id}        show            display a specific photo
-     *      GET         /photos/{id}/edit   editing_form    return an HTML form for editing the photo
-     *      POST        /photos             create          create a new photo
-     *      PUT         /photos/{id}        update          update an existing photo
-     *      DELETE      /photos/{id}/delete delete          delete an existing photo
-     *
-     * @param  string $name    The name of the controller to route to.
-     * @param  array  $options An list of possible ways to customize the routing.
-     */
-    public function resources($name, $options = [])
-    {
-        // In order to allow customization of the route the
-        // resources are sent to, we need to have a new name
-        // to store the values in.
-        $new_name = $name;
-
-        // If a new controller is specified, then we replace the
-        // $name value with the name of the new controller.
-        if (isset($options['controller'])) {
-            $new_name = $options['controller'];
-        }
-
-        // If a new module was specified, simply put that path
-        // in front of the controller.
-        if (isset($options['module'])) {
-            $new_name = $options['module'] . '/' . $new_name;
-        }
-
-        // In order to allow customization of allowed id values
-        // we need someplace to store them.
-        $id = isset($this->constraints[$this->default_constraint]) ? $this->constraints[$this->default_constraint] :
-            '(:any)';
-
-        if (isset($options['constraint'])) {
-            $id = $options['constraint'];
-        }
-
-        $this->get($name, $new_name . '/list_all', $options);
-        $this->get($name . '/' . $id, $new_name . '/show/$1', $options);
-        $this->post($name, $new_name . '/create', $options);
-        $this->put($name . '/' . $id, $new_name . '/update/$1', $options);
-        $this->delete($name . '/' . $id, $new_name . '/delete/$1', $options);
-        $this->options($name, $new_name . '/index', $options);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Lets the system know about different 'areas' within the site, like
-     * the admin area, that maps to certain controllers.
-     *
-     * @param  string $area       The name of the area.
-     * @param  string $controller The controller name to look for.
-     * @param         $options
-     */
-    public function area($area, $controller = null, $options = [])
-    {
-        // No controller? Match the area name.
-        $controller = is_null($controller) ? $area : $controller;
-
-        // Save the area so we can recognize it later.
-        self::$areas[$area] = $controller;
-
-        // Create routes for this area.
-        $this->create($area . '/(:any)/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4/$5', $options);
-        $this->create($area . '/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4', $options);
-        $this->create($area . '/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3', $options);
-        $this->create($area . '/(:any)/(:any)', '$1/' . $controller . '/$2', $options);
-        $this->create($area . '/(:any)', '$1/' . $controller, $options);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the name of the area based on the controller name.
-     *
-     * @param  string $controller The name of the controller
-     * @return string             The name of the corresponding area
-     */
-    public static function getAreaName($controller)
-    {
-        foreach (self::$areas as $area => $cont) {
-            if ($controller == $cont) {
-                return $area;
-            }
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Limits the routes to a specified ENVIRONMENT or they won't run.
-     *
-     * @param $env
-     * @param callable $callback
-     *
-     * @return bool|null
-     */
-    public function environment($env, \Closure $callback)
-    {
-        if (ENVIRONMENT == $env)
-        {
-            call_user_func($callback);
-            return true;
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Allows you to easily block access to any number of routes by setting
-     * that route to an empty path ('').
-     *
-     * Example:
-     *     Route::block('posts', 'photos/(:num)');
-     *
-     *     // Same as...
-     *     $route['posts']          = '';
-     *     $route['photos/(:num)']  = '';
-     */
-    public function block()
-    {
-        $paths = func_get_args();
-
-        if (! is_array($paths) || ! count($paths)) {
-            return;
-        }
-
-        foreach ($paths as $path) {
-            $this->create($path, '');
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Empties all named and un-named routes from the system.
-     *
-     * @return void
-     */
-    public function reset()
-    {
-        $this->routes = array();
-        $this->names  = array();
-        $this->group  = null;
-        self::$areas  = array();
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Does the heavy lifting of creating an actual route. You must specify
-     * the request method(s) that this route will work for. They can be separated
-     * by a pipe character "|" if there is more than one.
-     *
-     * @param  string $from
-     * @param  array  $to
-     * @param array   $options
-     *
-     * @return array          The built route.
-     */
-    private function create($from, $to, $options = array())
-    {
-        $prefix = is_null($this->group) ? '' : $this->group . '/';
-
-        $from = $prefix . $from;
-
-        // Are we saving the name for this one?
-        if (isset($options['as']) && !empty($options['as'])) {
-            self::$names[$options['as']] = $from;
-        }
-
-        // Limiting to subdomains?
-        if (isset($options['subdomain']) && !empty($options['subdomain'])) {
-            // If we don't match the current subdomain, then
-            // we don't need to add the route.
-            if (!$this->checkSubdomains($options['subdomain'])) {
-                return;
-            }
-        }
-
-        // Are we offsetting the parameters?
-        // If so, take care of them here in one
-        // fell swoop.
-        if (isset($options['offset'])) {
-            // Get a constant string to work with.
-            $to = preg_replace('/(\$\d+)/', '$X', $to);
-
-            for ($i = (int)$options['offset'] + 1; $i < (int)$options['offset'] + 7; $i ++) {
-                $to = preg_replace_callback(
-                    '/\$X/',
-                    function ($m) use ($i) {
-                        return '$' . $i;
-                    },
-                    $to,
-                    1
-                );
-            }
-        }
-
-        // Convert any custom constraints to the CI/pattern equivalent
-        foreach ($this->constraints as $name => $pattern) {
-            $from = str_replace('{' . $name . '}', $pattern, $from);
-        }
-
-        $this->routes[$from] = $to;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Compares the subdomain(s) passed in against the current subdomain
-     * on this page request.
-     *
-     * @param $subdomains
-     * @return bool
-     */
-    private function checkSubdomains($subdomains)
-    {
-        if (is_null($this->current_subdomain)) {
-            $this->determineCurrentSubdomain();
-        }
-
-        if (!is_array($subdomains)) {
-            $subdomains = array($subdomains);
-        }
-
-        $matched = false;
-
-        array_walk(
-            $subdomains,
-            function ($subdomain) use (&$matched) {
-                if ($subdomain == $this->current_subdomain || $subdomain == '*') {
-                    $matched = true;
-                }
-            }
-        );
-
-        return $matched;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Examines the HTTP_HOST to get a best match for the subdomain. It
-     * won't be perfect, but should work for our needs.
-     */
-    private function determineCurrentSubdomain()
-    {
-        $parsedUrl = parse_url($_SERVER['HTTP_HOST']);
-
-        $host = explode('.', $parsedUrl['host']);
-
-        // If we only have 2 parts, then we don't have a subdomain.
-        // This won't be totally accurate, since URL's like example.co.uk
-        // would still pass, but it helps to separate the chaff...
-        if (!is_array($host) || count($host) == 2) {
-            // Set it to false so we don't make it back here again.
-            $this->current_subdomain = false;
-            return;
-        }
-
-        // Now, we'll simply take the first element of the array. This should
-        // be fine even in cases like example.co.uk, since they won't be looking
-        // for 'example' when they try to match the subdomain, in most all cases.
-        $this->current_subdomain = array_shift($host);
-    }
-    //--------------------------------------------------------------------
+	// Our routes, ripe for the picking.
+	public $routes = array();
+
+	// Holds key/value pairs of named routes
+	public static $names = array();
+
+	// Used for grouping routes together.
+	public $group = null;
+
+	// Holds the 'areas' of the site.
+	public static $areas = array();
+
+	// The default controller to use in case
+	// 'default_controller' is not in the routes file.
+	protected $default_home = 'home';
+
+	// The default constraint to use in route building
+	protected $default_constraint = 'any';
+
+	protected $constraints = [
+		'any'  => '(:any)',
+		'num'  => '(:num)',
+		'id'   => '(:num)',
+		'name' => "([a-zA-Z']+)"
+	];
+
+	protected $current_subdomain = null;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combines the routes that we've defined with the Route class with the
+	 * routes passed in. This is intended to be used  after all routes have been
+	 * defined to merge CI's default $route array with our routes.
+	 *
+	 * Example:
+	 *     $route['default_controller'] = 'home';
+	 *     Route::resource('posts');
+	 *     $route = Route::map($route);
+	 *
+	 * @param array $routes
+	 * @internal param array $route The array to merge
+	 * @return array         The merge route array.
+	 */
+	public function map($routes = array())
+	{
+		$controller = isset($routes['default_controller']) ? $routes['default_controller'] : $this->default_home;
+
+		$routes = array_merge($routes, $this->routes);
+
+		foreach ($routes as $from => $to) {
+			$routes[$from] = str_ireplace('{default_controller}', $controller, $to);
+		}
+
+		return $routes;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A single point to the basic routing. Can be used in place of CI's $route
+	 * array if desired. Used internally by many of the methods.
+	 *
+	 * Available options are currently:
+	 *      'as'        - remembers the route via a name that can be called outside of it.
+	 *      'offset'    - Offsets and parameters ($1, $2, etc) in routes by the specified amount.
+	 *                    Useful while doing versioning of API's, etc.
+	 *
+	 * Example:
+	 *      $route->any('news', 'posts/index');
+	 *
+	 * @param string $from
+	 * @param string $to
+	 * @param array  $options
+	 * @return void
+	 */
+	public function any($from, $to, $options = array())
+	{
+		$this->create($from, $to, $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default constraint to be used in the system. Typically
+	 * for use with the 'resources' method.
+	 *
+	 * @param $constraint
+	 */
+	public function setDefaultConstraint($constraint)
+	{
+		if (array_key_exists($constraint, $this->constraints)) {
+			$this->default_constraint = $constraint;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers a new constraint to be used internally. Useful for creating
+	 * very specific regex patterns, or simply to allow your routes to be
+	 * a tad more readable.
+	 *
+	 * Example:
+	 *      $route->registerConstraint('hero', '(^.*)');
+	 *
+	 *      $route->any('home/{hero}', 'heroes/journey');
+	 *
+	 *      // Route then looks like:
+	 *      $route['home/(^.*)'] = 'heroes/journey';
+	 *
+	 * @param      $name
+	 * @param      $pattern
+	 * @param bool $overwrite
+	 */
+	public function registerConstraint($name, $pattern, $overwrite = false)
+	{
+		// Ensure consistency
+		$name    = trim($name, '{} ');
+		$pattern = '(' . trim($pattern, '() ') . ')';
+
+		// Not here? Add it and leave...
+		if (! array_key_exists($name, $this->constraints)) {
+			$this->constraints[$name] = $pattern;
+
+			return;
+		}
+
+		// Here? Then it exists. Should we overwrite it?
+		if ($overwrite) {
+			$this->constraints[$name] = $pattern;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Named Routes
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the value of a named route. Useful for getting named
+	 * routes for use while building with site_url() or in templates
+	 * where you don't need to instantiate the route class.
+	 *
+	 * Example:
+	 *      $route->any('news', 'posts/index', ['as' => 'blog']);
+	 *
+	 *      // Returns http://mysite.com/news
+	 *      site_url( Route::named('blog') );
+	 *
+	 * @param  [type] $name [description]
+	 * @return [type]       [description]
+	 */
+	public static function named($name)
+	{
+		if (isset(self::$names[$name])) {
+			return self::$names[$name];
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Grouping Routes
+	//--------------------------------------------------------------------
+
+	/**
+	 * Group a series of routes under a single URL segment. This is handy
+	 * for grouping items into an admin area, like:
+	 *
+	 * Example:
+	 *     $route->group('admin', function() {
+	 *            $route->resources('users');
+	 *     });
+	 *
+	 * @param  string   $name     The name to group/prefix the routes with.
+	 * @param  \Closure $callback An anonymous function that allows you route inside of this group.
+	 * @return void
+	 */
+	public function group($name, \Closure $callback)
+	{
+		$old_group = $this->group;
+
+		// To register a route, we'll set a flag so that our router
+		// so it will see the groupname.
+		$this->group = ltrim($old_group . '/' . $name, '/');
+
+		call_user_func($callback);
+
+		// Make sure to clear the group name so we don't accidentally
+		// group any ones we didn't want to.
+		$this->group = $old_group;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// HTTP Verb-based routing
+	//--------------------------------------------------------------------
+	// Routing works here because, as the routes config file is read in,
+	// the various HTTP verb-based routes will only be added to the in-memory
+	// routes if it is a call that should respond to that verb.
+	//
+	// The options array is typically used to pass in an 'as' or var, but may
+	// be expanded in the future. See the docblock for 'any' method above for
+	// current list of globally available options.
+	//
+
+	/**
+	 * Specifies a single route to match for multiple HTTP Verbs.
+	 *
+	 * Example:
+	 *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
+	 *
+	 * @param array $verbs
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function match($verbs = [], $from, $to, $options = [])
+	{
+		foreach ($verbs as $verb) {
+			$verb = strtolower($verb);
+
+			$this->{$verb}($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to GET requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function get($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to POST requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function post($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'POST') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to PUT requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function put($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'PUT') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to DELETE requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function delete($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'DELETE') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to HEAD requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function head($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to PATCH requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function patch($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'PATCH') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specifies a route that is only available to OPTIONS requests.
+	 *
+	 * @param       $from
+	 * @param       $to
+	 * @param array $options
+	 */
+	public function options($from, $to, $options = [])
+	{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+			$this->create($from, $to, $options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a collections of HTTP-verb based routes for a controller.
+	 *
+	 * Possible Options:
+	 *      'controller'    - Customize the name of the controller used in the 'to' route
+	 *      'module'        - Prepend a module name to the generate 'to' routes
+	 *      'constraint'    - The regex used by the Router. Defaults to '(:any)'
+	 *
+	 * Example:
+	 *      $route->resources('photos');
+	 *
+	 *      // Generates the following routes:
+	 *      HTTP Verb | Path        | Action        | Used for...
+	 *      ----------+-------------+---------------+-----------------
+	 *      GET         /photos             index           display a list of photos
+	 *      GET         /photos/new         creation_form   return an HTML form for creating a new photo
+	 *      GET         /photos/{id}        show            display a specific photo
+	 *      GET         /photos/{id}/edit   editing_form    return an HTML form for editing the photo
+	 *      POST        /photos             create          create a new photo
+	 *      PUT         /photos/{id}        update          update an existing photo
+	 *      DELETE      /photos/{id}/delete delete          delete an existing photo
+	 *
+	 * @param  string $name    The name of the controller to route to.
+	 * @param  array  $options An list of possible ways to customize the routing.
+	 */
+	public function resources($name, $options = [])
+	{
+		// In order to allow customization of the route the
+		// resources are sent to, we need to have a new name
+		// to store the values in.
+		$new_name = $name;
+
+		// If a new controller is specified, then we replace the
+		// $name value with the name of the new controller.
+		if (isset($options['controller'])) {
+			$new_name = $options['controller'];
+		}
+
+		// If a new module was specified, simply put that path
+		// in front of the controller.
+		if (isset($options['module'])) {
+			$new_name = $options['module'] . '/' . $new_name;
+		}
+
+		// In order to allow customization of allowed id values
+		// we need someplace to store them.
+		$id = isset($this->constraints[$this->default_constraint]) ? $this->constraints[$this->default_constraint] :
+			'(:any)';
+
+		if (isset($options['constraint'])) {
+			$id = $options['constraint'];
+		}
+
+		$this->get($name, $new_name . '/list_all', $options);
+		$this->get($name . '/' . $id, $new_name . '/show/$1', $options);
+		$this->post($name, $new_name . '/create', $options);
+		$this->put($name . '/' . $id, $new_name . '/update/$1', $options);
+		$this->delete($name . '/' . $id, $new_name . '/delete/$1', $options);
+		$this->options($name, $new_name . '/index', $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Lets the system know about different 'areas' within the site, like
+	 * the admin area, that maps to certain controllers.
+	 *
+	 * @param  string $area       The name of the area.
+	 * @param  string $controller The controller name to look for.
+	 * @param         $options
+	 */
+	public function area($area, $controller = null, $options = [])
+	{
+		// No controller? Match the area name.
+		$controller = is_null($controller) ? $area : $controller;
+
+		// Save the area so we can recognize it later.
+		self::$areas[$area] = $controller;
+
+		// Create routes for this area.
+		$this->create($area . '/(:any)/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4/$5', $options);
+		$this->create($area . '/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4', $options);
+		$this->create($area . '/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3', $options);
+		$this->create($area . '/(:any)/(:any)', '$1/' . $controller . '/$2', $options);
+		$this->create($area . '/(:any)', '$1/' . $controller, $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the area based on the controller name.
+	 *
+	 * @param  string $controller The name of the controller
+	 * @return string             The name of the corresponding area
+	 */
+	public static function getAreaName($controller)
+	{
+		foreach (self::$areas as $area => $cont) {
+			if ($controller == $cont) {
+				return $area;
+			}
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Limits the routes to a specified ENVIRONMENT or they won't run.
+	 *
+	 * @param $env
+	 * @param callable $callback
+	 *
+	 * @return bool|null
+	 */
+	public function environment($env, \Closure $callback)
+	{
+		if (ENVIRONMENT == $env)
+		{
+			call_user_func($callback);
+			return true;
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Allows you to easily block access to any number of routes by setting
+	 * that route to an empty path ('').
+	 *
+	 * Example:
+	 *     Route::block('posts', 'photos/(:num)');
+	 *
+	 *     // Same as...
+	 *     $route['posts']          = '';
+	 *     $route['photos/(:num)']  = '';
+	 */
+	public function block()
+	{
+		$paths = func_get_args();
+
+		if (! is_array($paths) || ! count($paths)) {
+			return;
+		}
+
+		foreach ($paths as $path) {
+			$this->create($path, '');
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Empties all named and un-named routes from the system.
+	 *
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->routes = array();
+		$this->names  = array();
+		$this->group  = null;
+		self::$areas  = array();
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does the heavy lifting of creating an actual route. You must specify
+	 * the request method(s) that this route will work for. They can be separated
+	 * by a pipe character "|" if there is more than one.
+	 *
+	 * @param  string $from
+	 * @param  array  $to
+	 * @param array   $options
+	 *
+	 * @return array          The built route.
+	 */
+	private function create($from, $to, $options = array())
+	{
+		$prefix = is_null($this->group) ? '' : $this->group . '/';
+
+		$from = $prefix . $from;
+
+		// Are we saving the name for this one?
+		if (isset($options['as']) && !empty($options['as'])) {
+			self::$names[$options['as']] = $from;
+		}
+
+		// Limiting to subdomains?
+		if (isset($options['subdomain']) && !empty($options['subdomain'])) {
+			// If we don't match the current subdomain, then
+			// we don't need to add the route.
+			if (!$this->checkSubdomains($options['subdomain'])) {
+				return;
+			}
+		}
+
+		// Are we offsetting the parameters?
+		// If so, take care of them here in one
+		// fell swoop.
+		if (isset($options['offset'])) {
+			// Get a constant string to work with.
+			$to = preg_replace('/(\$\d+)/', '$X', $to);
+
+			for ($i = (int)$options['offset'] + 1; $i < (int)$options['offset'] + 7; $i ++) {
+				$to = preg_replace_callback(
+					'/\$X/',
+					function ($m) use ($i) {
+						return '$' . $i;
+					},
+					$to,
+					1
+				);
+			}
+		}
+
+		// Convert any custom constraints to the CI/pattern equivalent
+		foreach ($this->constraints as $name => $pattern) {
+			$from = str_replace('{' . $name . '}', $pattern, $from);
+		}
+
+		$this->routes[$from] = $to;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compares the subdomain(s) passed in against the current subdomain
+	 * on this page request.
+	 *
+	 * @param $subdomains
+	 * @return bool
+	 */
+	private function checkSubdomains($subdomains)
+	{
+		if (is_null($this->current_subdomain)) {
+			$this->determineCurrentSubdomain();
+		}
+
+		if (!is_array($subdomains)) {
+			$subdomains = array($subdomains);
+		}
+
+		$matched = false;
+
+		array_walk(
+			$subdomains,
+			function ($subdomain) use (&$matched) {
+				if ($subdomain == $this->current_subdomain || $subdomain == '*') {
+					$matched = true;
+				}
+			}
+		);
+
+		return $matched;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Examines the HTTP_HOST to get a best match for the subdomain. It
+	 * won't be perfect, but should work for our needs.
+	 */
+	private function determineCurrentSubdomain()
+	{
+		$parsedUrl = parse_url($_SERVER['HTTP_HOST']);
+
+		$host = explode('.', $parsedUrl['host']);
+
+		// If we only have 2 parts, then we don't have a subdomain.
+		// This won't be totally accurate, since URL's like example.co.uk
+		// would still pass, but it helps to separate the chaff...
+		if (!is_array($host) || count($host) == 2) {
+			// Set it to false so we don't make it back here again.
+			$this->current_subdomain = false;
+			return;
+		}
+
+		// Now, we'll simply take the first element of the array. This should
+		// be fine even in cases like example.co.uk, since they won't be looking
+		// for 'example' when they try to match the subdomain, in most all cases.
+		$this->current_subdomain = array_shift($host);
+	}
+	//--------------------------------------------------------------------
 
 }

Spacing +29 added lines, -30 removed lines

@@ -162,10 +162,10 @@ 
     {
         // Ensure consistency
         $name    = trim($name, '{} ');
-        $pattern = '(' . trim($pattern, '() ') . ')';
+        $pattern = '('.trim($pattern, '() ').')';
 
         // Not here? Add it and leave...
-        if (! array_key_exists($name, $this->constraints)) {
+        if ( ! array_key_exists($name, $this->constraints)) {
             $this->constraints[$name] = $pattern;
 
             return;
@@ -231,7 +231,7 @@ 
 
         // To register a route, we'll set a flag so that our router
         // so it will see the groupname.
-        $this->group = ltrim($old_group . '/' . $name, '/');
+        $this->group = ltrim($old_group.'/'.$name, '/');
 
         call_user_func($callback);
 
@@ -429,24 +429,23 @@ 
         // If a new module was specified, simply put that path
         // in front of the controller.
         if (isset($options['module'])) {
-            $new_name = $options['module'] . '/' . $new_name;
+            $new_name = $options['module'].'/'.$new_name;
         }
 
         // In order to allow customization of allowed id values
         // we need someplace to store them.
-        $id = isset($this->constraints[$this->default_constraint]) ? $this->constraints[$this->default_constraint] :
-            '(:any)';
+        $id = isset($this->constraints[$this->default_constraint]) ? $this->constraints[$this->default_constraint] : '(:any)';
 
         if (isset($options['constraint'])) {
             $id = $options['constraint'];
         }
 
-        $this->get($name, $new_name . '/list_all', $options);
-        $this->get($name . '/' . $id, $new_name . '/show/$1', $options);
-        $this->post($name, $new_name . '/create', $options);
-        $this->put($name . '/' . $id, $new_name . '/update/$1', $options);
-        $this->delete($name . '/' . $id, $new_name . '/delete/$1', $options);
-        $this->options($name, $new_name . '/index', $options);
+        $this->get($name, $new_name.'/list_all', $options);
+        $this->get($name.'/'.$id, $new_name.'/show/$1', $options);
+        $this->post($name, $new_name.'/create', $options);
+        $this->put($name.'/'.$id, $new_name.'/update/$1', $options);
+        $this->delete($name.'/'.$id, $new_name.'/delete/$1', $options);
+        $this->options($name, $new_name.'/index', $options);
     }
 
     //--------------------------------------------------------------------
@@ -468,11 +467,11 @@ 
         self::$areas[$area] = $controller;
 
         // Create routes for this area.
-        $this->create($area . '/(:any)/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4/$5', $options);
-        $this->create($area . '/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4', $options);
-        $this->create($area . '/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3', $options);
-        $this->create($area . '/(:any)/(:any)', '$1/' . $controller . '/$2', $options);
-        $this->create($area . '/(:any)', '$1/' . $controller, $options);
+        $this->create($area.'/(:any)/(:any)/(:any)/(:any)/(:any)', '$1/'.$controller.'/$2/$3/$4/$5', $options);
+        $this->create($area.'/(:any)/(:any)/(:any)/(:any)', '$1/'.$controller.'/$2/$3/$4', $options);
+        $this->create($area.'/(:any)/(:any)/(:any)', '$1/'.$controller.'/$2/$3', $options);
+        $this->create($area.'/(:any)/(:any)', '$1/'.$controller.'/$2', $options);
+        $this->create($area.'/(:any)', '$1/'.$controller, $options);
     }
 
     //--------------------------------------------------------------------
@@ -534,7 +533,7 @@ 
     {
         $paths = func_get_args();
 
-        if (! is_array($paths) || ! count($paths)) {
+        if ( ! is_array($paths) || ! count($paths)) {
             return;
         }
 
@@ -577,20 +576,20 @@ 
      */
     private function create($from, $to, $options = array())
     {
-        $prefix = is_null($this->group) ? '' : $this->group . '/';
+        $prefix = is_null($this->group) ? '' : $this->group.'/';
 
-        $from = $prefix . $from;
+        $from = $prefix.$from;
 
         // Are we saving the name for this one?
-        if (isset($options['as']) && !empty($options['as'])) {
+        if (isset($options['as']) && ! empty($options['as'])) {
             self::$names[$options['as']] = $from;
         }
 
         // Limiting to subdomains?
-        if (isset($options['subdomain']) && !empty($options['subdomain'])) {
+        if (isset($options['subdomain']) && ! empty($options['subdomain'])) {
             // If we don't match the current subdomain, then
             // we don't need to add the route.
-            if (!$this->checkSubdomains($options['subdomain'])) {
+            if ( ! $this->checkSubdomains($options['subdomain'])) {
                 return;
             }
         }
@@ -602,11 +601,11 @@ 
             // Get a constant string to work with.
             $to = preg_replace('/(\$\d+)/', '$X', $to);
 
-            for ($i = (int)$options['offset'] + 1; $i < (int)$options['offset'] + 7; $i ++) {
+            for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i++) {
                 $to = preg_replace_callback(
                     '/\$X/',
-                    function ($m) use ($i) {
-                        return '$' . $i;
+                    function($m) use ($i) {
+                        return '$'.$i;
                     },
                     $to,
                     1
@@ -616,7 +615,7 @@ 
 
         // Convert any custom constraints to the CI/pattern equivalent
         foreach ($this->constraints as $name => $pattern) {
-            $from = str_replace('{' . $name . '}', $pattern, $from);
+            $from = str_replace('{'.$name.'}', $pattern, $from);
         }
 
         $this->routes[$from] = $to;
@@ -637,7 +636,7 @@ 
             $this->determineCurrentSubdomain();
         }
 
-        if (!is_array($subdomains)) {
+        if ( ! is_array($subdomains)) {
             $subdomains = array($subdomains);
         }
 
@@ -645,7 +644,7 @@ 
 
         array_walk(
             $subdomains,
-            function ($subdomain) use (&$matched) {
+            function($subdomain) use (&$matched) {
                 if ($subdomain == $this->current_subdomain || $subdomain == '*') {
                     $matched = true;
                 }
@@ -670,7 +669,7 @@ 
         // If we only have 2 parts, then we don't have a subdomain.
         // This won't be totally accurate, since URL's like example.co.uk
         // would still pass, but it helps to separate the chaff...
-        if (!is_array($host) || count($host) == 2) {
+        if ( ! is_array($host) || count($host) == 2) {
             // Set it to false so we don't make it back here again.
             $this->current_subdomain = false;
             return;

myth/Themers/MetaInterface.php

Doc Comments +2 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
      * @param $alias
      * @param null $value
      *
-     * @return mixed
+     * @return MetaCollection
      */
     public function set($alias, $value=null);
 
@@ -59,9 +59,8 @@ 
     /**
      * Renders out all defined meta tags.
      *
-     * @param array $show_tags
      *
-     * @return mixed
+     * @return null|string
      */
     public function renderTags();
 

Indentation +38 added lines, -38 removed lines

@@ -33,50 +33,50 @@
 
 interface MetaInterface {
 
-    /**
-     * Sets a single meta item.
-     *
-     * @param $alias
-     * @param null $value
-     *
-     * @return mixed
-     */
-    public function set($alias, $value=null);
+	/**
+	 * Sets a single meta item.
+	 *
+	 * @param $alias
+	 * @param null $value
+	 *
+	 * @return mixed
+	 */
+	public function set($alias, $value=null);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Returns a single meta item.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function get($alias);
+	/**
+	 * Returns a single meta item.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function get($alias);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Renders out all defined meta tags.
-     *
-     * @param array $show_tags
-     *
-     * @return mixed
-     */
-    public function renderTags();
+	/**
+	 * Renders out all defined meta tags.
+	 *
+	 * @param array $show_tags
+	 *
+	 * @return mixed
+	 */
+	public function renderTags();
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Registers a new HTTP Equivalent meta tag so it can be
-     * rendered out properly.
-     *
-     * @param $name
-     *
-     * @return $this
-     */
-    public function registerHTTPEquivTag($name);
+	/**
+	 * Registers a new HTTP Equivalent meta tag so it can be
+	 * rendered out properly.
+	 *
+	 * @param $name
+	 *
+	 * @return $this
+	 */
+	public function registerHTTPEquivTag($name);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      *
      * @return mixed
      */
-    public function set($alias, $value=null);
+    public function set($alias, $value = null);
 
     //--------------------------------------------------------------------
 

myth/Themers/ViewThemer.php

Doc Comments +7 added lines, -9 removed lines

@@ -73,7 +73,6 @@ 
      * controller and is generally the last method called.
      *
      * @param string $layout        If provided, will override the default layout.
-     * @param int    $cache_time    The number of seconds to cache the output for.
      * @return mixed
      */
     public function render($layout = null)
@@ -104,7 +103,6 @@ 
 	 * Used within the template layout file to render the current content.
 	 * This content is typically used to display the current view.
 	 *
-	 * @param int $cache_time
 	 *
 	 * @return mixed
 	 */
@@ -304,7 +302,7 @@ 
     /**
      * Returns the current theme.
      *
-     * @return mixed|string
+     * @return string
      */
     public function theme()
     {
@@ -343,7 +341,7 @@ 
     /**
      * Returns the current view.
      *
-     * @return mixed|string
+     * @return string
      */
     public function view()
     {
@@ -371,7 +369,7 @@ 
     /**
      * Returns the current layout.
      *
-     * @return mixed|string
+     * @return string
      */
     public function layout()
     {
@@ -425,7 +423,7 @@ 
      * CodeIgniter's parser.
      *
      * @param bool $parse
-     * @return mixed
+     * @return ViewThemer
      */
     public function parseViews($parse = false)
     {
@@ -444,7 +442,7 @@ 
      * @param $alias The name the theme can be referenced by
      * @param $path  A new path where themes can be found.
      *
-     * @return mixed
+     * @return ViewThemer
      */
     public function addThemePath($alias, $path)
     {
@@ -525,7 +523,7 @@ 
      *
      * @param $name
      * @param $postfix
-     * @return $this|mixed
+     * @return ViewThemer
      */
     public function addVariant($name, $postfix)
     {
@@ -540,7 +538,7 @@ 
      * Removes a variant from the system.
      *
      * @param $name
-     * @return $this|mixed
+     * @return ViewThemer
      */
     public function removeVariant($name)
     {

Indentation +522 added lines, -522 removed lines

@@ -35,70 +35,70 @@ 
 class ViewThemer implements ThemerInterface
 {
 
-    protected $theme = '';
+	protected $theme = '';
 
-    protected $default_theme = null;
+	protected $default_theme = null;
 
 	protected $active_theme = null;
 
-    protected $layout = 'index';
+	protected $layout = 'index';
 
-    protected $view = '';
+	protected $view = '';
 
-    protected $vars = [];
+	protected $vars = [];
 
-    protected $folders = [];
+	protected $folders = [];
 
-    protected $variants = [];
+	protected $variants = [];
 
-    protected $current_variant = '';
+	protected $current_variant = '';
 
 	protected $parse_views = false;
 
-    protected $ci;
+	protected $ci;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct($ci)
-    {
-        $this->ci = $ci;
+	public function __construct($ci)
+	{
+		$this->ci = $ci;
 
-	    $this->parse_views = config_item('theme.parse_views');
-    }
+		$this->parse_views = config_item('theme.parse_views');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * The main entryway into rendering a view. This is called from the
-     * controller and is generally the last method called.
-     *
-     * @param string $layout        If provided, will override the default layout.
-     * @param int    $cache_time    The number of seconds to cache the output for.
-     * @return mixed
-     */
-    public function render($layout = null)
-    {
-        // Make the template engine available within the views.
-        $this->vars['themer'] = $this;
+	/**
+	 * The main entryway into rendering a view. This is called from the
+	 * controller and is generally the last method called.
+	 *
+	 * @param string $layout        If provided, will override the default layout.
+	 * @param int    $cache_time    The number of seconds to cache the output for.
+	 * @return mixed
+	 */
+	public function render($layout = null)
+	{
+		// Make the template engine available within the views.
+		$this->vars['themer'] = $this;
 
-        // Render our current view content
-        $this->vars['view_content'] = $this->content();
+		// Render our current view content
+		$this->vars['view_content'] = $this->content();
 
-        $theme = empty($this->theme) ? $this->default_theme : $this->theme;
+		$theme = empty($this->theme) ? $this->default_theme : $this->theme;
 
-        if (! isset($this->folders[$theme])) {
-            throw new \LogicException( sprintf( lang('theme.bad_folder'), $theme ) );
-        }
+		if (! isset($this->folders[$theme])) {
+			throw new \LogicException( sprintf( lang('theme.bad_folder'), $theme ) );
+		}
 
-	    $this->active_theme = $theme;
+		$this->active_theme = $theme;
 
-        // Make the path available within views.
-        $this->vars['theme_path'] = $this->folders[$theme];
+		// Make the path available within views.
+		$this->vars['theme_path'] = $this->folders[$theme];
 
-        return $this->display($this->folders[$theme] . '/' . $this->layout);
-    }
+		return $this->display($this->folders[$theme] . '/' . $this->layout);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Used within the template layout file to render the current content.
@@ -108,490 +108,490 @@ 
 	 *
 	 * @return mixed
 	 */
-    public function content()
-    {
-        // Calc our view name based on current method/controller
-        $dir = $this->ci->router->fetch_directory();
+	public function content()
+	{
+		// Calc our view name based on current method/controller
+		$dir = $this->ci->router->fetch_directory();
 
-        foreach (Modules::$locations as $key => $offset) {
+		foreach (Modules::$locations as $key => $offset) {
 
-            if (stripos($dir, 'module') !== false) {
+			if (stripos($dir, 'module') !== false) {
 //                $dir = str_replace($offset, '', $dir);
-                $dir = str_replace('controllers/', '', $dir);
-            }
-        }
-
-        $module = $this->ci->router->fetch_module();
-
-        if (! empty($module) && substr($dir, -strlen($module .'/')) == $module . '/') {
-            $dir = '';
-        }
-
-        $view = ! empty($this->view) ? $this->view :
-            $dir . $this->ci->router->fetch_class() . '/' . $this->ci->router->fetch_method();
-
-        return $this->display($view);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Loads a view file. Useful to control caching. Intended for use
-     * from within view files.
-     *
-     * You can specify that a view should belong to a theme by prefixing
-     * the name of the theme and a colon to the view name. For example,
-     * "admin:header" would try to display the "header.php" file within
-     * the "admin" theme.
-     *
-     * If a variant has been specified, it will be added to the end
-     * of the view name before looking for the file.
-     *
-     * @param string $view
-     * @param array  $data
-     * @param int    $cache_time Number of minutes to cache the page for
-     * @param string $cache_name A custom name for the cached file.
-     * @return mixed
-     */
-    public function display($view, $data = array(), $cache_time = 0, $cache_name=null)
-    {
-	    if (empty($cache_name))
-	    {
-		    $cache_name = 'theme_view_' . $view . '_' . $this->ci->router->fetch_class() . '_' . $this->ci->router->fetch_method();
-		    $cache_name = str_replace( '/', '_', $cache_name );
-	    }
-
-	    if ($cache_time == 0 || ! $output = $this->ci->cache->get($cache_name))
-	    {
-		    $theme        = NULL;
-		    $variant_view = NULL;
-
-		    // Pull out the theme from the view, if given.
-		    if ( strpos( $view, ':' ) !== FALSE )
-		    {
-			    list( $theme, $view ) = explode( ':', $view );
-
-			    $theme = str_replace('{theme}', $this->active_theme, $theme);
-		    }
-
-		    if ( ! empty( $theme ) && isset( $this->folders[ $theme ] ) )
-		    {
-			    $view = rtrim( $this->folders[ $theme ], '/' ) . '/' . $view;
-		    }
-
-		    if (! is_array($data))
-		    {
-			    $data = [];
-		    }
-
-		    $data = array_merge( $this->vars, $data );
-
-		    // if using a variant, add it to the view name.
-		    if ( ! empty( $this->current_variant ) )
-		    {
-			    $variant_view = $view . $this->variants[ $this->current_variant ];
-
-			    $output = $this->loadView($variant_view, $data);
-		    }
-
-		    // If that didn't find anything, then try it without a variant
-		    if ( empty( $output ) )
-		    {
-			    $output = $this->loadView($view, $data);
-		    }
-
-		    // Cache it
-		    if ((int)$cache_time > 0)
-		    {
-			    $this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
-		    }
-	    }
-
-	    // Parse views?
-	    if ($this->parse_views)
-	    {
-		    $this->ci->load->library('parser');
-
-		    // Any class objects will cause failure
-		    // so get rid of those bad boys....
-		    unset($data['uikit'], $data['themer']);
-
-		    $output = $this->ci->parser->parse_string($output, $data, true);
-	    }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a callback method and returns the contents to the view.
-     *
-     * @param $command
-     * @param int $cache_time
-     * @param string $cache_name    // Number of MINUTES to cache output
-     * @return mixed|void
-     */
-    public function call($command, $cache_time=0, $cache_name=null)
-    {
-	    if (empty($cache_name))
-	    {
-		    $cache_name = 'theme_call_' . md5( $command );
-	    }
-
-        if (! $output = $this->ci->cache->get($cache_name)) {
-            $parts = explode(' ', $command);
-
-            list($class, $method) = explode(':', array_shift($parts));
-
-            // Prepare our parameter list to send to the callback
-            // by splitting $parts on equal signs.
-            $params = array();
-
-            foreach ($parts as $part) {
-                $p = explode('=', $part);
-
-                if (empty($p[0]) || empty($p[1]))
-                {
-                    continue;
-                }
-
-                $params[ $p[0] ] = $p[1];
-            }
-
-            // Let PHP try to autoload it through any available autoloaders
-            // (including Composer and user's custom autoloaders). If we
-            // don't find it, then assume it's a CI library that we can reach.
-            if (class_exists($class)) {
-                $class = new $class();
-            } else {
-                $this->ci->load->library($class);
-                $class =& $this->ci->$class;
-            }
-
-            if (! method_exists($class, $method)) {
-                throw new \RuntimeException( sprintf( lang('themer.bad_callback'), $class, $method ) );
-            }
-
-            // Call the class with our parameters
-            $output = $class->{$method}($params);
-
-            // Cache it
-            if ((int)$cache_time > 0)
-            {
-                $this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
-            }
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the active theme to use. This theme should be
-     * relative to one of the 'theme_paths' folders.
-     *
-     * @param $theme
-     */
-    public function setTheme($theme)
-    {
-        $this->theme = $theme;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current theme.
-     *
-     * @return mixed|string
-     */
-    public function theme()
-    {
-        return $this->theme;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the default theme to use if another isn't specified.
-     *
-     * @param $theme
-     * @return mixed|void
-     */
-    public function setDefaultTheme($theme)
-    {
-        $this->default_theme = $theme;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Sets the current view file to render.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setView($file)
-    {
-        $this->view = $file;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current view.
-     *
-     * @return mixed|string
-     */
-    public function view()
-    {
-        return $this->view;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current layout to be used. MUST be the name of one of
-     * the layout files within the current theme. Case-sensitive.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setLayout($file)
-    {
-        if (empty($file)) return;
-
-        $this->layout = $file;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current layout.
-     *
-     * @return mixed|string
-     */
-    public function layout()
-    {
-        return $this->layout;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores one or more pieces of data to be passed to the views when
-     * they are rendered out.
-     *
-     * If both $key and $value are ! empty, then it will treat it as a
-     * key/value pair. If $key is an array of key/value pairs, then $value
-     * is ignored and each element of the array are made available to the
-     * view as if it was a single $key/$value pair.
-     *
-     * @param string|array $key
-     * @param mixed $value
-     * @return $this
-     */
-    public function set($key, $value = null)
-    {
-        if (is_array($key)) {
-            $this->vars = array_merge($this->vars, $key);
-            return;
-        }
-
-        $this->vars[$key] = $value;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a value that has been previously set().
-     *
-     * @param $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        return isset($this->vars[$key]) ? $this->vars[$key] : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines whether or not the view should be parsed with the
-     * CodeIgniter's parser.
-     *
-     * @param bool $parse
-     * @return mixed
-     */
-    public function parseViews($parse = false)
-    {
-	    $this->parse_views = $parse;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Theme paths allow you to have multiple locations for themes to be
-     * stored. This might be used for separating themes for different sub-
-     * applications, or a core theme and user-submitted themes.
-     *
-     * @param $alias The name the theme can be referenced by
-     * @param $path  A new path where themes can be found.
-     *
-     * @return mixed
-     */
-    public function addThemePath($alias, $path)
-    {
-        $this->folders[$alias] = $path;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single theme path.
-     *
-     * @param $alias
-     * @return $this
-     */
-    public function removeThemePath($alias)
-    {
-        unset($this->folders[$alias]);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the path to the active/default theme's folder.
-     *
-     * @return string|null
-     */
-    public function getThemePath()
-    {
-        $theme = empty($this->theme) ? $this->default_theme : $this->theme;
-
-        if (! isset($this->folders[ $theme ]))
-        {
-            return null;
-        }
-
-        return $this->folders[$theme];
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    //--------------------------------------------------------------------
-    // Variants
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the variant used when creating view names. These variants can
-     * be anything, but by default are used to render specific templates
-     * for desktop, tablet, and phone. The name of the variant is added
-     * to the view name, joined by a "+" symbol.
-     *
-     * Example:
-     *      $this->setVariant('phone');
-     *      $this->display('header');
-     *
-     *      Tries to display "views/header+phone.php"
-     *
-     * @param $variant
-     * @return $this
-     */
-    public function setVariant($variant)
-    {
-        if (isset($this->variants[$variant])) {
-            $this->current_variant = $variant;
-        }
-
-        return $this;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new variant to the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return $this|mixed
-     */
-    public function addVariant($name, $postfix)
-    {
-        $this->variants[$name] = $postfix;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a variant from the system.
-     *
-     * @param $name
-     * @return $this|mixed
-     */
-    public function removeVariant($name)
-    {
-        if (isset($this->variants[$name])) {
-            unset($this->variants[$name]);
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Handles the actual loading of a view file, and checks for any
-     * overrides in themes, etc.
-     *
-     * @param $view
-     * @param $data
-     *
-     * @return string
-     */
-    private function loadView($view, $data)
-    {
-        // First - does it exist in the current theme?
-        $theme = ! empty($this->active_theme) ? $this->active_theme : $this->default_theme;
-        $theme = ! empty($this->folders[$theme]) ? $this->folders[$theme] : $theme;
-        $theme = rtrim($theme, '/ ') .'/';
-
-        if (file_exists($theme ."{$view}.php"))
-        {
-            $output = $this->ci->load->view_path( $theme . $view, $data, TRUE );
-        }
-
-        // Next, if it's a real file with path, then load it
-        elseif ( realpath( $view . '.php' ) )
-        {
-            $output = $this->ci->load->view_path( $view, $data, TRUE );
-        }
-
-        // Otherwise, treat it as a standard view, which means
-        // application/views will override any modules. (See HMVC/Loader)
-        else
-        {
-            $output = $this->ci->load->view( $view, $data, TRUE );
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+				$dir = str_replace('controllers/', '', $dir);
+			}
+		}
+
+		$module = $this->ci->router->fetch_module();
+
+		if (! empty($module) && substr($dir, -strlen($module .'/')) == $module . '/') {
+			$dir = '';
+		}
+
+		$view = ! empty($this->view) ? $this->view :
+			$dir . $this->ci->router->fetch_class() . '/' . $this->ci->router->fetch_method();
+
+		return $this->display($view);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads a view file. Useful to control caching. Intended for use
+	 * from within view files.
+	 *
+	 * You can specify that a view should belong to a theme by prefixing
+	 * the name of the theme and a colon to the view name. For example,
+	 * "admin:header" would try to display the "header.php" file within
+	 * the "admin" theme.
+	 *
+	 * If a variant has been specified, it will be added to the end
+	 * of the view name before looking for the file.
+	 *
+	 * @param string $view
+	 * @param array  $data
+	 * @param int    $cache_time Number of minutes to cache the page for
+	 * @param string $cache_name A custom name for the cached file.
+	 * @return mixed
+	 */
+	public function display($view, $data = array(), $cache_time = 0, $cache_name=null)
+	{
+		if (empty($cache_name))
+		{
+			$cache_name = 'theme_view_' . $view . '_' . $this->ci->router->fetch_class() . '_' . $this->ci->router->fetch_method();
+			$cache_name = str_replace( '/', '_', $cache_name );
+		}
+
+		if ($cache_time == 0 || ! $output = $this->ci->cache->get($cache_name))
+		{
+			$theme        = NULL;
+			$variant_view = NULL;
+
+			// Pull out the theme from the view, if given.
+			if ( strpos( $view, ':' ) !== FALSE )
+			{
+				list( $theme, $view ) = explode( ':', $view );
+
+				$theme = str_replace('{theme}', $this->active_theme, $theme);
+			}
+
+			if ( ! empty( $theme ) && isset( $this->folders[ $theme ] ) )
+			{
+				$view = rtrim( $this->folders[ $theme ], '/' ) . '/' . $view;
+			}
+
+			if (! is_array($data))
+			{
+				$data = [];
+			}
+
+			$data = array_merge( $this->vars, $data );
+
+			// if using a variant, add it to the view name.
+			if ( ! empty( $this->current_variant ) )
+			{
+				$variant_view = $view . $this->variants[ $this->current_variant ];
+
+				$output = $this->loadView($variant_view, $data);
+			}
+
+			// If that didn't find anything, then try it without a variant
+			if ( empty( $output ) )
+			{
+				$output = $this->loadView($view, $data);
+			}
+
+			// Cache it
+			if ((int)$cache_time > 0)
+			{
+				$this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
+			}
+		}
+
+		// Parse views?
+		if ($this->parse_views)
+		{
+			$this->ci->load->library('parser');
+
+			// Any class objects will cause failure
+			// so get rid of those bad boys....
+			unset($data['uikit'], $data['themer']);
+
+			$output = $this->ci->parser->parse_string($output, $data, true);
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a callback method and returns the contents to the view.
+	 *
+	 * @param $command
+	 * @param int $cache_time
+	 * @param string $cache_name    // Number of MINUTES to cache output
+	 * @return mixed|void
+	 */
+	public function call($command, $cache_time=0, $cache_name=null)
+	{
+		if (empty($cache_name))
+		{
+			$cache_name = 'theme_call_' . md5( $command );
+		}
+
+		if (! $output = $this->ci->cache->get($cache_name)) {
+			$parts = explode(' ', $command);
+
+			list($class, $method) = explode(':', array_shift($parts));
+
+			// Prepare our parameter list to send to the callback
+			// by splitting $parts on equal signs.
+			$params = array();
+
+			foreach ($parts as $part) {
+				$p = explode('=', $part);
+
+				if (empty($p[0]) || empty($p[1]))
+				{
+					continue;
+				}
+
+				$params[ $p[0] ] = $p[1];
+			}
+
+			// Let PHP try to autoload it through any available autoloaders
+			// (including Composer and user's custom autoloaders). If we
+			// don't find it, then assume it's a CI library that we can reach.
+			if (class_exists($class)) {
+				$class = new $class();
+			} else {
+				$this->ci->load->library($class);
+				$class =& $this->ci->$class;
+			}
+
+			if (! method_exists($class, $method)) {
+				throw new \RuntimeException( sprintf( lang('themer.bad_callback'), $class, $method ) );
+			}
+
+			// Call the class with our parameters
+			$output = $class->{$method}($params);
+
+			// Cache it
+			if ((int)$cache_time > 0)
+			{
+				$this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
+			}
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the active theme to use. This theme should be
+	 * relative to one of the 'theme_paths' folders.
+	 *
+	 * @param $theme
+	 */
+	public function setTheme($theme)
+	{
+		$this->theme = $theme;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current theme.
+	 *
+	 * @return mixed|string
+	 */
+	public function theme()
+	{
+		return $this->theme;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default theme to use if another isn't specified.
+	 *
+	 * @param $theme
+	 * @return mixed|void
+	 */
+	public function setDefaultTheme($theme)
+	{
+		$this->default_theme = $theme;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Sets the current view file to render.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setView($file)
+	{
+		$this->view = $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current view.
+	 *
+	 * @return mixed|string
+	 */
+	public function view()
+	{
+		return $this->view;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current layout to be used. MUST be the name of one of
+	 * the layout files within the current theme. Case-sensitive.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setLayout($file)
+	{
+		if (empty($file)) return;
+
+		$this->layout = $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current layout.
+	 *
+	 * @return mixed|string
+	 */
+	public function layout()
+	{
+		return $this->layout;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores one or more pieces of data to be passed to the views when
+	 * they are rendered out.
+	 *
+	 * If both $key and $value are ! empty, then it will treat it as a
+	 * key/value pair. If $key is an array of key/value pairs, then $value
+	 * is ignored and each element of the array are made available to the
+	 * view as if it was a single $key/$value pair.
+	 *
+	 * @param string|array $key
+	 * @param mixed $value
+	 * @return $this
+	 */
+	public function set($key, $value = null)
+	{
+		if (is_array($key)) {
+			$this->vars = array_merge($this->vars, $key);
+			return;
+		}
+
+		$this->vars[$key] = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a value that has been previously set().
+	 *
+	 * @param $key
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		return isset($this->vars[$key]) ? $this->vars[$key] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines whether or not the view should be parsed with the
+	 * CodeIgniter's parser.
+	 *
+	 * @param bool $parse
+	 * @return mixed
+	 */
+	public function parseViews($parse = false)
+	{
+		$this->parse_views = $parse;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Theme paths allow you to have multiple locations for themes to be
+	 * stored. This might be used for separating themes for different sub-
+	 * applications, or a core theme and user-submitted themes.
+	 *
+	 * @param $alias The name the theme can be referenced by
+	 * @param $path  A new path where themes can be found.
+	 *
+	 * @return mixed
+	 */
+	public function addThemePath($alias, $path)
+	{
+		$this->folders[$alias] = $path;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single theme path.
+	 *
+	 * @param $alias
+	 * @return $this
+	 */
+	public function removeThemePath($alias)
+	{
+		unset($this->folders[$alias]);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the path to the active/default theme's folder.
+	 *
+	 * @return string|null
+	 */
+	public function getThemePath()
+	{
+		$theme = empty($this->theme) ? $this->default_theme : $this->theme;
+
+		if (! isset($this->folders[ $theme ]))
+		{
+			return null;
+		}
+
+		return $this->folders[$theme];
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	//--------------------------------------------------------------------
+	// Variants
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the variant used when creating view names. These variants can
+	 * be anything, but by default are used to render specific templates
+	 * for desktop, tablet, and phone. The name of the variant is added
+	 * to the view name, joined by a "+" symbol.
+	 *
+	 * Example:
+	 *      $this->setVariant('phone');
+	 *      $this->display('header');
+	 *
+	 *      Tries to display "views/header+phone.php"
+	 *
+	 * @param $variant
+	 * @return $this
+	 */
+	public function setVariant($variant)
+	{
+		if (isset($this->variants[$variant])) {
+			$this->current_variant = $variant;
+		}
+
+		return $this;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new variant to the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return $this|mixed
+	 */
+	public function addVariant($name, $postfix)
+	{
+		$this->variants[$name] = $postfix;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a variant from the system.
+	 *
+	 * @param $name
+	 * @return $this|mixed
+	 */
+	public function removeVariant($name)
+	{
+		if (isset($this->variants[$name])) {
+			unset($this->variants[$name]);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles the actual loading of a view file, and checks for any
+	 * overrides in themes, etc.
+	 *
+	 * @param $view
+	 * @param $data
+	 *
+	 * @return string
+	 */
+	private function loadView($view, $data)
+	{
+		// First - does it exist in the current theme?
+		$theme = ! empty($this->active_theme) ? $this->active_theme : $this->default_theme;
+		$theme = ! empty($this->folders[$theme]) ? $this->folders[$theme] : $theme;
+		$theme = rtrim($theme, '/ ') .'/';
+
+		if (file_exists($theme ."{$view}.php"))
+		{
+			$output = $this->ci->load->view_path( $theme . $view, $data, TRUE );
+		}
+
+		// Next, if it's a real file with path, then load it
+		elseif ( realpath( $view . '.php' ) )
+		{
+			$output = $this->ci->load->view_path( $view, $data, TRUE );
+		}
+
+		// Otherwise, treat it as a standard view, which means
+		// application/views will override any modules. (See HMVC/Loader)
+		else
+		{
+			$output = $this->ci->load->view( $view, $data, TRUE );
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +35 added lines, -36 removed lines

@@ -86,8 +86,8 @@ 
 
         $theme = empty($this->theme) ? $this->default_theme : $this->theme;
 
-        if (! isset($this->folders[$theme])) {
-            throw new \LogicException( sprintf( lang('theme.bad_folder'), $theme ) );
+        if ( ! isset($this->folders[$theme])) {
+            throw new \LogicException(sprintf(lang('theme.bad_folder'), $theme));
         }
 
 	    $this->active_theme = $theme;
@@ -95,7 +95,7 @@ 
         // Make the path available within views.
         $this->vars['theme_path'] = $this->folders[$theme];
 
-        return $this->display($this->folders[$theme] . '/' . $this->layout);
+        return $this->display($this->folders[$theme].'/'.$this->layout);
     }
 
     //--------------------------------------------------------------------
@@ -123,12 +123,11 @@ 
 
         $module = $this->ci->router->fetch_module();
 
-        if (! empty($module) && substr($dir, -strlen($module .'/')) == $module . '/') {
+        if ( ! empty($module) && substr($dir, -strlen($module.'/')) == $module.'/') {
             $dir = '';
         }
 
-        $view = ! empty($this->view) ? $this->view :
-            $dir . $this->ci->router->fetch_class() . '/' . $this->ci->router->fetch_method();
+        $view = ! empty($this->view) ? $this->view : $dir.$this->ci->router->fetch_class().'/'.$this->ci->router->fetch_method();
 
         return $this->display($view);
     }
@@ -153,12 +152,12 @@ 
      * @param string $cache_name A custom name for the cached file.
      * @return mixed
      */
-    public function display($view, $data = array(), $cache_time = 0, $cache_name=null)
+    public function display($view, $data = array(), $cache_time = 0, $cache_name = null)
     {
 	    if (empty($cache_name))
 	    {
-		    $cache_name = 'theme_view_' . $view . '_' . $this->ci->router->fetch_class() . '_' . $this->ci->router->fetch_method();
-		    $cache_name = str_replace( '/', '_', $cache_name );
+		    $cache_name = 'theme_view_'.$view.'_'.$this->ci->router->fetch_class().'_'.$this->ci->router->fetch_method();
+		    $cache_name = str_replace('/', '_', $cache_name);
 	    }
 
 	    if ($cache_time == 0 || ! $output = $this->ci->cache->get($cache_name))
@@ -167,43 +166,43 @@ 
 		    $variant_view = NULL;
 
 		    // Pull out the theme from the view, if given.
-		    if ( strpos( $view, ':' ) !== FALSE )
+		    if (strpos($view, ':') !== FALSE)
 		    {
-			    list( $theme, $view ) = explode( ':', $view );
+			    list($theme, $view) = explode(':', $view);
 
 			    $theme = str_replace('{theme}', $this->active_theme, $theme);
 		    }
 
-		    if ( ! empty( $theme ) && isset( $this->folders[ $theme ] ) )
+		    if ( ! empty($theme) && isset($this->folders[$theme]))
 		    {
-			    $view = rtrim( $this->folders[ $theme ], '/' ) . '/' . $view;
+			    $view = rtrim($this->folders[$theme], '/').'/'.$view;
 		    }
 
-		    if (! is_array($data))
+		    if ( ! is_array($data))
 		    {
 			    $data = [];
 		    }
 
-		    $data = array_merge( $this->vars, $data );
+		    $data = array_merge($this->vars, $data);
 
 		    // if using a variant, add it to the view name.
-		    if ( ! empty( $this->current_variant ) )
+		    if ( ! empty($this->current_variant))
 		    {
-			    $variant_view = $view . $this->variants[ $this->current_variant ];
+			    $variant_view = $view.$this->variants[$this->current_variant];
 
 			    $output = $this->loadView($variant_view, $data);
 		    }
 
 		    // If that didn't find anything, then try it without a variant
-		    if ( empty( $output ) )
+		    if (empty($output))
 		    {
 			    $output = $this->loadView($view, $data);
 		    }
 
 		    // Cache it
-		    if ((int)$cache_time > 0)
+		    if ((int) $cache_time > 0)
 		    {
-			    $this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
+			    $this->ci->cache->save($cache_name, $output, (int) $cache_time * 60);
 		    }
 	    }
 
@@ -232,14 +231,14 @@ 
      * @param string $cache_name    // Number of MINUTES to cache output
      * @return mixed|void
      */
-    public function call($command, $cache_time=0, $cache_name=null)
+    public function call($command, $cache_time = 0, $cache_name = null)
     {
 	    if (empty($cache_name))
 	    {
-		    $cache_name = 'theme_call_' . md5( $command );
+		    $cache_name = 'theme_call_'.md5($command);
 	    }
 
-        if (! $output = $this->ci->cache->get($cache_name)) {
+        if ( ! $output = $this->ci->cache->get($cache_name)) {
             $parts = explode(' ', $command);
 
             list($class, $method) = explode(':', array_shift($parts));
@@ -256,7 +255,7 @@ 
                     continue;
                 }
 
-                $params[ $p[0] ] = $p[1];
+                $params[$p[0]] = $p[1];
             }
 
             // Let PHP try to autoload it through any available autoloaders
@@ -266,20 +265,20 @@ 
                 $class = new $class();
             } else {
                 $this->ci->load->library($class);
-                $class =& $this->ci->$class;
+                $class = & $this->ci->$class;
             }
 
-            if (! method_exists($class, $method)) {
-                throw new \RuntimeException( sprintf( lang('themer.bad_callback'), $class, $method ) );
+            if ( ! method_exists($class, $method)) {
+                throw new \RuntimeException(sprintf(lang('themer.bad_callback'), $class, $method));
             }
 
             // Call the class with our parameters
             $output = $class->{$method}($params);
 
             // Cache it
-            if ((int)$cache_time > 0)
+            if ((int) $cache_time > 0)
             {
-                $this->ci->cache->save($cache_name, $output, (int)$cache_time * 60);
+                $this->ci->cache->save($cache_name, $output, (int) $cache_time * 60);
             }
         }
 
@@ -479,7 +478,7 @@ 
     {
         $theme = empty($this->theme) ? $this->default_theme : $this->theme;
 
-        if (! isset($this->folders[ $theme ]))
+        if ( ! isset($this->folders[$theme]))
         {
             return null;
         }
@@ -569,24 +568,24 @@ 
         // First - does it exist in the current theme?
         $theme = ! empty($this->active_theme) ? $this->active_theme : $this->default_theme;
         $theme = ! empty($this->folders[$theme]) ? $this->folders[$theme] : $theme;
-        $theme = rtrim($theme, '/ ') .'/';
+        $theme = rtrim($theme, '/ ').'/';
 
-        if (file_exists($theme ."{$view}.php"))
+        if (file_exists($theme."{$view}.php"))
         {
-            $output = $this->ci->load->view_path( $theme . $view, $data, TRUE );
+            $output = $this->ci->load->view_path($theme.$view, $data, TRUE);
         }
 
         // Next, if it's a real file with path, then load it
-        elseif ( realpath( $view . '.php' ) )
+        elseif (realpath($view.'.php'))
         {
-            $output = $this->ci->load->view_path( $view, $data, TRUE );
+            $output = $this->ci->load->view_path($view, $data, TRUE);
         }
 
         // Otherwise, treat it as a standard view, which means
         // application/views will override any modules. (See HMVC/Loader)
         else
         {
-            $output = $this->ci->load->view( $view, $data, TRUE );
+            $output = $this->ci->load->view($view, $data, TRUE);
         }
 
         return $output;

Braces +3 added lines, -1 removed lines

@@ -361,7 +361,9 @@
      */
     public function setLayout($file)
     {
-        if (empty($file)) return;
+        if (empty($file)) {
+        	return;
+        }
 
         $this->layout = $file;
     }

myth/UIKits/BaseUIKit.php

Doc Comments +9 added lines, -10 removed lines

@@ -91,7 +91,6 @@ 
      * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
      * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
      *
-     * @param array $attributes
      * @return mixed
      */
     abstract public function column($options=[], \Closure $c);
@@ -107,7 +106,7 @@ 
      * top of a page.
      *
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      * @return string
      */
     abstract public function navbar($options=[], \Closure $c);
@@ -133,7 +132,7 @@ 
      *      'class'     - An additional class to add
      *
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      * @return string
      */
     abstract public function navbarRight($options=[], \Closure $c);
@@ -157,7 +156,7 @@ 
      *
      * @param          $title
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      */
     abstract public function navDropdown($title,$options=[], \Closure $c);
 
@@ -176,7 +175,7 @@ 
      * Creates a list of nav items to function as breadcrumbs for a site.
      *
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      * @return mixed
      */
     abstract public function breadcrumb($options=[], \Closure $c);
@@ -218,7 +217,7 @@ 
      * Creates button groups wrapping HTML.
      *
      * @param          $options
-     * @param callable $c
+     * @param \Closure $c
      * @return mixed
      */
     abstract public function buttonGroup($options, \Closure $c);
@@ -227,7 +226,7 @@ 
      * Creates the button bar wrapping HTML.
      *
      * @param          $options
-     * @param callable $c
+     * @param \Closure $c
      * @return mixed
      */
     abstract public function buttonBar($options, \Closure $c);
@@ -240,7 +239,7 @@ 
      * @param string $style
      * @param string $size
      * @param array  $options
-     * @param callable $c
+     * @param \Closure $c
      * @return mixed
      */
     abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
@@ -272,7 +271,7 @@ 
 	 *
 	 * @param $label_text
 	 * @param array $options
-	 * @param callable $c
+	 * @param \Closure $c
 	 *
 	 * @return mixed
 	 */
@@ -285,7 +284,7 @@ 
     /**
      * Helper method to run a Closure and collect the output of it.
      *
-     * @param callable $c
+     * @param \Closure $c
      * @return string
      */
     protected function runClosure(\Closure $c)

Indentation +384 added lines, -384 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\UIKits;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 /**
  * Class BaseUIKit
@@ -38,228 +38,228 @@ 
  */
 abstract class BaseUIKit {
 
-    /**
-     * Bucket for methods to control their current state between method calls.
-     * @var array
-     */
-    protected $states = [];
-
-    protected $name = '';
-
-    /**
-     * Attached to nav items that are considered active.
-     * @var string
-     */
-    protected $active_class = 'active';
-
-    //--------------------------------------------------------------------
-
-    public function name()
-    {
-        return $this->name;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Grids
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a row wrapper of HTML. We would have simple returned the
-     * the class for it, but some frameworks use a completely different
-     * approach to rows and columns than the reference Bootstrap and Foundation.
-     *
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function row($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the CSS for a column in a grid.
-     *
-     * The attribute array is made up of key/value pairs with the
-     * key being the size, and the value being the number of columns/offset
-     * in a 12-column grid.
-     *
-     * Note that we currently DO NOT support offset columns.
-     *
-     * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
-     *
-     * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
-     * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
-     *
-     * @param array $attributes
-     * @return mixed
-     */
-    abstract public function column($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    abstract public function navbar($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the HTML for the Title portion of the navbar. This typically
-     * includes the code for the hamburger menu on small resolutions.
-     *
-     * @param        $title
-     * @param string $url
-     * @return string
-     */
-    abstract public function navbarTitle($title, $url='#');
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a UL meant to pull to the right within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    abstract public function navbarRight($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    abstract public function navItem($title, $url, $options=[], $isActive=false);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    abstract public function navDropdown($title,$options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    abstract public function navDivider();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function breadcrumb($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Buttons
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function button($title, $style='default', $size='default', $options=[]);
-
-    /**
-     * Creates a simple link styled as a button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $url
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonGroup($options, \Closure $c);
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonBar($options, \Closure $c);
-
-    /**
-     * Creates a button that also has a dropdown menu. Also called Split Buttons
-     * by some frameworks.
-     *
-     * @param        $title
-     * @param string $style
-     * @param string $size
-     * @param array  $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    abstract public function notice($content, $style='success', $closable=true);
+	/**
+	 * Bucket for methods to control their current state between method calls.
+	 * @var array
+	 */
+	protected $states = [];
+
+	protected $name = '';
+
+	/**
+	 * Attached to nav items that are considered active.
+	 * @var string
+	 */
+	protected $active_class = 'active';
+
+	//--------------------------------------------------------------------
+
+	public function name()
+	{
+		return $this->name;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Grids
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a row wrapper of HTML. We would have simple returned the
+	 * the class for it, but some frameworks use a completely different
+	 * approach to rows and columns than the reference Bootstrap and Foundation.
+	 *
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function row($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the CSS for a column in a grid.
+	 *
+	 * The attribute array is made up of key/value pairs with the
+	 * key being the size, and the value being the number of columns/offset
+	 * in a 12-column grid.
+	 *
+	 * Note that we currently DO NOT support offset columns.
+	 *
+	 * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
+	 *
+	 * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
+	 * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
+	 *
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	abstract public function column($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	abstract public function navbar($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the HTML for the Title portion of the navbar. This typically
+	 * includes the code for the hamburger menu on small resolutions.
+	 *
+	 * @param        $title
+	 * @param string $url
+	 * @return string
+	 */
+	abstract public function navbarTitle($title, $url='#');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a UL meant to pull to the right within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	abstract public function navbarRight($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	abstract public function navItem($title, $url, $options=[], $isActive=false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	abstract public function navDropdown($title,$options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	abstract public function navDivider();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function breadcrumb($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Buttons
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function button($title, $style='default', $size='default', $options=[]);
+
+	/**
+	 * Creates a simple link styled as a button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $url
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonGroup($options, \Closure $c);
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonBar($options, \Closure $c);
+
+	/**
+	 * Creates a button that also has a dropdown menu. Also called Split Buttons
+	 * by some frameworks.
+	 *
+	 * @param        $title
+	 * @param string $style
+	 * @param string $size
+	 * @param array  $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	abstract public function notice($content, $style='success', $closable=true);
 
 	//--------------------------------------------------------------------
 	// Forms
@@ -278,137 +278,137 @@ 
 	 */
 	abstract public function inputWrap($label_text, $options=[], \Closure $c);
 
-    //--------------------------------------------------------------------
-    // Utility Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to run a Closure and collect the output of it.
-     *
-     * @param callable $c
-     * @return string
-     */
-    protected function runClosure(\Closure $c)
-    {
-        if (! is_callable($c)) return '';
-
-        ob_start();
-        $c();
-        $output = ob_get_contents();
-        ob_end_clean();
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a single method call to get the $classes, $id, and $attributes
-     * from the options array.
-     *
-     * @param        $options
-     * @param string $initial_classes
-     * @param bool   $fullClassString
-     * @return array
-     */
-    protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
-    {
-        return [
-            $this->buildClassString($initial_classes, $options, $fullClassString),
-            $this->buildIdFromOptions($options),
-            $this->buildAttributesFromOptions($options)
-        ];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the element that is to be considered the active item. This is
-     * based on the navItem's $title so it must match, though it is NOT
-     * case sensitive.
-     *
-     * @param $title
-     * @return mixed
-     */
-    public function setActiveNavItem($title)
-    {
-        $this->states['activeNavItem'] = strtolower($title);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Combines an initial classes string with a 'class' item that
-     * might be available within the options array.
-     *
-     * If 'buildEntireString' is TRUE will return the string with the 'class=""' portion.
-     * Otherwise, just returns the raw classes.
-     *
-     * @param string $initial
-     * @param array $options
-     * @return array
-     */
-    protected function buildClassString($initial, $options, $buildEntireString=false)
-    {
-        $classes = explode(' ', $initial);
-
-        if (isset($options['class']))
-        {
-            $classes = array_merge($classes, explode(' ', $options['class']));
-        }
-
-        if (isset($this->states['activeNavItem']) && isset($this->states['activeNavTitle']) &&
-            $this->states['activeNavItem'] == strtolower($this->states['activeNavTitle']))
-        {
-            $classes[] = $this->active_class;
-        }
-
-        $classes = implode(' ', $classes);
-
-        // Substitute the active class for a placeholder.
-        $classes = str_replace('{active}', $this->active_class, $classes);
-
-        return $buildEntireString ? "class='{$classes}'" : $classes;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Checks the options array for an ID and returns the entire string.
-     *
-     * Example Return:
-     *      id='MyID'
-     *
-     * @param $options
-     * @return string
-     */
-    protected function buildIdFromOptions($options)
-    {
-        return isset($options['id']) ? "id='{$options['id']}'" : ' ';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Parses out attributes from the options array. The attributes array
-     * should all contain no key names, only values, so:
-     *
-     * 'attributes' => [
-     *      'style="width:100%",
-     *      'required'
-     * ]
-     *
-     * @param $options
-     * @return string
-     */
-    protected function buildAttributesFromOptions($options)
-    {
-        if (isset($options['attributes']) && ! is_array($options['attributes']))
-        {
-            $options['attributes'] = [ $options['attributes'] ];
-        }
-
-        return isset($options['attributes']) ? implode($options['attributes']) : '';
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to run a Closure and collect the output of it.
+	 *
+	 * @param callable $c
+	 * @return string
+	 */
+	protected function runClosure(\Closure $c)
+	{
+		if (! is_callable($c)) return '';
+
+		ob_start();
+		$c();
+		$output = ob_get_contents();
+		ob_end_clean();
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a single method call to get the $classes, $id, and $attributes
+	 * from the options array.
+	 *
+	 * @param        $options
+	 * @param string $initial_classes
+	 * @param bool   $fullClassString
+	 * @return array
+	 */
+	protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
+	{
+		return [
+			$this->buildClassString($initial_classes, $options, $fullClassString),
+			$this->buildIdFromOptions($options),
+			$this->buildAttributesFromOptions($options)
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the element that is to be considered the active item. This is
+	 * based on the navItem's $title so it must match, though it is NOT
+	 * case sensitive.
+	 *
+	 * @param $title
+	 * @return mixed
+	 */
+	public function setActiveNavItem($title)
+	{
+		$this->states['activeNavItem'] = strtolower($title);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combines an initial classes string with a 'class' item that
+	 * might be available within the options array.
+	 *
+	 * If 'buildEntireString' is TRUE will return the string with the 'class=""' portion.
+	 * Otherwise, just returns the raw classes.
+	 *
+	 * @param string $initial
+	 * @param array $options
+	 * @return array
+	 */
+	protected function buildClassString($initial, $options, $buildEntireString=false)
+	{
+		$classes = explode(' ', $initial);
+
+		if (isset($options['class']))
+		{
+			$classes = array_merge($classes, explode(' ', $options['class']));
+		}
+
+		if (isset($this->states['activeNavItem']) && isset($this->states['activeNavTitle']) &&
+			$this->states['activeNavItem'] == strtolower($this->states['activeNavTitle']))
+		{
+			$classes[] = $this->active_class;
+		}
+
+		$classes = implode(' ', $classes);
+
+		// Substitute the active class for a placeholder.
+		$classes = str_replace('{active}', $this->active_class, $classes);
+
+		return $buildEntireString ? "class='{$classes}'" : $classes;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the options array for an ID and returns the entire string.
+	 *
+	 * Example Return:
+	 *      id='MyID'
+	 *
+	 * @param $options
+	 * @return string
+	 */
+	protected function buildIdFromOptions($options)
+	{
+		return isset($options['id']) ? "id='{$options['id']}'" : ' ';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses out attributes from the options array. The attributes array
+	 * should all contain no key names, only values, so:
+	 *
+	 * 'attributes' => [
+	 *      'style="width:100%",
+	 *      'required'
+	 * ]
+	 *
+	 * @param $options
+	 * @return string
+	 */
+	protected function buildAttributesFromOptions($options)
+	{
+		if (isset($options['attributes']) && ! is_array($options['attributes']))
+		{
+			$options['attributes'] = [ $options['attributes'] ];
+		}
+
+		return isset($options['attributes']) ? implode($options['attributes']) : '';
+	}
+
+	//--------------------------------------------------------------------
 }

Spacing +17 added lines, -17 removed lines

@@ -73,7 +73,7 @@ 
      * @param array $options
      * @return mixed
      */
-    abstract public function row($options=[], \Closure $c);
+    abstract public function row($options = [], \Closure $c);
 
     //--------------------------------------------------------------------
 
@@ -94,7 +94,7 @@ 
      * @param array $attributes
      * @return mixed
      */
-    abstract public function column($options=[], \Closure $c);
+    abstract public function column($options = [], \Closure $c);
 
     //--------------------------------------------------------------------
 
@@ -110,7 +110,7 @@ 
      * @param callable $c
      * @return string
      */
-    abstract public function navbar($options=[], \Closure $c);
+    abstract public function navbar($options = [], \Closure $c);
 
     //--------------------------------------------------------------------
 
@@ -122,7 +122,7 @@ 
      * @param string $url
      * @return string
      */
-    abstract public function navbarTitle($title, $url='#');
+    abstract public function navbarTitle($title, $url = '#');
 
     //--------------------------------------------------------------------
 
@@ -136,7 +136,7 @@ 
      * @param callable $c
      * @return string
      */
-    abstract public function navbarRight($options=[], \Closure $c);
+    abstract public function navbarRight($options = [], \Closure $c);
 
     //--------------------------------------------------------------------
 
@@ -148,7 +148,7 @@ 
      * @param array $options
      * @return string
      */
-    abstract public function navItem($title, $url, $options=[], $isActive=false);
+    abstract public function navItem($title, $url, $options = [], $isActive = false);
 
     //--------------------------------------------------------------------
 
@@ -159,7 +159,7 @@ 
      * @param array    $options
      * @param callable $c
      */
-    abstract public function navDropdown($title,$options=[], \Closure $c);
+    abstract public function navDropdown($title, $options = [], \Closure $c);
 
     //--------------------------------------------------------------------
 
@@ -179,7 +179,7 @@ 
      * @param callable $c
      * @return mixed
      */
-    abstract public function breadcrumb($options=[], \Closure $c);
+    abstract public function breadcrumb($options = [], \Closure $c);
 
     //--------------------------------------------------------------------
 
@@ -198,7 +198,7 @@ 
      * @param array $options
      * @return mixed
      */
-    abstract public function button($title, $style='default', $size='default', $options=[]);
+    abstract public function button($title, $style = 'default', $size = 'default', $options = []);
 
     /**
      * Creates a simple link styled as a button.
@@ -212,7 +212,7 @@ 
      * @param array $options
      * @return mixed
      */
-    abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
+    abstract public function buttonLink($title, $url = '#', $style = 'default', $size = 'default', $options = []);
 
     /**
      * Creates button groups wrapping HTML.
@@ -243,7 +243,7 @@ 
      * @param callable $c
      * @return mixed
      */
-    abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
+    abstract public function buttonDropdown($title, $style = 'default', $size = 'default', $options = [], \Closure $c);
 
     //--------------------------------------------------------------------
     // Notices
@@ -259,7 +259,7 @@ 
      * @param bool $closable
      * @return mixed
      */
-    abstract public function notice($content, $style='success', $closable=true);
+    abstract public function notice($content, $style = 'success', $closable = true);
 
 	//--------------------------------------------------------------------
 	// Forms
@@ -276,7 +276,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	abstract public function inputWrap($label_text, $options=[], \Closure $c);
+	abstract public function inputWrap($label_text, $options = [], \Closure $c);
 
     //--------------------------------------------------------------------
     // Utility Methods
@@ -290,7 +290,7 @@ 
      */
     protected function runClosure(\Closure $c)
     {
-        if (! is_callable($c)) return '';
+        if ( ! is_callable($c)) return '';
 
         ob_start();
         $c();
@@ -311,7 +311,7 @@ 
      * @param bool   $fullClassString
      * @return array
      */
-    protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
+    protected function parseStandardOptions($options, $initial_classes = '', $fullClassString = false)
     {
         return [
             $this->buildClassString($initial_classes, $options, $fullClassString),
@@ -348,7 +348,7 @@ 
      * @param array $options
      * @return array
      */
-    protected function buildClassString($initial, $options, $buildEntireString=false)
+    protected function buildClassString($initial, $options, $buildEntireString = false)
     {
         $classes = explode(' ', $initial);
 
@@ -404,7 +404,7 @@ 
     {
         if (isset($options['attributes']) && ! is_array($options['attributes']))
         {
-            $options['attributes'] = [ $options['attributes'] ];
+            $options['attributes'] = [$options['attributes']];
         }
 
         return isset($options['attributes']) ? implode($options['attributes']) : '';

Braces +3 added lines, -1 removed lines

@@ -290,7 +290,9 @@
      */
     protected function runClosure(\Closure $c)
     {
-        if (! is_callable($c)) return '';
+        if (! is_callable($c)) {
+        	return '';
+        }
 
         ob_start();
         $c();

myth/UIKits/Bootstrap.php

Doc Comments +19 added lines, -19 removed lines

@@ -49,7 +49,7 @@ 
      * approach to rows and columns than the reference Bootstrap and Foundation.
      *
      * @param array $options
-     * @return mixed
+     * @return string
      */
     public function row($options=[], \Closure $c)
     {
@@ -80,8 +80,7 @@ 
      * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
      * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
      *
-     * @param array $attributes
-     * @return mixed
+     * @return string
      */
     public function column($options=[], \Closure $c)
     {
@@ -141,7 +140,7 @@ 
      * top of a page.
      *
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      * @return string
      */
     public function navbar($options=[], \Closure $c)
@@ -218,7 +217,7 @@ 
      *      'class'     - An additional class to add
      *
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      * @return string
      */
     public function navbarRight($options=[], \Closure $c)
@@ -270,7 +269,7 @@ 
      *
      * @param          $title
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      */
     public function navDropdown($title,$options=[], \Closure $c)
     {
@@ -320,8 +319,8 @@ 
      * Creates a list of nav items to function as breadcrumbs for a site.
      *
      * @param array    $options
-     * @param callable $c
-     * @return mixed
+     * @param \Closure $c
+     * @return string
      */
     public function breadcrumb($options=[], \Closure $c)
     {
@@ -401,9 +400,10 @@ 
      * Helper method to render out our buttons in a DRY manner.
      *
      * @param $title
-     * @param $style
-     * @param $size
+     * @param string $style
+     * @param string $size
      * @param $tag
+     * @return \Closure
      */
     protected function renderButtonElement($title, $style, $size, $options, $tag)
     {
@@ -473,8 +473,8 @@ 
      * Creates button groups wrapping HTML.
      *
      * @param          $options
-     * @param callable $c
-     * @return mixed
+     * @param \Closure $c
+     * @return string
      */
     public function buttonGroup($options, \Closure $c)
     {
@@ -495,8 +495,8 @@ 
      * Creates the button bar wrapping HTML.
      *
      * @param          $options
-     * @param callable $c
-     * @return mixed
+     * @param \Closure $c
+     * @return string
      */
     public function buttonBar($options, \Closure $c)
     {
@@ -523,8 +523,8 @@ 
      * @param string $style
      * @param string $size
      * @param array  $options
-     * @param callable $c
-     * @return mixed
+     * @param \Closure $c
+     * @return string
      */
     public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
     {
@@ -556,7 +556,7 @@ 
      * @param $content
      * @param string $style
      * @param bool $closable
-     * @return mixed
+     * @return string
      */
     public function notice($content, $style='success', $closable=true, $options=[])
     {
@@ -609,9 +609,9 @@ 
 	 *
 	 * @param $label_text
 	 * @param array $options
-	 * @param callable $c
+	 * @param \Closure $c
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function inputWrap($label_text, $options=[], \Closure $c)
 	{

Indentation +544 added lines, -544 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\UIKits;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 /**
  * Class Bootstrap3UIKit
@@ -37,168 +37,168 @@ 
  */
 class Bootstrap extends BaseUIKit {
 
-    protected $name = 'Bootstrap3UIKit';
-
-    //--------------------------------------------------------------------
-    // Grid
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a row wrapper of HTML. We would have simple returned the
-     * the class for it, but some frameworks use a completely different
-     * approach to rows and columns than the reference Bootstrap and Foundation.
-     *
-     * @param array $options
-     * @return mixed
-     */
-    public function row($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the CSS for a column in a grid.
-     *
-     * The attribute array is made up of key/value pairs with the
-     * key being the size, and the value being the number of columns/offset
-     * in a 12-column grid.
-     *
-     * Note that we currently DO NOT support offset columns.
-     *
-     * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
-     *
-     * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
-     * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
-     *
-     * @param array $attributes
-     * @return mixed
-     */
-    public function column($options=[], \Closure $c)
-    {
-        // Build our classes
-        $classes = '';
-
-        foreach ($options['sizes'] as $size => $value)
-        {
-            switch ($size)
-            {
-                case 's':
-                    $classes .= ' col-xs-'. $value;
-                    break;
-                case 'm':
-                    $classes .= ' col-sm-'. $value;
-                    break;
-                case 'l':
-                    $classes .= ' col-md-'. $value;
-                    break;
-                case 'xl':
-                    $classes .= ' col-lg-'. $value;
-                    break;
-                case 's-offset':
-                    $classes .= ' col-xs-offset-'. $value;
-                    break;
-                case 'm-offset':
-                    $classes .= ' col-sm-offset-'. $value;
-                    break;
-                case 'l-offset':
-                    $classes .= ' col-md-offset-'. $value;
-                    break;
-                case 'xl-offset':
-                    $classes .= ' col-lg-offset-'. $value;
-                    break;
-            }
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbar($options=[], \Closure $c)
-    {
-        $output = '';
-
-        /*
+	protected $name = 'Bootstrap3UIKit';
+
+	//--------------------------------------------------------------------
+	// Grid
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a row wrapper of HTML. We would have simple returned the
+	 * the class for it, but some frameworks use a completely different
+	 * approach to rows and columns than the reference Bootstrap and Foundation.
+	 *
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function row($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the CSS for a column in a grid.
+	 *
+	 * The attribute array is made up of key/value pairs with the
+	 * key being the size, and the value being the number of columns/offset
+	 * in a 12-column grid.
+	 *
+	 * Note that we currently DO NOT support offset columns.
+	 *
+	 * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
+	 *
+	 * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
+	 * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
+	 *
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	public function column($options=[], \Closure $c)
+	{
+		// Build our classes
+		$classes = '';
+
+		foreach ($options['sizes'] as $size => $value)
+		{
+			switch ($size)
+			{
+				case 's':
+					$classes .= ' col-xs-'. $value;
+					break;
+				case 'm':
+					$classes .= ' col-sm-'. $value;
+					break;
+				case 'l':
+					$classes .= ' col-md-'. $value;
+					break;
+				case 'xl':
+					$classes .= ' col-lg-'. $value;
+					break;
+				case 's-offset':
+					$classes .= ' col-xs-offset-'. $value;
+					break;
+				case 'm-offset':
+					$classes .= ' col-sm-offset-'. $value;
+					break;
+				case 'l-offset':
+					$classes .= ' col-md-offset-'. $value;
+					break;
+				case 'xl-offset':
+					$classes .= ' col-lg-offset-'. $value;
+					break;
+			}
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbar($options=[], \Closure $c)
+	{
+		$output = '';
+
+		/*
          * Open the navbar
          */
-        $classes = "navbar navbar-default ";
-
-        foreach ($options as $option)
-        {
-            switch ($option)
-            {
-                case 'sticky-top':
-                    $classes .= " navbar-static-top";
-                    break;
-                case 'fixed':
-                    $classes .= " navbar-fixed-top";
-                    break;
-                case 'inverse':
-                    $classes .= " navbar-inverse";
-            }
-        }
-
-        list($class, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $output .= "<nav {$class} {$id} {$attributes} role='navigation'>
+		$classes = "navbar navbar-default ";
+
+		foreach ($options as $option)
+		{
+			switch ($option)
+			{
+				case 'sticky-top':
+					$classes .= " navbar-static-top";
+					break;
+				case 'fixed':
+					$classes .= " navbar-fixed-top";
+					break;
+				case 'inverse':
+					$classes .= " navbar-inverse";
+			}
+		}
+
+		list($class, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$output .= "<nav {$class} {$id} {$attributes} role='navigation'>
   <div class='container-fluid'>\n";
 
-        /*
+		/*
          * Do any user content inside the bar
          */
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        /*
+		/*
          * Close out the navbar
          */
-        $output .= "</div></nav>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the HTML for the Title portion of the navbar. This typically
-     * includes the code for the hamburger menu on small resolutions.
-     *
-     * @param        $title
-     * @param string $url
-     * @return string
-     */
-    public function navbarTitle($title, $url='#')
-    {
-        return '<div class="navbar-header">
+		$output .= "</div></nav>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the HTML for the Title portion of the navbar. This typically
+	 * includes the code for the hamburger menu on small resolutions.
+	 *
+	 * @param        $title
+	 * @param string $url
+	 * @return string
+	 */
+	public function navbarTitle($title, $url='#')
+	{
+		return '<div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
@@ -207,396 +207,396 @@ 
       </button>
       <a class="navbar-brand" href="'. $url .'">'. $title .'</a>
     </div>';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a UL meant to pull to the right within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbarRight($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a UL meant to pull to the right within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbarRight($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
         
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "</ul>\n";
+		$output .= "</ul>\n";
 
-        return $output;
-    }
+		return $output;
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function nav()
-    {
+	public function nav()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    public function navItem($title, $url='#', $options=[], $isActive=false)
-    {
-        $this->states['activeNavTitle'] = $title;
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	public function navItem($title, $url='#', $options=[], $isActive=false)
+	{
+		$this->states['activeNavTitle'] = $title;
 
-        $class = $isActive ? $this->active_class : '';
+		$class = $isActive ? $this->active_class : '';
 
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $class, true);
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $class, true);
 
-        return "    <li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>\n";
-    }
+		return "    <li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>\n";
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    public function navDropdown($title,$options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
-
-        $output = "\t<li {$classes} {$id} {$attributes}>
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	public function navDropdown($title,$options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
+
+		$output = "\t<li {$classes} {$id} {$attributes}>
         <a href='#' class='dropdown-toggle' data-toggle='dropdown'>{$title} <span class='caret'></span></a>
         <ul class='dropdown-menu' role='menu'>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
+
+		$output .= "    </ul></li>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	public function navDivider()
+	{
+		return "<li class=\"divider\"></li>\n";
+	}
 
-        $output .= "    </ul></li>\n";
+	//--------------------------------------------------------------------
 
-        return $output;
-    }
+	public function sideNav($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
 
-    //--------------------------------------------------------------------
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
 
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    public function navDivider()
-    {
-        return "<li class=\"divider\"></li>\n";
-    }
+		$output .= $this->runClosure($c);
 
-    //--------------------------------------------------------------------
+		$output .= "</ul>\n";
 
-    public function sideNav($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
+		return $output;
+	}
 
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function breadcrumb($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumb', true);
-
-        $output = "<ol {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ol>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Tables
-    //--------------------------------------------------------------------
-
-    public function table()
-    {
-        return 'table';
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Buttons
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function button($title, $style='default', $size='default', $options=[])
-    {
-        $tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple link styled as a button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $url
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
-    {
-        $tag = "<a href='{$url}' {classes} {id} {attributes} role='button'>{$title}</a>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to render out our buttons in a DRY manner.
-     *
-     * @param $title
-     * @param $style
-     * @param $size
-     * @param $tag
-     */
-    protected function renderButtonElement($title, $style, $size, $options, $tag)
-    {
-        $valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
-        $valid_sizes  = ['default', 'small', 'xsmall', 'large'];
-
-        if (! in_array($style, $valid_styles))
-        {
-            $style = 'default';
-            $options['attributes'][] = 'data-error="Invalid Style passed to button method."';
-        }
-
-        $classes = 'btn ';
-
-        // Sizes
-        switch($size)
-        {
-            case 'small':
-                $classes .= 'btn-sm ';
-                break;
-            case 'xsmall':
-                $classes .= 'btn-xs ';
-                break;
-            case 'large':
-                $classes .= 'btn-lg ';
-                break;
-            default:
-                break;
-        }
-
-        // Styles
-        switch ($style)
-        {
-            case 'primary':
-                $classes .= 'btn-primary ';
-                break;
-            case 'success':
-                $classes .= 'btn-success ';
-                break;
-            case 'info':
-                $classes .= 'btn-info ';
-                break;
-            case 'warning':
-                $classes .= 'btn-warning ';
-                break;
-            case 'danger':
-                $classes .= 'btn-danger ';
-                break;
-            case 'default':
-                $classes .= 'btn-default ';
-                break;
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $tag = str_replace('{classes}', $classes, $tag);
-        $tag = str_replace('{id}', $id, $tag);
-        $tag = str_replace('{attributes}', $attributes, $tag);
-        $tag = str_replace('{title}', $title, $tag);
-
-        return $tag;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonGroup($options, \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-group', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonBar($options, \Closure $c)
-    {
-        $options['attributes'][] = 'role="toolbar"';
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-toolbar', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a button that also has a dropdown menu. Also called Split Buttons
-     * by some frameworks.
-     *
-     * @param        $title
-     * @param string $style
-     * @param string $size
-     * @param array  $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
-    {
-        $tag = "<button type='button' {classes} data-toggle='dropdown'>
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function breadcrumb($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumb', true);
+
+		$output = "<ol {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ol>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Tables
+	//--------------------------------------------------------------------
+
+	public function table()
+	{
+		return 'table';
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Buttons
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function button($title, $style='default', $size='default', $options=[])
+	{
+		$tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple link styled as a button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $url
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
+	{
+		$tag = "<a href='{$url}' {classes} {id} {attributes} role='button'>{$title}</a>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to render out our buttons in a DRY manner.
+	 *
+	 * @param $title
+	 * @param $style
+	 * @param $size
+	 * @param $tag
+	 */
+	protected function renderButtonElement($title, $style, $size, $options, $tag)
+	{
+		$valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
+		$valid_sizes  = ['default', 'small', 'xsmall', 'large'];
+
+		if (! in_array($style, $valid_styles))
+		{
+			$style = 'default';
+			$options['attributes'][] = 'data-error="Invalid Style passed to button method."';
+		}
+
+		$classes = 'btn ';
+
+		// Sizes
+		switch($size)
+		{
+			case 'small':
+				$classes .= 'btn-sm ';
+				break;
+			case 'xsmall':
+				$classes .= 'btn-xs ';
+				break;
+			case 'large':
+				$classes .= 'btn-lg ';
+				break;
+			default:
+				break;
+		}
+
+		// Styles
+		switch ($style)
+		{
+			case 'primary':
+				$classes .= 'btn-primary ';
+				break;
+			case 'success':
+				$classes .= 'btn-success ';
+				break;
+			case 'info':
+				$classes .= 'btn-info ';
+				break;
+			case 'warning':
+				$classes .= 'btn-warning ';
+				break;
+			case 'danger':
+				$classes .= 'btn-danger ';
+				break;
+			case 'default':
+				$classes .= 'btn-default ';
+				break;
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$tag = str_replace('{classes}', $classes, $tag);
+		$tag = str_replace('{id}', $id, $tag);
+		$tag = str_replace('{attributes}', $attributes, $tag);
+		$tag = str_replace('{title}', $title, $tag);
+
+		return $tag;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonGroup($options, \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-group', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonBar($options, \Closure $c)
+	{
+		$options['attributes'][] = 'role="toolbar"';
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-toolbar', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a button that also has a dropdown menu. Also called Split Buttons
+	 * by some frameworks.
+	 *
+	 * @param        $title
+	 * @param string $style
+	 * @param string $size
+	 * @param array  $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
+	{
+		$tag = "<button type='button' {classes} data-toggle='dropdown'>
     {title} <span class='caret'></span>
   </button>
   <ul class='dropdown-menu' role='menu'>";
 
-        $output = $this->renderButtonElement($title, $style, $size, $options, $tag);
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    public function notice($content, $style='success', $closable=true, $options=[])
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert', false);
-
-        // Styles
-        switch ($style)
-        {
-            case 'success':
-                $classes .= ' alert-success ';
-                break;
-            case 'info':
-                $classes .= ' alert-info ';
-                break;
-            case 'warning':
-                $classes .= ' alert-warning ';
-                break;
-            case 'danger':
-                $classes .= ' alert-danger ';
-                break;
-            case 'default':
-                $classes .= ' text-muted ';
-                break;
-        }
-
-        $output = "<div class='{$classes}'>\n";
-
-        $output .= "\t$content\n";
-
-        if ($closable)
-        {
-            $output .= "\t<a href='#' class='close'>&times;</a>\n";
-        }
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+		$output = $this->renderButtonElement($title, $style, $size, $options, $tag);
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	public function notice($content, $style='success', $closable=true, $options=[])
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert', false);
+
+		// Styles
+		switch ($style)
+		{
+			case 'success':
+				$classes .= ' alert-success ';
+				break;
+			case 'info':
+				$classes .= ' alert-info ';
+				break;
+			case 'warning':
+				$classes .= ' alert-warning ';
+				break;
+			case 'danger':
+				$classes .= ' alert-danger ';
+				break;
+			case 'default':
+				$classes .= ' text-muted ';
+				break;
+		}
+
+		$output = "<div class='{$classes}'>\n";
+
+		$output .= "\t$content\n";
+
+		if ($closable)
+		{
+			$output .= "\t<a href='#' class='close'>&times;</a>\n";
+		}
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 	//--------------------------------------------------------------------
 	// Forms

Spacing +26 added lines, -26 removed lines

@@ -51,7 +51,7 @@ 
      * @param array $options
      * @return mixed
      */
-    public function row($options=[], \Closure $c)
+    public function row($options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
 
@@ -83,7 +83,7 @@ 
      * @param array $attributes
      * @return mixed
      */
-    public function column($options=[], \Closure $c)
+    public function column($options = [], \Closure $c)
     {
         // Build our classes
         $classes = '';
@@ -93,28 +93,28 @@ 
             switch ($size)
             {
                 case 's':
-                    $classes .= ' col-xs-'. $value;
+                    $classes .= ' col-xs-'.$value;
                     break;
                 case 'm':
-                    $classes .= ' col-sm-'. $value;
+                    $classes .= ' col-sm-'.$value;
                     break;
                 case 'l':
-                    $classes .= ' col-md-'. $value;
+                    $classes .= ' col-md-'.$value;
                     break;
                 case 'xl':
-                    $classes .= ' col-lg-'. $value;
+                    $classes .= ' col-lg-'.$value;
                     break;
                 case 's-offset':
-                    $classes .= ' col-xs-offset-'. $value;
+                    $classes .= ' col-xs-offset-'.$value;
                     break;
                 case 'm-offset':
-                    $classes .= ' col-sm-offset-'. $value;
+                    $classes .= ' col-sm-offset-'.$value;
                     break;
                 case 'l-offset':
-                    $classes .= ' col-md-offset-'. $value;
+                    $classes .= ' col-md-offset-'.$value;
                     break;
                 case 'xl-offset':
-                    $classes .= ' col-lg-offset-'. $value;
+                    $classes .= ' col-lg-offset-'.$value;
                     break;
             }
         }
@@ -144,7 +144,7 @@ 
      * @param callable $c
      * @return string
      */
-    public function navbar($options=[], \Closure $c)
+    public function navbar($options = [], \Closure $c)
     {
         $output = '';
 
@@ -196,7 +196,7 @@ 
      * @param string $url
      * @return string
      */
-    public function navbarTitle($title, $url='#')
+    public function navbarTitle($title, $url = '#')
     {
         return '<div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
@@ -205,7 +205,7 @@ 
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="'. $url .'">'. $title .'</a>
+      <a class="navbar-brand" href="'. $url.'">'.$title.'</a>
     </div>';
     }
 
@@ -221,7 +221,7 @@ 
      * @param callable $c
      * @return string
      */
-    public function navbarRight($options=[], \Closure $c)
+    public function navbarRight($options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
         
@@ -252,7 +252,7 @@ 
      * @param array $options
      * @return string
      */
-    public function navItem($title, $url='#', $options=[], $isActive=false)
+    public function navItem($title, $url = '#', $options = [], $isActive = false)
     {
         $this->states['activeNavTitle'] = $title;
 
@@ -272,7 +272,7 @@ 
      * @param array    $options
      * @param callable $c
      */
-    public function navDropdown($title,$options=[], \Closure $c)
+    public function navDropdown($title, $options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
 
@@ -301,7 +301,7 @@ 
 
     //--------------------------------------------------------------------
 
-    public function sideNav($options=[], \Closure $c)
+    public function sideNav($options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
 
@@ -323,7 +323,7 @@ 
      * @param callable $c
      * @return mixed
      */
-    public function breadcrumb($options=[], \Closure $c)
+    public function breadcrumb($options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumb', true);
 
@@ -367,9 +367,9 @@ 
      * @param array $options
      * @return mixed
      */
-    public function button($title, $style='default', $size='default', $options=[])
+    public function button($title, $style = 'default', $size = 'default', $options = [])
     {
-        $tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
+        $tag = "<button type='button' {classes} {id} {attributes}>{$title}</button>";
 
         return $this->renderButtonElement($title, $style, $size, $options, $tag);
     }
@@ -388,7 +388,7 @@ 
      * @param array $options
      * @return mixed
      */
-    public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
+    public function buttonLink($title, $url = '#', $style = 'default', $size = 'default', $options = [])
     {
         $tag = "<a href='{$url}' {classes} {id} {attributes} role='button'>{$title}</a>";
 
@@ -410,7 +410,7 @@ 
         $valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
         $valid_sizes  = ['default', 'small', 'xsmall', 'large'];
 
-        if (! in_array($style, $valid_styles))
+        if ( ! in_array($style, $valid_styles))
         {
             $style = 'default';
             $options['attributes'][] = 'data-error="Invalid Style passed to button method."';
@@ -419,7 +419,7 @@ 
         $classes = 'btn ';
 
         // Sizes
-        switch($size)
+        switch ($size)
         {
             case 'small':
                 $classes .= 'btn-sm ';
@@ -526,7 +526,7 @@ 
      * @param callable $c
      * @return mixed
      */
-    public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
+    public function buttonDropdown($title, $style = 'default', $size = 'default', $options = [], \Closure $c)
     {
         $tag = "<button type='button' {classes} data-toggle='dropdown'>
     {title} <span class='caret'></span>
@@ -558,7 +558,7 @@ 
      * @param bool $closable
      * @return mixed
      */
-    public function notice($content, $style='success', $closable=true, $options=[])
+    public function notice($content, $style = 'success', $closable = true, $options = [])
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert', false);
 
@@ -613,7 +613,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function inputWrap($label_text, $options=[], \Closure $c)
+	public function inputWrap($label_text, $options = [], \Closure $c)
 	{
 		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'form-group', true);
 

myth/UIKits/Foundation.php

Doc Comments +17 added lines, -18 removed lines

@@ -56,7 +56,7 @@ 
      * approach to rows and columns than the reference Bootstrap and Foundation.
      *
      * @param array $options
-     * @return mixed
+     * @return string
      */
     public function row($options=[], \Closure $c)
     {
@@ -87,8 +87,7 @@ 
      * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
      * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
      *
-     * @param array $attributes
-     * @return mixed
+     * @return string
      */
     public function column($options=[], \Closure $c)
     {
@@ -152,7 +151,7 @@ 
      * top of a page.
      *
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      * @return string
      */
     public function navbar($options=[], \Closure $c)
@@ -224,7 +223,7 @@ 
      *      'class'     - An additional class to add
      *
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      * @return string
      */
     public function navbarRight($options=[], \Closure $c)
@@ -263,7 +262,7 @@ 
      *      'class'     - An additional class to add
      *
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      * @return string
      */
     public function navbarLeft($options=[], \Closure $c)
@@ -331,7 +330,7 @@ 
      *
      * @param          $title
      * @param array    $options
-     * @param callable $c
+     * @param \Closure $c
      */
     public function navDropdown($title,$options=[], \Closure $c)
     {
@@ -389,8 +388,8 @@ 
      * Creates a list of nav items to function as breadcrumbs for a site.
      *
      * @param array    $options
-     * @param callable $c
-     * @return mixed
+     * @param \Closure $c
+     * @return string
      */
     public function breadcrumb($options=[], \Closure $c)
     {
@@ -470,8 +469,8 @@ 
      * Helper method to render out our buttons in a DRY manner.
      *
      * @param $title
-     * @param $style
-     * @param $size
+     * @param string $style
+     * @param string $size
      * @param $tag
      */
     protected function renderButtonElement($title, $style, $size, $options, $tag)
@@ -547,8 +546,8 @@ 
      * Creates button groups wrapping HTML.
      *
      * @param          $options
-     * @param callable $c
-     * @return mixed
+     * @param \Closure $c
+     * @return string
      */
     public function buttonGroup($options, \Closure $c)
     {
@@ -573,8 +572,8 @@ 
      * Creates the button bar wrapping HTML.
      *
      * @param          $options
-     * @param callable $c
-     * @return mixed
+     * @param \Closure $c
+     * @return string
      */
     public function buttonBar($options, \Closure $c)
     {
@@ -599,8 +598,8 @@ 
      * @param string $style
      * @param string $size
      * @param array  $options
-     * @param callable $c
-     * @return mixed
+     * @param \Closure $c
+     * @return string
      */
     public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
     {
@@ -630,7 +629,7 @@ 
      * @param $content
      * @param string $style
      * @param bool $closable
-     * @return mixed
+     * @return string
      */
     public function notice($content, $style='success', $closable=true, $options=[])
     {

Indentation +574 added lines, -574 removed lines

@@ -37,639 +37,639 @@
  */
 class Foundation extends BaseUIKit {
 
-    //--------------------------------------------------------------------
-
-    public function name()
-    {
-        return 'Foundation5UIKit';
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Grid
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a row wrapper of HTML. We would have simple returned the
-     * the class for it, but some frameworks use a completely different
-     * approach to rows and columns than the reference Bootstrap and Foundation.
-     *
-     * @param array $options
-     * @return mixed
-     */
-    public function row($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the CSS for a column in a grid.
-     *
-     * The attribute array is made up of key/value pairs with the
-     * key being the size, and the value being the number of columns/offset
-     * in a 12-column grid.
-     *
-     * Note that we currently DO NOT support offset columns.
-     *
-     * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
-     *
-     * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
-     * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
-     *
-     * @param array $attributes
-     * @return mixed
-     */
-    public function column($options=[], \Closure $c)
-    {
-        // Build our classes
-        $classes = '';
-
-        foreach ($options['sizes'] as $size => $value)
-        {
-            switch ($size)
-            {
-                case 's':
-                    $classes .= ' small-'. $value;
-                    break;
-                case 'm':
-                    $classes .= ' medium-'. $value;
-                    break;
-                case 'l':
-                    $classes .= ' large-'. $value;
-                    break;
-                case 'xl':
-                    $classes .= ' large-'. $value;
-                    break;
-                case 's-offset':
-                    $classes .= ' small-offset-'. $value;
-                    break;
-                case 'm-offset':
-                    $classes .= ' medium-offset-'. $value;
-                    break;
-                case 'l-offset':
-                    $classes .= ' large-offset-'. $value;
-                    break;
-                case 'xl-offset':
-                    $classes .= ' large-offset-'. $value;
-                    break;
-            }
-        }
-
-        $classes = $this->buildClassString($classes .' columns', $options, true);
-
-        $id = $this->buildIdFromOptions($options);
-
-        $attributes = $this->buildAttributesFromOptions($options);
-
-        $output = "<div {$classes} {$id} {$attributes}>";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbar($options=[], \Closure $c)
-    {
-        $output = '';
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'top-bar ', true);
-
-        foreach ($options as $option)
-        {
-            switch ($option)
-            {
-                case 'sticky-top':
-                    $classes .= " navbar-static-top";
-                    break;
-                case 'fixed':
-                    $classes .= " navbar-fixed-top";
-                    break;
-            }
-        }
-
-        $output .= "<nav {$classes} {$id} {$attributes} data-topbar>";
-
-        /*
+	//--------------------------------------------------------------------
+
+	public function name()
+	{
+		return 'Foundation5UIKit';
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Grid
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a row wrapper of HTML. We would have simple returned the
+	 * the class for it, but some frameworks use a completely different
+	 * approach to rows and columns than the reference Bootstrap and Foundation.
+	 *
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function row($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the CSS for a column in a grid.
+	 *
+	 * The attribute array is made up of key/value pairs with the
+	 * key being the size, and the value being the number of columns/offset
+	 * in a 12-column grid.
+	 *
+	 * Note that we currently DO NOT support offset columns.
+	 *
+	 * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
+	 *
+	 * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
+	 * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
+	 *
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	public function column($options=[], \Closure $c)
+	{
+		// Build our classes
+		$classes = '';
+
+		foreach ($options['sizes'] as $size => $value)
+		{
+			switch ($size)
+			{
+				case 's':
+					$classes .= ' small-'. $value;
+					break;
+				case 'm':
+					$classes .= ' medium-'. $value;
+					break;
+				case 'l':
+					$classes .= ' large-'. $value;
+					break;
+				case 'xl':
+					$classes .= ' large-'. $value;
+					break;
+				case 's-offset':
+					$classes .= ' small-offset-'. $value;
+					break;
+				case 'm-offset':
+					$classes .= ' medium-offset-'. $value;
+					break;
+				case 'l-offset':
+					$classes .= ' large-offset-'. $value;
+					break;
+				case 'xl-offset':
+					$classes .= ' large-offset-'. $value;
+					break;
+			}
+		}
+
+		$classes = $this->buildClassString($classes .' columns', $options, true);
+
+		$id = $this->buildIdFromOptions($options);
+
+		$attributes = $this->buildAttributesFromOptions($options);
+
+		$output = "<div {$classes} {$id} {$attributes}>";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbar($options=[], \Closure $c)
+	{
+		$output = '';
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'top-bar ', true);
+
+		foreach ($options as $option)
+		{
+			switch ($option)
+			{
+				case 'sticky-top':
+					$classes .= " navbar-static-top";
+					break;
+				case 'fixed':
+					$classes .= " navbar-fixed-top";
+					break;
+			}
+		}
+
+		$output .= "<nav {$classes} {$id} {$attributes} data-topbar>";
+
+		/*
          * Do any user content inside the bar
          */
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        if (isset($this->states['nav-section-open']))
-        {
-            $output .= "</section>";
-            unset($this->states['nav-section-open']);
-        }
+		if (isset($this->states['nav-section-open']))
+		{
+			$output .= "</section>";
+			unset($this->states['nav-section-open']);
+		}
 
-        /*
+		/*
          * Close out the navbar
          */
-        $output .= '</nav>';
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the HTML for the Title portion of the navbar. This typically
-     * includes the code for the hamburger menu on small resolutions.
-     *
-     * @param        $title
-     * @param string $url
-     * @return string
-     */
-    public function navbarTitle($title, $url='#')
-    {
-        return "<ul class='title-area'>
+		$output .= '</nav>';
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the HTML for the Title portion of the navbar. This typically
+	 * includes the code for the hamburger menu on small resolutions.
+	 *
+	 * @param        $title
+	 * @param string $url
+	 * @return string
+	 */
+	public function navbarTitle($title, $url='#')
+	{
+		return "<ul class='title-area'>
     <li class='name'>
       <h1><a href='{$url}'>{$title}</a></h1>
     </li>
     <li class='toggle-topbar menu-icon'><a href='#'><span>Menu</span></a></li>
   </ul>";
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Creates a UL meant to pull to the right within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbarRight($options=[], \Closure $c)
-    {
-        $output = '';
+	/**
+	 * Creates a UL meant to pull to the right within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbarRight($options=[], \Closure $c)
+	{
+		$output = '';
 
-        if (! isset($this->states['nav-section-open']))
-        {
-            $output .= "<section class='top-bar-section'>\n";
-            $this->states['nav-section-open'] = true;
-        }
+		if (! isset($this->states['nav-section-open']))
+		{
+			$output .= "<section class='top-bar-section'>\n";
+			$this->states['nav-section-open'] = true;
+		}
 
-        // Class
-        $classes = $this->buildClassString('right', $options);
+		// Class
+		$classes = $this->buildClassString('right', $options);
 
-        // ID
-        $id = $this->buildIdFromOptions($options);
+		// ID
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        $output .= "<ul class='{$classes}' {$id} {$attributes}>\n";
+		$output .= "<ul class='{$classes}' {$id} {$attributes}>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "</ul>\n";
+		$output .= "</ul>\n";
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Creates a UL meant to pull to the left within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbarLeft($options=[], \Closure $c)
-    {
-        $output = '';
+	/**
+	 * Creates a UL meant to pull to the left within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbarLeft($options=[], \Closure $c)
+	{
+		$output = '';
 
-        if (! isset($this->states['nav-section-open']))
-        {
-            $output .= "<section class='top-bar-section'>\n";
-            $this->states['nav-section-open'] = true;
-        }
+		if (! isset($this->states['nav-section-open']))
+		{
+			$output .= "<section class='top-bar-section'>\n";
+			$this->states['nav-section-open'] = true;
+		}
 
-        // Class
-        $classes = $this->buildClassString('left', $options);
+		// Class
+		$classes = $this->buildClassString('left', $options);
 
-        // ID
-        $id = $this->buildIdFromOptions($options);
+		// ID
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        $output .= "<ul class='{$classes}' {$id} {$attributes}>\n";
+		$output .= "<ul class='{$classes}' {$id} {$attributes}>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "</ul>\n";
+		$output .= "</ul>\n";
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function nav()
-    {
+	public function nav()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    public function navItem($title, $url='#', $options=[], $active=false)
-    {
-        $options['active'] = $active;
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	public function navItem($title, $url='#', $options=[], $active=false)
+	{
+		$options['active'] = $active;
 
-        $classes = $this->buildClassString('', $options, true);
+		$classes = $this->buildClassString('', $options, true);
 
-        $id = $this->buildIdFromOptions($options);
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        return "\t<li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>";
-    }
+		return "\t<li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>";
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    public function navDropdown($title,$options=[], \Closure $c)
-    {
-        $classes = $this->buildClassString('has-dropdown', $options, true);
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	public function navDropdown($title,$options=[], \Closure $c)
+	{
+		$classes = $this->buildClassString('has-dropdown', $options, true);
 
-        $id = $this->buildIdFromOptions($options);
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        $output = "\t<li {$classes} {$id} {$attributes}>
+		$output = "\t<li {$classes} {$id} {$attributes}>
         <a href='#'>{$title}</a>
         <ul class='dropdown'>";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "\t</ul></li>";
+		$output .= "\t</ul></li>";
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    public function navDivider()
-    {
-        return '<li class="divider"></li>';
-    }
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	public function navDivider()
+	{
+		return '<li class="divider"></li>';
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function sideNav($options=[], \Closure $c)
-    {
-        $classes = $this->buildClassString('side-nav', $options, true);
+	public function sideNav($options=[], \Closure $c)
+	{
+		$classes = $this->buildClassString('side-nav', $options, true);
 
-        $id = $this->buildIdFromOptions($options);
+		$id = $this->buildIdFromOptions($options);
 
-        $attributes = $this->buildAttributesFromOptions($options);
+		$attributes = $this->buildAttributesFromOptions($options);
 
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function breadcrumb($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumbs', true);
-
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Tables
-    //--------------------------------------------------------------------
-
-    public function table()
-    {
-        return 'table';
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Buttons
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function button($title, $style='default', $size='default', $options=[])
-    {
-        $tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple link styled as a button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $url
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
-    {
-        $class = isset($options['class']) ? $options['class'] .' button' : 'button';
-        $options['class'] = $class;
-
-        $tag = "<a {classes} {id} {attributes} role='button'>{$title}</a>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to render out our buttons in a DRY manner.
-     *
-     * @param $title
-     * @param $style
-     * @param $size
-     * @param $tag
-     */
-    protected function renderButtonElement($title, $style, $size, $options, $tag)
-    {
-        $valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
-        $valid_sizes  = ['default', 'small', 'xsmall', 'large'];
-
-        if (! in_array($style, $valid_styles))
-        {
-            $style = 'default';
-            $options['attributes'][] = 'data-error="Invalid Style passed to button method."';
-        }
-
-        $classes = 'btn ';
-
-        // Sizes
-        switch($size)
-        {
-            case 'small':
-                $classes .= 'small ';
-                break;
-            case 'xsmall':
-                $classes .= 'tiny ';
-                break;
-            case 'large':
-                $classes .= 'large ';
-                break;
-            default:
-                break;
-        }
-
-        // Styles
-        switch ($style)
-        {
-            case 'primary':
-                $classes .= '';
-                break;
-            case 'success':
-                $classes .= 'success ';
-                break;
-            case 'info':
-                $classes .= 'secondary ';
-                break;
-            case 'warning':
-                $classes .= 'alert ';
-                break;
-            case 'danger':
-                $classes .= 'alert ';
-                break;
-            case 'default':
-                $classes .= 'secondary ';
-                break;
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $tag = str_replace('{classes}', $classes, $tag);
-        $tag = str_replace('{id}', $id, $tag);
-        $tag = str_replace('{attributes}', $attributes, $tag);
-        $tag = str_replace('{title}', $title, $tag);
-
-        // If we're in a button group we need to wrap each item in li tags.
-        if (isset($this->states['inButtonGroup']))
-        {
-            $tag = '<li>'. $tag .'</li>';
-        }
-        return $tag;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonGroup($options, \Closure $c)
-    {
-        $this->states['inButtonGroup'] = true;
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button-group', true);
-
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        unset($this->states['inButtonGroup']);
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonBar($options, \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button-bar', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a button that also has a dropdown menu. Also called Split Buttons
-     * by some frameworks.
-     *
-     * @param        $title
-     * @param string $style
-     * @param string $size
-     * @param array  $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button split', true);
-
-        $output = "<a href='#' {$classes} {$id} {$attributes}>{$title} <span data-dropdown='drop'></span></a><br>\n
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function breadcrumb($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumbs', true);
+
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Tables
+	//--------------------------------------------------------------------
+
+	public function table()
+	{
+		return 'table';
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Buttons
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function button($title, $style='default', $size='default', $options=[])
+	{
+		$tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple link styled as a button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $url
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
+	{
+		$class = isset($options['class']) ? $options['class'] .' button' : 'button';
+		$options['class'] = $class;
+
+		$tag = "<a {classes} {id} {attributes} role='button'>{$title}</a>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to render out our buttons in a DRY manner.
+	 *
+	 * @param $title
+	 * @param $style
+	 * @param $size
+	 * @param $tag
+	 */
+	protected function renderButtonElement($title, $style, $size, $options, $tag)
+	{
+		$valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
+		$valid_sizes  = ['default', 'small', 'xsmall', 'large'];
+
+		if (! in_array($style, $valid_styles))
+		{
+			$style = 'default';
+			$options['attributes'][] = 'data-error="Invalid Style passed to button method."';
+		}
+
+		$classes = 'btn ';
+
+		// Sizes
+		switch($size)
+		{
+			case 'small':
+				$classes .= 'small ';
+				break;
+			case 'xsmall':
+				$classes .= 'tiny ';
+				break;
+			case 'large':
+				$classes .= 'large ';
+				break;
+			default:
+				break;
+		}
+
+		// Styles
+		switch ($style)
+		{
+			case 'primary':
+				$classes .= '';
+				break;
+			case 'success':
+				$classes .= 'success ';
+				break;
+			case 'info':
+				$classes .= 'secondary ';
+				break;
+			case 'warning':
+				$classes .= 'alert ';
+				break;
+			case 'danger':
+				$classes .= 'alert ';
+				break;
+			case 'default':
+				$classes .= 'secondary ';
+				break;
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$tag = str_replace('{classes}', $classes, $tag);
+		$tag = str_replace('{id}', $id, $tag);
+		$tag = str_replace('{attributes}', $attributes, $tag);
+		$tag = str_replace('{title}', $title, $tag);
+
+		// If we're in a button group we need to wrap each item in li tags.
+		if (isset($this->states['inButtonGroup']))
+		{
+			$tag = '<li>'. $tag .'</li>';
+		}
+		return $tag;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonGroup($options, \Closure $c)
+	{
+		$this->states['inButtonGroup'] = true;
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button-group', true);
+
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		unset($this->states['inButtonGroup']);
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonBar($options, \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button-bar', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a button that also has a dropdown menu. Also called Split Buttons
+	 * by some frameworks.
+	 *
+	 * @param        $title
+	 * @param string $style
+	 * @param string $size
+	 * @param array  $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button split', true);
+
+		$output = "<a href='#' {$classes} {$id} {$attributes}>{$title} <span data-dropdown='drop'></span></a><br>\n
                   <ul id='drop' class='f-dropdown' data-dropdown-content>\n";
 
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    public function notice($content, $style='success', $closable=true, $options=[])
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert-box ', false);
-
-        // Styles
-        switch ($style)
-        {
-            case 'success':
-                $classes .= ' success ';
-                break;
-            case 'info':
-                $classes .= ' secondary ';
-                break;
-            case 'warning':
-                $classes .= ' alert ';
-                break;
-            case 'danger':
-                $classes .= ' alert ';
-                break;
-            case 'default':
-                $classes .= ' secondary ';
-                break;
-        }
-
-        $output = "<div data-alert class='{$classes}'>\n";
-
-        $output .= "\t$content\n";
-
-        if ($closable)
-        {
-            $output .= "\t<a href='#' class='close'>&times;</a>\n";
-        }
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	public function notice($content, $style='success', $closable=true, $options=[])
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert-box ', false);
+
+		// Styles
+		switch ($style)
+		{
+			case 'success':
+				$classes .= ' success ';
+				break;
+			case 'info':
+				$classes .= ' secondary ';
+				break;
+			case 'warning':
+				$classes .= ' alert ';
+				break;
+			case 'danger':
+				$classes .= ' alert ';
+				break;
+			case 'default':
+				$classes .= ' secondary ';
+				break;
+		}
+
+		$output = "<div data-alert class='{$classes}'>\n";
+
+		$output .= "\t$content\n";
+
+		if ($closable)
+		{
+			$output .= "\t<a href='#' class='close'>&times;</a>\n";
+		}
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +30 added lines, -30 removed lines

@@ -58,7 +58,7 @@ 
      * @param array $options
      * @return mixed
      */
-    public function row($options=[], \Closure $c)
+    public function row($options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
 
@@ -90,7 +90,7 @@ 
      * @param array $attributes
      * @return mixed
      */
-    public function column($options=[], \Closure $c)
+    public function column($options = [], \Closure $c)
     {
         // Build our classes
         $classes = '';
@@ -100,33 +100,33 @@ 
             switch ($size)
             {
                 case 's':
-                    $classes .= ' small-'. $value;
+                    $classes .= ' small-'.$value;
                     break;
                 case 'm':
-                    $classes .= ' medium-'. $value;
+                    $classes .= ' medium-'.$value;
                     break;
                 case 'l':
-                    $classes .= ' large-'. $value;
+                    $classes .= ' large-'.$value;
                     break;
                 case 'xl':
-                    $classes .= ' large-'. $value;
+                    $classes .= ' large-'.$value;
                     break;
                 case 's-offset':
-                    $classes .= ' small-offset-'. $value;
+                    $classes .= ' small-offset-'.$value;
                     break;
                 case 'm-offset':
-                    $classes .= ' medium-offset-'. $value;
+                    $classes .= ' medium-offset-'.$value;
                     break;
                 case 'l-offset':
-                    $classes .= ' large-offset-'. $value;
+                    $classes .= ' large-offset-'.$value;
                     break;
                 case 'xl-offset':
-                    $classes .= ' large-offset-'. $value;
+                    $classes .= ' large-offset-'.$value;
                     break;
             }
         }
 
-        $classes = $this->buildClassString($classes .' columns', $options, true);
+        $classes = $this->buildClassString($classes.' columns', $options, true);
 
         $id = $this->buildIdFromOptions($options);
 
@@ -155,7 +155,7 @@ 
      * @param callable $c
      * @return string
      */
-    public function navbar($options=[], \Closure $c)
+    public function navbar($options = [], \Closure $c)
     {
         $output = '';
 
@@ -205,7 +205,7 @@ 
      * @param string $url
      * @return string
      */
-    public function navbarTitle($title, $url='#')
+    public function navbarTitle($title, $url = '#')
     {
         return "<ul class='title-area'>
     <li class='name'>
@@ -227,11 +227,11 @@ 
      * @param callable $c
      * @return string
      */
-    public function navbarRight($options=[], \Closure $c)
+    public function navbarRight($options = [], \Closure $c)
     {
         $output = '';
 
-        if (! isset($this->states['nav-section-open']))
+        if ( ! isset($this->states['nav-section-open']))
         {
             $output .= "<section class='top-bar-section'>\n";
             $this->states['nav-section-open'] = true;
@@ -266,11 +266,11 @@ 
      * @param callable $c
      * @return string
      */
-    public function navbarLeft($options=[], \Closure $c)
+    public function navbarLeft($options = [], \Closure $c)
     {
         $output = '';
 
-        if (! isset($this->states['nav-section-open']))
+        if ( ! isset($this->states['nav-section-open']))
         {
             $output .= "<section class='top-bar-section'>\n";
             $this->states['nav-section-open'] = true;
@@ -311,7 +311,7 @@ 
      * @param array $options
      * @return string
      */
-    public function navItem($title, $url='#', $options=[], $active=false)
+    public function navItem($title, $url = '#', $options = [], $active = false)
     {
         $options['active'] = $active;
 
@@ -333,7 +333,7 @@ 
      * @param array    $options
      * @param callable $c
      */
-    public function navDropdown($title,$options=[], \Closure $c)
+    public function navDropdown($title, $options = [], \Closure $c)
     {
         $classes = $this->buildClassString('has-dropdown', $options, true);
 
@@ -366,7 +366,7 @@ 
 
     //--------------------------------------------------------------------
 
-    public function sideNav($options=[], \Closure $c)
+    public function sideNav($options = [], \Closure $c)
     {
         $classes = $this->buildClassString('side-nav', $options, true);
 
@@ -392,7 +392,7 @@ 
      * @param callable $c
      * @return mixed
      */
-    public function breadcrumb($options=[], \Closure $c)
+    public function breadcrumb($options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumbs', true);
 
@@ -433,9 +433,9 @@ 
      * @param array $options
      * @return mixed
      */
-    public function button($title, $style='default', $size='default', $options=[])
+    public function button($title, $style = 'default', $size = 'default', $options = [])
     {
-        $tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
+        $tag = "<button type='button' {classes} {id} {attributes}>{$title}</button>";
 
         return $this->renderButtonElement($title, $style, $size, $options, $tag);
     }
@@ -454,9 +454,9 @@ 
      * @param array $options
      * @return mixed
      */
-    public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
+    public function buttonLink($title, $url = '#', $style = 'default', $size = 'default', $options = [])
     {
-        $class = isset($options['class']) ? $options['class'] .' button' : 'button';
+        $class = isset($options['class']) ? $options['class'].' button' : 'button';
         $options['class'] = $class;
 
         $tag = "<a {classes} {id} {attributes} role='button'>{$title}</a>";
@@ -479,7 +479,7 @@ 
         $valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
         $valid_sizes  = ['default', 'small', 'xsmall', 'large'];
 
-        if (! in_array($style, $valid_styles))
+        if ( ! in_array($style, $valid_styles))
         {
             $style = 'default';
             $options['attributes'][] = 'data-error="Invalid Style passed to button method."';
@@ -488,7 +488,7 @@ 
         $classes = 'btn ';
 
         // Sizes
-        switch($size)
+        switch ($size)
         {
             case 'small':
                 $classes .= 'small ';
@@ -536,7 +536,7 @@ 
         // If we're in a button group we need to wrap each item in li tags.
         if (isset($this->states['inButtonGroup']))
         {
-            $tag = '<li>'. $tag .'</li>';
+            $tag = '<li>'.$tag.'</li>';
         }
         return $tag;
     }
@@ -602,7 +602,7 @@ 
      * @param callable $c
      * @return mixed
      */
-    public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
+    public function buttonDropdown($title, $style = 'default', $size = 'default', $options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button split', true);
 
@@ -632,7 +632,7 @@ 
      * @param bool $closable
      * @return mixed
      */
-    public function notice($content, $style='success', $closable=true, $options=[])
+    public function notice($content, $style = 'success', $closable = true, $options = [])
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert-box ', false);