kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/CIPHPUnitTest.php

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public static function init(array $autoload_dirs = null)
 	{
-		if (! defined('TESTPATH')) {
+		if ( ! defined('TESTPATH')) {
 			define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
 		}
 
@@ -38,38 +38,38 @@ 
 		$cwd_backup = getcwd();
 
 		// Load autoloader for ci-phpunit-test
-		require __DIR__ . '/autoloader.php';
+		require __DIR__.'/autoloader.php';
 
-		require TESTPATH . 'TestCase.php';
+		require TESTPATH.'TestCase.php';
 
-		$db_test_case_file = TESTPATH . 'DbTestCase.php';
+		$db_test_case_file = TESTPATH.'DbTestCase.php';
 		if (is_readable($db_test_case_file))
 		{
 			require $db_test_case_file;
 		}
 
-		$unit_test_case_file = TESTPATH . 'UnitTestCase.php';
+		$unit_test_case_file = TESTPATH.'UnitTestCase.php';
 		if (is_readable($unit_test_case_file))
 		{
 			require $unit_test_case_file;
 		}
 
 		// 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';
 		// Load ci-phpunit-test CI_Output
-		require __DIR__ . '/replacing/core/Output.php';
+		require __DIR__.'/replacing/core/Output.php';
 
 		// Change current directory
 		chdir(FCPATH);
@@ -81,12 +81,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();
 		}
@@ -110,7 +110,7 @@ 
 	 */
 	public static function createCodeIgniterInstance($use_my_controller = false)
 	{
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			if ($use_my_controller && self::hasMyController())
 			{
@@ -135,11 +135,11 @@ 
 		}
 
 		$my_controller_file =
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Controller.php';
+			APPPATH.'core/'.config_item('subclass_prefix').'Controller.php';
 
 		if (file_exists($my_controller_file))
 		{
-			$controller_class = config_item('subclass_prefix') . 'Controller';
+			$controller_class = config_item('subclass_prefix').'Controller';
 			if ( ! class_exists($controller_class))
 			{
 				require $my_controller_file;
@@ -171,11 +171,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;
@@ -194,19 +194,19 @@ 
 
 	protected static function loadHelper($helper)
 	{
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
 		if (file_exists($my_helper_file))
 		{
 			require $my_helper_file;
 		}
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
 	}
 
 	public static function setPatcherCacheDir($dir = null)
 	{
 		if ($dir === null)
 		{
-			$dir = TESTPATH . '_ci_phpunit_test/tmp/cache';
+			$dir = TESTPATH.'_ci_phpunit_test/tmp/cache';
 		}
 
 		MonkeyPatchManager::setCacheDir(

Braces +3 added lines, -6 removed lines

@@ -89,8 +89,7 @@ 
 		if (! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
-		}
-		else
+		} else
 		{
 			new MX_Controller();
 		}
@@ -115,13 +114,11 @@ 
 			if ($use_my_controller && self::hasMyController())
 			{
 				new self::$controller_class;
-			}
-			else
+			} else
 			{
 				new CI_Controller();
 			}
-		}
-		else
+		} else
 		{
 			new CI();
 			new MX_Controller();

application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php

Spacing +14 added lines, -14 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Support PHPUnit 6.0
-if (! class_exists('PHPUnit_Framework_TestCase'))
+if ( ! class_exists('PHPUnit_Framework_TestCase'))
 {
 	class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
 }
@@ -69,7 +69,7 @@ 
 			return $this->$name;
 		}
 
-		throw new LogicException('No such property: ' . $name);
+		throw new LogicException('No such property: '.$name);
 	}
 
 	public static function setUpBeforeClass()
@@ -99,7 +99,7 @@ 
 	{
 		reset_instance();
 		CIPHPUnitTest::createCodeIgniterInstance($use_my_controller);
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 	}
 
 	protected function tearDown()
@@ -172,8 +172,8 @@ 
 		}
 
 		set_error_handler(
-			function ($errno, $errstr, $errfile, $errline) {
-				throw new RuntimeException($errstr . ' on line ' . $errline . ' in file ' . $errfile);
+			function($errno, $errstr, $errfile, $errline) {
+				throw new RuntimeException($errstr.' on line '.$errline.' in file '.$errfile);
 			}
 		);
 
@@ -310,7 +310,7 @@ 
 		$this->assertSame(
 			$code,
 			$actual,
-			'Status code is not ' . $code . ' but ' . $actual . '.'
+			'Status code is not '.$code.' but '.$actual.'.'
 		);
 	}
 
@@ -322,7 +322,7 @@ 
 	 */
 	public function assertResponseHeader($name, $value)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$actual = $CI->output->get_header($name);
 
 		if ($actual === null)
@@ -346,7 +346,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;
 
@@ -414,23 +414,23 @@ 
 			$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');
 		}
 
-		if (! preg_match('#^(\w+:)?//#i', $uri))
+		if ( ! preg_match('#^(\w+:)?//#i', $uri))
 		{
 			$uri = site_url($uri);
 		}
 		$absolute_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)
@@ -438,7 +438,7 @@ 
 			$this->assertSame(
 				$code,
 				$status['code'],
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
+				'Status code is not '.$code.' but '.$status['code'].'.'
 			);
 		}
 	}