Completed
Pull Request — master (#271)
by Kenji
02:21
created
application/tests/_ci_phpunit_test/replacing/core/old/3.1.8-CodeIgniter.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  *  Start the timer... tick tock tick tock...
186 186
  * ------------------------------------------------------
187 187
  */
188
-	$BM =& load_class('Benchmark', 'core');
188
+	$BM = & load_class('Benchmark', 'core');
189 189
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
190 190
 	$BM->mark('total_execution_time_start');
191 191
 	$BM->mark('loading_time:_base_classes_start');
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
  *  Instantiate the hooks class
196 196
  * ------------------------------------------------------
197 197
  */
198
-	$EXT =& load_class('Hooks', 'core');
198
+	$EXT = & load_class('Hooks', 'core');
199 199
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
200 200
 
201 201
 /*
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
  * depending on another class that uses it.
216 216
  *
217 217
  */
218
-	$CFG =& load_class('Config', 'core');
218
+	$CFG = & load_class('Config', 'core');
219 219
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
220 220
 
221 221
 	// Do we have any manually set config items in the index.php file?
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
  *  Instantiate the UTF-8 class
295 295
  * ------------------------------------------------------
296 296
  */
297
-	$UNI =& load_class('Utf8', 'core');
297
+	$UNI = & load_class('Utf8', 'core');
298 298
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
299 299
 
300 300
 /*
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
  *  Instantiate the URI class
303 303
  * ------------------------------------------------------
304 304
  */
305
-	$URI =& load_class('URI', 'core');
305
+	$URI = & load_class('URI', 'core');
306 306
 	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
307 307
 
308 308
 /*
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
  *  Instantiate the routing class and set the routing
311 311
  * ------------------------------------------------------
312 312
  */
313
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
313
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
314 314
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
315 315
 
316 316
 /*
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
  *  Instantiate the output class
319 319
  * ------------------------------------------------------
320 320
  */
321
-	$OUT =& load_class('Output', 'core');
321
+	$OUT = & load_class('Output', 'core');
322 322
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
323 323
 
324 324
 /*
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
  * Load the security class for xss and csrf support
337 337
  * -----------------------------------------------------
338 338
  */
339
-	$SEC =& load_class('Security', 'core');
339
+	$SEC = & load_class('Security', 'core');
340 340
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
341 341
 
342 342
 /*
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
  *  Load the Input class and sanitize globals
345 345
  * ------------------------------------------------------
346 346
  */
347
-	$IN	=& load_class('Input', 'core');
347
+	$IN = & load_class('Input', 'core');
348 348
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
349 349
 
350 350
 /*
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
  *  Load the Language class
353 353
  * ------------------------------------------------------
354 354
  */
355
-	$LANG =& load_class('Lang', 'core');
355
+	$LANG = & load_class('Lang', 'core');
356 356
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
357 357
 
358 358
 /*
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	 */
376 376
 	function &get_instance()
377 377
 	{
378
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
378
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 379
 		{
380 380
 			return CI_Controller::get_instance();
381 381
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/libraries/old/3.1.8-Upload.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -293,8 +293,8 @@  discard block
 block discarded – undo
293 293
 	{
294 294
 		empty($config) OR $this->initialize($config, FALSE);
295 295
 
296
-		$this->_mimes =& get_mimes();
297
-		$this->_CI =& get_instance();
296
+		$this->_mimes = & get_mimes();
297
+		$this->_CI = & get_instance();
298 298
 
299 299
 		log_message('info', 'Upload Class Initialized');
300 300
 	}
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 			else
481 481
 			{
482 482
 				// An extension was provided, let's have it!
483
-				$this->file_ext	= $this->get_extension($this->_file_name_override);
483
+				$this->file_ext = $this->get_extension($this->_file_name_override);
484 484
 			}
485 485
 
486 486
 			if ( ! $this->is_allowed_filetype(TRUE))
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 		// Convert the file size to kilobytes
494 494
 		if ($this->file_size > 0)
495 495
 		{
496
-			$this->file_size = round($this->file_size/1024, 2);
496
+			$this->file_size = round($this->file_size / 1024, 2);
497 497
 		}
498 498
 
499 499
 		// Is the file size within the allowed maximum?
@@ -818,10 +818,10 @@  discard block
 block discarded – undo
818 818
 			{
819 819
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
820 820
 
821
-				$this->image_width	= $D[0];
822
-				$this->image_height	= $D[1];
823
-				$this->image_type	= isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
824
-				$this->image_size_str	= $D[3]; // string containing height and width
821
+				$this->image_width = $D[0];
822
+				$this->image_height = $D[1];
823
+				$this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
824
+				$this->image_size_str = $D[3]; // string containing height and width
825 825
 			}
826 826
 		}
827 827
 
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 			$this->file_type = 'image/jpeg';
870 870
 		}
871 871
 
872
-		$img_mimes = array('image/gif',	'image/jpeg', 'image/png');
872
+		$img_mimes = array('image/gif', 'image/jpeg', 'image/png');
873 873
 
874 874
 		return in_array($this->file_type, $img_mimes, TRUE);
875 875
 	}
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
1011 1011
 			return FALSE;
