Completed
Pull Request — master (#161)
by Kenji
02:26
created
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.
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.
Installer.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
     public static function install($app = 'application')
16 16
     {
17 17
         self::recursiveCopy(
18
-            dirname(__FILE__) . '/application/tests',
19
-            $app . '/' . static::TEST_FOLDER
18
+            dirname(__FILE__).'/application/tests',
19
+            $app.'/'.static::TEST_FOLDER
20 20
         );
21 21
         self::fixPath($app);
22 22
     }
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
      */
27 27
     private static function fixPath($app = 'application')
28 28
     {
29
-        $file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
29
+        $file = $app.'/'.static::TEST_FOLDER.'/Bootstrap.php';
30 30
         $contents = file_get_contents($file);
31 31
         
32
-        if (! file_exists('system')) {
32
+        if ( ! file_exists('system')) {
33 33
             if (file_exists('vendor/codeigniter/framework/system')) {
34 34
                 $contents = str_replace(
35 35
                     '$system_path = \'../../system\';',
@@ -41,14 +41,14 @@  discard block
 block discarded – undo
41 41
             }
42 42
         }
43 43
         
44
-        if (! file_exists('index.php')) {
44
+        if ( ! file_exists('index.php')) {
45 45
             if (file_exists('public/index.php')) {
46 46
                 $contents = str_replace(
47 47
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
48 48
                     "define('FCPATH', realpath(dirname(__FILE__).'/../../public').'/');",
49 49
                     $contents
50 50
                 );
51
-            } elseif (file_exists($app . '/public/index.php')) {
51
+            } elseif (file_exists($app.'/public/index.php')) {
52 52
                 $contents = str_replace(
53 53
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
54 54
                     "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
@@ -71,10 +71,10 @@  discard block
 block discarded – undo
71 71
 
72 72
     public static function update($app = 'application')
73 73
     {
74
-        $target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
74
+        $target_dir = $app.'/'.static::TEST_FOLDER.'/_ci_phpunit_test';
75 75
         self::recursiveUnlink($target_dir);
76 76
         self::recursiveCopy(
77
-            dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
77
+            dirname(__FILE__).'/application/tests/_ci_phpunit_test',
78 78
             $target_dir
79 79
         );
80 80
     }
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
         
97 97
         foreach ($iterator as $file) {
98 98
             if ($file->isDir()) {
99
-                @mkdir($dst . '/' . $iterator->getSubPathName());
99
+                @mkdir($dst.'/'.$iterator->getSubPathName());
100 100
             } else {
101
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
101
+                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
102 102
                 if ($success) {
103
-                    echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
103
+                    echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
104 104
                 }
105 105
             }
106 106
         }
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/Patcher/ConstantPatcher/Proxy.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 			$method = isset($info['class_method']) ? $info['class_method'] : $info['function'];
66 66
 
67 67
 			MonkeyPatchManager::log(
68
-				'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()'
68
+				'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()'
69 69
 			);
70 70
 		}
71 71
 	}
@@ -111,10 +111,10 @@  discard block
 block discarded – undo
111 111
 
112 112
 		if (isset(self::$patches_to_apply[$constant]))
113 113
 		{
114
-			if (! self::checkCalledMethod($constant))
114
+			if ( ! self::checkCalledMethod($constant))
115 115
 			{
116 116
 				MonkeyPatchManager::log(
117
-					'invoke_const: ' . $constant . ' not patched (out of scope)'
117
+					'invoke_const: '.$constant.' not patched (out of scope)'
118 118
 				);
119 119
 				return constant($constant);
120 120
 			}
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
 
123 123
 		if (array_key_exists($constant, self::$patches))
124 124
 		{
125
-			MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched');
125
+			MonkeyPatchManager::log('invoke_const: '.$constant.' patched');
126 126
 			return self::$patches[$constant];
127 127
 		}
128 128
 
129 129
 		MonkeyPatchManager::log(
130
-			'invoke_const: ' . $constant . ' not patched (no patch)'
130
+			'invoke_const: '.$constant.' not patched (no patch)'
131 131
 		);
132 132
 		return constant($constant);
133 133
 	}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/Patcher/ConstantPatcher.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/ConstantPatcher/NodeVisitor.php';
14
-require __DIR__ . '/ConstantPatcher/Proxy.php';
13
+require __DIR__.'/ConstantPatcher/NodeVisitor.php';
14
+require __DIR__.'/ConstantPatcher/Proxy.php';
15 15
 
16 16
 use LogicException;
17 17
 
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/Patcher/ConstantPatcher/NodeVisitor.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function enterNode(Node $node)
26 26
 	{
27
-		$callback = [$this, 'before' . ucfirst($node->getType())];
27
+		$callback = [$this, 'before'.ucfirst($node->getType())];
28 28
 		if (is_callable($callback)) {
29 29
 			call_user_func_array($callback, [$node]);
30 30
 		}
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 
33 33
 	public function leaveNode(Node $node)
34 34
 	{
35
-		if (! ($node instanceof ConstFetch))
35
+		if ( ! ($node instanceof ConstFetch))
36 36
 		{
37
-			$callback = [$this, 'rewrite' . ucfirst($node->getType())];
37
+			$callback = [$this, 'rewrite'.ucfirst($node->getType())];
38 38
 			if (is_callable($callback)) {
39 39
 				call_user_func_array($callback, [$node]);
40 40
 			}
@@ -47,26 +47,26 @@  discard block
 block discarded – undo
47 47
 			return;
48 48
 		}
49 49
 
50
-		if (! ($node->name instanceof Name))
50
+		if ( ! ($node->name instanceof Name))
51 51
 		{
52 52
 			return;
53 53
 		}
54 54
 
55
-		if (! $node->name->isUnqualified())
55
+		if ( ! $node->name->isUnqualified())
56 56
 		{
57 57
 			return;
58 58
 		}
59 59
 
60
-		if (! ConstantPatcher::isBlacklisted((string) $node->name))
60
+		if ( ! ConstantPatcher::isBlacklisted((string) $node->name))
61 61
 		{
62 62
 			$replacement = new FullyQualified(array());
63 63
 			$replacement->set(
64
-				'\__ConstProxy__::get(\'' . (string) $node->name . '\')'
64
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')'
65 65
 			);
66 66
 
67 67
 			$pos = $node->getAttribute('startTokenPos');
68 68
 			ConstantPatcher::$replacement[$pos] = 
69
-				'\__ConstProxy__::get(\'' . (string) $node->name .'\')';
69
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')';
70 70
 
71 71
 			$node->name = $replacement;
72 72
 		}
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.