Completed
Pull Request — master (#88)
by Kenji
04:13
created
application/tests/mocks/libraries/email.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Part of CI PHPUnit Test
4
- *
5
- * @author     Kenji Suzuki <https://github.com/kenjis>
6
- * @license    MIT License
7
- * @copyright  2015 Kenji Suzuki
8
- * @link       https://github.com/kenjis/ci-phpunit-test
9
- */
3
+	 * Part of CI PHPUnit Test
4
+	 *
5
+	 * @author     Kenji Suzuki <https://github.com/kenjis>
6
+	 * @license    MIT License
7
+	 * @copyright  2015 Kenji Suzuki
8
+	 * @link       https://github.com/kenjis/ci-phpunit-test
9
+	 */
10 10
 
11 11
 require __DIR__ . '/Installer.php';
12 12
 
Please login to merge, or discard this patch.
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/TestSuiteProvider.php 2 patches
Indentation   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Test Suite Provider for NetBeans
4
- * https://github.com/BrickieToolShed/netbeans-phpunit-support
5
- * 
6
- * Modified 2015 by Kenji Suzuki <https://github.com/kenjis>
7
- * @link       https://github.com/kenjis/ci-phpunit-test
8
- */
3
+	 * Test Suite Provider for NetBeans
4
+	 * https://github.com/BrickieToolShed/netbeans-phpunit-support
5
+	 * 
6
+	 * Modified 2015 by Kenji Suzuki <https://github.com/kenjis>
7
+	 * @link       https://github.com/kenjis/ci-phpunit-test
8
+	 */
9 9
 
10 10
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
11 11
 /**
@@ -52,71 +52,71 @@  discard block
 block discarded – undo
52 52
  */
53 53
 final class TestSuiteProvider
54 54
 {
55
-    /**
56
-     * phpunit configuration file
57
-     *
58
-     * @var string
59
-     */
60
-    private static $file;
55
+	/**
56
+	 * phpunit configuration file
57
+	 *
58
+	 * @var string
59
+	 */
60
+	private static $file;
61 61
 
62
-    /**
63
-     * constructor
64
-     */
65
-    private function __construct() {}
62
+	/**
63
+	 * constructor
64
+	 */
65
+	private function __construct() {}
66 66
 
67
-    /**
68
-     * set the phpunit configuration file
69
-     *
70
-     * @param string $file the path or filename of the phunit configuration file
71
-     */
72
-    public static function setConfigurationFile($file)
73
-    {
74
-        static::$file = $file;
75
-    }
67
+	/**
68
+	 * set the phpunit configuration file
69
+	 *
70
+	 * @param string $file the path or filename of the phunit configuration file
71
+	 */
72
+	public static function setConfigurationFile($file)
73
+	{
74
+		static::$file = $file;
75
+	}
76 76
 
77
-    /**
78
-     * get the phpunit test suite instance
79
-     *
80
-     * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
81
-     * @throws FileNotFoundException       if the file is not found
82
-     */
83
-    public static function suite()
84
-    {
85
-        $file = static::checkConfigurationFile(
86
-            static::getConfigurationFile()
87
-        );
77
+	/**
78
+	 * get the phpunit test suite instance
79
+	 *
80
+	 * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
81
+	 * @throws FileNotFoundException       if the file is not found
82
+	 */
83
+	public static function suite()
84
+	{
85
+		$file = static::checkConfigurationFile(
86
+			static::getConfigurationFile()
87
+		);
88 88
 
89
-        return PHPUnit_Util_Configuration::getInstance($file)
90
-            ->getTestSuiteConfiguration();
91
-    }
89
+		return PHPUnit_Util_Configuration::getInstance($file)
90
+			->getTestSuiteConfiguration();
91
+	}
92 92
 
93
-    /**
94
-     * get the phpunit configuration file
95
-     *
96
-     * @return string
97
-     */
98
-    private static function getConfigurationFile()
99
-    {
100
-        static::$file = isset(static::$file)
101
-            ? static::$file
102
-            : APPPATH.'tests/phpunit.xml';
93
+	/**
94
+	 * get the phpunit configuration file
95
+	 *
96
+	 * @return string
97
+	 */
98
+	private static function getConfigurationFile()
99
+	{
100
+		static::$file = isset(static::$file)
101
+			? static::$file
102
+			: APPPATH.'tests/phpunit.xml';
103 103
 
104
-        return static::$file;
105
-    }
104
+		return static::$file;
105
+	}
106 106
 
107
-    /**
108
-     * check the given file
109
-     *
110
-     * @param  string                $file file to check
111
-     * @return string                returns the file if it is valid
112
-     * @throws FileNotFoundException if the file is not found
113
-     */
114
-    private static function checkConfigurationFile($file)
115
-    {
116
-        if (!file_exists($file)) {
117
-            throw new \RuntimeException("The requested phpunit configuration was not found at $file");
118
-        }
107
+	/**
108
+	 * check the given file
109
+	 *
110
+	 * @param  string                $file file to check
111
+	 * @return string                returns the file if it is valid
112
+	 * @throws FileNotFoundException if the file is not found
113
+	 */
114
+	private static function checkConfigurationFile($file)
115
+	{
116
+		if (!file_exists($file)) {
117
+			throw new \RuntimeException("The requested phpunit configuration was not found at $file");
118
+		}
119 119
 
120
-        return $file;
121
-    }
120
+		return $file;
121
+	}
122 122
 }
Please login to merge, or discard this 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/CIPHPUnitTestNullCodeIgniter.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Part of CI PHPUnit Test
4
- *
5
- * @author     Kenji Suzuki <https://github.com/kenjis>
6
- * @license    MIT License
7
- * @copyright  2015 Kenji Suzuki
8
- * @link       https://github.com/kenjis/ci-phpunit-test
9
- */
3
+	 * Part of CI PHPUnit Test
4
+	 *
5
+	 * @author     Kenji Suzuki <https://github.com/kenjis>
6
+	 * @license    MIT License
7
+	 * @copyright  2015 Kenji Suzuki
8
+	 * @link       https://github.com/kenjis/ci-phpunit-test
9
+	 */
10 10
 
11 11
 require __DIR__ . '/Installer.php';
12 12
 
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/exceptions/CIPHPUnitTestShow404Exception.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Part of CI PHPUnit Test
4
- *
5
- * @author     Kenji Suzuki <https://github.com/kenjis>
6
- * @license    MIT License
7
- * @copyright  2015 Kenji Suzuki
8
- * @link       https://github.com/kenjis/ci-phpunit-test
9
- */
3
+	 * Part of CI PHPUnit Test
4
+	 *
5
+	 * @author     Kenji Suzuki <https://github.com/kenjis>
6
+	 * @license    MIT License
7
+	 * @copyright  2015 Kenji Suzuki
8
+	 * @link       https://github.com/kenjis/ci-phpunit-test
9
+	 */
10 10
 
11 11
 require __DIR__ . '/Installer.php';
12 12
 
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/Input.php 3 patches
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	/**
234 234
 	 * Fetch an item from the GET array
235 235
 	 *
236
-	 * @param	mixed	$index		Index for item to be fetched from $_GET
236
+	 * @param	string	$index		Index for item to be fetched from $_GET
237 237
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
238 238
 	 * @return	mixed
239 239
 	 */
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	/**
248 248
 	 * Fetch an item from the POST array
249 249
 	 *
250
-	 * @param	mixed	$index		Index for item to be fetched from $_POST
250
+	 * @param	string	$index		Index for item to be fetched from $_POST
251 251
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
252 252
 	 * @return	mixed
253 253
 	 */
@@ -307,9 +307,9 @@  discard block
 block discarded – undo
307 307
 	/**
308 308
 	 * Fetch an item from the SERVER array
309 309
 	 *
310
-	 * @param	mixed	$index		Index for item to be fetched from $_SERVER
310
+	 * @param	string	$index		Index for item to be fetched from $_SERVER
311 311
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
312
-	 * @return	mixed
312
+	 * @return	string
313 313
 	 */
314 314
 	public function server($index, $xss_clean = NULL)
315 315
 	{
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 	 * Allows read access to protected properties
893 893
 	 *
894 894
 	 * @param	string	$name
895
-	 * @return	mixed
895
+	 * @return	string|null
896 896
 	 */
897 897
 	public function __get($name)
898 898
 	{
Please login to merge, or discard this 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.
Braces   +16 added lines, -23 removed lines patch added patch discarded remove patch
@@ -196,29 +196,30 @@  discard block
 block discarded – undo
196 196
 		if (isset($array[$index]))
197 197
 		{
198 198
 			$value = $array[$index];
199
-		}
200
-		elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation
199
+		} elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
200
+			// Does the index contain array notation
201 201
 		{
202 202
 			$value = $array;
203
+		}
203 204
 			for ($i = 0; $i < $count; $i++)
204 205
 			{
205 206
 				$key = trim($matches[0][$i], '[]');
206
-				if ($key === '') // Empty notation will return the value as array
207
+				if ($key === '') {
208
+					// Empty notation will return the value as array
207 209
 				{
208 210
 					break;
209 211
 				}
212
+				}
210 213
 
211 214
 				if (isset($value[$key]))
212 215
 				{
213 216
 					$value = $value[$key];
214
-				}
215
-				else
217
+				} else
216 218
 				{
217 219
 					return NULL;
218 220
 				}
219 221
 			}
220
-		}
221
-		else
222
+		} else
222 223
 		{
223 224
 			return NULL;
224 225
 		}
