kenjis / ci-phpunit-test

application/libraries/Seeder.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
 	public function __construct()
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		$this->CI->load->database();
 		$this->CI->load->dbforge();
 		$this->db = $this->CI->db;
@@ -30,7 +30,7 @@ 
 	 */
 	public function call($seeder)
 	{
-		$file = APPPATH . 'database/seeds/' . $seeder . '.php';
+		$file = APPPATH.'database/seeds/'.$seeder.'.php';
 		require_once $file;
 		$obj = new $seeder;
 		$obj->run();

application/tests/Bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  */
 // This is needed for @runInSeparateProcess
-if (! defined('ENVIRONMENT'))
+if ( ! defined('ENVIRONMENT'))
 {
 	define('ENVIRONMENT', 'testing');
 }
@@ -327,7 +327,7 @@ 
  *  Added for CI PHPUnit Test
  * -------------------------------------------------------------------
  */
-require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php';
+require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php';
 CIPHPUnitTest::init();
 /*
  * Or you can set directories for autoloading

Braces +9 added lines, -18 removed lines

@@ -80,8 +80,7 @@ 
 		if (version_compare(PHP_VERSION, '5.3', '>='))
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
-		else
+		} else
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
 		}
@@ -204,8 +203,7 @@ 
 	if (($_temp = realpath($system_path)) !== FALSE)
 	{
 		$system_path = $_temp.DIRECTORY_SEPARATOR;
-	}
-	else
+	} else
 	{
 		// Ensure there's a trailing slash
 		$system_path = strtr(
@@ -247,8 +245,7 @@ 
 		if (($_temp = realpath($application_folder)) !== FALSE)
 		{
 			$application_folder = $_temp;
-		}
-		else
+		} else
 		{
 			$application_folder = strtr(
 				rtrim($application_folder, '/\\'),
@@ -256,16 +253,14 @@ 
 				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 			);
 		}
-	}
-	elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+	} elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 	{
 		$application_folder = BASEPATH.strtr(
 			trim($application_folder, '/\\'),
 			'/\\',
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 		);
-	}
-	else
+	} else
 	{
 		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
@@ -278,14 +273,12 @@ 
 	if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
 	{
 		$view_folder = APPPATH.'views';
-	}
-	elseif (is_dir($view_folder))
+	} elseif (is_dir($view_folder))
 	{
 		if (($_temp = realpath($view_folder)) !== FALSE)
 		{
 			$view_folder = $_temp;
-		}
-		else
+		} else
 		{
 			$view_folder = strtr(
 				rtrim($view_folder, '/\\'),
@@ -293,16 +286,14 @@ 
 				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 			);
 		}
-	}
-	elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+	} elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 	{
 		$view_folder = APPPATH.strtr(
 			trim($view_folder, '/\\'),
 			'/\\',
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 		);
-	}
-	else
+	} else
 	{
 		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 		echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;

application/tests/_ci_phpunit_test/CIPHPUnitTestAutoloader.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 	{
 		if (in_array($class, $this->alias))
 		{
-			$dir = __DIR__ . '/alias';
+			$dir = __DIR__.'/alias';
 			$this->loadClassFile($dir, $class);
 		}
 	}
@@ -88,7 +88,7 @@ 
 		}
 		else
 		{
-			$dir = __DIR__ . '/exceptions';
+			$dir = __DIR__.'/exceptions';
 			$this->loadClassFile($dir, $class);
 		}
 	}
@@ -129,7 +129,7 @@ 
 
 	protected function loadClassFile($dir, $class)
 	{
-		$class_file = $dir . '/' . $class . '.php';
+		$class_file = $dir.'/'.$class.'.php';
 		if (file_exists($class_file))
 		{
 			require $class_file;

Braces +3 added lines, -6 removed lines

@@ -43,8 +43,7 @@ 
 				APPPATH.'controllers',
 				APPPATH.'modules',
 			];
-		}
-		else
+		} else
 		{
 			$this->dirs = $dirs;
 		}
@@ -85,8 +84,7 @@ 
 		{
 			$dir = __DIR__;
 			$this->loadClassFile($dir, $class);
-		}
-		else
+		} else
 		{
 			$dir = __DIR__ . '/exceptions';
 			$this->loadClassFile($dir, $class);
@@ -151,8 +149,7 @@ 
 			{
 				require $filename;
 				return true;
-			}
-			else
+			} else
 			{
 				unset($this->cache[$class]);
 			}

application/tests/_ci_phpunit_test/CIPHPUnitTestFileCache.php

Spacing +3 added lines, -3 removed lines

@@ -24,18 +24,18 @@
 		}
 
 		$dir = dirname($this->file);
-		if (! is_dir($dir))
+		if ( ! is_dir($dir))
 		{
 			if (@mkdir($dir, 0777, true) === false)
 			{
-				throw new RuntimeException('Failed to create folder: ' . $dir);
+				throw new RuntimeException('Failed to create folder: '.$dir);
 			}
 		}
 
 		if (file_put_contents($this->file, '') === false)
 		{
 			throw new RuntimeException(
-				'Failed to write to cache file: ' . $this->file
+				'Failed to write to cache file: '.$this->file
 			);
 		}
 	}

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 		{
 			$patched = true;
 			$new_source = static::generateNewSource($source);
-		}
-		else
+		} else
 		{
 			$new_source = $source;
 		}

application/tests/_ci_phpunit_test/CIPHPUnitTestReflection.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 		$ref_method->setAccessible(true);
 		$obj = (gettype($obj) === 'object') ? $obj : null;
 
-		return function () use ($obj, $ref_method) {
+		return function() use ($obj, $ref_method) {
 			$args = func_get_args();
 			return $ref_method->invokeArgs($obj, $args);
 		};

application/tests/_ci_phpunit_test/CIPHPUnitTestRequest.php

Braces +2 added lines, -4 removed lines

@@ -129,8 +129,7 @@ 
 				return $this->callControllerMethod(
 					$http_method, $argv, $params
 				);
-			}
-			else
+			} else
 			{
 				return $this->requestUri($http_method, $argv, $params);
 			}
@@ -141,8 +140,7 @@ 
 			if ($e->getCode() === 0)
 			{
 				set_status_header(200);
-			}
-			else
+			} else
 			{
 				set_status_header($e->getCode());
 			}

Spacing +9 added lines, -9 removed lines

@@ -95,7 +95,7 @@ 
 	public function enableHooks()
 	{
 		$this->enableHooks = true;
-		$this->hooks =& load_class('Hooks', 'core');
+		$this->hooks = & load_class('Hooks', 'core');
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 			{
 				set_status_header($e->getCode());
 			}
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->output->_status['redirect'] = $e->getMessage();
 		}
 		// show_404()
@@ -197,17 +197,17 @@ 
 		$this->setRawInputStream($request_params);
 
 		// 404 checking
-		if (! class_exists($class) || ! method_exists($class, $method))
+		if ( ! class_exists($class) || ! method_exists($class, $method))
 		{
 			// If 404, CodeIgniter instance is not created yet. So create it here
 			// Because we need CI->output->_status to store info
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ($CI === null)
 			{
 				new CI_Controller();
 			}
 
-			show_404($class.'::'.$method . '() is not found');
+			show_404($class.'::'.$method.'() is not found');
 		}
 
 		$params = $argv;
@@ -266,7 +266,7 @@ 
 	{
 		if (is_string($string))
 		{
-			$INPUT =& load_class('Input', 'core');
+			$INPUT = & load_class('Input', 'core');
 			CIPHPUnitTestReflection::setPrivateProperty(
 				$INPUT,
 				'_raw_input_stream',
@@ -290,7 +290,7 @@ 
 
 		// Create controller
 		$controller = new $class;
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// Set CodeIgniter instance to TestCase
 		$this->testCase->setCI($CI);
@@ -330,8 +330,8 @@ 
 	 */
 	public function getStatus()
 	{
-		$CI =& get_instance();
-		if (! isset($CI->output->_status))
+		$CI = & get_instance();
+		if ( ! isset($CI->output->_status))
 		{
 			throw new LogicException('Status code is not set. You must call $this->request() first');
 		}

application/tests/_ci_phpunit_test/CIPHPUnitTestRouter.php

Braces +2 added lines, -4 removed lines

@@ -29,16 +29,14 @@
 		if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
 		{
 			$e404 = TRUE;
-		}
-		else
+		} else
 		{
 			require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
 
 			if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
 			{
 				$e404 = TRUE;
-			}
-			elseif (method_exists($class, '_remap'))
+			} elseif (method_exists($class, '_remap'))
 			{
 				$params = array($method, array_slice($URI->rsegments, 2));
 				$method = '_remap';

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 	 */
 	public function getRoute()
 	{
-		$RTR =& load_class('Router', 'core');
-		$URI =& load_class('URI', 'core');
+		$RTR = & load_class('Router', 'core');
+		$URI = & load_class('URI', 'core');
 
 		$e404 = FALSE;
 		$class = ucfirst($RTR->class);
@@ -57,7 +57,7 @@ 
 		{
 			// If 404, CodeIgniter instance is not created yet. So create it here.
 			// Because we need $this->CI->output->_status
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ($CI === null)
 			{
 				new CI_Controller();

application/tests/_ci_phpunit_test/CIPHPUnitTestSuperGlobal.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 				// Set $_GET if URI string has query string
 				parse_str($query_string, $_GET);
 				// Remove query string from URI string
-				$argv = substr($argv, 0, -strlen($query_string)-1);
+				$argv = substr($argv, 0, -strlen($query_string) - 1);
 			}
 		}
 
@@ -64,12 +64,12 @@ 
 		if ($_GET !== [])
 		{
 			$_SERVER['REQUEST_URI'] =
-				'/' . $path . '?'
+				'/'.$path.'?'
 				. http_build_query($_GET);
 		}
 		else
 		{
-			$_SERVER['REQUEST_URI'] = '/' . $path;
+			$_SERVER['REQUEST_URI'] = '/'.$path;
 		}
 	}
 
@@ -86,7 +86,7 @@ 
 
 		if ($query_string === false)
 		{
-			throw new LogicException('Bad URI string: ' . $uri);
+			throw new LogicException('Bad URI string: '.$uri);
 		}
 
 		return $query_string;
@@ -111,7 +111,7 @@ 
 		}
 		else
 		{
-			$key = 'HTTP_' . $normalized_name;
+			$key = 'HTTP_'.$normalized_name;
 		}
 
 		$_SERVER[$key] = $value;

Braces +3 added lines, -6 removed lines

@@ -54,8 +54,7 @@ 
 		if (is_string($argv))
 		{
 			$path = $argv;
-		}
-		elseif (is_array($argv))
+		} elseif (is_array($argv))
 		{
 			// Generate URI path from array of controller, method, arg, ...
 			$path = implode('/', $argv);
@@ -66,8 +65,7 @@ 
 			$_SERVER['REQUEST_URI'] =
 				'/' . $path . '?'
 				. http_build_query($_GET);
-		}
-		else
+		} else
 		{
 			$_SERVER['REQUEST_URI'] = '/' . $path;
 		}
