kenjis / ci-phpunit-test

application/tests/Bootstrap.php

Switch Indentation +22 added lines, -22 removed lines

@@ -69,28 +69,28 @@
  */
 switch (ENVIRONMENT)
 {
-	case 'testing':
-	case 'development':
-		error_reporting(-1);
-		ini_set('display_errors', 1);
-	break;
-
-	case 'production':
-		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
-		else
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
-		}
-	break;
-
-	default:
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'The application environment is not set correctly.';
-		exit(1); // EXIT_ERROR
+		case 'testing':
+		case 'development':
+			error_reporting(-1);
+			ini_set('display_errors', 1);
+		break;
+
+		case 'production':
+			ini_set('display_errors', 0);
+			if (version_compare(PHP_VERSION, '5.3', '>='))
+			{
+				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+			}
+			else
+			{
+				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
+			}
+		break;
+
+		default:
+			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+			echo 'The application environment is not set correctly.';
+			exit(1); // EXIT_ERROR
 }
 
 /*

Braces +10 added lines, -20 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(
@@ -249,8 +247,7 @@ 
 		if (($_temp = realpath($application_folder)) !== FALSE)
 		{
 			$application_folder = $_temp;
-		}
-		else
+		} else
 		{
 			$application_folder = strtr(
 				rtrim($application_folder, '/\\'),
@@ -258,16 +255,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;
@@ -280,14 +275,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, '/\\'),
@@ -295,16 +288,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;
@@ -317,8 +308,7 @@ 
 	if (is_file(TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR . 'CIPHPUnitTest.php'))
 	{
 		define('CI_PHPUNIT_TESTPATH', TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR);
-	}
-	else
+	} else
 	{
 		// Assume Composer with a vendor directory parallel to the application directory
 		define('CI_PHPUNIT_TESTPATH', implode(

Spacing +4 added lines, -4 removed lines

@@ -243,7 +243,7 @@ 
 	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
 
 	// Path to the test directory containing all the test files.
-	define('TESTPATH', __DIR__.DIRECTORY_SEPARATOR);  // Should be the folder this `Bootstrap.php` file is in.
+	define('TESTPATH', __DIR__.DIRECTORY_SEPARATOR); // Should be the folder this `Bootstrap.php` file is in.
 
 	// Path to the system directory
 	define('BASEPATH', $system_path);
@@ -325,9 +325,9 @@ 
 	define('VIEWPATH', $view_folder.DIRECTORY_SEPARATOR);
 
 	// Path to the ci-phpunit-test directory
-	if (is_file(TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR . 'CIPHPUnitTest.php'))
+	if (is_file(TESTPATH.'_ci_phpunit_test'.DIRECTORY_SEPARATOR.'CIPHPUnitTest.php'))
 	{
-		define('CI_PHPUNIT_TESTPATH', TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR);
+		define('CI_PHPUNIT_TESTPATH', TESTPATH.'_ci_phpunit_test'.DIRECTORY_SEPARATOR);
 	}
 	else
 	{
@@ -388,7 +388,7 @@ 
  * -------------------------------------------------------------------
  */
 
-require CI_PHPUNIT_TESTPATH . '/CIPHPUnitTest.php';
+require CI_PHPUNIT_TESTPATH.'/CIPHPUnitTest.php';
 
 CIPHPUnitTest::init();
 // Or you can set directories for autoloading

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

@@ -44,8 +44,7 @@ 
 				APPPATH.'modules',
 				APPPATH.'hooks',
 			];
-		}
-		else
+		} else
 		{
 			$this->dirs = $dirs;
 		}
@@ -86,8 +85,7 @@ 
 		{
 			$dir = __DIR__;
 			$this->loadClassFile($dir, $class);
-		}
-		else
+		} else
 		{
 			$dir = __DIR__ . '/exceptions';
 			$this->loadClassFile($dir, $class);
@@ -152,8 +150,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

@@ -67,8 +67,7 @@
 		if ($this->offsetExists($key))
 		{
 			return $this->map[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}

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/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 CI->output->_status
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ($CI instanceof CIPHPUnitTestNullCodeIgniter)
 			{
 				CIPHPUnitTest::createCodeIgniterInstance();

application/tests/_ci_phpunit_test/functions.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 		{
 			$CI->db->close();
 			$CI->db = null;
-		}
-		else
+		} else
 		{
 			// Don't close if SQLite in-memory database
 			// If we close it, all tables and stored data will be gone

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
 	reset_config();
 
 	// Close db connection
-	$CI =& get_instance();
+	$CI = & get_instance();
 	if (isset($CI->db))
 	{
 		if (
@@ -52,12 +52,12 @@ 
 	}
 
 	// Load core classes
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
 
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
 	// Do we have any manually set config items in the index.php file?
 	global $assign_to_config;
@@ -69,19 +69,19 @@ 
 		}
 	}
 
-	$UNI =& load_class('URI', 'core');
+	$UNI = & load_class('URI', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
 //	$URI =& load_class('Utf8', 'core');
 //	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
-	$RTR =& load_class('Router', 'core');
+	$RTR = & load_class('Router', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
-	$IN =& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
 
 	CIPHPUnitTest::loadLoader();

application/tests/_ci_phpunit_test/patcher/Cache.php

Spacing +15 added lines, -15 removed lines

@@ -45,17 +45,17 @@ 
 			throw new LogicException("No such directory: $dir");
 		}
 		
-		self::$src_cache_dir = self::$cache_dir . '/src';
+		self::$src_cache_dir = self::$cache_dir.'/src';
 		self::$tmp_function_whitelist_file = 
-			self::$cache_dir . '/conf/func_whiltelist.php';
+			self::$cache_dir.'/conf/func_whiltelist.php';
 		self::$tmp_function_blacklist_file = 
-			self::$cache_dir . '/conf/func_blacklist.php';
+			self::$cache_dir.'/conf/func_blacklist.php';
 		self::$tmp_patcher_list_file = 
-			self::$cache_dir . '/conf/patcher_list.php';
+			self::$cache_dir.'/conf/patcher_list.php';
 		self::$tmp_include_paths_file = 
-			self::$cache_dir . '/conf/include_paths.php';
+			self::$cache_dir.'/conf/include_paths.php';
 		self::$tmp_exclude_paths_file = 
-			self::$cache_dir . '/conf/exclude_paths.php';
+			self::$cache_dir.'/conf/exclude_paths.php';
 	}
 
 	public static function getCacheDir()
@@ -73,16 +73,16 @@ 
 			return false;
 		}
 
-		return self::$src_cache_dir . '/' . $relative_path;
+		return self::$src_cache_dir.'/'.$relative_path;
 	}
 
 	protected static function createDir($dir)
 	{
-		if (! is_dir($dir))
+		if ( ! is_dir($dir))
 		{
-			if (! @mkdir($dir, 0777, true))
+			if ( ! @mkdir($dir, 0777, true))
 			{
-				throw new RuntimeException('Failed to create folder: ' . $dir);
+				throw new RuntimeException('Failed to create folder: '.$dir);
 			}
 		}
 	}
