Completed
Pull Request — master (#88)
by Kenji
02:55
created
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -31,29 +31,29 @@  discard block
 block discarded – undo
31 31
 		self::$autoload_dirs = $autoload_dirs;
32 32
 
33 33
 		// Load autoloader for ci-phpunit-test
34
-		require __DIR__ . '/autoloader.php';
34
+		require __DIR__.'/autoloader.php';
35 35
 
36 36
 		// Autoloader for PHP-Parser
37 37
 		// Don't use `require`, because we may have required already
38 38
 		// in `patcher/bootstrap.php`
39
-		require_once __DIR__ . '/patcher/third_party/PHP-Parser/lib/bootstrap.php';
39
+		require_once __DIR__.'/patcher/third_party/PHP-Parser/lib/bootstrap.php';
40 40
 
41
-		require APPPATH . '/tests/TestCase.php';
41
+		require APPPATH.'/tests/TestCase.php';
42 42
 
43 43
 		// Replace a few Common functions
44
-		require __DIR__ . '/replacing/core/Common.php';
45
-		require BASEPATH . 'core/Common.php';
44
+		require __DIR__.'/replacing/core/Common.php';
45
+		require BASEPATH.'core/Common.php';
46 46
 
47 47
 		// Workaround for missing CodeIgniter's error handler
48 48
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
49 49
 		set_error_handler('_error_handler');
50 50
 
51 51
 		// Load new functions of CIPHPUnitTest
52
-		require __DIR__ . '/functions.php';
52
+		require __DIR__.'/functions.php';
53 53
 		// Load ci-phpunit-test CI_Loader
54
-		require __DIR__ . '/replacing/core/Loader.php';
54
+		require __DIR__.'/replacing/core/Loader.php';
55 55
 		// Load ci-phpunit-test CI_Input
56
-		require __DIR__ . '/replacing/core/Input.php';
56
+		require __DIR__.'/replacing/core/Input.php';
57 57
 
58 58
 		// Change current directroy
59 59
 		chdir(FCPATH);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		 *
66 66
 		 * And away we go...
67 67
 		 */
68
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
68
+		require __DIR__.'/replacing/core/CodeIgniter.php';
69 69
 
70 70
 		self::replaceHelpers();
71 71
 
@@ -87,11 +87,11 @@  discard block
 block discarded – undo
87 87
 	protected static function replaceLoader()
88 88
 	{
89 89
 		$my_loader_file = 
90
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
90
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
91 91
 
92 92
 		if (file_exists($my_loader_file))
93 93
 		{
94
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
94
+			self::$loader_class = config_item('subclass_prefix').'Loader';
95 95
 			if ( ! class_exists(self::$loader_class))
96 96
 			{
97 97
 				require $my_loader_file;
@@ -102,19 +102,19 @@  discard block
 block discarded – undo
102 102
 
103 103
 	protected static function replaceHelpers()
104 104
 	{
105
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php';
105
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php';
106 106
 		if (file_exists($my_helper_file))
107 107
 		{
108 108
 			require $my_helper_file;
109 109
 		}
110
-		require __DIR__ . '/replacing/helpers/url_helper.php';
110
+		require __DIR__.'/replacing/helpers/url_helper.php';
111 111
 	}
112 112
 
113 113
 	public static function setPatcherCacheDir($dir = null)
114 114
 	{
115 115
 		if ($dir === null)
116 116
 		{
117
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
117
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
118 118
 		}
119 119
 
120 120
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 			return $this->$name;
42 42
 		}
43 43
 
44
-		throw new LogicException('No such property: ' . $name);
44
+		throw new LogicException('No such property: '.$name);
45 45
 	}
46 46
 
47 47
 	public static function setUpBeforeClass()
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	{
62 62
 		reset_instance();
63 63
 		new CI_Controller();
64
-		$this->CI =& get_instance();
64
+		$this->CI = & get_instance();
65 65
 	}
66 66
 
67 67
 	protected function tearDown()
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 		$this->assertSame(
237 237
 			$code,
238 238
 			$actual,
239
-			'Status code is not ' . $code . ' but ' . $actual . '.'
239
+			'Status code is not '.$code.' but '.$actual.'.'
240 240
 		);
241 241
 	}
242 242
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 */
249 249
 	public function assertResponseHeader($name, $value)
250 250
 	{
251
-		$CI =& get_instance();
251
+		$CI = & get_instance();
252 252
 		$actual = $CI->output->get_header($name);
253 253
 
254 254
 		if ($actual === null)
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 	 */
273 273
 	public function assertResponseCookie($name, $value, $allow_duplicate = false)
274 274
 	{
275
-		$CI =& get_instance();
275
+		$CI = & get_instance();
276 276
 		$cookies = isset($CI->output->_cookies[$name])
277 277
 			? $CI->output->_cookies[$name] : null;
278 278
 
@@ -330,18 +330,18 @@  discard block
 block discarded – undo
330 330
 			$this->fail('redirect() is not called.');
331 331
 		}
332 332
 
333
-		if (! function_exists('site_url'))
333
+		if ( ! function_exists('site_url'))
334 334
 		{
335
-			$CI =& get_instance();
335
+			$CI = & get_instance();
336 336
 			$CI->load->helper('url');
337 337
 		}
338 338
 		$absolute_url = site_url($uri);
339
-		$expected = 'Redirect to ' . $absolute_url;
339
+		$expected = 'Redirect to '.$absolute_url;
340 340
 
341 341
 		$this->assertSame(
342 342
 			$expected,
343 343
 			$status['redirect'],
344
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
344
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
345 345
 		);
346 346
 
347 347
 		if ($code !== null)
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 			$this->assertSame(
350 350
 				$code,
351 351
 				$status['code'],
352
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
352
+				'Status code is not '.$code.' but '.$status['code'].'.'
353 353
 			);
354 354
 		}
355 355
 	}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/Input.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -137,17 +137,17 @@  discard block
 block discarded – undo
137 137
 	 */
138 138
 	public function __construct()
139 139
 	{
140
-		$this->_allow_get_array		= (config_item('allow_get_array') === TRUE);
141
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
142
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
143
-		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
140
+		$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
141
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
142
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
143
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
144 144
 
145
-		$this->security =& load_class('Security', 'core');
145
+		$this->security = & load_class('Security', 'core');
146 146
 
147 147
 		// Do we need the UTF-8 class?
148 148
 		if (UTF8_ENABLED === TRUE)
149 149
 		{
150
-			$this->uni =& load_class('Utf8', 'core');
150
+			$this->uni = & load_class('Utf8', 'core');
151 151
 		}
152 152
 
153 153
 		// Sanitize global arrays
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 		// Save cookie in Output object
415 415
 		// added by ci-phpunit-test
416
-		$CI =& get_instance();
416
+		$CI = & get_instance();
417 417
 		$output = $CI->output;
418 418
 		$output->_cookies[$prefix.$name][] = [
419 419
 			'value' => $value,
Please login to merge, or discard this patch.