Completed
Push — master ( 1409b8...da3f13 )
by Kenji
14s
created
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.
application/libraries/Seeder.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public function __construct()
19 19
 	{
20
-		$this->CI =& get_instance();
20
+		$this->CI = & get_instance();
21 21
 		$this->CI->load->database();
22 22
 		$this->CI->load->dbforge();
23 23
 		$this->db = $this->CI->db;
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
 	{
34 34
 		if ($this->seedPath === null)
35 35
 		{
36
-			$this->seedPath = APPPATH . 'database/seeds/';
36
+			$this->seedPath = APPPATH.'database/seeds/';
37 37
 		}
38 38
 
39
-		$file = $this->seedPath . $seeder . '.php';
39
+		$file = $this->seedPath.$seeder.'.php';
40 40
 		require_once $file;
41 41
 
42 42
 		$obj = new $seeder;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestDouble.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,8 +48,7 @@
 block discarded – undo
48 48
 		if ($constructor_params === false)
49 49
 		{
50 50
 			$mock->disableOriginalConstructor();
51
-		}
52
-		elseif (is_array($constructor_params))
51
+		} elseif (is_array($constructor_params))
53 52
 		{
54 53
 			$mock->setConstructorArgs($constructor_params);
55 54
 		}
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	 *
33 33
 	 * @param  string $classname
34 34
 	 * @param  array  $params             [method_name => return_value]
35
-	 * @param  mixed  $constructor_params false: disable construntor, array: construntor params
35
+	 * @param  boolean  $constructor_params false: disable construntor, array: construntor params
36 36
 	 * 
37 37
 	 * @return object PHPUnit mock object
38 38
 	 */
@@ -72,6 +72,10 @@  discard block
 block discarded – undo
72 72
 		return $mock;
73 73
 	}
74 74
 
75
+	/**
76
+	 * @param string $method
77
+	 * @param string $with
78
+	 */
75 79
 	protected function _verify($mock, $method, $params = null, $expects, $with)
76 80
 	{
77 81
 		$invocation = $mock->expects($expects)
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/helpers/download_helper.php 2 patches
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@  discard block
 block discarded – undo
67 67
 		if ($filename === '' OR $data === '')
68 68
 		{
69 69
 			return;
70
-		}
71
-		elseif ($data === NULL)
70
+		} elseif ($data === NULL)
72 71
 		{
73 72
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
74 73
 			{
@@ -78,8 +77,7 @@  discard block
 block discarded – undo
78 77
 			$filepath = $filename;
79 78
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
80 79
 			$filename = end($filename);
81
-		}
82
-		else
80
+		} else
83 81
 		{
84 82
 			$filesize = strlen($data);
85 83
 		}
@@ -158,8 +156,7 @@  discard block
 block discarded – undo
158 156
 			if (ENVIRONMENT !== 'testing')
159 157
 			{
160 158
 				exit($data);
161
-			}
162
-			else
159
+			} else
163 160
 			{
164 161
 				echo($data);
165 162
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -176,8 +173,7 @@  discard block
 block discarded – undo
176 173
 		if (ENVIRONMENT !== 'testing')
177 174
 		{
178 175
 			exit;
179
-		}
180
-		else
176
+		} else
181 177
 		{
182 178
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
183 179
 		}
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 			}
102 102
 
103 103
 			// Load the mime types
104
-			$mimes =& get_mimes();
104
+			$mimes = & get_mimes();
105 105
 
106 106
 			// Only change the default MIME if we can find one
107 107
 			if (isset($mimes[$extension]))
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
 		if (ENVIRONMENT === 'testing')
148 148
 		{
149
-			$CI =& get_instance();
149
+			$CI = & get_instance();
150 150
 			$CI->output->set_header('Content-Type: '.$mime);
151 151
 			$CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"');
152 152
 			$CI->output->set_header('Expires: 0');
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestSuperGlobal.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 		}
43 43
 
44 44
 		// Handle single file
45
-		$file =& $files[$field];
45
+		$file = & $files[$field];
46 46
 
