ci-bonfire / Sprint

myth/Settings/DatabaseStore.php

Spacing +11 added lines, -11 removed lines

@@ -38,14 +38,14 @@ 
 
     //--------------------------------------------------------------------
 
-    public function __construct( $ci=null )
+    public function __construct($ci = null)
     {
         if (is_object($ci))
         {
-            $this->ci =& $ci;
+            $this->ci = & $ci;
         }
         else {
-            $this->ci =& get_instance();
+            $this->ci = & get_instance();
         }
 
         // Ensure that the database is loaded.
@@ -65,7 +65,7 @@ 
      * @param string $group
      * @return bool
      */
-    public function save($key, $value=null, $group='app')
+    public function save($key, $value = null, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -100,7 +100,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function get($key, $group='app')
+    public function get($key, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -115,7 +115,7 @@ 
         $query = $this->ci->db->where($where)
                               ->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }
@@ -123,7 +123,7 @@ 
         $value = $query->row()->value;
 
         // Check to see if it needs to be unserialized
-        $data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
+        $data = @unserialize($value); // We don't need to issue an E_NOTICE here...
 
         // Check for a value of false or
         if ($value === 'b:0;' || $data !== false)
@@ -143,7 +143,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function delete($key, $group='app')
+    public function delete($key, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -177,7 +177,7 @@ 
         $query = $this->ci->db->where($field, $value)
                               ->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }
@@ -193,7 +193,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function all($group=null)
+    public function all($group = null)
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -202,7 +202,7 @@ 
 
         $query = $this->ci->db->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }

myth/Settings/Settings.php

Spacing +19 added lines, -19 removed lines

@@ -70,15 +70,15 @@ 
         {
             foreach ($user_stores as $alias => $class)
             {
-                self::$stores[ strtolower($alias) ] = new $class();
+                self::$stores[strtolower($alias)] = new $class();
             }
         }
 
         self::$default_store = config_item('settings.default_store');
 
-        if (empty(self::$stores[ self::$default_store ]))
+        if (empty(self::$stores[self::$default_store]))
         {
-            show_error( lang('settings.bad_default') );
+            show_error(lang('settings.bad_default'));
         }
     }
 
@@ -92,7 +92,7 @@ 
      * @param string $group
      * @param string $store
      */
-    public static function save($key, $value=null, $group='app', $store=null)
+    public static function save($key, $value = null, $group = 'app', $store = null)
     {
         self::init();
 
@@ -103,7 +103,7 @@ 
             $store = self::$default_store;
         }
 
-        return self::$stores[ $store ]->save($key, $value, $group);
+        return self::$stores[$store]->save($key, $value, $group);
     }
 
     //--------------------------------------------------------------------
@@ -118,7 +118,7 @@ 
      * @param string $store
      * @return mixed
      */
