Completed
Pull Request — master (#336)
by
unknown
02:35 queued 18s
created
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.
application/tests/_ci_phpunit_test/patcher/2.x/MonkeyPatchManager.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
 	public static function log($message)
43 43
 	{
44
-		if (! self::$debug)
44
+		if ( ! self::$debug)
45 45
 		{
46 46
 			return;
47 47
 		}
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 		}
81 81
 		if (is_null(self::$log_file))
82 82
 		{
83
-			self::$log_file = __DIR__ . '/debug.log';
83
+			self::$log_file = __DIR__.'/debug.log';
84 84
 		}
85 85
 	}
86 86
 
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
 		else
94 94
 		{
95 95
 			// APPPATH is constant in CodeIgniter
96
-			Cache::setProjectRootDir(APPPATH . '../');
96
+			Cache::setProjectRootDir(APPPATH.'../');
97 97
 		}
98 98
 
99
-		if (! isset($config['cache_dir']))
99
+		if ( ! isset($config['cache_dir']))
100 100
 		{
101 101
 			throw new LogicException('You have to set "cache_dir"');
102 102
 		}
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
 	protected static function setPaths(array $config)
107 107
 	{
108
-		if (! isset($config['include_paths']))
108
+		if ( ! isset($config['include_paths']))
109 109
 		{
110 110
 			throw new LogicException('You have to set "include_paths"');
111 111
 		}
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		// Updated?
167 167
 		if ($cached !== $current)
168 168
 		{
169
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
169
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
170 170
 			Cache::clearSrcCache();
171 171
 			Cache::writeTmpIncludePaths($current);
172 172
 		}
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 		// Updated?
178 178
 		if ($cached !== $current)
179 179
 		{
180
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
180
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
181 181
 			Cache::clearSrcCache();
182 182
 			Cache::writeTmpExcludePaths($current);
183 183
 		}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		// Updated?
191 191
 		if ($cached !== self::$patcher_list)
192 192
 		{
193
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
193
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
194 194
 			Cache::clearSrcCache();
195 195
 			Cache::writeTmpPatcherList(self::$patcher_list);
196 196
 		}
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 		// Updated?
205 205
 		if ($cached !== $current)
206 206
 		{
207
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
207
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
208 208
 			Cache::clearSrcCache();
209 209
 			Cache::writeTmpFunctionWhitelist($current);
210 210
 		}
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	 */
267 267
 	public static function patch($path)
268 268
 	{
269
-		if (! is_readable($path))
269
+		if ( ! is_readable($path))
270 270
 		{
271 271
 			throw new LogicException("Can't read '$path'");
272 272
 		}
@@ -274,17 +274,17 @@  discard block
 block discarded – undo
274 274
 		// Check cache file
275 275
 		if ($cache_file = Cache::getValidSrcCachePath($path))
276 276
 		{
277
-			self::log('cache_hit: ' . $path);
277
+			self::log('cache_hit: '.$path);
278 278
 			return fopen($cache_file, 'r');
279 279
 		}
280 280
 
281
-		self::log('cache_miss: ' . $path);
281
+		self::log('cache_miss: '.$path);
282 282
 		$source = file_get_contents($path);
283 283
 
284 284
 		list($new_source, $patched) = self::execPatchers($source);
285 285
 
286 286
 		// Write to cache file
287
-		self::log('write_cache: ' . $path);
287
+		self::log('write_cache: '.$path);
288 288
 		Cache::writeSrcCacheFile($path, $new_source);
289 289
 
290 290
 		$resource = fopen('php://memory', 'rb+');
@@ -300,12 +300,12 @@  discard block
 block discarded – undo
300 300
 			return;
301 301
 		}
302 302
 
303
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
304
-		require __DIR__ . '/Patcher/Backtrace.php';
303
+		require __DIR__.'/Patcher/AbstractPatcher.php';
304
+		require __DIR__.'/Patcher/Backtrace.php';
305 305
 
306 306
 		foreach (self::$patcher_list as $classname)
307 307
 		{
308
-			require __DIR__ . '/Patcher/' . $classname . '.php';
308
+			require __DIR__.'/Patcher/'.$classname.'.php';
309 309
 		}
310 310
 
311 311
 		self::$load_patchers = true;
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		$patched = false;
317 317
 		foreach (self::$patcher_list as $classname)
318 318
 		{
319
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
319
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
320 320
 			$patcher = new $classname;
321 321
 			list($source, $patched_this) = $patcher->patch($source);
322 322
 			$patched = $patched || $patched_this;
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.
application/tests/_ci_phpunit_test/patcher/2.x/Patcher/MethodPatcher.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/MethodPatcher/NodeVisitor.php';
14
-require __DIR__ . '/MethodPatcher/PatchManager.php';
13
+require __DIR__.'/MethodPatcher/NodeVisitor.php';
14
+require __DIR__.'/MethodPatcher/PatchManager.php';
15 15
 
16 16
 use LogicException;
17 17
 
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
64 64
 			{
65 65
 				if ($start_method && $token === '{')
66 66
 				{
67
-					if(self::isVoidFunction($tokens, $key)){
68
-						$new_source .= '{ ' . self::CODENORET;
67
+					if (self::isVoidFunction($tokens, $key)) {
68
+						$new_source .= '{ '.self::CODENORET;
69 69
 					}
70
-					else{
71
-						$new_source .= '{ ' . self::CODE;
70
+					else {
71
+						$new_source .= '{ '.self::CODE;
72 72
 					}
73 73
 					$start_method = false;
74 74
 					$replacement['key'] = key(self::$replacement);
@@ -100,22 +100,22 @@  discard block
 block discarded – undo
100 100
 	 * @param $key
101 101
 	 * @return bool
102 102
 	 */
103
-	protected static function isVoidFunction($tokens, $key){
104
-		if($key - 1 <= 0){
103
+	protected static function isVoidFunction($tokens, $key) {
104
+		if ($key - 1 <= 0) {
105 105
 			return false;
106 106
 		}
107 107
 		$token = $tokens[$key - 1];
108
-		if(is_array($token)){
108
+		if (is_array($token)) {
109 109
 			$token = $token[1];
110 110
 		}
111 111
 		//Loop backwards though the start of the function block till you either find "void" or the end of the
112 112
 		//parameters declaration.
113
-		while($token !== ")"){
114
-			if(strpos($token, "void") !== false){
113
+		while ($token !== ")") {
114
+			if (strpos($token, "void") !== false) {
115 115
 				return true;
116 116
 			}
117 117
 			$token = $tokens[$key - 1];
118
-			if(is_array($token)){
118
+			if (is_array($token)) {
119 119
 				$token = $token[1];
120 120
 			}
121 121
 			$key--;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/MethodPatcher.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/MethodPatcher/NodeVisitor.php';
14
-require __DIR__ . '/MethodPatcher/PatchManager.php';
13
+require __DIR__.'/MethodPatcher/NodeVisitor.php';
14
+require __DIR__.'/MethodPatcher/PatchManager.php';
15 15
 
16 16
 use LogicException;
17 17
 
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
64 64
 			{
65 65
 				if ($start_method && $token === '{')
66 66
 				{
67
-					if(self::isVoidFunction($tokens, $key)){
68
-						$new_source .= '{ ' . self::CODENORET;
67
+					if (self::isVoidFunction($tokens, $key)) {
68
+						$new_source .= '{ '.self::CODENORET;
69 69
 					}
70
-					else{
71
-						$new_source .= '{ ' . self::CODE;
70
+					else {
71
+						$new_source .= '{ '.self::CODE;
72 72
 					}
73 73
 					$start_method = false;
74 74
 					$replacement['key'] = key(self::$replacement);
@@ -100,22 +100,22 @@  discard block
 block discarded – undo
100 100
 	 * @param $key
101 101
 	 * @return bool
102 102
 	 */
103
-	protected static function isVoidFunction($tokens, $key){
104
-		if($key - 1 <= 0){
103
+	protected static function isVoidFunction($tokens, $key) {
104
+		if ($key - 1 <= 0) {
105 105
 			return false;
106 106
 		}
107 107
 		$token = $tokens[$key - 1];
108
-		if(is_array($token)){
108
+		if (is_array($token)) {
109 109
 			$token = $token[1];
110 110
 		}
111 111
 		//Loop backwards though the start of the function block till you either find "void" or the end of the
112 112
 		//parameters declaration.
113
-		while($token !== ")"){
114
-			if(strpos($token, "void") !== false){
113
+		while ($token !== ")") {
114
+			if (strpos($token, "void") !== false) {
115 115
 				return true;
116 116
 			}
117 117
 			$token = $tokens[$key - 1];
118
-			if(is_array($token)){
118
+			if (is_array($token)) {
119 119
 				$token = $token[1];
120 120
 			}
121 121
 			$key--;
Please login to merge, or discard this patch.