Completed
Pull Request — master (#364)
by Kenji
02:19
created
application/tests/_ci_phpunit_test/patcher/Cache.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -251,10 +251,10 @@
 block discarded – undo
251 251
 	}
252 252
 
253 253
 	/**
254
-	* Recursive Unlink
255
-	*
256
-	* @param string $dir
257
-	*/
254
+	 * Recursive Unlink
255
+	 *
256
+	 * @param string $dir
257
+	 */
258 258
 	protected static function recursiveUnlink($dir)
259 259
 	{
260 260
 		if (! is_dir($dir))
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestRequest.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,9 +10,9 @@
 block discarded – undo
10 10
 
11 11
 class CIPHPUnitTestRequest
12 12
 {
13
-    /**
14
-     * @var TestCase
15
-     */
13
+	/**
14
+	 * @var TestCase
15
+	 */
16 16
 	protected $testCase;
17 17
 
18 18
 	/**
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/TestSuiteProvider.php 1 patch
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 // Support PHPUnit 6.0
46 46
 if (! class_exists('PHPUnit_Util_Configuration')) {
47
-    class_alias('PHPUnit\Util\Configuration', 'PHPUnit_Util_Configuration');
47
+	class_alias('PHPUnit\Util\Configuration', 'PHPUnit_Util_Configuration');
48 48
 }
49 49
 
50 50
 /**
@@ -57,71 +57,71 @@  discard block
 block discarded – undo
57 57
  */
58 58
 final class TestSuiteProvider
59 59
 {
60
-    /**
61
-     * phpunit configuration file
62
-     *
63
-     * @var string
64
-     */
65
-    private static $file;
60
+	/**
61
+	 * phpunit configuration file
62
+	 *
63
+	 * @var string
64
+	 */
65
+	private static $file;
66 66
 
67
-    /**
68
-     * constructor
69
-     */
70
-    private function __construct() {}
67
+	/**
68
+	 * constructor
69
+	 */
70
+	private function __construct() {}
71 71
 
72
-    /**
73
-     * set the phpunit configuration file
74
-     *
75
-     * @param string $file the path or filename of the phunit configuration file
76
-     */
77
-    public static function setConfigurationFile($file)
78
-    {
79
-        static::$file = $file;
80
-    }
72
+	/**
73
+	 * set the phpunit configuration file
74
+	 *
75
+	 * @param string $file the path or filename of the phunit configuration file
76
+	 */
77
+	public static function setConfigurationFile($file)
78
+	{
79
+		static::$file = $file;
80
+	}
81 81
 
82
-    /**
83
-     * get the phpunit test suite instance
84
-     *
85
-     * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
86
-     * @throws FileNotFoundException       if the file is not found
87
-     */
88
-    public static function suite()
89
-    {
90
-        $file = static::checkConfigurationFile(
91
-            static::getConfigurationFile()
92
-        );
82
+	/**
83
+	 * get the phpunit test suite instance
84
+	 *
85
+	 * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
86
+	 * @throws FileNotFoundException       if the file is not found
87
+	 */
88
+	public static function suite()
89
+	{
90
+		$file = static::checkConfigurationFile(
91
+			static::getConfigurationFile()
92
+		);
93 93
 
94
-        return PHPUnit_Util_Configuration::getInstance($file)
95
-            ->getTestSuiteConfiguration();
96
-    }
94
+		return PHPUnit_Util_Configuration::getInstance($file)
95
+			->getTestSuiteConfiguration();
96
+	}
97 97
 
98
-    /**
99
-     * get the phpunit configuration file
100
-     *
101
-     * @return string
102
-     */
103
-    private static function getConfigurationFile()
104
-    {
105
-        static::$file = isset(static::$file)
106
-            ? static::$file
107
-            : TESTPATH.'phpunit.xml';
98
+	/**
99
+	 * get the phpunit configuration file
100
+	 *
101
+	 * @return string
102
+	 */
103
+	private static function getConfigurationFile()
104
+	{
105
+		static::$file = isset(static::$file)
106
+			? static::$file
107
+			: TESTPATH.'phpunit.xml';
108 108
 
109
-        return static::$file;
110
-    }
109
+		return static::$file;
110
+	}
111 111
 
112
-    /**
113
-     * check the given file
114
-     *
115
-     * @param  string                $file file to check
116
-     * @return string                returns the file if it is valid
117
-     * @throws FileNotFoundException if the file is not found
118
-     */
119
-    private static function checkConfigurationFile($file)
120
-    {
121
-        if (!file_exists($file)) {
122
-            throw new \RuntimeException("The requested phpunit configuration was not found at $file");
123
-        }
112
+	/**
113
+	 * check the given file
114
+	 *
115
+	 * @param  string                $file file to check
116
+	 * @return string                returns the file if it is valid
117
+	 * @throws FileNotFoundException if the file is not found
118
+	 */
119
+	private static function checkConfigurationFile($file)
120
+	{
121
+		if (!file_exists($file)) {
122
+			throw new \RuntimeException("The requested phpunit configuration was not found at $file");
123
+		}
124 124
 
125
-        return $file;
126
-    }
125
+		return $file;
126
+	}
127 127
 }
Please login to merge, or discard this patch.
lib/Installer.php 1 patch
Indentation   +215 added lines, -215 removed lines patch added patch discarded remove patch
@@ -10,219 +10,219 @@
 block discarded – undo
10 10
 
11 11
 class Installer
12 12
 {
13
-    private $silent = false;
14
-    private $app_dir = 'application';  // -a DIRECTORY
15
-    private $pub_dir = 'public';       // -p DIRECTORY
16
-    private $test_dir = null;          // -t DIRECTORY
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
-            if (is_null($this->test_dir)) {
30
-                $this->test_dir = $this->app_dir.'/tests';
31
-            }
32
-
33
-            return;
34
-        }
35
-
36
-        for ($i = 1; $i <= $argc; $i++) {
37
-            if (! isset($argv[$i])) {
38
-                break;
39
-            }
40
-
41
-            switch ($argv[$i]) {
42
-                // php install.php -s
43
-                case '-s':
44
-                    $this->silent = true;
45
-                    break;
46
-
47
-                // php install.php -a application
48
-                case '-a':
49
-                    if (is_dir($argv[$i+1])) {
50
-                        $this->app_dir = $argv[$i+1];
51
-                    } else {
52
-                        throw new Exception('No such application directory: '.$argv[$i+1]);
53
-                    }
54
-                    $i++;
55
-                    break;
56
-
57
-                // php install.php -p public
58
-                case '-p':
59
-                    if (is_dir($argv[$i+1])) {
60
-                        $this->pub_dir = $argv[$i+1];
61
-                    } else {
62
-                        throw new Exception('No such public directory: '.$argv[$i+1]);
63
-                    }
64
-                    $i++;
65
-                    break;
66
-
67
-                // php install.php -t application/tests
68
-                case '-t':
69
-                    if (is_dir($argv[$i+1])) {
70
-                        $this->test_dir = $argv[$i+1];
71
-                    } else {
72
-                        throw new Exception('No such test directory: '.$argv[$i+1]);
73
-                    }
74
-                    $i++;
75
-                    break;
76
-
77
-                case '--from-composer':
78
-                    $this->from_composer = true;
79
-                    break;
80
-
81
-                default:
82
-                    throw new Exception('Unknown argument: '.$argv[$i]);
83
-            }
84
-        }
85
-
86
-        if (is_null($this->test_dir)) {
87
-            $this->test_dir = $this->app_dir.'/tests';
88
-        }
89
-    }
90
-
91
-    public function install()
92
-    {
93
-        $this->recursiveCopy(
94
-            dirname(dirname(__FILE__)).'/application/tests',
95
-            $this->test_dir
96
-        );
97
-        $this->fixPath();
98
-        if ($this->from_composer) {
99
-            $this->recursiveUnlink($this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test');
100
-        }
101
-    }
102
-
103
-    /**
104
-     * Fix paths in Bootstrap.php
105
-     *
106
-     * @FIXME Too ad hoc. Must rewrite, because can't handle complex paths.
107
-     */
108
-    private function fixPath()
109
-    {
110
-        $file = $this->test_dir.'/Bootstrap.php';
111
-        $contents = file_get_contents($file);
112
-
113
-        if (! file_exists('system')) {
114
-            if (file_exists('vendor/codeigniter/framework/system')) {
115
-                $contents = str_replace(
116
-                    '$system_path = \'../../system\';',
117
-                    '$system_path = \'../../vendor/codeigniter/framework/system\';',
118
-                    $contents
119
-                );
120
-            } else {
121
-                throw new Exception('Can\'t find "system" folder.');
122
-            }
123
-        }
124
-
125
-        if (! file_exists('index.php')) {
126
-            if (file_exists($this->pub_dir.'/index.php')) {
127
-                // CodeIgniter 3.0.6 and after
128
-                $contents = str_replace(
129
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
130
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').DIRECTORY_SEPARATOR);",
131
-                    $contents
132
-                );
133
-                // CodeIgniter 3.0.5 and before
134
-                $contents = str_replace(
135
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
136
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').'/');",
137
-                    $contents
138
-                );
139
-            } elseif (file_exists($this->app_dir.'/public/index.php')) {
140
-                // CodeIgniter 3.0.6 and after
141
-                $contents = str_replace(
142
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
143
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
144
-                    $contents
145
-                );
146
-                // CodeIgniter 3.0.5 and before
147
-                $contents = str_replace(
148
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
149
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
150
-                    $contents
151
-                );
152
-                if ($this->app_dir !== 'application') {
153
-                    $contents = str_replace(
154
-                        "\$application_folder = '../../application';",
155
-                        "\$application_folder = '../../{$this->app_dir}';",
156
-                        $contents
157
-                    );
158
-                }
159
-            } else {
160
-                throw new Exception('Can\'t find "index.php".');
161
-            }
162
-        }
163
-
164
-        file_put_contents($file, $contents);
165
-    }
166
-
167
-    public function update()
168
-    {
169
-        $target_dir = $this->test_dir.'/_ci_phpunit_test';
170
-        $this->recursiveUnlink($target_dir);
171
-        $this->recursiveCopy(
172
-            dirname(dirname(__FILE__)).'/application/tests/_ci_phpunit_test',
173
-            $target_dir
174
-        );
175
-    }
176
-
177
-    /**
178
-     * Recursive Copy
179
-     *
180
-     * @param string $src
181
-     * @param string $dst
182
-     */
183
-    private function recursiveCopy($src, $dst)
184
-    {
185
-        @mkdir($dst, 0755);
186
-
187
-        $iterator = new \RecursiveIteratorIterator(
188
-            new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
189
-            \RecursiveIteratorIterator::SELF_FIRST
190
-        );
191
-
192
-        foreach ($iterator as $file) {
193
-            if ($file->isDir()) {
194
-                @mkdir($dst.'/'.$iterator->getSubPathName());
195
-            } else {
196
-                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
197
-                if ($success) {
198
-                    if (! $this->silent) {
199
-                        echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
200
-                    }
201
-                }
202
-            }
203
-        }
204
-    }
205
-
206
-    /**
207
-     * Recursive Unlink
208
-     *
209
-     * @param string $dir
210
-     */
211
-    private function recursiveUnlink($dir)
212
-    {
213
-        $iterator = new \RecursiveIteratorIterator(
214
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
215
-            \RecursiveIteratorIterator::CHILD_FIRST
216
-        );
217
-
218
-        foreach ($iterator as $file) {
219
-            if ($file->isDir()) {
220
-                rmdir($file);
221
-            } else {
222
-                unlink($file);
223
-            }
224
-        }
225
-
226
-        rmdir($dir);
227
-    }
13
+	private $silent = false;
14
+	private $app_dir = 'application';  // -a DIRECTORY
15
+	private $pub_dir = 'public';       // -p DIRECTORY
16
+	private $test_dir = null;          // -t DIRECTORY
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
+			if (is_null($this->test_dir)) {
30
+				$this->test_dir = $this->app_dir.'/tests';
31
+			}
32
+
33
+			return;
34
+		}
35
+
36
+		for ($i = 1; $i <= $argc; $i++) {
37
+			if (! isset($argv[$i])) {
38
+				break;
39
+			}
40
+
41
+			switch ($argv[$i]) {
42
+				// php install.php -s
43
+				case '-s':
44
+					$this->silent = true;
45
+					break;
46
+
47
+				// php install.php -a application
48
+				case '-a':
49
+					if (is_dir($argv[$i+1])) {
50
+						$this->app_dir = $argv[$i+1];
51
+					} else {
52
+						throw new Exception('No such application directory: '.$argv[$i+1]);
53
+					}
54
+					$i++;
55
+					break;
56
+
57
+				// php install.php -p public
58
+				case '-p':
59
+					if (is_dir($argv[$i+1])) {
60
+						$this->pub_dir = $argv[$i+1];
61
+					} else {
62
+						throw new Exception('No such public directory: '.$argv[$i+1]);
63
+					}
64
+					$i++;
65
+					break;
66
+
67
+				// php install.php -t application/tests
68
+				case '-t':
69
+					if (is_dir($argv[$i+1])) {
70
+						$this->test_dir = $argv[$i+1];
71
+					} else {
72
+						throw new Exception('No such test directory: '.$argv[$i+1]);
73
+					}
74
+					$i++;
75
+					break;
76
+
77
+				case '--from-composer':
78
+					$this->from_composer = true;
79
+					break;
80
+
81
+				default:
82
+					throw new Exception('Unknown argument: '.$argv[$i]);
83
+			}
84
+		}
85
+
86
+		if (is_null($this->test_dir)) {
87
+			$this->test_dir = $this->app_dir.'/tests';
88
+		}
89
+	}
90
+
91
+	public function install()
92
+	{
93
+		$this->recursiveCopy(
94
+			dirname(dirname(__FILE__)).'/application/tests',
95
+			$this->test_dir
96
+		);
97
+		$this->fixPath();
98
+		if ($this->from_composer) {
99
+			$this->recursiveUnlink($this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test');
100
+		}
101
+	}
102
+
103
+	/**
104
+	 * Fix paths in Bootstrap.php
105
+	 *
106
+	 * @FIXME Too ad hoc. Must rewrite, because can't handle complex paths.
107
+	 */
108
+	private function fixPath()
109
+	{
110
+		$file = $this->test_dir.'/Bootstrap.php';
111
+		$contents = file_get_contents($file);
112
+
113
+		if (! file_exists('system')) {
114
+			if (file_exists('vendor/codeigniter/framework/system')) {
115
+				$contents = str_replace(
116
+					'$system_path = \'../../system\';',
117
+					'$system_path = \'../../vendor/codeigniter/framework/system\';',
118
+					$contents
119
+				);
120
+			} else {
121
+				throw new Exception('Can\'t find "system" folder.');
122
+			}
123
+		}
124
+
125
+		if (! file_exists('index.php')) {
126
+			if (file_exists($this->pub_dir.'/index.php')) {
127
+				// CodeIgniter 3.0.6 and after
128
+				$contents = str_replace(
129
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
130
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').DIRECTORY_SEPARATOR);",
131
+					$contents
132
+				);
133
+				// CodeIgniter 3.0.5 and before
134
+				$contents = str_replace(
135
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
136
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').'/');",
137
+					$contents
138
+				);
139
+			} elseif (file_exists($this->app_dir.'/public/index.php')) {
140
+				// CodeIgniter 3.0.6 and after
141
+				$contents = str_replace(
142
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
143
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
144
+					$contents
145
+				);
146
+				// CodeIgniter 3.0.5 and before
147
+				$contents = str_replace(
148
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
149
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
150
+					$contents
151
+				);
152
+				if ($this->app_dir !== 'application') {
153
+					$contents = str_replace(
154
+						"\$application_folder = '../../application';",
155
+						"\$application_folder = '../../{$this->app_dir}';",
156
+						$contents
157
+					);
158
+				}
159
+			} else {
160
+				throw new Exception('Can\'t find "index.php".');
161
+			}
162
+		}
163
+
164
+		file_put_contents($file, $contents);
165
+	}
166
+
167
+	public function update()
168
+	{
169
+		$target_dir = $this->test_dir.'/_ci_phpunit_test';
170
+		$this->recursiveUnlink($target_dir);
171
+		$this->recursiveCopy(
172
+			dirname(dirname(__FILE__)).'/application/tests/_ci_phpunit_test',
173
+			$target_dir
174
+		);
175
+	}
176
+
177
+	/**
178
+	 * Recursive Copy
179
+	 *
180
+	 * @param string $src
181
+	 * @param string $dst
182
+	 */
183
+	private function recursiveCopy($src, $dst)
184
+	{
185
+		@mkdir($dst, 0755);
186
+
187
+		$iterator = new \RecursiveIteratorIterator(
188
+			new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
189
+			\RecursiveIteratorIterator::SELF_FIRST
190
+		);
191
+
192
+		foreach ($iterator as $file) {
193
+			if ($file->isDir()) {
194
+				@mkdir($dst.'/'.$iterator->getSubPathName());
195
+			} else {
196
+				$success = copy($file, $dst.'/'.$iterator->getSubPathName());
197
+				if ($success) {
198
+					if (! $this->silent) {
199
+						echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
200
+					}
201
+				}
202
+			}
203
+		}
204
+	}
205
+
206
+	/**
207
+	 * Recursive Unlink
208
+	 *
209
+	 * @param string $dir
210
+	 */
211
+	private function recursiveUnlink($dir)
212
+	{
213
+		$iterator = new \RecursiveIteratorIterator(
214
+			new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
215
+			\RecursiveIteratorIterator::CHILD_FIRST
216
+		);
217
+
218
+		foreach ($iterator as $file) {
219
+			if ($file->isDir()) {
220
+				rmdir($file);
221
+			} else {
222
+				unlink($file);
223
+			}
224
+		}
225
+
226
+		rmdir($dir);
227
+	}
228 228
 }
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/MonkeyPatch.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@
 block discarded – undo
37 37
 	}
38 38
 
39 39
 	/**
40
-     * Patch on constant
41
-     * 
42
-     * @param string $constant
43
-     * @param mixed $value
44
-     * @param string $class_method
45
-     */
40
+	 * Patch on constant
41
+	 * 
42
+	 * @param string $constant
43
+	 * @param mixed $value
44
+	 * @param string $class_method
45
+	 */
46 46
 	public static function patchConstant($constant, $value, $class_method = null)
47 47
 	{
48 48
 		ConstProxy::patch($constant, $value, $class_method);
Please login to merge, or discard this patch.