1012 1012
 		}
1013 1013
 
1014
-		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/',  $this->upload_path);
1014
+		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path);
1015 1015
 		return TRUE;
1016 1016
 	}
1017 1017
 
@@ -1055,9 +1055,9 @@  discard block
 block discarded – undo
1055 1055
 		$ext = '';
1056 1056
 		if (strpos($filename, '.') !== FALSE)
1057 1057
 		{
1058
-			$parts		= explode('.', $filename);
1059
-			$ext		= '.'.array_pop($parts);
1060
-			$filename	= implode('.', $parts);
1058
+			$parts = explode('.', $filename);
1059
+			$ext = '.'.array_pop($parts);
1060
+			$filename = implode('.', $parts);
1061 1061
 		}
1062 1062
 
1063 1063
 		return substr($filename, 0, ($length - strlen($ext))).$ext;
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/replacing/helpers/old/3.1.8-url_helper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 				ob_end_clean();
106 106
 			}
107 107
 
108
-			throw new CIPHPUnitTestRedirectException('Redirect to ' . $uri, $code);
108
+			throw new CIPHPUnitTestRedirectException('Redirect to '.$uri, $code);
109 109
 		}
110 110
 	}
111 111
 }
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/replacing/helpers/old/3.1.8-download_helper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 			}
102 102
 
103 103
 			// Load the mime types
104
-			$mimes =& get_mimes();
104
+			$mimes = & get_mimes();
105 105
 
106 106
 			// Only change the default MIME if we can find one
107 107
 			if (isset($mimes[$extension]))
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
 		if (ENVIRONMENT === 'testing')
