ci-bonfire / Sprint

myth/Forge/BaseGenerator.php

Spacing +68 added lines, -68 removed lines

@@ -79,7 +79,7 @@ 
 
 		    if (is_array($folders))
 		    {
-			    $this->module_path = $folders[0] . strtolower($module) .'/';
+			    $this->module_path = $folders[0].strtolower($module).'/';
 		    }
 		}
 
@@ -101,7 +101,7 @@ 
      * @param bool  $quiet      If true, models should accept default values.
      * @return mixed
      */
-    abstract function run($segments=[], $quiet=false);
+    abstract function run($segments = [], $quiet = false);
 
     //--------------------------------------------------------------------
 
@@ -114,7 +114,7 @@ 
      *
      * @return bool
      */
-    public function createFile($path, $contents=null, $overwrite=false, $perms=0644)
+    public function createFile($path, $contents = null, $overwrite = false, $perms = 0644)
     {
 	    $path = $this->sandbox($path);
 
@@ -123,8 +123,8 @@ 
         // Does file already exist?
         if ($file_exists)
         {
-	        if (! $overwrite) {
-		        CLI::write( CLI::color("\t". strtolower(lang('exists')) .": ", 'blue') . str_replace(APPPATH, '', $path ) );
+	        if ( ! $overwrite) {
+		        CLI::write(CLI::color("\t".strtolower(lang('exists')).": ", 'blue').str_replace(APPPATH, '', $path));
 		        return true;
 	        }
 
@@ -136,27 +136,27 @@ 
 		array_pop($segments);
 		$folder = implode('/', $segments);
 
-	    if (! is_dir($folder))
+	    if ( ! is_dir($folder))
 	    {
 		    $this->createDirectory($folder);
 	    }
 
         get_instance()->load->helper('file');
 
-        if (! write_file($path, $contents))
+        if ( ! write_file($path, $contents))
         {
-            throw new \RuntimeException( sprintf( lang('errors.writing_file'),  $path) );
+            throw new \RuntimeException(sprintf(lang('errors.writing_file'), $path));
         }
 
         chmod($path, $perms);
 
 	    if ($overwrite && $file_exists)
 	    {
-		    CLI::write( CLI::color("\t". strtolower( lang('overwrote') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
+		    CLI::write(CLI::color("\t".strtolower(lang('overwrote'))." ", 'light_red').str_replace(APPPATH, '', $path));
 	    }
 	    else
 	    {
-		    CLI::write( CLI::color("\t". strtolower( lang('created') ) ." ", 'yellow') . str_replace(APPPATH, '', $path ) );
+		    CLI::write(CLI::color("\t".strtolower(lang('created'))." ", 'yellow').str_replace(APPPATH, '', $path));
 	    }
 
         return $this;
@@ -172,7 +172,7 @@ 
      *
      * @return bool
      */
-    public function createDirectory($path, $perms=0755)
+    public function createDirectory($path, $perms = 0755)
     {
 	    $path = $this->sandbox($path);
 
@@ -181,9 +181,9 @@ 
             return $this;
         }
 
-        if (! mkdir($path, $perms, true) )
+        if ( ! mkdir($path, $perms, true))
         {
-            throw new \RuntimeException( sprintf( lang('errors.creating_dir'), $path) );
+            throw new \RuntimeException(sprintf(lang('errors.creating_dir'), $path));
         }
 
         return $this;
@@ -200,11 +200,11 @@ 
      *
      * @return bool
      */
-    public function copyFile($source, $destination, $overwrite=false)
+    public function copyFile($source, $destination, $overwrite = false)
     {
 	    $source = $this->sandbox($source);
 
-	    if (! file_exists($source))
+	    if ( ! file_exists($source))
 	    {
 		    return null;
 	    }
@@ -227,9 +227,9 @@ 
      *
      * @return $this
      */
-    public function copyTemplate($template, $destination, $data=[], $overwrite=false)
+    public function copyTemplate($template, $destination, $data = [], $overwrite = false)
     {
-	    if (! is_array($data))
+	    if ( ! is_array($data))
 	    {
 		    $data = array($data);
 	    }
@@ -259,7 +259,7 @@ 
      *
      * @return $this
      */
-    public function injectIntoFile($path, $content, $options='append')
+    public function injectIntoFile($path, $content, $options = 'append')
     {
         $kit = new FileKit();
 
@@ -270,11 +270,11 @@ 
         else if (is_array($options) && count($options))
         {
             $keys = array_keys($options);
-            $action = array_shift( $keys );
+            $action = array_shift($keys);
             $param = $options[$action];
         }
 
-        switch ( strtolower($action) )
+        switch (strtolower($action))
         {
             case 'prepend':
                 $success = $kit->prepend($path, $content);
@@ -299,11 +299,11 @@ 
 
         if ($success)
         {
-            CLI::write( CLI::color("\t". strtolower( lang('modified') ) ." ", 'cyan') . str_replace(APPPATH, '', $path ) );
+            CLI::write(CLI::color("\t".strtolower(lang('modified'))." ", 'cyan').str_replace(APPPATH, '', $path));
         }
         else
         {
-            CLI::write( CLI::color("\t". strtolower( lang('error') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
+            CLI::write(CLI::color("\t".strtolower(lang('error'))." ", 'light_red').str_replace(APPPATH, '', $path));
         }
 
         return $this;
@@ -320,10 +320,10 @@ 
 	 * @param $command
 	 * @param null $options
 	 */
-    public function generate($command, $options = '', $quiet=false)
+    public function generate($command, $options = '', $quiet = false)
     {
 		$orig_options = CLI::optionString();
-	    $options = $orig_options .' '. $options;
+	    $options = $orig_options.' '.$options;
 
 	    if ($quiet === true)
 	    {
@@ -335,7 +335,7 @@ 
 		    $options .= ' -overwrite';
 	    }
 
-	    passthru( "php sprint forge {$command} {$options}" );
+	    passthru("php sprint forge {$command} {$options}");
     }
 
     //--------------------------------------------------------------------
@@ -348,7 +348,7 @@ 
      *
      * @return \Myth\Forge\BaseGenerator
      */
-    public function route($left, $right, $options=[], $method='any')
+    public function route($left, $right, $options = [], $method = 'any')
     {
         $option_str = '[';
 
@@ -361,7 +361,7 @@ 
 
         $content = "\$routes->{$method}('{$left}', '{$right}', {$option_str});\n";
 
-        return $this->injectIntoFile(APPPATH .'config/routes.php', $content, ['after' => "// Auto-generated routes go here\n"]);
+        return $this->injectIntoFile(APPPATH.'config/routes.php', $content, ['after' => "// Auto-generated routes go here\n"]);
     }
     
     //--------------------------------------------------------------------
@@ -369,21 +369,21 @@ 
     /**
      * Outputs the contents of the file in the template's source path.
      */
-    public function readme($file='readme.txt')
+    public function readme($file = 'readme.txt')
     {
 	    $name = str_replace('Generator', '', get_class($this));
 
 	    $path = $this->locateGenerator($name);
 
-        if (! file_exists($path . $file))
+        if ( ! file_exists($path.$file))
         {
-            CLI::error(sprintf( lang('forge.cant_find_readme'), $file) );
+            CLI::error(sprintf(lang('forge.cant_find_readme'), $file));
         }
 
-	    $contents = file_get_contents($path . $file);
+	    $contents = file_get_contents($path.$file);
 
         CLI::new_line(2);
-        CLI::write( CLI::wrap($contents), 'green' );
+        CLI::write(CLI::wrap($contents), 'green');
         CLI::new_line();
     }
 
@@ -399,7 +399,7 @@ 
      *
      * @return string The rendered template
      */
-    public function render($template_name, $data=[], $folder=null)
+    public function render($template_name, $data = [], $folder = null)
     {
         if (empty($this->themer))
         {
@@ -410,27 +410,27 @@ 
 
         $output = null;
 
-	    $view = $template_name .'.tpl';
+	    $view = $template_name.'.tpl';
 
         $groups = config_item('forge.collections');
 
-	    $name = str_replace('Generator', '', get_class($this) );
+	    $name = str_replace('Generator', '', get_class($this));
 
         foreach ($groups as $group => $path)
         {
-	        $path = rtrim($path, '/ ') .'/';
+	        $path = rtrim($path, '/ ').'/';
 	        $folders = scandir($path);
 
-	        if (! $i = array_search(ucfirst($name), $folders))
+	        if ( ! $i = array_search(ucfirst($name), $folders))
 	        {
 		        continue;
 	        }
 
-	        $view = $folders[$i] . '/'. $view;
+	        $view = $folders[$i].'/'.$view;
 
-            if (realpath($path . $view .'.php'))
+            if (realpath($path.$view.'.php'))
             {
-                $output = $this->themer->display($group .':'. $view, $data);
+                $output = $this->themer->display($group.':'.$view, $data);
                 break;
             }
         }
@@ -461,24 +461,24 @@ 
         $path = $this->normalizePath($path);
 
 		// If it's writing to BASEPATH - FIX IT
-		if (strpos($path, $this->normalizePath(BASEPATH) ) === 0)
+		if (strpos($path, $this->normalizePath(BASEPATH)) === 0)
 		{
-			return APPPATH . $path;
+			return APPPATH.$path;
 		}
 
 		// Exact match for FCPATH?
-		if (strpos($path, $this->normalizePath(FCPATH) ) === 0)
+		if (strpos($path, $this->normalizePath(FCPATH)) === 0)
 		{
 			return $path;
 		}
 
 		// Exact match for APPPATH?
-		if (strpos($path, $this->normalizePath(APPPATH) ) === 0)
+		if (strpos($path, $this->normalizePath(APPPATH)) === 0)
 		{
 			return $path;
 		}
 
-	    return APPPATH . $path;
+	    return APPPATH.$path;
 	}
 
 	//--------------------------------------------------------------------
@@ -493,12 +493,12 @@ 
     {
         $themer_name = config_item('forge.themer');
 
-        if (! $themer_name)
+        if ( ! $themer_name)
         {
-            throw new \RuntimeException( lang('forge.no_themer') );
+            throw new \RuntimeException(lang('forge.no_themer'));
         }
 
-        $this->themer = new $themer_name( get_instance() );
+        $this->themer = new $themer_name(get_instance());
 
         // Register our paths with the themer
         $paths = config_item('forge.collections');
@@ -514,9 +514,9 @@ 
 	{
 		$kit_name = config_item('theme.uikit');
 
-		if (! $kit_name)
+		if ( ! $kit_name)
 		{
-			throw new \RuntimeException( lang('forge.no_uikit') );
+			throw new \RuntimeException(lang('forge.no_uikit'));
 		}
 
 		$uikit = new $kit_name();
@@ -527,16 +527,16 @@ 
 	//--------------------------------------------------------------------
 
 
-	protected function determineOutputPath($folder='')
+	protected function determineOutputPath($folder = '')
 	{
-		$path = APPPATH . $folder;
+		$path = APPPATH.$folder;
 
-		if (! empty($this->module_path))
+		if ( ! empty($this->module_path))
 		{
-			$path = $this->module_path . $folder;
+			$path = $this->module_path.$folder;
 		}
 
-		return rtrim($path, '/ ') .'/';
+		return rtrim($path, '/ ').'/';
 	}
 
 	//--------------------------------------------------------------------
@@ -552,22 +552,22 @@ 
 	{
 		$collections = config_item('forge.collections');
 
-		if (! is_array($collections) || ! count($collections) )
+		if ( ! is_array($collections) || ! count($collections))
 		{
-			return CLI::error( lang('forge.no_collections') );
+			return CLI::error(lang('forge.no_collections'));
 		}
 
 		foreach ($collections as $alias => $path)
 		{
-			$path = rtrim($path, '/ ') .'/';
+			$path = rtrim($path, '/ ').'/';
 			$folders = scandir($path);
 
-			if (! $i = array_search(ucfirst($name), $folders))
+			if ( ! $i = array_search(ucfirst($name), $folders))
 			{
 				continue;
 			}
 
-			$this->gen_path = $path . $folders[$i] .'/';
+			$this->gen_path = $path.$folders[$i].'/';
 
 			return $this->gen_path;
 		}
@@ -584,9 +584,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function stringify($array, $depth=0)
+	protected function stringify($array, $depth = 0)
 	{
-		if (! is_array($array))
+		if ( ! is_array($array))
 		{
 			return '';
 		}
@@ -606,9 +606,9 @@ 
 
 		foreach ($array as $key => $value)
 		{
-			$str .= str_repeat("\t", $depth +1);
+			$str .= str_repeat("\t", $depth + 1);
 
-			if (! is_numeric($key))
+			if ( ! is_numeric($key))
 			{
 				$str .= "'{$key}' => ";
 			}
@@ -632,7 +632,7 @@ 
 			}
 		}
 
-		$str .= str_repeat("\t", $depth) ."],";
+		$str .= str_repeat("\t", $depth)."],";
 
 		return $str;
 	}
@@ -667,13 +667,13 @@ 
         // Initialize testing variable
         $test = '';
 
-        foreach($segments as $segment)
+        foreach ($segments as $segment)
         {
-            if($segment != '.')
+            if ($segment != '.')
             {
                 $test = array_pop($parts);
 
-                if(is_null($test))
+                if (is_null($test))
                 {
                     $parts[] = $segment;
                 }

myth/Forge/FileKit.php

Spacing +20 added lines, -20 removed lines

@@ -47,7 +47,7 @@ 
         }
 
         // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
+        $content = rtrim($content)."\n";
 
         $fh = fopen($file, 'a');
         $result = fwrite($fh, $content);
@@ -75,18 +75,18 @@ 
         }
 
         // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
+        $content = rtrim($content)."\n";
 
         $file_contents = file_get_contents($file);
 
         if ($file_contents === false)
         {
-            throw new \RuntimeException( sprintf(lang('errors.reading_file'), $file));
+            throw new \RuntimeException(sprintf(lang('errors.reading_file'), $file));
         }
 
-        $result = file_put_contents($file, $content . $file_contents);
+        $result = file_put_contents($file, $content.$file_contents);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------
@@ -108,13 +108,13 @@ 
         }
 
         // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
+        $content = rtrim($content)."\n";
 
         $lines = file($file);
 
         if ($lines === false)
         {
-            throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ));
+            throw new \RuntimeException(sprintf(lang('errors.file_not_found'), $file));
         }
 
         // Where to insert the row.
@@ -122,7 +122,7 @@ 
 
         foreach ($lines as $index => $line)
         {
-            if (strtolower($line) == strtolower($before) )
+            if (strtolower($line) == strtolower($before))
             {
                 $location = $index;
                 break;
@@ -133,7 +133,7 @@ 
 
         $result = file_put_contents($file, $lines);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------
@@ -146,13 +146,13 @@ 
         }
 
         // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
+        $content = rtrim($content)."\n";
 
         $lines = file($file);
 
         if ($lines === false)
         {
-            throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ) );
+            throw new \RuntimeException(sprintf(lang('errors.file_not_found'), $file));
         }
 
         // Where to insert the row.
@@ -160,18 +160,18 @@ 
 
         foreach ($lines as $index => $line)
         {
-            if (strtolower($line) == strtolower($after) )
+            if (strtolower($line) == strtolower($after))
             {
                 $location = $index;
                 break;
             }
         }
 
-        array_splice($lines, $location +1, 0, $content);
+        array_splice($lines, $location + 1, 0, $content);
 
         $result = file_put_contents($file, $lines);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------
@@ -190,14 +190,14 @@ 
 
         if ($file_contents === false)
         {
-            throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
+            throw new \RuntimeException(sprintf(lang('errors.reading_file'), $file));
         }
 
         $file_contents = str_replace($search, $replace, $file_contents);
 
         $result = file_put_contents($file, $file_contents);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------
@@ -216,7 +216,7 @@ 
 
         if ($file_contents === false)
         {
-            throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
+            throw new \RuntimeException(sprintf(lang('errors.reading_file'), $file));
         }
 
         $file_contents = preg_replace($pattern, $replace, $file_contents);
@@ -224,12 +224,12 @@ 
         $result = false;
 
         // Don't let us erase a file!
-        if (! empty($file_contents))
+        if ( ! empty($file_contents))
         {
-            $result = file_put_contents( $file, $file_contents );
+            $result = file_put_contents($file, $file_contents);
         }
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     //--------------------------------------------------------------------

myth/Mail/BaseMailer.php

Spacing +23 added lines, -23 removed lines

@@ -64,7 +64,7 @@ 
      * will use the system default.
      * @var null
      */
-    protected $service_name  = null;
+    protected $service_name = null;
 
     protected $service = null;
 
@@ -83,9 +83,9 @@ 
      *
      * @param null $options
      */
-    public function __construct($options=null)
+    public function __construct($options = null)
     {
-        if (! empty($options))
+        if ( ! empty($options))
         {
             $this->setOptions($options);
         }
@@ -107,7 +107,7 @@ 
             {
                 if ($key == 'service')
                 {
-                    $this->service =& $value;
+                    $this->service = & $value;
                     continue;
                 }
 
@@ -135,7 +135,7 @@ 
      *
      * @return bool
      */
-    public function send($to, $subject, $data=[], $view=null)
+    public function send($to, $subject, $data = [], $view = null)
     {
         // Are we pretending to send?
         if (config_item('mail.pretend') === true)
@@ -156,8 +156,8 @@ 
             $this->service->from($this->from);
         }
 
-        if (! empty($this->cc))         $this->service->cc($this->cc);
-        if (! empty($this->bcc))        $this->service->bcc($this->bcc);
+        if ( ! empty($this->cc))         $this->service->cc($this->cc);
+        if ( ! empty($this->bcc))        $this->service->bcc($this->bcc);
 
         if (is_array($this->reply_to)) {
             $this->service->reply_to($this->reply_to[0], $this->reply_to[1]);
@@ -172,20 +172,20 @@ 
         // the debug_backtrace, though, to make it all function in the background.
         list(, $method) = debug_backtrace(false);
 
-        $view = 'emails/'. strtolower( (new \ReflectionClass($this))->getShortName() ) .'/'. $method['function'];
+        $view = 'emails/'.strtolower((new \ReflectionClass($this))->getShortName()).'/'.$method['function'];
 
         // Get our message's text and html versions based on which files exist...
-        $basepath = APPPATH .'views/'. $view;
+        $basepath = APPPATH.'views/'.$view;
 
         // Is a text version available?
-        if (file_exists($basepath .'.text.php'))
+        if (file_exists($basepath.'.text.php'))
         {
-            $text = $this->load->view($view .'.text.php', $data, true);
+            $text = $this->load->view($view.'.text.php', $data, true);
             $this->service->text_message($text);
         }
 
         // If an html version is around, we need to theme it out
-        if (file_exists($basepath .'.html.php'))
+        if (file_exists($basepath.'.html.php'))
         {
             $this->startThemer();
 
@@ -198,14 +198,14 @@ 
             $this->themer->set($data);
 
             // Render the view into a var we can pass to the layout.
-            $content = $this->themer->display($view .'.html.php');
+            $content = $this->themer->display($view.'.html.php');
 
             $this->themer->set('content', $content);
 
-            $this->service->html_message( $this->themer->display($this->theme .':'. $layout) );
+            $this->service->html_message($this->themer->display($this->theme.':'.$layout));
         }
 
-        if (! $this->service->send() )
+        if ( ! $this->service->send())
         {
             // todo do something here
             return false;
@@ -224,7 +224,7 @@ 
      * @param string|array  $field
      * @param string        $value
      */
-    public function header($field, $value=null)
+    public function header($field, $value = null)
     {
         $this->startMailService();
 
@@ -241,7 +241,7 @@ 
      * @param string    $newname        If you'd like to rename the file for delivery
      * @param string    $mime           Custom defined mime type.
      */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null)
+    public function attach($filename, $disposition = null, $newname = null, $mime = null)
     {
         $this->startMailService();
 
@@ -262,16 +262,16 @@ 
     protected function startMailService()
     {
         // Only once!
-        if (! empty($this->service) && is_object($this->service))
+        if ( ! empty($this->service) && is_object($this->service))
         {
             return;
         }
 
         $service_name = ! empty($this->service_name) ? $this->service_name : config_item('mail.default_service');
 
-        if (! class_exists($service_name))
+        if ( ! class_exists($service_name))
         {
-            throw new \RuntimeException( sprintf( lang('mail.invalid_service'), $service_name) );
+            throw new \RuntimeException(sprintf(lang('mail.invalid_service'), $service_name));
         }
 
         $this->service = new $service_name();
@@ -290,12 +290,12 @@ 
         $themer = config_item('active_themer');
 
         if (empty($themer)) {
-            throw new \RuntimeException( lang('no_themer') );
+            throw new \RuntimeException(lang('no_themer'));
         }
 
         if (empty($this->themer))
         {
-            $this->themer = new $themer( get_instance() );
+            $this->themer = new $themer(get_instance());
         }
 
         // Register our paths with the themer
@@ -306,7 +306,7 @@ 
         }
 
         // Set our default theme.
-        $this->themer->setDefaultTheme( 'email' );
+        $this->themer->setDefaultTheme('email');
     }
 
     //--------------------------------------------------------------------

myth/Mail/CIMailService.php

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
 
     public function __construct()
     {
-        $this->ci =& get_instance();
+        $this->ci = & get_instance();
 
         $this->ci->load->library('email');
     }
@@ -63,7 +63,7 @@ 
      *
      * @return mixed
      */
-    public function send($clear_after=true)
+    public function send($clear_after = true)
     {
         $this->ci->email->mailtype = $this->format;
 
@@ -82,7 +82,7 @@ 
      * @param string    $newname        If you'd like to rename the file for delivery
      * @param string    $mime           Custom defined mime type.
      */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null)
+    public function attach($filename, $disposition = null, $newname = null, $mime = null)
     {
         $this->ci->email->attach($filename, $disposition, $newname, $mime);
     }
@@ -131,7 +131,7 @@ 
      * @param null $name
      * @return mixed
      */
-    public function from($email, $name=null)
+    public function from($email, $name = null)
     {
         $this->ci->email->from($email, $name);
 
@@ -176,7 +176,7 @@ 
      * @param $email
      * @return mixed
      */
-    public function reply_to($email, $name=null)
+    public function reply_to($email, $name = null)
     {
         $this->ci->email->reply_to($email, $name);
     }
@@ -254,7 +254,7 @@ 
      * @param bool $clear_attachments
      * @return mixed
      */
-    public function reset($clear_attachments=true)
+    public function reset($clear_attachments = true)
     {
         $this->ci->email->clear($clear_attachments);
 

myth/Mail/LogMailService.php

Spacing +18 added lines, -18 removed lines

@@ -53,7 +53,7 @@ 
 
     public function __construct()
     {
-        $this->ci =& get_instance();
+        $this->ci = & get_instance();
 
         $this->ci->load->library('email');
     }
@@ -71,7 +71,7 @@ 
      *
      * @return mixed
      */
-    public function send($clear_after=true)
+    public function send($clear_after = true)
     {
 
         // Ensure we have enough data
@@ -79,21 +79,21 @@ 
             (empty($this->html_message) && empty($this->text_message))
         )
         {
-            throw new \RuntimeException( lang('mail.invalid_log_data') );
+            throw new \RuntimeException(lang('mail.invalid_log_data'));
         }
 
         $symbols = ['#', '%', '&', '{', '}', '\\', '/', '<', '>', '*', '?', ' ', '$', '!', '\'', '"', ':', '@', '+', '`', '='];
 
-        $email = str_replace($symbols, '.', strtolower($this->to) );
+        $email = str_replace($symbols, '.', strtolower($this->to));
 
-        $filename = date('YmdHis_'). $email;
+        $filename = date('YmdHis_').$email;
 
         // Ensure the emails folder exists in the log folder.
         $path = config_item('log_path');
-        $path = ! empty( $path ) ? $path : APPPATH .'logs/';
-        $path = rtrim($path, '/ ') .'/email/';
+        $path = ! empty($path) ? $path : APPPATH.'logs/';
+        $path = rtrim($path, '/ ').'/email/';
 
-        if (! is_dir($path))
+        if ( ! is_dir($path))
         {
             mkdir($path, 0777, true);
         }
@@ -101,15 +101,15 @@ 
         get_instance()->load->helper('file');
 
         // Write our HTML file out
-        if (! empty($this->html_message) && ! write_file( $path . $filename . '.html', $this->html_message ) )
+        if ( ! empty($this->html_message) && ! write_file($path.$filename.'.html', $this->html_message))
         {
-            throw new \RuntimeException( sprintf( lang('mail.error_html_log'), $path, $filename) );
+            throw new \RuntimeException(sprintf(lang('mail.error_html_log'), $path, $filename));
         }
 
         // Write our TEXT file out
-        if (! empty($this->text_message) && ! write_file( $path . $filename . '.txt', $this->text_message ) )
+        if ( ! empty($this->text_message) && ! write_file($path.$filename.'.txt', $this->text_message))
         {
-            throw new \RuntimeException( sprintf( lang('mail.error_text_log'), $path, $filename) );
+            throw new \RuntimeException(sprintf(lang('mail.error_text_log'), $path, $filename));
         }
 
         return true;
@@ -125,7 +125,7 @@ 
      * @param string    $newname        If you'd like to rename the file for delivery
      * @param string    $mime           Custom defined mime type.
      */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null)
+    public function attach($filename, $disposition = null, $newname = null, $mime = null)
     {
         return;
     }
@@ -174,9 +174,9 @@ 
      * @param null $name
      * @return mixed
      */
-    public function from($email, $name=null)
+    public function from($email, $name = null)
     {
-        if (! empty($name))
+        if ( ! empty($name))
         {
             $this->from = [$email, $name];
         }
@@ -226,9 +226,9 @@ 
      * @param $email
      * @return mixed
      */
-    public function reply_to($email, $name=null)
+    public function reply_to($email, $name = null)
     {
-        if (! empty($name))
+        if ( ! empty($name))
         {
             $this->reply_to = [$email, $name];
         }
@@ -309,7 +309,7 @@ 
      * @param bool $clear_attachments
      * @return mixed
      */
-    public function reset($clear_attachments=true)
+    public function reset($clear_attachments = true)
     {
         $this->to = null;
         $this->from = null;

myth/Mail/Mail.php

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;
     }

myth/Mail/MailServiceInterface.php

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
      *
      * @return mixed
      */
-    public function send($clear_after=true);
+    public function send($clear_after = true);
 
     //--------------------------------------------------------------------
 
@@ -61,7 +61,7 @@ 
      * @param string    $newname        If you'd like to rename the file for delivery
      * @param string    $mime           Custom defined mime type.
      */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null);
+    public function attach($filename, $disposition = null, $newname = null, $mime = null);
 
     //--------------------------------------------------------------------
 
@@ -97,7 +97,7 @@ 
      * @param null $name
      * @return mixed
      */
-    public function from($email, $name=null);
+    public function from($email, $name = null);
 
     //--------------------------------------------------------------------
 
@@ -128,7 +128,7 @@ 
      * @param $name
      * @return mixed
      */
-    public function reply_to($email, $name=null);
+    public function reply_to($email, $name = null);
 
     //--------------------------------------------------------------------
 
@@ -180,7 +180,7 @@ 
      * @param bool $clear_attachments
      * @return mixed
      */
-    public function reset($clear_attachments=true);
+    public function reset($clear_attachments = true);
 
     //--------------------------------------------------------------------
 }

myth/Modules.php

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;
 

myth/Route.php

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;