@@ -403,8 +404,7 @@  discard block
 block discarded – undo
403 404
 		if ( ! is_numeric($expire))
404 405
 		{
405 406
 			$expire = time() - 86500;
406
-		}
407
-		else
407
+		} else
408 408
 		{
409 409
 			$expire = ($expire > 0) ? time() + $expire : 0;
410 410
 		}
@@ -463,8 +463,7 @@  discard block
 block discarded – undo
463 463
 					if ( ! $this->valid_ip($spoof))
464 464
 					{
465 465
 						$spoof = NULL;
466
-					}
467
-					else
466
+					} else
468 467
 					{
469 468
 						break;
470 469
 					}
@@ -517,8 +516,7 @@  discard block
 block discarded – undo
517 516
 							}
518 517
 
519 518
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
520
-						}
521
-						else
519
+						} else
522 520
 						{
523 521
 							$ip = explode('.', $this->ip_address);
524 522
 							$sprintf = '%08b%08b%08b%08b';
@@ -538,8 +536,7 @@  discard block
 block discarded – undo
538 536
 						{
539 537
 							$netaddr[$i] = intval($netaddr[$i], 16);
540 538
 						}
541
-					}
542
-					else
539
+					} else
543 540
 					{
544 541
 						$netaddr = explode('.', $netaddr);
545 542
 					}