148 148
 		{
149
-			$CI =& get_instance();
149
+			$CI = & get_instance();
150 150
 			$CI->output->set_header('Content-Type: '.$mime);
151 151
 			$CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"');
152 152
 			$CI->output->set_header('Expires: 0');
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 */
22 22
 	public static function init(array $autoload_dirs = null)
23 23
 	{
24
-		if (! defined('TESTPATH')) {
24
+		if ( ! defined('TESTPATH')) {
25 25
 			define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
26 26
 		}
27 27
 
@@ -38,38 +38,38 @@  discard block
 block discarded – undo
38 38
 		$cwd_backup = getcwd();
39 39
 
40 40
 		// Load autoloader for ci-phpunit-test
41
-		require __DIR__ . '/autoloader.php';
41
+		require __DIR__.'/autoloader.php';
42 42
 
43
-		require TESTPATH . 'TestCase.php';
43
+		require TESTPATH.'TestCase.php';
44 44
 
45
-		$db_test_case_file = TESTPATH . 'DbTestCase.php';
45
+		$db_test_case_file = TESTPATH.'DbTestCase.php';
46 46
 		if (is_readable($db_test_case_file))
47 47
 		{
48 48
 			require $db_test_case_file;
49 49
 		}
50 50
 
51
-		$unit_test_case_file = TESTPATH . 'UnitTestCase.php';
51
+		$unit_test_case_file = TESTPATH.'UnitTestCase.php';
52 52
 		if (is_readable($unit_test_case_file))
53 53
 		{
54 54
 			require $unit_test_case_file;
55 55
 		}
56 56
 
57 57
 		// Replace a few Common functions
58
-		require __DIR__ . '/replacing/core/Common.php';
59
-		require BASEPATH . 'core/Common.php';
58
+		require __DIR__.'/replacing/core/Common.php';
59
+		require BASEPATH.'core/Common.php';
60 60
 
61 61
 		// Workaround for missing CodeIgniter's error handler
62 62
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
63 63
 		set_error_handler('_error_handler');
64 64
 
65 65
 		// Load new functions of CIPHPUnitTest
66
-		require __DIR__ . '/functions.php';
66
+		require __DIR__.'/functions.php';
67 67
 		// Load ci-phpunit-test CI_Loader
68
-		require __DIR__ . '/replacing/core/Loader.php';
68
+		require __DIR__.'/replacing/core/Loader.php';
69 69
 		// Load ci-phpunit-test CI_Input
70
-		require __DIR__ . '/replacing/core/Input.php';
70
+		require __DIR__.'/replacing/core/Input.php';
71 71
 		// Load ci-phpunit-test CI_Output
72
-		require __DIR__ . '/replacing/core/Output.php';
72
+		require __DIR__.'/replacing/core/Output.php';
73 73
 
74 74
 		// Change current directory
75 75
 		chdir(FCPATH);
@@ -81,12 +81,12 @@  discard block
 block discarded – undo
81 81
 		 *
82 82
 		 * And away we go...
83 83
 		 */
84
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
84
+		require __DIR__.'/replacing/core/CodeIgniter.php';
85 85
 
86 86
 		self::replaceHelpers();
87 87
 
88 88
 		// Create CodeIgniter instance
89
-		if (! self::wiredesignzHmvcInstalled())
89
+		if ( ! self::wiredesignzHmvcInstalled())
90 90
 		{
91 91
 			new CI_Controller();
92 92
 		}
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	 */
111 111
 	public static function createCodeIgniterInstance($use_my_controller = false)
112 112
 	{
113
-		if (! self::wiredesignzHmvcInstalled())
113
+		if ( ! self::wiredesignzHmvcInstalled())
114 114
 		{
115 115
 			if ($use_my_controller && self::hasMyController())
116 116
 			{
@@ -135,11 +135,11 @@  discard block
 block discarded – undo
135 135
 		}
136 136
 
137 137
 		$my_controller_file =
138
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Controller.php';
138
+			APPPATH.'core/'.config_item('subclass_prefix').'Controller.php';
139 139
 
140 140
 		if (file_exists($my_controller_file))
141 141
 		{
142
-			$controller_class = config_item('subclass_prefix') . 'Controller';
142
+			$controller_class = config_item('subclass_prefix').'Controller';
143 143
 			if ( ! class_exists($controller_class))
144 144
 			{
145 145
 				require $my_controller_file;
@@ -171,11 +171,11 @@  discard block
 block discarded – undo
171 171
 	protected static function replaceLoader()
172 172
 	{
173 173
 		$my_loader_file =
174
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
174
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
175 175
 
176 176
 		if (file_exists($my_loader_file))
177 177
 		{
178
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
178
+			self::$loader_class = config_item('subclass_prefix').'Loader';
179 179
 			if ( ! class_exists(self::$loader_class))
180 180
 			{
181 181
 				require $my_loader_file;
@@ -194,19 +194,19 @@  discard block
 block discarded – undo
194 194
 
195 195
 	protected static function loadHelper($helper)
196 196
 	{
197
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
197
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
198 198
 		if (file_exists($my_helper_file))
199 199
 		{
200 200
 			require $my_helper_file;
201 201
 		}
202
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
202
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
203 203
 	}
204 204
 
205 205
 	public static function setPatcherCacheDir($dir = null)
206 206
 	{
207 207
 		if ($dir === null)
208 208
 		{
209
-			$dir = TESTPATH . '_ci_phpunit_test/tmp/cache';
209
+			$dir = TESTPATH.'_ci_phpunit_test/tmp/cache';
210 210
 		}
211 211
 
212 212
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  */
10 10
 
11 11
 // Support PHPUnit 6.0
12
-if (! class_exists('PHPUnit_Framework_TestCase'))
12
+if ( ! class_exists('PHPUnit_Framework_TestCase'))
13 13
 {
14 14
 	class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
15 15
 }
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 			return $this->$name;
70 70
 		}
71 71
 
72
-		throw new LogicException('No such property: ' . $name);
72
+		throw new LogicException('No such property: '.$name);
73 73
 	}
74 74
 
75 75
 	public static function setUpBeforeClass()
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	{
100 100
 		reset_instance();
101 101
 		CIPHPUnitTest::createCodeIgniterInstance($use_my_controller);
102
-		$this->CI =& get_instance();
102
+		$this->CI = & get_instance();
103 103
 	}
104 104
 
105 105
 	protected function tearDown()
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
172 172
 		}
173 173
 
174 174
 		set_error_handler(
175
-			function ($errno, $errstr, $errfile, $errline) {
176
-				throw new RuntimeException($errstr . ' on line ' . $errline . ' in file ' . $errfile);
175
+			function($errno, $errstr, $errfile, $errline) {
176
+				throw new RuntimeException($errstr.' on line '.$errline.' in file '.$errfile);
177 177
 			}
178 178
 		);
179 179
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 		$this->assertSame(
311 311
 			$code,
312 312
 			$actual,
313
-			'Status code is not ' . $code . ' but ' . $actual . '.'
313
+			'Status code is not '.$code.' but '.$actual.'.'
314 314
 		);
315 315
 	}
316 316
 
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 	 */
323 323
 	public function assertResponseHeader($name, $value)
324 324
 	{
325
-		$CI =& get_instance();
325
+		$CI = & get_instance();
326 326
 		$actual = $CI->output->get_header($name);
327 327
 
328 328
 		if ($actual === null)
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 	 */
347 347
 	public function assertResponseCookie($name, $value, $allow_duplicate = false)
348 348
 	{
349
-		$CI =& get_instance();
349
+		$CI = & get_instance();
350 350
 		$cookies = isset($CI->output->_cookies[$name])
351 351
 			? $CI->output->_cookies[$name] : null;
352 352
 
@@ -414,23 +414,23 @@  discard block
 block discarded – undo
414 414
 			$this->fail('redirect() is not called.');
415 415
 		}
416 416
 
417
-		if (! function_exists('site_url'))
417
+		if ( ! function_exists('site_url'))
418 418
 		{
419
-			$CI =& get_instance();
419
+			$CI = & get_instance();
420 420
 			$CI->load->helper('url');
421 421
 		}
422 422
 
423
-		if (! preg_match('#^(\w+:)?//#i', $uri))
423
+		if ( ! preg_match('#^(\w+:)?//#i', $uri))
424 424
 		{
425 425
 			$uri = site_url($uri);
426 426
 		}
427 427
 		$absolute_url = $uri;
428
-		$expected = 'Redirect to ' . $absolute_url;
428
+		$expected = 'Redirect to '.$absolute_url;
429 429
 
430 430
 		$this->assertSame(
431 431
 			$expected,
432 432
 			$status['redirect'],
433
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
433
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
434 434
 		);
435 435
 
436 436
 		if ($code !== null)
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 			$this->assertSame(
439 439
 				$code,
440 440
 				$status['code'],
441
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
441
+				'Status code is not '.$code.' but '.$status['code'].'.'
442 442
 			);
443 443
 		}
444 444
 	}
Please login to merge, or discard this patch.