47
-		if (! file_exists($file['tmp_name']))
47
+		if ( ! file_exists($file['tmp_name']))
48 48
 		{
49 49
 			$file['error'] = UPLOAD_ERR_NO_FILE;
50 50
 			$file['type'] = '';
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 				// Set $_GET if URI string has query string
111 111
 				parse_str($query_string, $_GET);
112 112
 				// Remove query string from URI string
113
-				$argv = substr($argv, 0, -strlen($query_string)-1);
113
+				$argv = substr($argv, 0, -strlen($query_string) - 1);
114 114
 			}
115 115
 		}
116 116
 
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 		if ($_GET !== [])
144 144
 		{
145 145
 			$_SERVER['REQUEST_URI'] =
146
-				'/' . $path . '?'
146
+				'/'.$path.'?'
147 147
 				. http_build_query($_GET);
148 148
 		}
149 149
 		else
150 150
 		{
151
-			$_SERVER['REQUEST_URI'] = '/' . $path;
151
+			$_SERVER['REQUEST_URI'] = '/'.$path;
152 152
 		}
153 153
 	}
154 154
 
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
 		if ($query_string === false)
167 167
 		{
168
-			throw new LogicException('Bad URI string: ' . $uri);
168
+			throw new LogicException('Bad URI string: '.$uri);
169 169
 		}
170 170
 
171 171
 		return $query_string;
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		}
191 191
 		else
192 192
 		{
193
-			$key = 'HTTP_' . $normalized_name;
193
+			$key = 'HTTP_'.$normalized_name;
194 194
 		}
195 195
 
196 196
 		$_SERVER[$key] = $value;
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,8 +76,7 @@  discard block
 block discarded – undo
76 76
 		if (is_numeric($value))
77 77
 		{
78 78
 			return $value;
79
-		}
80
-		else
79
+		} else
81 80
 		{
82 81
 			$value_length = strlen($value);
83 82
 			$number = substr($value, 0, $value_length - 1);
@@ -133,8 +132,7 @@  discard block
 block discarded – undo
133 132
 		if (is_string($argv))
134 133
 		{
135 134
 			$path = $argv;
136
-		}
137
-		elseif (is_array($argv))
135
+		} elseif (is_array($argv))
138 136
 		{
139 137
 			// Generate URI path from array of controller, method, arg, ...
140 138
 			$path = implode('/', $argv);
@@ -145,8 +143,7 @@  discard block
 block discarded – undo
145 143
 			$_SERVER['REQUEST_URI'] =
146 144
 				'/' . $path . '?'
147 145
 				. http_build_query($_GET);
148
-		}
149
-		else
146
+		} else
150 147
 		{
151 148
 			$_SERVER['REQUEST_URI'] = '/' . $path;
152 149
 		}
@@ -187,8 +184,7 @@  discard block
 block discarded – undo
187 184
 		)
188 185
 		{
189 186
 			$key = $normalized_name;
190
-		}
191
-		else
187
+		} else
192 188
 		{
193 189
 			$key = 'HTTP_' . $normalized_name;
194 190
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/libraries/Upload.php 2 patches
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.
Braces   +21 added lines, -19 removed lines patch added patch discarded remove patch
@@ -331,19 +331,16 @@  discard block
 block discarded – undo
331 331
 					if ($reflection->hasMethod('set_'.$key))
332 332
 					{
333 333
 						$this->{'set_'.$key}($config[$key]);
334
-					}
335
-					else
334
+					} else
336 335
 					{
337 336
 						$this->$key = $config[$key];
338 337
 					}
339
-				}
340
-				else
338
+				} else
341 339
 				{
342 340
 					$this->$key = $defaults[$key];
343 341
 				}
344 342
 			}
345
-		}
346
-		else
343
+		} else
347 344
 		{
348 345
 			foreach ($config as $key => &$value)
349 346
 			{
@@ -352,8 +349,7 @@  discard block
 block discarded – undo
352 349
 					if ($reflection->hasMethod('set_'.$key))
353 350
 					{
354 351
 						$this->{'set_'.$key}($value);
355
-					}
356
-					else
352
+					} else
357 353
 					{
358 354
 						$this->$key = $value;
359 355
 					}
@@ -415,9 +411,11 @@  discard block
 block discarded – undo
415 411
 		}
416 412
 
