kenjis / ci-phpunit-test

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

Spacing +10 added lines, -10 removed lines

@@ -41,7 +41,7 @@ 
 			return $this->$name;
 		}
 
-		throw new LogicException('No such property: ' . $name);
+		throw new LogicException('No such property: '.$name);
 	}
 
 	public static function setUpBeforeClass()
@@ -61,7 +61,7 @@ 
 	{
 		reset_instance();
 		new CI_Controller();
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 	}
 
 	protected function tearDown()
@@ -236,7 +236,7 @@ 
 		$this->assertSame(
 			$code,
 			$actual,
-			'Status code is not ' . $code . ' but ' . $actual . '.'
+			'Status code is not '.$code.' but '.$actual.'.'
 		);
 	}
 
@@ -248,7 +248,7 @@ 
 	 */
 	public function assertResponseHeader($name, $value)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$actual = $CI->output->get_header($name);
 
 		if ($actual === null)
@@ -272,7 +272,7 @@ 
 	 */
 	public function assertResponseCookie($name, $value, $allow_duplicate = false)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$cookies = isset($CI->output->_cookies[$name])
 			? $CI->output->_cookies[$name] : null;
 
@@ -330,18 +330,18 @@ 
 			$this->fail('redirect() is not called.');
 		}
 
-		if (! function_exists('site_url'))
+		if ( ! function_exists('site_url'))
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->load->helper('url');
 		}
 		$absolute_url = site_url($uri);
-		$expected = 'Redirect to ' . $absolute_url;
+		$expected = 'Redirect to '.$absolute_url;
 
 		$this->assertSame(
 			$expected,
 			$status['redirect'],
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
 		);
 
 		if ($code !== null)
@@ -349,7 +349,7 @@ 
 			$this->assertSame(
 				$code,
 				$status['code'],
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
+				'Status code is not '.$code.' but '.$status['code'].'.'
 			);
 		}
 	}

application/tests/_ci_phpunit_test/CIPHPUnitTest.php

Spacing +16 added lines, -16 removed lines

@@ -31,29 +31,29 @@ 
 		self::$autoload_dirs = $autoload_dirs;
 
 		// Load autoloader for ci-phpunit-test
-		require __DIR__ . '/autoloader.php';
+		require __DIR__.'/autoloader.php';
 
 		// Autoloader for PHP-Parser
 		// Don't use `require`, because we may have required already
 		// in `patcher/bootstrap.php`
-		require_once __DIR__ . '/patcher/third_party/PHP-Parser/lib/bootstrap.php';
+		require_once __DIR__.'/patcher/third_party/PHP-Parser/lib/bootstrap.php';
 
-		require APPPATH . '/tests/TestCase.php';
+		require APPPATH.'/tests/TestCase.php';
 
 		// Replace a few Common functions
-		require __DIR__ . '/replacing/core/Common.php';
-		require BASEPATH . 'core/Common.php';
+		require __DIR__.'/replacing/core/Common.php';
+		require BASEPATH.'core/Common.php';
 
 		// Workaround for missing CodeIgniter's error handler
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
 		set_error_handler('_error_handler');
 
 		// Load new functions of CIPHPUnitTest
-		require __DIR__ . '/functions.php';
+		require __DIR__.'/functions.php';
 		// Load ci-phpunit-test CI_Loader
-		require __DIR__ . '/replacing/core/Loader.php';
+		require __DIR__.'/replacing/core/Loader.php';
 		// Load ci-phpunit-test CI_Input
-		require __DIR__ . '/replacing/core/Input.php';
+		require __DIR__.'/replacing/core/Input.php';
 
 		// Change current directroy
 		chdir(FCPATH);
@@ -65,12 +65,12 @@ 
 		 *
 		 * And away we go...
 		 */
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
+		require __DIR__.'/replacing/core/CodeIgniter.php';
 
 		self::replaceHelpers();
 
 		// Create CodeIgniter instance
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
 		}
@@ -88,7 +88,7 @@ 
 
 	public static function createCodeIgniterInstance()
 	{
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
 		}
@@ -117,11 +117,11 @@ 
 	protected static function replaceLoader()
 	{
 		$my_loader_file = 
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
 
 		if (file_exists($my_loader_file))
 		{
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
+			self::$loader_class = config_item('subclass_prefix').'Loader';
 			if ( ! class_exists(self::$loader_class))
 			{
 				require $my_loader_file;
@@ -132,19 +132,19 @@ 
 
 	protected static function replaceHelpers()
 	{
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php';
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php';
 		if (file_exists($my_helper_file))
 		{
 			require $my_helper_file;
 		}
-		require __DIR__ . '/replacing/helpers/url_helper.php';
+		require __DIR__.'/replacing/helpers/url_helper.php';
 	}
 
 	public static function setPatcherCacheDir($dir = null)
 	{
 		if ($dir === null)
 		{
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
 		}
 
 		MonkeyPatchManager::setCacheDir(

Braces +2 added lines, -4 removed lines

@@ -47,8 +47,7 @@ 
 					? $backtrace[$offset+2]['class']
 					: null;
 			$function = $backtrace[$offset+2]['function'];
-		}
-		else
+		} else
 		{
 			$class = null;
 			$function = null;
@@ -59,8 +58,7 @@ 
 			$method = $function;
 			$class_method = $class . '::' . $function;
 			$function = null;
-		}
-		else
+		} else
 		{
 			$method = null;
 			$class_method = null;