ci-bonfire / Sprint

myth/Forensics/Console.php

Spacing +6 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
 	*/
 	public static function init() 
 	{
-		self::$ci =& get_instance();
+		self::$ci = & get_instance();
 	}
 	
 	//--------------------------------------------------------------------
@@ -105,7 +105,7 @@ 
 		Parameters:
 			$data	- The variable to log.
 	*/
-	public static function log($data=null) 
+	public static function log($data = null) 
 	{
 		if ($data !== 0 && empty($data)) 
 		{ 
@@ -131,7 +131,7 @@ 
 			$object	- The object to store the memory usage of.
 			$name	- The name to be displayed in the console.
 	*/
-	public static function logMemory($object=false, $name='PHP')
+	public static function logMemory($object = false, $name = 'PHP')
 	{
 		$memory = memory_get_usage();
 		
@@ -182,15 +182,15 @@ 
 	// !PRIVATE METHODS
 	//--------------------------------------------------------------------
 	
-	protected static function addToConsole($log=null, $item=null)
+	protected static function addToConsole($log = null, $item = null)
 	{
 		if (empty($log) || empty($item)) 
 		{ 
 			return;
 		}
 		
-		self::$logs['console'][]	= $item;
-		self::$logs[$log] 			+= 1;
+		self::$logs['console'][] = $item;
+		self::$logs[$log] += 1;
 	}
 	
 	//--------------------------------------------------------------------

myth/Forensics/Profiler.php

Spacing +12 added lines, -12 removed lines

@@ -81,20 +81,20 @@ 
 										'view_data'
 										);
 
-	protected $_sections = array();		// Stores _compile_x() results
+	protected $_sections = array(); // Stores _compile_x() results
 
-	protected $_query_toggle_count 	= 25;
+	protected $_query_toggle_count = 25;
 
 	// --------------------------------------------------------------------
 
 	public function __construct($config = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		$this->CI->load->language('profiler');
 
 		// If the config file has a query_toggle_count,
 		// use it, but remove it from the config array.
-		if ( isset($config['query_toggle_count']) )
+		if (isset($config['query_toggle_count']))
 		{
 			$this->_query_toggle_count = (int) $config['query_toggle_count'];
 			unset($config['query_toggle_count']);
@@ -195,7 +195,7 @@ 
 		// Let's determine which databases are currently connected to
 		foreach (get_object_vars($this->CI) as $CI_object)
 		{
-			if (is_object($CI_object) && is_subclass_of(get_class($CI_object), 'CI_DB') )
+			if (is_object($CI_object) && is_subclass_of(get_class($CI_object), 'CI_DB'))
 			{
 				$dbs[] = $CI_object;
 			}
@@ -229,7 +229,7 @@ 
 
 					foreach ($highlight as $bold)
 					{
-						$val = str_replace($bold, '<b>'. $bold .'</b>', $val);
+						$val = str_replace($bold, '<b>'.$bold.'</b>', $val);
 					}
 
 					$output[][$time] = $val;
@@ -268,7 +268,7 @@ 
 			{
 				if (is_array($val))
 				{
-					$output[$key] = "<pre>" . htmlspecialchars(stripslashes(print_r($val, true))) . "</pre>";
+					$output[$key] = "<pre>".htmlspecialchars(stripslashes(print_r($val, true)))."</pre>";
 				}
 				else
 				{
@@ -306,11 +306,11 @@ 
 
 				if (is_array($val))
 				{
-					$output['&#36;_POST['. $key .']'] = '<pre>'. htmlspecialchars(stripslashes(print_r($val, TRUE))) . '</pre>';
+					$output['&#36;_POST['.$key.']'] = '<pre>'.htmlspecialchars(stripslashes(print_r($val, TRUE))).'</pre>';
 				}
 				else
 				{
-					$output['&#36;_POST['. $key .']'] = htmlspecialchars(stripslashes($val));
+					$output['&#36;_POST['.$key.']'] = htmlspecialchars(stripslashes($val));
 				}
 			}
 		}
@@ -366,7 +366,7 @@ 
 	{
 		if (function_exists('memory_get_usage') && ($usage = memory_get_usage()) != '')
 		{
-			$output = number_format($usage) .' bytes';
+			$output = number_format($usage).' bytes';
 		}
 		else
 		{
@@ -389,10 +389,10 @@ 
 	{
 		$output = array();
 
-		foreach (array('HTTP_ACCEPT', 'HTTP_USER_AGENT', 'HTTP_CONNECTION', 'SERVER_PORT', 'SERVER_NAME', 'REMOTE_ADDR', 'SERVER_SOFTWARE', 'HTTP_ACCEPT_LANGUAGE', 'SCRIPT_NAME', 'REQUEST_METHOD',' HTTP_HOST', 'REMOTE_HOST', 'CONTENT_TYPE', 'SERVER_PROTOCOL', 'QUERY_STRING', 'HTTP_ACCEPT_ENCODING', 'HTTP_X_FORWARDED_FOR') as $header)
+		foreach (array('HTTP_ACCEPT', 'HTTP_USER_AGENT', 'HTTP_CONNECTION', 'SERVER_PORT', 'SERVER_NAME', 'REMOTE_ADDR', 'SERVER_SOFTWARE', 'HTTP_ACCEPT_LANGUAGE', 'SCRIPT_NAME', 'REQUEST_METHOD', ' HTTP_HOST', 'REMOTE_HOST', 'CONTENT_TYPE', 'SERVER_PROTOCOL', 'QUERY_STRING', 'HTTP_ACCEPT_ENCODING', 'HTTP_X_FORWARDED_FOR') as $header)
 		{
 			$val = (isset($_SERVER[$header])) ? $_SERVER[$header] : '';
-			$output[$header] =  $val;
+			$output[$header] = $val;
 		}
 
 		return $output;

myth/Forensics/views/profiler_template.php

Spacing +2 added lines, -2 removed lines

@@ -196,7 +196,7 @@ 
 				Load Time
 			</a>
 			<a href="#" id="ci-profiler-menu-memory" onclick="ci_profiler_bar.show('ci-profiler-memory', 'ci-profiler-menu-memory'); return false;">
-				<span><?php echo (! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage()/1024/1024, 2).' MB' ?></span>
+				<span><?php echo ( ! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage() / 1024 / 1024, 2).' MB' ?></span>
 				Memory Used
 			</a>
 		<?php endif; ?>
@@ -384,7 +384,7 @@ 
 
 					<?php $append = ($section == 'get' || $section == 'post') ? '_data' : '' ?>
 					<a href="#" onclick="ci_profiler_bar.toggle_data_table('<?php echo $section ?>'); return false;">
-						<h2><?php echo lang('profiler_' . $section . $append) ?></h2>
+						<h2><?php echo lang('profiler_'.$section.$append) ?></h2>
 					</a>
 
 

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