417 413
 		// Was the file able to be uploaded? If not, determine the reason why.
418
-		if ( ! file_exists($_file['tmp_name']))	// modified by ci-phpunit-test
414
+		if ( ! file_exists($_file['tmp_name'])) {
415
+			// modified by ci-phpunit-test
419 416
 		{
420 417
 			$error = isset($_file['error']) ? $_file['error'] : 4;
418
+		}
421 419
 
422 420
 			switch ($error)
423 421
 			{
@@ -482,8 +480,7 @@  discard block
 block discarded – undo
482 480
 			if (strpos($this->_file_name_override, '.') === FALSE)
483 481
 			{
484 482
 				$this->file_name .= $this->file_ext;
485
-			}
486
-			else
483
+			} else
487 484
 			{
488 485
 				// An extension was provided, let's have it!
489 486
 				$this->file_ext	= $this->get_extension($this->_file_name_override);
@@ -687,8 +684,7 @@  discard block
 block discarded – undo
687 684
 		{
688 685
 			$this->set_error('upload_bad_filename', 'debug');
689 686
 			return FALSE;
690
-		}
691
-		else
687
+		} else
692 688
 		{
693 689
 			return $new_filename;
694 690
 		}
@@ -883,8 +879,7 @@  discard block
 block discarded – undo
883 879
 		if (in_array($this->file_type, $png_mimes))
884 880
 		{
885 881
 			$this->file_type = 'image/png';
886
-		}
887
-		elseif (in_array($this->file_type, $jpeg_mimes))
882
+		} elseif (in_array($this->file_type, $jpeg_mimes))
888 883
 		{
889 884
 			$this->file_type = 'image/jpeg';
890 885
 		}
@@ -1150,9 +1145,12 @@  discard block
 block discarded – undo
1150 1145
 
