Completed
Pull Request — master (#274)
by
unknown
02:28
created
application/tests/Bootstrap.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
  * NOTE: If you change these, also change the error_reporting() code below
55 55
  */
56 56
 // This `if` statemant is needed for @runInSeparateProcess
57
-if (! defined('ENVIRONMENT'))
57
+if ( ! defined('ENVIRONMENT'))
58 58
 {
59 59
 	define('ENVIRONMENT', 'testing');
60 60
 }
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
233 233
 
234 234
 	// Path to the test directory containing all the test files.
235
-	define('TESTPATH', __dir__.DIRECTORY_SEPARATOR);  // Should be the folder this `Bootstrap.php` file is in.
235
+	define('TESTPATH', __dir__.DIRECTORY_SEPARATOR); // Should be the folder this `Bootstrap.php` file is in.
236 236
 
237 237
 	// Path to the system directory
238 238
 	define('BASEPATH', $system_path);
@@ -314,9 +314,9 @@  discard block
 block discarded – undo
314 314
 	define('VIEWPATH', $view_folder.DIRECTORY_SEPARATOR);
315 315
 
316 316
 	// Path to the ci-phpunit-test directory
317
-	if (is_dir(TESTPATH . '_ci_phpunit_test'))
317
+	if (is_dir(TESTPATH.'_ci_phpunit_test'))
318 318
 	{
319
-		define('CI_PHPUNIT_TESTPATH', TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR);
319
+		define('CI_PHPUNIT_TESTPATH', TESTPATH.'_ci_phpunit_test'.DIRECTORY_SEPARATOR);
320 320
 	}
321 321
 	else
322 322
 	{
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
380 380
 */
381 381
 
382
-require CI_PHPUNIT_TESTPATH . '/CIPHPUnitTest.php';
382
+require CI_PHPUNIT_TESTPATH.'/CIPHPUnitTest.php';
383 383
 
384 384
 CIPHPUnitTest::init();
385 385
 // Or you can set directories for autoloading
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 		if (! defined('TESTPATH')) {
24 24
 			define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
25 25
 		}
26
-        // Current Bootstrap.php should define this, but in case it doesn't:
26
+		// Current Bootstrap.php should define this, but in case it doesn't:
27 27
 		if (! defined('CI_PHPUNIT_TESTPATH')) {
28 28
 			define('CI_PHPUNIT_TESTPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
29 29
 		}
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -20,11 +20,11 @@  discard block
 block discarded – undo
20 20
 	 */
21 21
 	public static function init(array $autoload_dirs = null)
22 22
 	{
23
-		if (! defined('TESTPATH')) {
23
+		if ( ! defined('TESTPATH')) {
24 24
 			define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
25 25
 		}
26 26
         // Current Bootstrap.php should define this, but in case it doesn't:
27
-		if (! defined('CI_PHPUNIT_TESTPATH')) {
27
+		if ( ! defined('CI_PHPUNIT_TESTPATH')) {
28 28
 			define('CI_PHPUNIT_TESTPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
29 29
 		}
30 30
 
@@ -41,38 +41,38 @@  discard block
 block discarded – undo
41 41
 		$cwd_backup = getcwd();
42 42
 
43 43
 		// Load autoloader for ci-phpunit-test
44
-		require __DIR__ . '/autoloader.php';
44
+		require __DIR__.'/autoloader.php';
45 45
 
46
-		require TESTPATH . 'TestCase.php';
46
+		require TESTPATH.'TestCase.php';
47 47
 
48
-		$db_test_case_file = TESTPATH . 'DbTestCase.php';
48
+		$db_test_case_file = TESTPATH.'DbTestCase.php';
49 49
 		if (is_readable($db_test_case_file))
50 50
 		{
51 51
 			require $db_test_case_file;
52 52
 		}
53 53
 
54
-		$unit_test_case_file = TESTPATH . 'UnitTestCase.php';
54
+		$unit_test_case_file = TESTPATH.'UnitTestCase.php';
55 55
 		if (is_readable($unit_test_case_file))
56 56
 		{
57 57
 			require $unit_test_case_file;
58 58
 		}
59 59
 
60 60
 		// Replace a few Common functions
61
-		require __DIR__ . '/replacing/core/Common.php';
62
-		require BASEPATH . 'core/Common.php';
61
+		require __DIR__.'/replacing/core/Common.php';
62
+		require BASEPATH.'core/Common.php';
63 63
 
64 64
 		// Workaround for missing CodeIgniter's error handler
65 65
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
66 66
 		set_error_handler('_error_handler');
67 67
 
68 68
 		// Load new functions of CIPHPUnitTest
69
-		require __DIR__ . '/functions.php';
69
+		require __DIR__.'/functions.php';
70 70
 		// Load ci-phpunit-test CI_Loader
71
-		require __DIR__ . '/replacing/core/Loader.php';
71
+		require __DIR__.'/replacing/core/Loader.php';
72 72
 		// Load ci-phpunit-test CI_Input
73
-		require __DIR__ . '/replacing/core/Input.php';
73
+		require __DIR__.'/replacing/core/Input.php';
74 74
 		// Load ci-phpunit-test CI_Output
75
-		require __DIR__ . '/replacing/core/Output.php';
75
+		require __DIR__.'/replacing/core/Output.php';
76 76
 
77 77
 		// Change current directory
78 78
 		chdir(FCPATH);
@@ -84,12 +84,12 @@  discard block
 block discarded – undo
84 84
 		 *
85 85
 		 * And away we go...
86 86
 		 */
87
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
87
+		require __DIR__.'/replacing/core/CodeIgniter.php';
88 88
 
89 89
 		self::replaceHelpers();
90 90
 
91 91
 		// Create CodeIgniter instance
92
-		if (! self::wiredesignzHmvcInstalled())
92
+		if ( ! self::wiredesignzHmvcInstalled())
93 93
 		{
94 94
 			new CI_Controller();
95 95
 		}
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 
111 111
 	public static function createCodeIgniterInstance()
112 112
 	{
113
-		if (! self::wiredesignzHmvcInstalled())
113
+		if ( ! self::wiredesignzHmvcInstalled())
114 114
 		{
115 115
 			new CI_Controller();
116 116
 		}
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
 	protected static function replaceLoader()
140 140
 	{
141 141
 		$my_loader_file =
142
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
142
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
143 143
 
144 144
 		if (file_exists($my_loader_file))
145 145
 		{
146
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
146
+			self::$loader_class = config_item('subclass_prefix').'Loader';
147 147
 			if ( ! class_exists(self::$loader_class))
148 148
 			{
149 149
 				require $my_loader_file;
@@ -162,19 +162,19 @@  discard block
 block discarded – undo
162 162
 
163 163
 	protected static function loadHelper($helper)
164 164
 	{
165
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
165
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
166 166
 		if (file_exists($my_helper_file))
167 167
 		{
168 168
 			require $my_helper_file;
169 169
 		}
170
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
170
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
171 171
 	}
172 172
 
173 173
 	public static function setPatcherCacheDir($dir = null)
174 174
 	{
175 175
 		if ($dir === null)
176 176
 		{
177
-			$dir = CI_PHPUNIT_TESTPATH . 'tmp/cache';
177
+			$dir = CI_PHPUNIT_TESTPATH.'tmp/cache';
178 178
 		}
179 179
 
180 180
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
lib/Installer.php 1 patch
Indentation   +196 added lines, -196 removed lines patch added patch discarded remove patch
@@ -10,200 +10,200 @@
 block discarded – undo
10 10
 
11 11
 class Installer
12 12
 {
13
-    private $silent = false;
14
-    private $app_dir = 'application';
15
-    private $pub_dir = 'public';
16
-    private $test_dir = 'tests';
17
-    private $from_composer = false;
18
-
19
-    public function __construct($argv)
20
-    {
21
-        $this->parse_args($argv);
22
-    }
23
-
24
-    private function parse_args($argv)
25
-    {
26
-        $argc = count($argv);
27
-
28
-        if ($argc === 1) {
29
-            return;
30
-        }
31
-
32
-        for ($i = 1; $i <= $argc; $i++) {
33
-            if (! isset($argv[$i])) {
34
-                break;
35
-            }
36
-
37
-            switch ($argv[$i]) {
38
-                // php install.php -s
39
-                case '-s':
40
-                    $this->silent = true;
41
-                    break;
42
-
43
-                // php install.php -a application
44
-                case '-a':
45
-                    if (is_dir($argv[$i+1])) {
46
-                        $this->app_dir = $argv[$i+1];
47
-                    } else {
48
-                        throw new Exception('No such directory: '.$argv[$i+1]);
49
-                    }
50
-                    $i++;
51
-                    break;
52
-
53
-                // php install.php -p public
54
-                case '-p':
55
-                    if (is_dir($argv[$i+1])) {
56
-                        $this->pub_dir = $argv[$i+1];
57
-                    } else {
58
-                        throw new Exception('No such directory: '.$argv[$i+1]);
59
-                    }
60
-                    $i++;
61
-                    break;
62
-
63
-                case '--from-composer':
64
-                    $this->from_composer = true;
65
-                    $i++;
66
-                    break;
67
-
68
-                default:
69
-                    throw new Exception('Unknown argument: '.$argv[$i]);
70
-            }
71
-        }
72
-    }
73
-
74
-    public function install()
75
-    {
76
-        $this->recursiveCopy(
77
-            dirname(dirname(__FILE__)).'/application/tests',
78
-            $this->app_dir.'/'.$this->test_dir
79
-        );
80
-        $this->fixPath();
81
-        if ($this->from_composer) {
82
-            $this->recursiveUnlink($this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test');
83
-        }
84
-    }
85
-
86
-    /**
87
-     * Fix paths in Bootstrap.php
88
-     */
89
-    private function fixPath()
90
-    {
91
-        $file = $this->app_dir.'/'.$this->test_dir.'/Bootstrap.php';
92
-        $contents = file_get_contents($file);
93
-
94
-        if (! file_exists('system')) {
95
-            if (file_exists('vendor/codeigniter/framework/system')) {
96
-                $contents = str_replace(
97
-                    '$system_path = \'../../system\';',
98
-                    '$system_path = \'../../vendor/codeigniter/framework/system\';',
99
-                    $contents
100
-                );
101
-            } else {
102
-                throw new Exception('Can\'t find "system" folder.');
103
-            }
104
-        }
105
-
106
-        if (! file_exists('index.php')) {
107
-            if (file_exists($this->pub_dir.'/index.php')) {
108
-                // CodeIgniter 3.0.6 and after
109
-                $contents = str_replace(
110
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
111
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').DIRECTORY_SEPARATOR);",
112
-                    $contents
113
-                );
114
-                // CodeIgniter 3.0.5 and before
115
-                $contents = str_replace(
116
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
117
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').'/');",
118
-                    $contents
119
-                );
120
-            } elseif (file_exists($this->app_dir.'/public/index.php')) {
121
-                // CodeIgniter 3.0.6 and after
122
-                $contents = str_replace(
123
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
124
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
125
-                    $contents
126
-                );
127
-                // CodeIgniter 3.0.5 and before
128
-                $contents = str_replace(
129
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
130
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
131
-                    $contents
132
-                );
133
-                if ($this->app_dir !== 'application') {
134
-                    $contents = str_replace(
135
-                        "\$application_folder = '../../application';",
136
-                        "\$application_folder = '../../{$this->app_dir}';",
137
-                        $contents
138
-                    );
139
-                }
140
-            } else {
141
-                throw new Exception('Can\'t find "index.php".');
142
-            }
143
-        }
144
-
145
-        file_put_contents($file, $contents);
146
-    }
147
-
148
-    public function update()
149
-    {
150
-        $target_dir = $this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test';
151
-        $this->recursiveUnlink($target_dir);
152
-        $this->recursiveCopy(
153
-            dirname(dirname(__FILE__)).'/application/tests/_ci_phpunit_test',
154
-            $target_dir
155
-        );
156
-    }
157
-
158
-    /**
159
-     * Recursive Copy
160
-     *
161
-     * @param string $src
162
-     * @param string $dst
163
-     */
164
-    private function recursiveCopy($src, $dst)
165
-    {
166
-        @mkdir($dst, 0755);
167
-
168
-        $iterator = new \RecursiveIteratorIterator(
169
-            new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
170
-            \RecursiveIteratorIterator::SELF_FIRST
171
-        );
172
-
173
-        foreach ($iterator as $file) {
174
-            if ($file->isDir()) {
175
-                @mkdir($dst.'/'.$iterator->getSubPathName());
176
-            } else {
177
-                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
178
-                if ($success) {
179
-                    if (! $this->silent) {
180
-                        echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
181
-                    }
182
-                }
183
-            }
184
-        }
185
-    }
186
-
187
-    /**
188
-     * Recursive Unlink
189
-     *
190
-     * @param string $dir
191
-     */
192
-    private function recursiveUnlink($dir)
193
-    {
194
-        $iterator = new \RecursiveIteratorIterator(
195
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
196
-            \RecursiveIteratorIterator::CHILD_FIRST
197
-        );
198
-
199
-        foreach ($iterator as $file) {
200
-            if ($file->isDir()) {
201
-                rmdir($file);
202
-            } else {
203
-                unlink($file);
204
-            }
205
-        }
206
-
207
-        rmdir($dir);
208
-    }
13
+	private $silent = false;
14
+	private $app_dir = 'application';
15
+	private $pub_dir = 'public';
16
+	private $test_dir = 'tests';
17
+	private $from_composer = false;
18
+
19
+	public function __construct($argv)
20
+	{
21
+		$this->parse_args($argv);
22
+	}
23
+
24
+	private function parse_args($argv)
25
+	{
26
+		$argc = count($argv);
27
+
28
+		if ($argc === 1) {
29
+			return;
30
+		}
31
+
32
+		for ($i = 1; $i <= $argc; $i++) {
33
+			if (! isset($argv[$i])) {
34
+				break;
35
+			}
36
+
37
+			switch ($argv[$i]) {
38
+				// php install.php -s
39
+				case '-s':
40
+					$this->silent = true;
41
+					break;
42
+
43
+				// php install.php -a application
44
+				case '-a':
45
+					if (is_dir($argv[$i+1])) {
46
+						$this->app_dir = $argv[$i+1];
47
+					} else {
48
+						throw new Exception('No such directory: '.$argv[$i+1]);
49
+					}
50
+					$i++;
51
+					break;
52
+
53
+				// php install.php -p public
54
+				case '-p':
55
+					if (is_dir($argv[$i+1])) {
56
+						$this->pub_dir = $argv[$i+1];
57
+					} else {
58
+						throw new Exception('No such directory: '.$argv[$i+1]);
59
+					}
60
+					$i++;
61
+					break;
62
+
63
+				case '--from-composer':
64
+					$this->from_composer = true;
65
+					$i++;
66
+					break;
67
+
68
+				default:
69
+					throw new Exception('Unknown argument: '.$argv[$i]);
70
+			}
71
+		}
72
+	}
73
+
74
+	public function install()
75
+	{
76
+		$this->recursiveCopy(
77
+			dirname(dirname(__FILE__)).'/application/tests',
78
+			$this->app_dir.'/'.$this->test_dir
79
+		);
80
+		$this->fixPath();
81
+		if ($this->from_composer) {
82
+			$this->recursiveUnlink($this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test');
83
+		}
84
+	}
85
+
86
+	/**
87
+	 * Fix paths in Bootstrap.php
88
+	 */
89
+	private function fixPath()
90
+	{
91
+		$file = $this->app_dir.'/'.$this->test_dir.'/Bootstrap.php';
92
+		$contents = file_get_contents($file);
93
+
94
+		if (! file_exists('system')) {
95
+			if (file_exists('vendor/codeigniter/framework/system')) {
96
+				$contents = str_replace(
97
+					'$system_path = \'../../system\';',
98
+					'$system_path = \'../../vendor/codeigniter/framework/system\';',
99
+					$contents
100
+				);
101
+			} else {
102
+				throw new Exception('Can\'t find "system" folder.');
103
+			}
104
+		}
105
+
106
+		if (! file_exists('index.php')) {
107
+			if (file_exists($this->pub_dir.'/index.php')) {
108
+				// CodeIgniter 3.0.6 and after
109
+				$contents = str_replace(
110
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
111
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').DIRECTORY_SEPARATOR);",
112
+					$contents
113
+				);
114
+				// CodeIgniter 3.0.5 and before
115
+				$contents = str_replace(
116
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
117
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').'/');",
118
+					$contents
119
+				);
120
+			} elseif (file_exists($this->app_dir.'/public/index.php')) {
121
+				// CodeIgniter 3.0.6 and after
122
+				$contents = str_replace(
123
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
124
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
125
+					$contents
126
+				);
127
+				// CodeIgniter 3.0.5 and before
128
+				$contents = str_replace(
129
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
130
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
131
+					$contents
132
+				);
133
+				if ($this->app_dir !== 'application') {
134
+					$contents = str_replace(
135
+						"\$application_folder = '../../application';",
136
+						"\$application_folder = '../../{$this->app_dir}';",
137
+						$contents
138
+					);
139
+				}
140
+			} else {
141
+				throw new Exception('Can\'t find "index.php".');
142
+			}
143
+		}
144
+
145
+		file_put_contents($file, $contents);
146
+	}
147
+
148
+	public function update()
149
+	{
150
+		$target_dir = $this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test';
151
+		$this->recursiveUnlink($target_dir);
152
+		$this->recursiveCopy(
153
+			dirname(dirname(__FILE__)).'/application/tests/_ci_phpunit_test',
154
+			$target_dir
155
+		);
156
+	}
157
+
158
+	/**
159
+	 * Recursive Copy
160
+	 *
161
+	 * @param string $src
162
+	 * @param string $dst
163
+	 */
164
+	private function recursiveCopy($src, $dst)
165
+	{
166
+		@mkdir($dst, 0755);
167
+
168
+		$iterator = new \RecursiveIteratorIterator(
169
+			new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
170
+			\RecursiveIteratorIterator::SELF_FIRST
171
+		);
172
+
173
+		foreach ($iterator as $file) {
174
+			if ($file->isDir()) {
175
+				@mkdir($dst.'/'.$iterator->getSubPathName());
176
+			} else {
177
+				$success = copy($file, $dst.'/'.$iterator->getSubPathName());
178
+				if ($success) {
179
+					if (! $this->silent) {
180
+						echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
181
+					}
182
+				}
183
+			}
184
+		}
185
+	}
186
+
187
+	/**
188
+	 * Recursive Unlink
189
+	 *
190
+	 * @param string $dir
191
+	 */
192
+	private function recursiveUnlink($dir)
193
+	{
194
+		$iterator = new \RecursiveIteratorIterator(
195
+			new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
196
+			\RecursiveIteratorIterator::CHILD_FIRST
197
+		);
198
+
199
+		foreach ($iterator as $file) {
200
+			if ($file->isDir()) {
201
+				rmdir($file);
202
+			} else {
203
+				unlink($file);
204
+			}
205
+		}
206
+
207
+		rmdir($dir);
208
+	}
209 209
 }
Please login to merge, or discard this patch.