Completed
Push — master ( ce859b...64aab5 )
by Kenji
02:48
created
application/tests/_ci_phpunit_test/TestSuiteProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
      */
114 114
     private static function checkConfigurationFile($file)
115 115
     {
116
-        if (!file_exists($file)) {
116
+        if ( ! file_exists($file)) {
117 117
             throw new \RuntimeException("The requested phpunit configuration was not found at $file");
118 118
         }
119 119
 
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/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/core/Common.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 
264 264
 	// Save status code in Output object
265 265
 	// added by ci-phpunit-test
266
-	$CI =& get_instance();
266
+	$CI = & get_instance();
267 267
 	$output = $CI->output;
268 268
 	$output->_status = [
269 269
 		'code'     => $code,
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 	if (empty($_config))
377 377
 	{
378 378
 		// references cannot be directly assigned to static variables, so we use an array
379
-		$_config[0] =& get_config();
379
+		$_config[0] = & get_config();
380 380
 	}
381 381
 
382 382
 	return isset($_config[0][$item]) ? $_config[0][$item] : NULL;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/PathChecker.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,12 +38,12 @@
 block discarded – undo
38 38
 			$real_path = realpath($path);
39 39
 			if ($real_path === FALSE)
40 40
 			{
41
-				throw new RuntimeException($path . ' does not exist?');
41
+				throw new RuntimeException($path.' does not exist?');
42 42
 			}
43 43
 			if (is_dir($real_path))
44 44
 			{
45 45
 				// Must use DIRECTORY_SEPARATOR for Windows
46
-				$real_path = $real_path . DIRECTORY_SEPARATOR;
46
+				$real_path = $real_path.DIRECTORY_SEPARATOR;
47 47
 			}
48 48
 			$new_paths[] = $excluded ? '-'.$real_path : $real_path;
49 49
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestDbTestCase.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	{
36 36
 		if ($this->db === null)
37 37
 		{
38
-			$CI =& get_instance();
38
+			$CI = & get_instance();
39 39
 			$CI->load->database();
40 40
 			$this->db = $CI->db;
41 41
 		}
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 */
55 55
 	protected function tearDown()
56 56
 	{
57
-		if (! empty($this->insertCache))
57
+		if ( ! empty($this->insertCache))
58 58
 		{
59 59
 			foreach ($this->insertCache as $row)
60 60
 			{
Please login to merge, or discard this patch.
application/libraries/Seeder.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public function __construct()
19 19
 	{
20
-		$this->CI =& get_instance();
20
+		$this->CI = & get_instance();
21 21
 		$this->CI->load->database();
22 22
 		$this->CI->load->dbforge();
23 23
 		$this->db = $this->CI->db;
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
 	{
34 34
 		if ($this->seedPath === null)
35 35
 		{
36
-			$this->seedPath = APPPATH . 'database/seeds/';
36
+			$this->seedPath = APPPATH.'database/seeds/';
37 37
 		}
38 38
 
39
-		$file = $this->seedPath . $seeder . '.php';
39
+		$file = $this->seedPath.$seeder.'.php';
40 40
 		require_once $file;
41 41
 
42 42
 		$obj = new $seeder;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/helpers/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/CIPHPUnitTestSuperGlobal.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 		}
43 43
 
44 44
 		// Handle single file
45
-		$file =& $files[$field];
45
+		$file = & $files[$field];
46 46
 
47
-		if (! file_exists($file['tmp_name']))
47
+		if ( ! file_exists($file['tmp_name']))
48 48
 		{
49 49
 			$file['error'] = UPLOAD_ERR_NO_FILE;
50 50
 			$file['type'] = '';
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 				// Set $_GET if URI string has query string
111 111
 				parse_str($query_string, $_GET);
112 112
 				// Remove query string from URI string
113
-				$argv = substr($argv, 0, -strlen($query_string)-1);
113
+				$argv = substr($argv, 0, -strlen($query_string) - 1);
114 114
 			}
115 115
 		}
116 116
 
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 		if ($_GET !== [])
144 144
 		{
145 145
 			$_SERVER['REQUEST_URI'] =
146
-				'/' . $path . '?'
146
+				'/'.$path.'?'
147 147
 				. http_build_query($_GET);
148 148
 		}
149 149
 		else
150 150
 		{
151
-			$_SERVER['REQUEST_URI'] = '/' . $path;
151
+			$_SERVER['REQUEST_URI'] = '/'.$path;
152 152
 		}
153 153
 	}
154 154
 
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
 		if ($query_string === false)
167 167
 		{
168
-			throw new LogicException('Bad URI string: ' . $uri);
168
+			throw new LogicException('Bad URI string: '.$uri);
169 169
 		}
170 170
 
171 171
 		return $query_string;
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		}
191 191
 		else
192 192
 		{
193
-			$key = 'HTTP_' . $normalized_name;
193
+			$key = 'HTTP_'.$normalized_name;
194 194
 		}
195 195
 
196 196
 		$_SERVER[$key] = $value;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/libraries/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.