Completed
Pull Request — master (#88)
by Kenji
02:55
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/CIPHPUnitTestRequest.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	public function enableHooks()
96 96
 	{
97 97
 		$this->enableHooks = true;
98
-		$this->hooks =& load_class('Hooks', 'core');
98
+		$this->hooks = & load_class('Hooks', 'core');
99 99
 	}
100 100
 
101 101
 	/**
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 			{
142 142
 				set_status_header($e->getCode());
143 143
 			}
144
-			$CI =& get_instance();
144
+			$CI = & get_instance();
145 145
 			$CI->output->_status['redirect'] = $e->getMessage();
146 146
 		}
147 147
 		// show_404()
@@ -197,17 +197,17 @@  discard block
 block discarded – undo
197 197
 		$this->setRawInputStream($request_params);
198 198
 
199 199
 		// 404 checking
200
-		if (! class_exists($class) || ! method_exists($class, $method))
200
+		if ( ! class_exists($class) || ! method_exists($class, $method))
201 201
 		{
202 202
 			// If 404, CodeIgniter instance is not created yet. So create it here
203 203
 			// Because we need CI->output->_status to store info
204
-			$CI =& get_instance();
204
+			$CI = & get_instance();
205 205
 			if ($CI === null)
206 206
 			{
207 207
 				new CI_Controller();
208 208
 			}
209 209
 
210
-			show_404($class.'::'.$method . '() is not found');
210
+			show_404($class.'::'.$method.'() is not found');
211 211
 		}
212 212
 
213 213
 		$params = $argv;
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	{
267 267
 		if (is_string($string))
268 268
 		{
269
-			$INPUT =& load_class('Input', 'core');
269
+			$INPUT = & load_class('Input', 'core');
270 270
 			CIPHPUnitTestReflection::setPrivateProperty(
271 271
 				$INPUT,
272 272
 				'_raw_input_stream',
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 
291 291
 		// Create controller
292 292
 		$controller = new $class;
293
-		$CI =& get_instance();
293
+		$CI = & get_instance();
294 294
 
295 295
 		// Set CodeIgniter instance to TestCase
296 296
 		$this->testCase->setCI($CI);
@@ -330,8 +330,8 @@  discard block
 block discarded – undo
330 330
 	 */
331 331
 	public function getStatus()
332 332
 	{
333
-		$CI =& get_instance();
334
-		if (! isset($CI->output->_status))
333
+		$CI = & get_instance();
334
+		if ( ! isset($CI->output->_status))
335 335
 		{
336 336
 			throw new LogicException('Status code is not set. You must call $this->request() first');
337 337
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestRouter.php 1 patch
Spacing   +3 added lines, -3 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,7 +57,7 @@  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 $this->CI->output->_status
60
-			$CI =& get_instance();
60
+			$CI = & get_instance();
61 61
 			if ($CI === null)
62 62
 			{
63 63
 				new CI_Controller();
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/CIPHPUnitTest.php 1 patch
Spacing   +14 added lines, -14 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,7 +65,7 @@  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
 
@@ -87,11 +87,11 @@  discard block
 block discarded – undo
87 87
 	protected static function replaceLoader()
88 88
 	{
89 89
 		$my_loader_file = 
90
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
90
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
91 91
 
92 92
 		if (file_exists($my_loader_file))
93 93
 		{
94
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
94
+			self::$loader_class = config_item('subclass_prefix').'Loader';
95 95
 			if ( ! class_exists(self::$loader_class))
96 96
 			{
97 97
 				require $my_loader_file;
@@ -102,19 +102,19 @@  discard block
 block discarded – undo
102 102
 
103 103
 	protected static function replaceHelpers()
104 104
 	{
105
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php';
105
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php';
106 106
 		if (file_exists($my_helper_file))
107 107
 		{
108 108
 			require $my_helper_file;
109 109
 		}
110
-		require __DIR__ . '/replacing/helpers/url_helper.php';
110
+		require __DIR__.'/replacing/helpers/url_helper.php';
111 111
 	}
112 112
 
113 113
 	public static function setPatcherCacheDir($dir = null)
114 114
 	{
115 115
 		if ($dir === null)
116 116
 		{
117
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
117
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
118 118
 		}
119 119
 
120 120
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php 1 patch
Spacing   +10 added lines, -10 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
 		new CI_Controller();
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,18 +330,18 @@  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
 		$absolute_url = site_url($uri);
339
-		$expected = 'Redirect to ' . $absolute_url;
339
+		$expected = 'Redirect to '.$absolute_url;
340 340
 
341 341
 		$this->assertSame(
342 342
 			$expected,
343 343
 			$status['redirect'],
344
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
344
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
345 345
 		);
346 346
 
347 347
 		if ($code !== null)
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 			$this->assertSame(
350 350
 				$code,
351 351
 				$status['code'],
352
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
352
+				'Status code is not '.$code.' but '.$status['code'].'.'
353 353
 			);
354 354
 		}
355 355
 	}
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.