Completed
Pull Request — master (#106)
by Kenji
04:30 queued 01:50
created
application/tests/_ci_phpunit_test/CIPHPUnitTestDouble.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		// methods in it. But we can't use them in
45 45
 		// `$this->request->setCallablePreConstructor()`
46 46
 		$mock = $this->testCase->getMockBuilder($classname);
47
-		if (! $enable_constructor)
47
+		if ( ! $enable_constructor)
48 48
 		{
49 49
 			$mock->disableOriginalConstructor();
50 50
 		}
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 				break;
97 97
 			default:
98 98
 				throw new RuntimeException(
99
-					'Sorry, ' . $count . ' params not implemented yet'
99
+					'Sorry, '.$count.' params not implemented yet'
100 100
 				);
101 101
 		}
102 102
 	}
Please login to merge, or discard this patch.
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/functions.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
 	is_loaded('', TRUE);
30 30
 
31 31
 	// Close db connection
32
-	$CI =& get_instance();
32
+	$CI = & get_instance();
33 33
 	if (isset($CI->db))
34 34
 	{
35 35
 		if (
@@ -49,25 +49,25 @@  discard block
 block discarded – undo
49 49
 	}
50 50
 
51 51
 	// Load core classes
52
-	$BM =& load_class('Benchmark', 'core');
52
+	$BM = & load_class('Benchmark', 'core');
53 53
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
54
-	$EXT =& load_class('Hooks', 'core');
54
+	$EXT = & load_class('Hooks', 'core');
55 55
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
56
-	$CFG =& load_class('Config', 'core');
56
+	$CFG = & load_class('Config', 'core');
57 57
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
58
-	$UNI =& load_class('URI', 'core');
58
+	$UNI = & load_class('URI', 'core');
59 59
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
60 60
 //	$URI =& load_class('Utf8', 'core');
61 61
 //	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
62
-	$RTR =& load_class('Router', 'core');
62
+	$RTR = & load_class('Router', 'core');
63 63
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
64
-	$OUT =& load_class('Output', 'core');
64
+	$OUT = & load_class('Output', 'core');
65 65
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
66
-	$SEC =& load_class('Security', 'core');
66
+	$SEC = & load_class('Security', 'core');
67 67
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
68
-	$IN =& load_class('Input', 'core');
68
+	$IN = & load_class('Input', 'core');
69 69
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
70
-	$LANG =& load_class('Lang', 'core');
70
+	$LANG = & load_class('Lang', 'core');
71 71
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
72 72
 
73 73
 	CIPHPUnitTest::loadLoader();
Please login to merge, or discard this patch.
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/CIPHPUnitTest.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -31,29 +31,29 @@  discard block
 block discarded – undo
31 31
 		self::$autoload_dirs = $autoload_dirs;
32 32
 
33 33
 		// Load autoloader for ci-phpunit-test
34
-		require __DIR__ . '/autoloader.php';
34
+		require __DIR__.'/autoloader.php';
35 35
 
36 36
 		// Autoloader for PHP-Parser
37 37
 		// Don't use `require`, because we may have required already
38 38
 		// in `patcher/bootstrap.php`
39
-		require_once __DIR__ . '/patcher/third_party/PHP-Parser/lib/bootstrap.php';
39
+		require_once __DIR__.'/patcher/third_party/PHP-Parser/lib/bootstrap.php';
40 40
 
41
-		require APPPATH . '/tests/TestCase.php';
41
+		require APPPATH.'/tests/TestCase.php';
42 42
 
43 43
 		// Replace a few Common functions
44
-		require __DIR__ . '/replacing/core/Common.php';
45
-		require BASEPATH . 'core/Common.php';
44
+		require __DIR__.'/replacing/core/Common.php';
45
+		require BASEPATH.'core/Common.php';
46 46
 
47 47
 		// Workaround for missing CodeIgniter's error handler
48 48
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
49 49
 		set_error_handler('_error_handler');
50 50
 
51 51
 		// Load new functions of CIPHPUnitTest
52
-		require __DIR__ . '/functions.php';
52
+		require __DIR__.'/functions.php';
53 53
 		// Load ci-phpunit-test CI_Loader
54
-		require __DIR__ . '/replacing/core/Loader.php';
54
+		require __DIR__.'/replacing/core/Loader.php';
55 55
 		// Load ci-phpunit-test CI_Input
56
-		require __DIR__ . '/replacing/core/Input.php';
56
+		require __DIR__.'/replacing/core/Input.php';
57 57
 
58 58
 		// Change current directroy
59 59
 		chdir(FCPATH);
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
65 65
 		 *
66 66
 		 * And away we go...
67 67
 		 */
68
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
68
+		require __DIR__.'/replacing/core/CodeIgniter.php';
69 69
 
70 70
 		self::replaceHelpers();
71 71
 
72 72
 		// Create CodeIgniter instance
73
-		if (! self::wiredesignzHmvcInstalled())
73
+		if ( ! self::wiredesignzHmvcInstalled())
74 74
 		{
75 75
 			new CI_Controller();
76 76
 		}
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 
89 89
 	public static function createCodeIgniterInstance()
90 90
 	{
91
-		if (! self::wiredesignzHmvcInstalled())
91
+		if ( ! self::wiredesignzHmvcInstalled())
92 92
 		{
93 93
 			new CI_Controller();
94 94
 		}
@@ -117,11 +117,11 @@  discard block
 block discarded – undo
117 117
 	protected static function replaceLoader()
118 118
 	{
119 119
 		$my_loader_file = 
120
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
120
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
121 121
 
122 122
 		if (file_exists($my_loader_file))
123 123
 		{
124
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
124
+			self::$loader_class = config_item('subclass_prefix').'Loader';
125 125
 			if ( ! class_exists(self::$loader_class))
126 126
 			{
127 127
 				require $my_loader_file;
@@ -132,19 +132,19 @@  discard block
 block discarded – undo
132 132
 
133 133
 	protected static function replaceHelpers()
134 134
 	{
135
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php';
135
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php';
136 136
 		if (file_exists($my_helper_file))
137 137
 		{
138 138
 			require $my_helper_file;
139 139
 		}
140
-		require __DIR__ . '/replacing/helpers/url_helper.php';
140
+		require __DIR__.'/replacing/helpers/url_helper.php';
141 141
 	}
142 142
 
143 143
 	public static function setPatcherCacheDir($dir = null)
144 144
 	{
145 145
 		if ($dir === null)
146 146
 		{
147
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
147
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
148 148
 		}
149 149
 
150 150
 		MonkeyPatchManager::setCacheDir(
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.
application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 			return $this->$name;
42 42
 		}
43 43
 
44
-		throw new LogicException('No such property: ' . $name);
44
+		throw new LogicException('No such property: '.$name);
45 45
 	}
46 46
 
47 47
 	public static function setUpBeforeClass()
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	{
62 62
 		reset_instance();
63 63
 		CIPHPUnitTest::createCodeIgniterInstance();
64
-		$this->CI =& get_instance();
64
+		$this->CI = & get_instance();
65 65
 	}
66 66
 
67 67
 	protected function tearDown()
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 		$this->assertSame(
237 237
 			$code,
238 238
 			$actual,
239
-			'Status code is not ' . $code . ' but ' . $actual . '.'
239
+			'Status code is not '.$code.' but '.$actual.'.'
240 240
 		);
241 241
 	}
242 242
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 */
249 249
 	public function assertResponseHeader($name, $value)
250 250
 	{
251
-		$CI =& get_instance();
251
+		$CI = & get_instance();
252 252
 		$actual = $CI->output->get_header($name);
253 253
 
254 254
 		if ($actual === null)
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 	 */
273 273
 	public function assertResponseCookie($name, $value, $allow_duplicate = false)
274 274
 	{
275
-		$CI =& get_instance();
275
+		$CI = & get_instance();
276 276
 		$cookies = isset($CI->output->_cookies[$name])
277 277
 			? $CI->output->_cookies[$name] : null;
278 278
 
@@ -330,23 +330,23 @@  discard block
 block discarded – undo
330 330
 			$this->fail('redirect() is not called.');
331 331
 		}
332 332
 
333
-		if (! function_exists('site_url'))
333
+		if ( ! function_exists('site_url'))
334 334
 		{
335
-			$CI =& get_instance();
335
+			$CI = & get_instance();
336 336
 			$CI->load->helper('url');
337 337
 		}
338 338
 
339
-		if (! preg_match('#^(\w+:)?//#i', $uri))
339
+		if ( ! preg_match('#^(\w+:)?//#i', $uri))
340 340
 		{
341 341
 			$uri = site_url($uri);
342 342
 		}
343 343
 		$absolute_url = $uri;
344
-		$expected = 'Redirect to ' . $absolute_url;
344
+		$expected = 'Redirect to '.$absolute_url;
345 345
 
346 346
 		$this->assertSame(
347 347
 			$expected,
348 348
 			$status['redirect'],
349
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
349
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
350 350
 		);
351 351
 
352 352
 		if ($code !== null)
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 			$this->assertSame(
355 355
 				$code,
356 356
 				$status['code'],
357
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
357
+				'Status code is not '.$code.' but '.$status['code'].'.'
358 358
 			);
359 359
 		}
360 360
 	}
Please login to merge, or discard this patch.