@@ -250,6 +250,9 @@ |
||
| 250 | 250 | return $this->createAndCallController($class, $method, $params); |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | + /** |
|
| 254 | + * @param string $hook |
|
| 255 | + */ |
|
| 253 | 256 | protected function callHook($hook) |
| 254 | 257 | { |
| 255 | 258 | if ($this->enableHooks) |
@@ -1,12 +1,12 @@ |
||
| 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 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -63,6 +63,9 @@ discard block |
||
| 63 | 63 | return self::$cache_dir; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | + /** |
|
| 67 | + * @param string $path |
|
| 68 | + */ |
|
| 66 | 69 | public static function getSrcCacheFilePath($path) |
| 67 | 70 | { |
| 68 | 71 | $len = strlen(self::$project_root); |
@@ -158,6 +161,9 @@ discard block |
||
| 158 | 161 | ); |
| 159 | 162 | } |
| 160 | 163 | |
| 164 | + /** |
|
| 165 | + * @param string $filename |
|
| 166 | + */ |
|
| 161 | 167 | protected static function writeTmpConfFile($filename, array $list) |
| 162 | 168 | { |
| 163 | 169 | $contents = implode("\n", $list); |
@@ -194,6 +200,9 @@ discard block |
||
| 194 | 200 | ); |
| 195 | 201 | } |
| 196 | 202 | |
| 203 | + /** |
|
| 204 | + * @param string $filename |
|
| 205 | + */ |
|
| 197 | 206 | protected static function getTmpConfFile($filename) |
| 198 | 207 | { |
| 199 | 208 | if (is_readable(self::$$filename)) |
@@ -1,12 +1,12 @@ discard block |
||
| 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 | namespace Kenjis\MonkeyPatch; |
| 12 | 12 | |
@@ -251,10 +251,10 @@ discard block |
||
| 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)) |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | * |
| 22 | 22 | * @param string $function function name |
| 23 | 23 | * @param mixed $return_value return value |
| 24 | - * @param string $class_name class::method to apply this patch |
|
| 24 | + * @param string $class_method class::method to apply this patch |
|
| 25 | 25 | */ |
| 26 | 26 | public static function patchFunction($function, $return_value, $class_method = null) |
| 27 | 27 | { |
@@ -55,6 +55,9 @@ discard block |
||
| 55 | 55 | PatchManager::clear(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | + /** |
|
| 59 | + * @param string $class_method |
|
| 60 | + */ |
|
| 58 | 61 | protected static function getClassname($class_method) |
| 59 | 62 | { |
| 60 | 63 | if (strpos($class_method, '::') === false) |
@@ -1,12 +1,12 @@ discard block |
||
| 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 | namespace Kenjis\MonkeyPatch; |
| 12 | 12 | |
@@ -37,12 +37,12 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | - * Patch on constant |
|
| 41 | - * |
|
| 42 | - * @param type $constant |
|
| 43 | - * @param type $value |
|
| 44 | - * @param type $class_method |
|
| 45 | - */ |
|
| 40 | + * Patch on constant |
|
| 41 | + * |
|
| 42 | + * @param type $constant |
|
| 43 | + * @param type $value |
|
| 44 | + * @param type $class_method |
|
| 45 | + */ |
|
| 46 | 46 | public static function patchConstant($constant, $value, $class_method = null) |
| 47 | 47 | { |
| 48 | 48 | ConstProxy::patch($constant, $value, $class_method); |
@@ -32,6 +32,9 @@ discard block |
||
| 32 | 32 | 'MethodPatcher', |
| 33 | 33 | ]; |
| 34 | 34 | |
| 35 | + /** |
|
| 36 | + * @param string $message |
|
| 37 | + */ |
|
| 35 | 38 | public static function log($message) |
| 36 | 39 | { |
| 37 | 40 | if (! self::$debug) |
@@ -276,6 +279,9 @@ discard block |
||
| 276 | 279 | self::$load_patchers = true; |
| 277 | 280 | } |
| 278 | 281 | |
| 282 | + /** |
|
| 283 | + * @param string $source |
|
| 284 | + */ |
|
| 279 | 285 | protected static function execPatchers($source) |
| 280 | 286 | { |
| 281 | 287 | $patched = false; |
@@ -1,12 +1,12 @@ |
||
| 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 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * |
| 38 | 38 | * @param string $function function name |
| 39 | 39 | * @param mixed $return_value return value or callable |
| 40 | - * @param string $class_name class::method to apply this patch |
|
| 40 | + * @param string $class_method class::method to apply this patch |
|
| 41 | 41 | * |
| 42 | 42 | * @throws LogicException |
| 43 | 43 | */ |
@@ -86,6 +86,9 @@ discard block |
||
| 86 | 86 | InvocationVerifier::verify(self::$expected_invocations, self::$invocations); |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | + /** |
|
| 90 | + * @param string $function |
|
| 91 | + */ |
|
| 89 | 92 | protected static function logInvocation($function, $arguments) |
| 90 | 93 | { |
| 91 | 94 | if (MonkeyPatchManager::$debug) |
@@ -111,6 +114,9 @@ discard block |
||
| 111 | 114 | } |
| 112 | 115 | } |
| 113 | 116 | |
| 117 | + /** |
|
| 118 | + * @param string $function |
|
| 119 | + */ |
|
| 114 | 120 | protected static function checkCalledMethod($function) |
| 115 | 121 | { |
| 116 | 122 | $trace = debug_backtrace(); |
@@ -184,6 +190,9 @@ discard block |
||
| 184 | 190 | return call_user_func_array($function, $arguments); |
| 185 | 191 | } |
| 186 | 192 | |
| 193 | + /** |
|
| 194 | + * @param string $function |
|
| 195 | + */ |
|
| 187 | 196 | protected static function checkPassedByReference($function) |
| 188 | 197 | { |
| 189 | 198 | $ref_func = new ReflectionFunction($function); |
@@ -1,12 +1,12 @@ |
||
| 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 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -136,6 +136,11 @@ discard block |
||
| 136 | 136 | return $_is_loaded; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | +/** |
|
| 140 | + * @param boolean $return |
|
| 141 | + * |
|
| 142 | + * @return boolean |
|
| 143 | + */ |
|
| 139 | 144 | function is_cli($return = null) |
| 140 | 145 | { |
| 141 | 146 | static $_return = TRUE; |
@@ -148,6 +153,9 @@ discard block |
||
| 148 | 153 | return $_return; |
| 149 | 154 | } |
| 150 | 155 | |
| 156 | +/** |
|
| 157 | + * @param string $message |
|
| 158 | + */ |
|
| 151 | 159 | function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered') |
| 152 | 160 | { |
| 153 | 161 | $status_code = abs($status_code); |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | * @param string $library Library name |
| 186 | 186 | * @param array $params Optional parameters to pass to the library class constructor |
| 187 | 187 | * @param string $object_name An optional object name to assign to |
| 188 | - * @return object |
|
| 188 | + * @return CI_Loader |
|
| 189 | 189 | */ |
| 190 | 190 | public function library($library, $params = NULL, $object_name = NULL) |
| 191 | 191 | { |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @param string $model Model name |
| 230 | 230 | * @param string $name An optional object name to assign to |
| 231 | 231 | * @param bool $db_conn An optional database connection configuration to initialize |
| 232 | - * @return object |
|
| 232 | + * @return CI_Loader |
|
| 233 | 233 | * |
| 234 | 234 | * modified by ci-phpunit-test |
| 235 | 235 | */ |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | /** |
| 332 | 332 | * Database Loader |
| 333 | 333 | * |
| 334 | - * @param mixed $params Database configuration options |
|
| 334 | + * @param string|boolean $params Database configuration options |
|
| 335 | 335 | * @param bool $return Whether to return the database object |
| 336 | 336 | * @param bool $query_builder Whether to enable Query Builder |
| 337 | 337 | * (overrides the configuration setting) |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | * An associative array or object containing values |
| 488 | 488 | * to be set, or a value's name if string |
| 489 | 489 | * @param string $val Value to set, only used if $vars is a string |
| 490 | - * @return object |
|
| 490 | + * @return CI_Loader |
|
| 491 | 491 | */ |
| 492 | 492 | public function vars($vars, $val = '') |
| 493 | 493 | { |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | * Helper Loader |
| 560 | 560 | * |
| 561 | 561 | * @param string|string[] $helpers Helper name(s) |
| 562 | - * @return object |
|
| 562 | + * @return CI_Loader |
|
| 563 | 563 | */ |
| 564 | 564 | public function helper($helpers = array()) |
| 565 | 565 | { |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | * |
| 631 | 631 | * @uses CI_Loader::helper() |
| 632 | 632 | * @param string|string[] $helpers Helper name(s) |
| 633 | - * @return object |
|
| 633 | + * @return CI_Loader |
|
| 634 | 634 | */ |
| 635 | 635 | public function helpers($helpers = array()) |
| 636 | 636 | { |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | * |
| 647 | 647 | * @param string|string[] $files List of language file names to load |
| 648 | 648 | * @param string Language name |
| 649 | - * @return object |
|
| 649 | + * @return CI_Loader |
|
| 650 | 650 | */ |
| 651 | 651 | public function language($files, $lang = '') |
| 652 | 652 | { |
@@ -733,7 +733,7 @@ discard block |
||
| 733 | 733 | * |
| 734 | 734 | * @param string $path Path to add |
| 735 | 735 | * @param bool $view_cascade (default: TRUE) |
| 736 | - * @return object |
|
| 736 | + * @return CI_Loader |
|
| 737 | 737 | */ |
| 738 | 738 | public function add_package_path($path, $view_cascade = TRUE) |
| 739 | 739 | { |
@@ -777,7 +777,7 @@ discard block |
||
| 777 | 777 | * added path will be removed removed. |
| 778 | 778 | * |
| 779 | 779 | * @param string $path Path to remove |
| 780 | - * @return object |
|
| 780 | + * @return CI_Loader |
|
| 781 | 781 | */ |
| 782 | 782 | public function remove_package_path($path = '') |
| 783 | 783 | { |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | * @used-by CI_Loader::_ci_load_library() |
| 1066 | 1066 | * @uses CI_Loader::_ci_init_library() |
| 1067 | 1067 | * |
| 1068 | - * @param string $library Library name to load |
|
| 1068 | + * @param string $library_name Library name to load |
|
| 1069 | 1069 | * @param string $file_path Path to the library filename, relative to libraries/ |
| 1070 | 1070 | * @param mixed $params Optional parameters to pass to the class constructor |
| 1071 | 1071 | * @param string $object_name Optional object name to assign to |
@@ -1,11 +1,11 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | { |
@@ -1,40 +1,40 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * CodeIgniter |
|
| 4 | - * |
|
| 5 | - * An open source application development framework for PHP |
|
| 6 | - * |
|
| 7 | - * This content is released under the MIT License (MIT) |
|
| 8 | - * |
|
| 9 | - * Copyright (c) 2014 - 2016, British Columbia Institute of Technology |
|
| 10 | - * |
|
| 11 | - * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
| 12 | - * of this software and associated documentation files (the "Software"), to deal |
|
| 13 | - * in the Software without restriction, including without limitation the rights |
|
| 14 | - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
| 15 | - * copies of the Software, and to permit persons to whom the Software is |
|
| 16 | - * furnished to do so, subject to the following conditions: |
|
| 17 | - * |
|
| 18 | - * The above copyright notice and this permission notice shall be included in |
|
| 19 | - * all copies or substantial portions of the Software. |
|
| 20 | - * |
|
| 21 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
| 22 | - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
| 23 | - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
| 24 | - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
| 25 | - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
| 26 | - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
| 27 | - * THE SOFTWARE. |
|
| 28 | - * |
|
| 29 | - * @package CodeIgniter |
|
| 30 | - * @author EllisLab Dev Team |
|
| 31 | - * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) |
|
| 32 | - * @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/) |
|
| 33 | - * @license http://opensource.org/licenses/MIT MIT License |
|
| 34 | - * @link https://codeigniter.com |
|
| 35 | - * @since Version 1.0.0 |
|
| 36 | - * @filesource |
|
| 37 | - */ |
|
| 3 | + * CodeIgniter |
|
| 4 | + * |
|
| 5 | + * An open source application development framework for PHP |
|
| 6 | + * |
|
| 7 | + * This content is released under the MIT License (MIT) |
|
| 8 | + * |
|
| 9 | + * Copyright (c) 2014 - 2016, British Columbia Institute of Technology |
|
| 10 | + * |
|
| 11 | + * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
| 12 | + * of this software and associated documentation files (the "Software"), to deal |
|
| 13 | + * in the Software without restriction, including without limitation the rights |
|
| 14 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
| 15 | + * copies of the Software, and to permit persons to whom the Software is |
|
| 16 | + * furnished to do so, subject to the following conditions: |
|
| 17 | + * |
|
| 18 | + * The above copyright notice and this permission notice shall be included in |
|
| 19 | + * all copies or substantial portions of the Software. |
|
| 20 | + * |
|
| 21 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
| 22 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
| 23 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
| 24 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
| 25 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
| 26 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
| 27 | + * THE SOFTWARE. |
|
| 28 | + * |
|
| 29 | + * @package CodeIgniter |
|
| 30 | + * @author EllisLab Dev Team |
|
| 31 | + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) |
|
| 32 | + * @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/) |
|
| 33 | + * @license http://opensource.org/licenses/MIT MIT License |
|
| 34 | + * @link https://codeigniter.com |
|
| 35 | + * @since Version 1.0.0 |
|
| 36 | + * @filesource |
|
| 37 | + */ |
|
| 38 | 38 | defined('BASEPATH') OR exit('No direct script access allowed'); |
| 39 | 39 | |
| 40 | 40 | /** |