1151 1146
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
1152 1147
 		{
1153
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
1148
+			if (($file = @fopen($file, 'rb')) === FALSE) {
1149
+				// "b" to force binary
1154 1150
 			{
1155
-				return FALSE; // Couldn't open the file, return FALSE
1151
+				return FALSE;
1152
+			}
1153
+			// Couldn't open the file, return FALSE
1156 1154
 			}
1157 1155
 
1158 1156
 			$opening_bytes = fread($file, 256);
@@ -1271,9 +1269,11 @@  discard block
 block discarded – undo
1271 1269
 		if (function_exists('finfo_file'))
1272 1270
 		{
1273 1271
 			$finfo = @finfo_open(FILEINFO_MIME);
1274
-			if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1272
+			if (is_resource($finfo)) {
1273
+				// It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1275 1274
 			{
1276 1275
 				$mime = @finfo_file($finfo, $file['tmp_name']);
1276
+			}
1277 1277
 				finfo_close($finfo);
1278 1278
 
1279 1279
 				/* According to the comments section of the PHP manual page,
@@ -1358,10 +1358,12 @@  discard block
 block discarded – undo
1358 1358
 		if (function_exists('mime_content_type'))
1359 1359
 		{
1360 1360
 			$this->file_type = @mime_content_type($file['tmp_name']);
1361
-			if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string
1361
+			if (strlen($this->file_type) > 0) {
1362
+				// It's possible that mime_content_type() returns FALSE or an empty string
1362 1363
 			{
1363 1364
 				return;
1364 1365
 			}
1366
+			}
1365 1367
 		}
1366 1368
 
1367 1369
 		$this->file_type = $file['type'];
Please login to merge, or discard this patch.
install.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,17 +15,17 @@
 block discarded – undo
15 15
 
16 16
 // php install.php -s
17 17
 if (isset($argv[1]) && $argv[1] === '-s') {
18
-    $silent = true;
18
+	$silent = true;
19 19
 
20
-    // php install.php -s app
21
-    if (isset($argv[2]) && is_dir($argv[2])) {
22
-        $app_dir = $argv[2];
23
-    }
20
+	// php install.php -s app
21
+	if (isset($argv[2]) && is_dir($argv[2])) {
22
+		$app_dir = $argv[2];
23
+	}
24 24
 }
25 25
 
26 26
 // php install.php app
27 27
 if (isset($argv[1]) && is_dir($argv[1])) {
28
-    $app_dir = $argv[1];
28
+	$app_dir = $argv[1];
29 29
 }
30 30
 
31 31
 $installer = new Installer($silent);
Please login to merge, or discard this 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
 $silent = false;
14 14
 $app_dir = 'application';
Please login to merge, or discard this patch.
update.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,17 +15,17 @@
 block discarded – undo
15 15
 
16 16
 // php update.php -s
17 17
 if (isset($argv[1]) && $argv[1] === '-s') {
18
-    $silent = true;
18
+	$silent = true;
19 19
 
20
-    // php update.php -s app
21
-    if (isset($argv[2]) && is_dir($argv[2])) {
22
-        $app_dir = $argv[2];
23
-    }
20
+	// php update.php -s app
21
+	if (isset($argv[2]) && is_dir($argv[2])) {
22
+		$app_dir = $argv[2];
23
+	}
24 24
 }
25 25
 
26 26
 // php update.php app
27 27
 if (isset($argv[1]) && is_dir($argv[1])) {
28
-    $app_dir = $argv[1];
28
+	$app_dir = $argv[1];
29 29
 }
30 30
 
31 31
 $installer = new Installer($silent);
Please login to merge, or discard this 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
 $silent = false;
14 14
 $app_dir = 'application';
Please login to merge, or discard this patch.
Installer.php 2 patches
Indentation   +127 added lines, -127 removed lines patch added patch discarded remove patch
@@ -10,145 +10,145 @@
 block discarded – undo
10 10
 
11 11
 class Installer
12 12
 {
13
-    const TEST_FOLDER = 'tests';
13
+	const TEST_FOLDER = 'tests';
14 14
 
15
-    private $silent = false;
15
+	private $silent = false;
16 16
 
17
-    public function __construct($silent = false)
18
-    {
19
-        $this->silent = $silent;
20
-    }
17
+	public function __construct($silent = false)
18
+	{
19
+		$this->silent = $silent;
20
+	}
21 21
 
22
-    public function install($app = 'application')
23
-    {
24
-        $this->recursiveCopy(
25
-            dirname(__FILE__) . '/application/tests',
26
-            $app . '/' . static::TEST_FOLDER
27
-        );
28
-        $this->fixPath($app);
29
-    }
22
+	public function install($app = 'application')
23
+	{
24
+		$this->recursiveCopy(
25
+			dirname(__FILE__) . '/application/tests',
26
+			$app . '/' . static::TEST_FOLDER
27
+		);
28
+		$this->fixPath($app);
29
+	}
30 30
 
31
-    /**
32
-     * Fix paths in Bootstrap.php
33
-     */
34
-    private function fixPath($app = 'application')
35
-    {
36
-        $file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
37
-        $contents = file_get_contents($file);
31
+	/**
32
+	 * Fix paths in Bootstrap.php
33
+	 */
34
+	private function fixPath($app = 'application')
35
+	{
36
+		$file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
37
+		$contents = file_get_contents($file);
38 38
         
39
-        if (! file_exists('system')) {
40
-            if (file_exists('vendor/codeigniter/framework/system')) {
41
-                $contents = str_replace(
42
-                    '$system_path = \'../../system\';',
43
-                    '$system_path = \'../../vendor/codeigniter/framework/system\';',
44
-                    $contents
45
-                );
46
-            } else {
47
-                throw new Exception('Can\'t find "system" folder.');
48
-            }
49
-        }
39
+		if (! file_exists('system')) {
40
+			if (file_exists('vendor/codeigniter/framework/system')) {
41
+				$contents = str_replace(
42
+					'$system_path = \'../../system\';',
43
+					'$system_path = \'../../vendor/codeigniter/framework/system\';',
44
+					$contents
45
+				);
46
+			} else {
47
+				throw new Exception('Can\'t find "system" folder.');
48
+			}
49
+		}
50 50
         
51
-        if (! file_exists('index.php')) {
52
-            if (file_exists('public/index.php')) {
53
-                // CodeIgniter 3.0.6 and after
54
-                $contents = str_replace(
55
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
56
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../public').DIRECTORY_SEPARATOR);",
57
-                    $contents
58
-                );
59
-                // CodeIgniter 3.0.5 and before
60
-                $contents = str_replace(
61
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
62
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../public').'/');",
63
-                    $contents
64
-                );
65
-            } elseif (file_exists($app . '/public/index.php')) {
66
-                // CodeIgniter 3.0.6 and after
67
-                $contents = str_replace(
68
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
69
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
70
-                    $contents
71
-                );
72
-                // CodeIgniter 3.0.5 and before
73
-                $contents = str_replace(
74
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
75
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
76
-                    $contents
77
-                );
78
-                if ($app != 'application') {
79
-                    $contents = str_replace(
80
-                        "\$application_folder = '../../application';",
81
-                        "\$application_folder = '../../{$app}';",
82
-                        $contents
83
-                    );
84
-                }
85
-            } else {
86
-                throw new Exception('Can\'t find "index.php".');
87
-            }
88
-        }
51
+		if (! file_exists('index.php')) {
52
+			if (file_exists('public/index.php')) {
53
+				// CodeIgniter 3.0.6 and after
54
+				$contents = str_replace(
55
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
56
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../public').DIRECTORY_SEPARATOR);",
57
+					$contents
58
+				);
59
+				// CodeIgniter 3.0.5 and before
60
+				$contents = str_replace(
61
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
62
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../public').'/');",
63
+					$contents
64
+				);
65
+			} elseif (file_exists($app . '/public/index.php')) {
66
+				// CodeIgniter 3.0.6 and after
67
+				$contents = str_replace(
68
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
69
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
70
+					$contents
71
+				);
72
+				// CodeIgniter 3.0.5 and before
73
+				$contents = str_replace(
74
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
75
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
76
+					$contents
77
+				);
78
+				if ($app != 'application') {
79
+					$contents = str_replace(
80
+						"\$application_folder = '../../application';",
81
+						"\$application_folder = '../../{$app}';",
82
+						$contents
83
+					);
84
+				}
85
+			} else {
86
+				throw new Exception('Can\'t find "index.php".');
87
+			}
88
+		}
89 89
         
90
-        file_put_contents($file, $contents);
91
-    }
90
+		file_put_contents($file, $contents);
91
+	}
92 92
 
93
-    public function update($app = 'application')
94
-    {
95
-        $target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
96
-        $this->recursiveUnlink($target_dir);
97
-        $this->recursiveCopy(
98
-            dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
99
-            $target_dir
100
-        );
101
-    }
93
+	public function update($app = 'application')
94
+	{
95
+		$target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
96
+		$this->recursiveUnlink($target_dir);
97
+		$this->recursiveCopy(
98
+			dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
99
+			$target_dir
100
+		);
101
+	}
102 102
 
103
-    /**
104
-     * Recursive Copy
105
-     *
106
-     * @param string $src
107
-     * @param string $dst
108
-     */
109
-    private function recursiveCopy($src, $dst)
110
-    {
111
-        @mkdir($dst, 0755);
103
+	/**
104
+	 * Recursive Copy
105
+	 *
106
+	 * @param string $src
107
+	 * @param string $dst
108
+	 */
109
+	private function recursiveCopy($src, $dst)
110
+	{
111
+		@mkdir($dst, 0755);
112 112
         
113
-        $iterator = new \RecursiveIteratorIterator(
114
-            new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
115
-            \RecursiveIteratorIterator::SELF_FIRST
116
-        );
113
+		$iterator = new \RecursiveIteratorIterator(
114
+			new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
115
+			\RecursiveIteratorIterator::SELF_FIRST
116
+		);
117 117
         
118
-        foreach ($iterator as $file) {
119
-            if ($file->isDir()) {
120
-                @mkdir($dst . '/' . $iterator->getSubPathName());
121
-            } else {
122
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
123
-                if ($success) {
124
-                    if (! $this->silent) {
125
-                        echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
126
-                    }
127
-                }
128
-            }
129
-        }
130
-    }
118
+		foreach ($iterator as $file) {
119
+			if ($file->isDir()) {
120
+				@mkdir($dst . '/' . $iterator->getSubPathName());
121
+			} else {
122
+				$success = copy($file, $dst . '/' . $iterator->getSubPathName());
123
+				if ($success) {
124
+					if (! $this->silent) {
125
+						echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
126
+					}
127
+				}
128
+			}
129
+		}
130
+	}
131 131
 
132
-    /**
133
-     * Recursive Unlink
134
-     *
135
-     * @param string $dir
136
-     */
137
-    private function recursiveUnlink($dir)
138
-    {
139
-        $iterator = new \RecursiveIteratorIterator(
140
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
141
-            \RecursiveIteratorIterator::CHILD_FIRST
142
-        );
132
+	/**
133
+	 * Recursive Unlink
134
+	 *
135
+	 * @param string $dir
136
+	 */
137
+	private function recursiveUnlink($dir)
138
+	{
139
+		$iterator = new \RecursiveIteratorIterator(
140
+			new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
141
+			\RecursiveIteratorIterator::CHILD_FIRST
142
+		);
143 143
         
144
-        foreach ($iterator as $file) {
145
-            if ($file->isDir()) {
146
-                rmdir($file);
147
-            } else {
148
-                unlink($file);
149
-            }
150
-        }
144
+		foreach ($iterator as $file) {
145
+			if ($file->isDir()) {
146
+				rmdir($file);
147
+			} else {
148
+				unlink($file);
149
+			}
150
+		}
151 151
         
152
-        rmdir($dir);
153
-    }
152
+		rmdir($dir);
153
+	}
154 154
 }
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
     public function install($app = 'application')
23 23
     {
24 24
         $this->recursiveCopy(
25
-            dirname(__FILE__) . '/application/tests',
26
-            $app . '/' . static::TEST_FOLDER
25
+            dirname(__FILE__).'/application/tests',
26
+            $app.'/'.static::TEST_FOLDER
27 27
         );
28 28
         $this->fixPath($app);
29 29
     }
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
      */
34 34
     private function fixPath($app = 'application')
35 35
     {
36
-        $file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
36
+        $file = $app.'/'.static::TEST_FOLDER.'/Bootstrap.php';
37 37
         $contents = file_get_contents($file);
38 38
         
39
-        if (! file_exists('system')) {
39
+        if ( ! file_exists('system')) {
40 40
             if (file_exists('vendor/codeigniter/framework/system')) {
41 41
                 $contents = str_replace(
42 42
                     '$system_path = \'../../system\';',
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             }
49 49
         }
50 50
         
51
-        if (! file_exists('index.php')) {
51
+        if ( ! file_exists('index.php')) {
52 52
             if (file_exists('public/index.php')) {
53 53
                 // CodeIgniter 3.0.6 and after
54 54
                 $contents = str_replace(
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
                     "define('FCPATH', realpath(dirname(__FILE__).'/../../public').'/');",
63 63
                     $contents
64 64
                 );
65
-            } elseif (file_exists($app . '/public/index.php')) {
65
+            } elseif (file_exists($app.'/public/index.php')) {
66 66
                 // CodeIgniter 3.0.6 and after
67 67
                 $contents = str_replace(
68 68
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
@@ -92,10 +92,10 @@  discard block
 block discarded – undo
92 92
 
93 93
     public function update($app = 'application')
94 94
     {
95
-        $target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
95
+        $target_dir = $app.'/'.static::TEST_FOLDER.'/_ci_phpunit_test';
96 96
         $this->recursiveUnlink($target_dir);
97 97
         $this->recursiveCopy(
98
-            dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
98
+            dirname(__FILE__).'/application/tests/_ci_phpunit_test',
99 99
             $target_dir
100 100
         );
101 101
     }
@@ -117,12 +117,12 @@  discard block
 block discarded – undo
117 117
         
118 118
         foreach ($iterator as $file) {
119 119
             if ($file->isDir()) {
120
-                @mkdir($dst . '/' . $iterator->getSubPathName());
120
+                @mkdir($dst.'/'.$iterator->getSubPathName());
121 121
             } else {
122
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
122
+                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
123 123
                 if ($success) {
124
-                    if (! $this->silent) {
125
-                        echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
124
+                    if ( ! $this->silent) {
125
+                        echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
126 126
                     }
127 127
                 }
128 128
             }
Please login to merge, or discard this patch.