@@ -108,8 +106,7 @@ 
 		)
 		{
 			$key = $normalized_name;
-		}
-		else
+		} else
 		{
 			$key = 'HTTP_' . $normalized_name;
 		}

application/tests/_ci_phpunit_test/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -9,10 +9,10 @@ 
  */
 
 // Autoloader for ci-phpunit-test
-require __DIR__ . '/CIPHPUnitTestAutoloader.php';
-require __DIR__ . '/CIPHPUnitTestFileCache.php';
+require __DIR__.'/CIPHPUnitTestAutoloader.php';
+require __DIR__.'/CIPHPUnitTestFileCache.php';
 $cache = new CIPHPUnitTestFileCache(
-	__DIR__ . '/tmp/cache/autoload.php'
+	__DIR__.'/tmp/cache/autoload.php'
 );
 $autoload_dirs = CIPHPUnitTest::getAutoloadDirs();
 $autoloader = new CIPHPUnitTestAutoloader($cache, $autoload_dirs);
@@ -20,5 +20,5 @@ 
 
 // Register CodeIgniter's tests/mocks/autoloader.php
 define('SYSTEM_PATH', BASEPATH);
-require APPPATH .'tests/mocks/autoloader.php';
+require APPPATH.'tests/mocks/autoloader.php';
 spl_autoload_register('autoload');