Completed
Push — master ( f35f2b...d07ffd )
by Kenji
13s
created
application/tests/_ci_phpunit_test/replacing/core/old/3.1.7-Loader.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -63,63 +63,63 @@  discard block
 block discarded – undo
63 63
 	 *
64 64
 	 * @var	array
65 65
 	 */
66
-	protected $_ci_view_paths =	array(VIEWPATH	=> TRUE);
66
+	protected $_ci_view_paths = array(VIEWPATH	=> TRUE);
67 67
 
68 68
 	/**
69 69
 	 * List of paths to load libraries from
70 70
 	 *
71 71
 	 * @var	array
72 72
 	 */
73
-	protected $_ci_library_paths =	array(APPPATH, BASEPATH);
73
+	protected $_ci_library_paths = array(APPPATH, BASEPATH);
74 74
 
75 75
 	/**
76 76
 	 * List of paths to load models from
77 77
 	 *
78 78
 	 * @var	array
79 79
 	 */
80
-	protected $_ci_model_paths =	array(APPPATH);
80
+	protected $_ci_model_paths = array(APPPATH);
81 81
 
82 82
 	/**
83 83
 	 * List of paths to load helpers from
84 84
 	 *
85 85
 	 * @var	array
86 86
 	 */
87
-	protected $_ci_helper_paths =	array(APPPATH, BASEPATH);
87
+	protected $_ci_helper_paths = array(APPPATH, BASEPATH);
88 88
 
89 89
 	/**
90 90
 	 * List of cached variables
91 91
 	 *
92 92
 	 * @var	array
93 93
 	 */
94
-	protected $_ci_cached_vars =	array();
94
+	protected $_ci_cached_vars = array();
95 95
 
96 96
 	/**
97 97
 	 * List of loaded classes
98 98
 	 *
99 99
 	 * @var	array
100 100
 	 */
101
-	protected $_ci_classes =	array();
101
+	protected $_ci_classes = array();
102 102
 
103 103
 	/**
104 104
 	 * List of loaded models
105 105
 	 *
106 106
 	 * @var	array
107 107
 	 */
108
-	protected $_ci_models =	array();
108
+	protected $_ci_models = array();
109 109
 
110 110
 	/**
111 111
 	 * List of loaded helpers
112 112
 	 *
113 113
 	 * @var	array
114 114
 	 */
115
-	protected $_ci_helpers =	array();
115
+	protected $_ci_helpers = array();
116 116
 
117 117
 	/**
118 118
 	 * List of class name mappings
119 119
 	 *
120 120
 	 * @var	array
121 121
 	 */
122
-	protected $_ci_varmap =	array(
122
+	protected $_ci_varmap = array(
123 123
 		'unit_test' => 'unit',
124 124
 		'user_agent' => 'agent'
125 125
 	);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	public function __construct()
139 139
 	{
140 140
 		$this->_ci_ob_level = ob_get_level();
141
-		$this->_ci_classes =& is_loaded();
141
+		$this->_ci_classes = & is_loaded();
142 142
 
143 143
 		log_message('info', 'Loader Class Initialized');
144 144
 	}
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 			return $this;
280 280
 		}
281 281
 
282
-		$CI =& get_instance();
282
+		$CI = & get_instance();
283 283
 		if (isset($CI->$name))
284 284
 		{
285 285
 			throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name);
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
383 383
 	{
384 384
 		// Grab the super object
385
-		$CI =& get_instance();
385
+		$CI = & get_instance();
386 386
 
387 387
 		// Do we even need to load the database class?
388 388
 		if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 		$CI->db = '';
403 403
 
404 404
 		// Load the DB class
405
-		$CI->db =& DB($params, $query_builder);
405
+		$CI->db = & DB($params, $query_builder);
406 406
 		return $this;
407 407
 	}
408 408
 
@@ -419,12 +419,12 @@  discard block
 block discarded – undo
419 419
 	 */
420 420
 	public function dbutil($db = NULL, $return = FALSE)