@@ -154,7 +154,7 @@ 
 	public static function appendTmpFunctionBlacklist($function)
 	{
 		file_put_contents(
-			self::getTmpFunctionBlacklistFile(), $function . "\n", FILE_APPEND
+			self::getTmpFunctionBlacklistFile(), $function."\n", FILE_APPEND
 		);
 	}
 
@@ -234,20 +234,20 @@ 
 	{
 		$cache = self::getSrcCacheFilePath($orig_file);
 		@unlink($cache);
-		MonkeyPatchManager::log('remove_src_cache: ' . $cache);
+		MonkeyPatchManager::log('remove_src_cache: '.$cache);
 		return $cache;
 	}
 
 	public static function clearSrcCache()
 	{
 		self::recursiveUnlink(self::$src_cache_dir);
-		MonkeyPatchManager::log('clear_src_cache: cleared ' . self::$src_cache_dir);
+		MonkeyPatchManager::log('clear_src_cache: cleared '.self::$src_cache_dir);
 	}
 
 	public static function clearCache()
 	{
 		self::recursiveUnlink(self::$cache_dir);
-		MonkeyPatchManager::log('clear_cache: cleared ' . self::$cache_dir);
+		MonkeyPatchManager::log('clear_cache: cleared '.self::$cache_dir);
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 	*/
 	protected static function recursiveUnlink($dir)
 	{
-		if (! is_dir($dir))
+		if ( ! is_dir($dir))
 		{
 			return;
 		}

Indentation +4 added lines, -4 removed lines

@@ -251,10 +251,10 @@
 	}
 
 	/**
-	* Recursive Unlink
-	*
-	* @param string $dir
-	*/
+	 * Recursive Unlink
+	 *
+	 * @param string $dir
+	 */
 	protected static function recursiveUnlink($dir)
 	{
 		if (! is_dir($dir))

application/tests/_ci_phpunit_test/patcher/IncludeStream.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	{
 		$this->unwrap();
 
-		MonkeyPatchManager::log('stream_open: ' . $path);
+		MonkeyPatchManager::log('stream_open: '.$path);
 
 		$including = (bool) ($options & self::STREAM_OPEN_FOR_INCLUDE);
 		if ($including && $this->shouldPreprocess($path)) {

application/tests/_ci_phpunit_test/patcher/InvocationVerifier.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 					PHPUnit_Framework_TestCase::assertEquals(
 						$expected_times,
 						$actual_times,
-						$class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.'
+						$class_method.'() expected to be not invoked, but invoked '.$actual_times.' times.'
 					);
 				}
 				elseif ($expected_times === '+')
@@ -62,7 +62,7 @@ 
 					PHPUnit_Framework_TestCase::assertGreaterThanOrEqual(
 						1,
 						$actual_times,
-						$class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.'
+						$class_method.'() expected to be invoked at least one time, but invoked '.$actual_times.' times.'
 					);
 				}
 				else
@@ -70,7 +70,7 @@ 
 					PHPUnit_Framework_TestCase::assertEquals(
 						$expected_times,
 						$actual_times,
-						$class_method . '() expected to be invoked ' . $expected_times . ' times, but invoked ' . $actual_times . ' times.'
+						$class_method.'() expected to be invoked '.$expected_times.' times, but invoked '.$actual_times.' times.'
 					);
 				}
 			}

Braces +4 added lines, -8 removed lines

@@ -31,12 +31,10 @@ 
 				if ($invoked === false)
 				{
 					$actual_times = 0;
-				}
-				elseif ($expected_params === null)
+				} elseif ($expected_params === null)
 				{
 					$actual_times = count($invocations[$class_method]);
-				}
-				else
+				} else
 				{
 					$count = 0;
 					foreach ($invocations[$class_method] as $actual_params)
@@ -56,16 +54,14 @@ 
 						$actual_times,
 						$class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.'
 					);
-				}
-				elseif ($expected_times === '+')
+				} elseif ($expected_times === '+')
 				{
 					PHPUnit_Framework_TestCase::assertGreaterThanOrEqual(
 						1,
 						$actual_times,
 						$class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.'
 					);
-				}
-				else
+				} else
 				{
 					PHPUnit_Framework_TestCase::assertEquals(
 						$expected_times,