@@ -620,8 +617,7 @@  discard block
 block discarded – undo
620 617
 		if ($this->_allow_get_array === FALSE)
621 618
 		{
622 619
 			$_GET = array();
623
-		}
624
-		elseif (is_array($_GET))
620
+		} elseif (is_array($_GET))
625 621
 		{
626 622
 			foreach ($_GET as $key => $val)
627 623
 			{
@@ -657,8 +653,7 @@  discard block
 block discarded – undo
657 653
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
658 654
 				{
659 655
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
660
-				}
661
-				else
656
+				} else
662 657
 				{
663 658
 					unset($_COOKIE[$key]);
664 659
 				}
@@ -744,8 +739,7 @@  discard block
 block discarded – undo
744 739
 			if ($fatal === TRUE)
745 740
 			{
746 741
 				return FALSE;
747
-			}
748
-			else
742
+			} else
749 743
 			{
750 744
 				set_status_header(503);
751 745
 				echo 'Disallowed Key Characters.';
@@ -900,8 +894,7 @@  discard block
 block discarded – undo
900 894
 		{
901 895
 			isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input');
902 896
 			return $this->_raw_input_stream;
903
-		}
904
-		elseif ($name === 'ip_address')
897
+		} elseif ($name === 'ip_address')
905 898
 		{
906 899
 			return $this->ip_address;
907 900
 		}
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.