421 421
 	{
422
-		$CI =& get_instance();
422
+		$CI = & get_instance();
423 423
 
424 424
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
425 425
 		{
426 426
 			class_exists('CI_DB', FALSE) OR $this->database();
427
-			$db =& $CI->db;
427
+			$db = & $CI->db;
428 428
 		}
429 429
 
430 430
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -453,11 +453,11 @@  discard block
 block discarded – undo
453 453
 	 */
454 454
 	public function dbforge($db = NULL, $return = FALSE)
455 455
 	{
456
-		$CI =& get_instance();
456
+		$CI = & get_instance();
457 457
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
458 458
 		{
459 459
 			class_exists('CI_DB', FALSE) OR $this->database();
460
-			$db =& $CI->db;
460
+			$db = & $CI->db;
461 461
 		}
462 462
 
463 463
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
820 820
 
821 821
 		// Add config file path
822
-		$config =& $this->_ci_get_component('config');
822
+		$config = & $this->_ci_get_component('config');
823 823
 		$config->_config_paths[] = $path;
824 824
 
825 825
 		return $this;
@@ -858,7 +858,7 @@  discard block
 block discarded – undo
858 858
 	 */
859 859
 	public function remove_package_path($path = '')
860 860
 	{
861
-		$config =& $this->_ci_get_component('config');
861
+		$config = & $this->_ci_get_component('config');
862 862
 
863 863
 		if ($path === '')
864 864
 		{
@@ -961,12 +961,12 @@  discard block
 block discarded – undo
961 961
 
962 962
 		// This allows anything loaded using $this->load (views, files, etc.)
963 963
 		// to become accessible from within the Controller and Model functions.
964
-		$_ci_CI =& get_instance();
964
+		$_ci_CI = & get_instance();
965 965
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
966 966
 		{
967 967
 			if ( ! isset($this->$_ci_key))
968 968
 			{
969
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
969
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
970 970
 			}
971 971
 		}
972 972
 
@@ -1099,7 +1099,7 @@  discard block
 block discarded – undo
1099 1099
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
1100 1100
 			}
1101 1101
 
1102
-			$CI =& get_instance();
1102
+			$CI = & get_instance();
1103 1103
 			if (isset($CI->$property))
1104 1104
 			{
1105 1105
 //				log_message('debug', $class.' class already loaded. Second attempt ignored.');
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
1174 1174
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
1175 1175
 			}
1176 1176
 
1177
-			$CI =& get_instance();
1177
+			$CI = & get_instance();
1178 1178
 			if ( ! isset($CI->$property))
1179 1179
 			{
1180 1180
 				return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1322,7 +1322,7 @@  discard block
 block discarded – undo
1322 1322
 		}
1323 1323
 
1324 1324
 		// Don't overwrite existing properties
1325
-		$CI =& get_instance();
1325
+		$CI = & get_instance();
1326 1326
 		if (isset($CI->$object_name))
1327 1327
 		{
1328 1328
 			if ($CI->$object_name instanceof $class_name)
@@ -1473,7 +1473,7 @@  discard block
 block discarded – undo
1473 1473
 	 */
1474 1474
 	protected function &_ci_get_component($component)
1475 1475
 	{
1476
-		$CI =& get_instance();
1476
+		$CI = & get_instance();
1477 1477
 		return $CI->$component;
1478 1478
 	}
1479 1479
 }
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/old/3.1.7-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/replacing/core/old/3.1.7-Input.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -139,17 +139,17 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	public function __construct()
141 141
 	{
142
-		$this->_allow_get_array		= (config_item('allow_get_array') !== FALSE);
143
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
144
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
145
-		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
142
+		$this->_allow_get_array = (config_item('allow_get_array') !== FALSE);
143
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
144
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
145
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
146 146
 
147
-		$this->security =& load_class('Security', 'core');
147
+		$this->security = & load_class('Security', 'core');
148 148
 
149 149
 		// Do we need the UTF-8 class?
150 150
 		if (UTF8_ENABLED === TRUE)
151 151
 		{
152
-			$this->uni =& load_class('Utf8', 'core');
152
+			$this->uni = & load_class('Utf8', 'core');
153 153
 		}
154 154
 
155 155
 		// Sanitize global arrays
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 
430 430
 		// Save cookie in Output object
431 431
 		// added by ci-phpunit-test
432
-		$CI =& get_instance();
432
+		$CI = & get_instance();
433 433
 		$output = $CI->output;
434 434
 		$output->_cookies[$prefix.$name][] = [
435 435
 			'value' => $value,
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/libraries/old/3.1.7-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.
lib/Installer.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
         }
30 30
 
31 31
         for ($i = 1; $i <= $argc; $i++) {
32
-            if (! isset($argv[$i])) {
32
+            if ( ! isset($argv[$i])) {
33 33
                 break;
34 34
             }
35 35
 
@@ -41,20 +41,20 @@  discard block
 block discarded – undo
41 41
 
42 42
                 // php install.php -a application
43 43
                 case '-a':
44
-                    if (is_dir($argv[$i+1])) {
45
-                        $this->app_dir = $argv[$i+1];
44
+                    if (is_dir($argv[$i + 1])) {
45
+                        $this->app_dir = $argv[$i + 1];
46 46
                     } else {
47
-                        throw new Exception('No such directory: '.$argv[$i+1]);
47
+                        throw new Exception('No such directory: '.$argv[$i + 1]);
48 48
                     }
49 49
                     $i++;
50 50
                     break;
51 51
 
52 52
                 // php install.php -p public
53 53
                 case '-p':
54
-                    if (is_dir($argv[$i+1])) {
55
-                        $this->pub_dir = $argv[$i+1];
54
+                    if (is_dir($argv[$i + 1])) {
55
+                        $this->pub_dir = $argv[$i + 1];
56 56
                     } else {
57
-                        throw new Exception('No such directory: '.$argv[$i+1]);
57
+                        throw new Exception('No such directory: '.$argv[$i + 1]);
58 58
                     }
59 59
                     $i++;
60 60
                     break;
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
         $file = $this->app_dir.'/'.$this->test_dir.'/Bootstrap.php';
83 83
         $contents = file_get_contents($file);
84 84
 
85
-        if (! file_exists('system')) {
85
+        if ( ! file_exists('system')) {
86 86
             if (file_exists('vendor/codeigniter/framework/system')) {
87 87
                 $contents = str_replace(
88 88
                     '$system_path = \'../../system\';',
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
             }
95 95
         }
96 96
 
97
-        if (! file_exists('index.php')) {
97
+        if ( ! file_exists('index.php')) {
98 98
             if (file_exists($this->pub_dir.'/index.php')) {
99 99
                 // CodeIgniter 3.0.6 and after
100 100
                 $contents = str_replace(
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
             } else {
168 168
                 $success = copy($file, $dst.'/'.$iterator->getSubPathName());
169 169
                 if ($success) {
170
-                    if (! $this->silent) {
170
+                    if ( ! $this->silent) {
171 171
                         echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
172 172
                     }
173 173
                 }
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/3.x/Patcher/ConstantPatcher/Proxy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			$method = isset($info['class_method']) ? $info['class_method'] : $info['function'];
64 64
 
65 65
 			MonkeyPatchManager::log(
66
-				'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()'
66
+				'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()'
67 67
 			);
68 68
 		}
69 69
 	}
@@ -106,12 +106,12 @@  discard block
 block discarded – undo
106 106
 	{
107 107
 		self::logInvocation($constant);
108 108
 
109
-		if (! empty(self::$patches_to_apply[$constant]))
109
+		if ( ! empty(self::$patches_to_apply[$constant]))
110 110
 		{
111
-			if (! self::checkCalledMethod($constant))
111
+			if ( ! self::checkCalledMethod($constant))
112 112
 			{
113 113
 				MonkeyPatchManager::log(
114
-					'invoke_const: ' . $constant . ' not patched (out of scope)'
114
+					'invoke_const: '.$constant.' not patched (out of scope)'
115 115
 				);
116 116
 				return constant($constant);
117 117
 			}
@@ -119,12 +119,12 @@  discard block
 block discarded – undo
119 119
 
120 120
 		if (array_key_exists($constant, self::$patches))
121 121
 		{
122
-			MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched');
122
+			MonkeyPatchManager::log('invoke_const: '.$constant.' patched');
123 123
 			return self::$patches[$constant];
124 124
 		}
125 125
 
126 126
 		MonkeyPatchManager::log(
127
-			'invoke_const: ' . $constant . ' not patched (no patch)'
127
+			'invoke_const: '.$constant.' not patched (no patch)'
128 128
 		);
129 129
 		return constant($constant);
130 130
 	}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/2.x/Patcher/ConstantPatcher/Proxy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			$method = isset($info['class_method']) ? $info['class_method'] : $info['function'];
64 64
 
65 65
 			MonkeyPatchManager::log(
66
-				'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()'
66
+				'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()'
67 67
 			);
68 68
 		}
69 69
 	}
@@ -106,12 +106,12 @@  discard block
 block discarded – undo
106 106
 	{
107 107
 		self::logInvocation($constant);
108 108
 
109
-		if (! empty(self::$patches_to_apply[$constant]))
109
+		if ( ! empty(self::$patches_to_apply[$constant]))
110 110
 		{
111
-			if (! self::checkCalledMethod($constant))
111
+			if ( ! self::checkCalledMethod($constant))
112 112
 			{
113 113
 				MonkeyPatchManager::log(
114
-					'invoke_const: ' . $constant . ' not patched (out of scope)'
114
+					'invoke_const: '.$constant.' not patched (out of scope)'
115 115
 				);
116 116
 				return constant($constant);
117 117
 			}
@@ -119,12 +119,12 @@  discard block
 block discarded – undo
119 119
 
120 120
 		if (array_key_exists($constant, self::$patches))
121 121
 		{
122
-			MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched');
122
+			MonkeyPatchManager::log('invoke_const: '.$constant.' patched');
123 123
 			return self::$patches[$constant];
124 124
 		}
125 125
 
126 126
 		MonkeyPatchManager::log(
127
-			'invoke_const: ' . $constant . ' not patched (no patch)'
127
+			'invoke_const: '.$constant.' not patched (no patch)'
128 128
 		);
129 129
 		return constant($constant);
130 130
 	}
Please login to merge, or discard this patch.
update.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
  * @link       https://github.com/kenjis/ci-phpunit-test
9 9
  */
10 10
 
11
-require __DIR__ . '/lib/Installer.php';
11
+require __DIR__.'/lib/Installer.php';
12 12
 
13 13
 $installer = new Installer($argv);
14 14
 $installer->update();
Please login to merge, or discard this patch.