Completed
Pull Request — master (#88)
by Kenji
03:16
created
install.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__ . '/Installer.php';
11
+require __DIR__.'/Installer.php';
12 12
 
13 13
 $installer = new Installer();
14 14
 $installer->update();
Please login to merge, or discard this patch.
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/CIPHPUnitTestRequest.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	public function enableHooks()
107 107
 	{
108 108
 		$this->enableHooks = true;
109
-		$this->hooks =& load_class('Hooks', 'core');
109
+		$this->hooks = & load_class('Hooks', 'core');
110 110
 	}
111 111
 
112 112
 	/**
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 			{
153 153
 				set_status_header($e->getCode());
154 154
 			}
155
-			$CI =& get_instance();
155
+			$CI = & get_instance();
156 156
 			$CI->output->_status['redirect'] = $e->getMessage();
157 157
 		}
158 158
 		// show_404()
@@ -208,14 +208,14 @@  discard block
 block discarded – undo
208 208
 		$this->setRawInputStream($request_params);
209 209
 
210 210
 		// 404 checking
211
-		if (! class_exists($class) || ! method_exists($class, $method))
211
+		if ( ! class_exists($class) || ! method_exists($class, $method))
212 212
 		{
213 213
 			// If 404, CodeIgniter instance is not created yet. So create it here
214 214
 			// Because we need CI->output->_status to store info
215
-			$CI =& get_instance();
215
+			$CI = & get_instance();
216 216
 			if ($CI instanceof CIPHPUnitTestNullCodeIgniter)
217 217
 			{
218
-				if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
218
+				if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
219 219
 				{
220 220
 					new CI_Controller();
221 221
 				}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 				}
227 227
 			}
228 228
 
229
-			show_404($class.'::'.$method . '() is not found');
229
+			show_404($class.'::'.$method.'() is not found');
230 230
 		}
231 231
 
232 232
 		$params = $argv;
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 	{
288 288
 		if (is_string($string))
289 289
 		{
290
-			$INPUT =& load_class('Input', 'core');
290
+			$INPUT = & load_class('Input', 'core');
291 291
 			CIPHPUnitTestReflection::setPrivateProperty(
292 292
 				$INPUT,
293 293
 				'_raw_input_stream',
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 			new CI();
318 318
 		}
319 319
 		$controller = new $class;
320
-		$CI =& get_instance();
320
+		$CI = & get_instance();
321 321
 
322 322
 		// Set CodeIgniter instance to TestCase
323 323
 		$this->testCase->setCI($CI);
@@ -363,8 +363,8 @@  discard block
 block discarded – undo
363 363
 	 */
364 364
 	public function getStatus()
365 365
 	{
366
-		$CI =& get_instance();
367
-		if (! isset($CI->output->_status))
366
+		$CI = & get_instance();
367
+		if ( ! isset($CI->output->_status))
368 368
 		{
369 369
 			throw new LogicException('Status code is not set. You must call $this->request() first');
370 370
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestRouter.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 	 */
20 20
 	public function getRoute()
21 21
 	{
22
-		$RTR =& load_class('Router', 'core');
23
-		$URI =& load_class('URI', 'core');
22
+		$RTR = & load_class('Router', 'core');
23
+		$URI = & load_class('URI', 'core');
24 24
 
25 25
 		$e404 = FALSE;
26 26
 		$class = ucfirst($RTR->class);
@@ -57,10 +57,10 @@  discard block
 block discarded – undo
57 57
 		{
58 58
 			// If 404, CodeIgniter instance is not created yet. So create it here.
59 59
 			// Because we need CI->output->_status
60
-			$CI =& get_instance();
60
+			$CI = & get_instance();
61 61
 			if ($CI instanceof CIPHPUnitTestNullCodeIgniter)
62 62
 			{
63
-				if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
63
+				if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
64 64
 				{
65 65
 					new CI_Controller();
66 66
 				}
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()
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	public function resetInstance()
61 61
 	{
62 62
 		reset_instance();
63
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
63
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
64 64
 		{
65 65
 			new CI_Controller();
66 66
 		}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 			new CI();
70 70
 			new MX_Controller();
71 71
 		}
72
-		$this->CI =& get_instance();
72
+		$this->CI = & get_instance();
73 73
 	}
74 74
 
75 75
 	protected function tearDown()
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 		$this->assertSame(
245 245
 			$code,
246 246
 			$actual,
247
-			'Status code is not ' . $code . ' but ' . $actual . '.'
247
+			'Status code is not '.$code.' but '.$actual.'.'
248 248
 		);
249 249
 	}
250 250
 
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 	 */
257 257
 	public function assertResponseHeader($name, $value)
258 258
 	{
259
-		$CI =& get_instance();
259
+		$CI = & get_instance();
260 260
 		$actual = $CI->output->get_header($name);
261 261
 
262 262
 		if ($actual === null)
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 	 */
281 281
 	public function assertResponseCookie($name, $value, $allow_duplicate = false)
282 282
 	{
283
-		$CI =& get_instance();
283
+		$CI = & get_instance();
284 284
 		$cookies = isset($CI->output->_cookies[$name])
285 285
 			? $CI->output->_cookies[$name] : null;
286 286
 
@@ -338,18 +338,18 @@  discard block
 block discarded – undo
338 338
 			$this->fail('redirect() is not called.');
339 339
 		}
340 340
 
341
-		if (! function_exists('site_url'))
341
+		if ( ! function_exists('site_url'))
342 342
 		{
343
-			$CI =& get_instance();
343
+			$CI = & get_instance();
344 344
 			$CI->load->helper('url');
345 345
 		}
346 346
 		$absolute_url = site_url($uri);
347
-		$expected = 'Redirect to ' . $absolute_url;
347
+		$expected = 'Redirect to '.$absolute_url;
348 348
 
349 349
 		$this->assertSame(
350 350
 			$expected,
351 351
 			$status['redirect'],
352
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
352
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
353 353
 		);
354 354
 
355 355
 		if ($code !== null)
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 			$this->assertSame(
358 358
 				$code,
359 359
 				$status['code'],
360
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
360
+				'Status code is not '.$code.' but '.$status['code'].'.'
361 361
 			);
362 362
 		}
363 363
 	}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 1 patch
Spacing   +15 added lines, -15 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
 		}
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
 	protected static function replaceLoader()
105 105
 	{
106 106
 		$my_loader_file = 
107
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
107
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
108 108
 
109 109
 		if (file_exists($my_loader_file))
110 110
 		{
111
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
111
+			self::$loader_class = config_item('subclass_prefix').'Loader';
112 112
 			if ( ! class_exists(self::$loader_class))
113 113
 			{
114 114
 				require $my_loader_file;
@@ -119,19 +119,19 @@  discard block
 block discarded – undo
119 119
 
120 120
 	protected static function replaceHelpers()
121 121
 	{
122
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php';
122
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php';
123 123
 		if (file_exists($my_helper_file))
124 124
 		{
125 125
 			require $my_helper_file;
126 126
 		}
127
-		require __DIR__ . '/replacing/helpers/url_helper.php';
127
+		require __DIR__.'/replacing/helpers/url_helper.php';
128 128
 	}
129 129
 
130 130
 	public static function setPatcherCacheDir($dir = null)
131 131
 	{
132 132
 		if ($dir === null)
133 133
 		{
134
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
134
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
135 135
 		}
136 136
 
137 137
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.