-    public static function get($key, $group='app', $store=null)
+    public static function get($key, $group = 'app', $store = null)
     {
         self::init();
 
@@ -126,13 +126,13 @@ 
 
         // If the store is specified but doesn't exist, crap out
         // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
+        if ( ! is_null($store) && empty(self::$stores[$store]))
         {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+            show_error(sprintf(lang('settings.cant_retrieve'), $store));
         }
 
         // If $store is set, get the value from that store only.
-        if (! empty($store))
+        if ( ! empty($store))
         {
             return self::$stores[$store]->get($key, $group);
         }
@@ -160,7 +160,7 @@ 
      * @param $store
      * @return mixed
      */
-    public static function delete($key, $group='app', $store=null)
+    public static function delete($key, $group = 'app', $store = null)
     {
         self::init();
 
@@ -168,19 +168,19 @@ 
 
         // If the store is specified but doesn't exist, crap out
         // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
+        if ( ! is_null($store) && empty(self::$stores[$store]))
         {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+            show_error(sprintf(lang('settings.cant_retrieve'), $store));
         }
 
         // If $store is set, get the value from that store only.
-        if (! empty($store))
+        if ( ! empty($store))
         {
             return self::$stores[$store]->delete($key, $group);
         }
 
         // Otherwise delete from the default store
-        return self::$stores[ self::$default_store ]->delete($key, $group);
+        return self::$stores[self::$default_store]->delete($key, $group);
     }
 
     //--------------------------------------------------------------------
@@ -215,15 +215,15 @@ 
      * @param string $group
      * @return mixed
      */
-    public static function all($group=null, $store=null)
+    public static function all($group = null, $store = null)
     {
         self::init();
 
         $group = strtolower($group);
 
-        if (! empty($store))
+        if ( ! empty($store))
         {
-            return self::$stores[ $store ]->all($group);
+            return self::$stores[$store]->all($group);
         }
 
         // Otherwise combine the results from all stores
@@ -234,7 +234,7 @@ 
             $found = $s->all($group);
             if ($found)
             {
-                $results = array_merge($results, (array)$found);
+                $results = array_merge($results, (array) $found);
             }
         }
 
@@ -256,7 +256,7 @@ 
 
         if (class_exists($class))
         {
-            self::$stores[ strtolower($alias) ] = new $class();
+            self::$stores[strtolower($alias)] = new $class();
             return true;
         }
 

myth/Settings/SettingsStoreInterface.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
      * @param null $value
      * @param string $group
      */
-    public function save($key, $value=null, $group='app');
+    public function save($key, $value = null, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -58,7 +58,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function get($key, $group='app');
+    public function get($key, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -69,7 +69,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function delete($key, $group='app');
+    public function delete($key, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -90,7 +90,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function all($group=null);
+    public function all($group = null);
 
     //--------------------------------------------------------------------
 

myth/Themers/MetaCollection.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Myth\Themers;
 
-require_once dirname(__FILE__) .'/escape.php';
+require_once dirname(__FILE__).'/escape.php';
 
 /**
  * Sprint
@@ -108,7 +108,7 @@ 
      *
      * @return mixed
      */
-    public function set($alias, $value=null, $escape=true)
+    public function set($alias, $value = null, $escape = true)
     {
         if (is_array($alias))
         {
@@ -128,7 +128,7 @@ 
             return $this;
         }
 
-        $this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
+        $this->meta[strtolower($alias)] = $escape ? esc($value, 'htmlAttr') : $value;
 
         return $this;
     }
@@ -146,7 +146,7 @@ 
     {
         $alias = strtolower($alias);
 
-        return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
+        return isset($this->meta[$alias]) ? $this->meta[$alias] : null;
     }
 
     //--------------------------------------------------------------------
@@ -158,7 +158,7 @@ 
      */
     public function renderTags()
     {
-        if (! count($this->meta))
+        if ( ! count($this->meta))
         {
             return null;
         }
@@ -227,7 +227,7 @@ 
      * @param $alias
      * @param null $value
      */
-    public function __set($alias, $value=null)
+    public function __set($alias, $value = null)
     {
         $this->set($alias, $value);
     }

myth/Themers/MetaInterface.php

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/ThemerInterface.php

Spacing +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
      * @param int $cache_minutes
      * @return mixed
      */
-    public function call($command, $cache_minutes=0);
+    public function call($command, $cache_minutes = 0);
 
     //--------------------------------------------------------------------
 

myth/Themers/ViewThemer.php

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;

myth/Themers/escape.php

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 
 use Zend\Escaper\Escaper;
 
-if (! function_exists('esc'))
+if ( ! function_exists('esc'))
 {
     /**
      * Escapes strings to make them safe for use
@@ -28,7 +28,7 @@ 
      *
      * @return string
      */
-    function esc($data, $context='html', $escaper=null)
+    function esc($data, $context = 'html', $escaper = null)
     {
         if (is_array($data))
         {
@@ -40,18 +40,18 @@ 
 
         $context = strtolower($context);
 
-        if (! is_object($escaper))
+        if ( ! is_object($escaper))
         {
             $escaper = new Escaper(config_item('charset'));
         }
 
         // Valid context?
-        if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
+        if ( ! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
         {
-            throw new \InvalidArgumentException('Invalid Context type: '. $context);
+            throw new \InvalidArgumentException('Invalid Context type: '.$context);
         }
 
-        if (! is_string($data))
+        if ( ! is_string($data))
         {
             return $data;
         }

myth/UIKits/BaseUIKit.php

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']) : '';