@@ -20,6 +20,9 @@ |
||
| 20 | 20 | 'ConstantPatcher' => 0, |
| 21 | 21 | ]; |
| 22 | 22 | |
| 23 | + /** |
|
| 24 | + * @param string $patcher |
|
| 25 | + */ |
|
| 23 | 26 | public static function getInfo($patcher, $backtrace) |
| 24 | 27 | { |
| 25 | 28 | if (! isset(self::$map[$patcher])) |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | public static function getInfo($patcher, $backtrace) |
| 23 | 23 | { |
| 24 | - if (! isset(self::$map[$patcher])) |
|
| 24 | + if ( ! isset(self::$map[$patcher])) |
|
| 25 | 25 | { |
| 26 | 26 | throw new LogicException("No such a patcher: $patcher"); |
| 27 | 27 | } |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | $line = isset($backtrace[$offset]['line']) |
| 42 | 42 | ? $backtrace[$offset]['line'] : null; |
| 43 | 43 | |
| 44 | - if (isset($backtrace[$offset+2])) |
|
| 44 | + if (isset($backtrace[$offset + 2])) |
|
| 45 | 45 | { |
| 46 | - $class = isset($backtrace[$offset+2]['class']) |
|
| 47 | - ? $backtrace[$offset+2]['class'] |
|
| 46 | + $class = isset($backtrace[$offset + 2]['class']) |
|
| 47 | + ? $backtrace[$offset + 2]['class'] |
|
| 48 | 48 | : null; |
| 49 | - $function = $backtrace[$offset+2]['function']; |
|
| 49 | + $function = $backtrace[$offset + 2]['function']; |
|
| 50 | 50 | } |
| 51 | 51 | else |
| 52 | 52 | { |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | if (isset($class)) |
| 58 | 58 | { |
| 59 | 59 | $method = $function; |
| 60 | - $class_method = $class . '::' . $function; |
|
| 60 | + $class_method = $class.'::'.$function; |
|
| 61 | 61 | $function = null; |
| 62 | 62 | } |
| 63 | 63 | else |
@@ -47,8 +47,7 @@ discard block |
||
| 47 | 47 | ? $backtrace[$offset+2]['class'] |
| 48 | 48 | : null; |
| 49 | 49 | $function = $backtrace[$offset+2]['function']; |
| 50 | - } |
|
| 51 | - else |
|
| 50 | + } else |
|
| 52 | 51 | { |
| 53 | 52 | $class = null; |
| 54 | 53 | $function = null; |
@@ -59,8 +58,7 @@ discard block |
||
| 59 | 58 | $method = $function; |
| 60 | 59 | $class_method = $class . '::' . $function; |
| 61 | 60 | $function = null; |
| 62 | - } |
|
| 63 | - else |
|
| 61 | + } else |
|
| 64 | 62 | { |
| 65 | 63 | $method = null; |
| 66 | 64 | $class_method = null; |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | require __DIR__ . '/ConstantPatcher/Proxy.php'; |
| 15 | 15 | |
| 16 | 16 | use LogicException; |
| 17 | - |
|
| 18 | 17 | use Kenjis\MonkeyPatch\Patcher\ConstantPatcher\NodeVisitor; |
| 19 | 18 | |
| 20 | 19 | class ConstantPatcher extends AbstractPatcher |
@@ -10,8 +10,8 @@ |
||
| 10 | 10 | |
| 11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
| 12 | 12 | |
| 13 | -require __DIR__ . '/ConstantPatcher/NodeVisitor.php'; |
|
| 14 | -require __DIR__ . '/ConstantPatcher/Proxy.php'; |
|
| 13 | +require __DIR__.'/ConstantPatcher/NodeVisitor.php'; |
|
| 14 | +require __DIR__.'/ConstantPatcher/Proxy.php'; |
|
| 15 | 15 | |
| 16 | 16 | use LogicException; |
| 17 | 17 | |
@@ -181,8 +181,7 @@ discard block |
||
| 181 | 181 | if (is_string($token)) |
| 182 | 182 | { |
| 183 | 183 | $new_source .= $token; |
| 184 | - } |
|
| 185 | - elseif ($i == $replacement['key']) |
|
| 184 | + } elseif ($i == $replacement['key']) |
|
| 186 | 185 | { |
| 187 | 186 | $new_source .= $replacement['value']; |
| 188 | 187 | $replacement['key'] = key(self::$replacement); |
@@ -192,8 +191,7 @@ discard block |
||
| 192 | 191 | { |
| 193 | 192 | $replacement = false; |
| 194 | 193 | } |
| 195 | - } |
|
| 196 | - else |
|
| 194 | + } else |
|
| 197 | 195 | { |
| 198 | 196 | $new_source .= $token[1]; |
| 199 | 197 | } |
@@ -51,6 +51,9 @@ discard block |
||
| 51 | 51 | self::$patches_to_apply = []; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | + /** |
|
| 55 | + * @param string $constant |
|
| 56 | + */ |
|
| 54 | 57 | protected static function logInvocation($constant) |
| 55 | 58 | { |
| 56 | 59 | if (MonkeyPatchManager::$debug) |
@@ -68,6 +71,9 @@ discard block |
||
| 68 | 71 | } |
| 69 | 72 | } |
| 70 | 73 | |
| 74 | + /** |
|
| 75 | + * @param string $constant |
|
| 76 | + */ |
|
| 71 | 77 | protected static function checkCalledMethod($constant) |
| 72 | 78 | { |
| 73 | 79 | $trace = debug_backtrace(); |
@@ -13,14 +13,9 @@ |
||
| 13 | 13 | class_alias('Kenjis\MonkeyPatch\Patcher\ConstantPatcher\Proxy', '__ConstProxy__'); |
| 14 | 14 | |
| 15 | 15 | use LogicException; |
| 16 | -use ReflectionConstant; |
|
| 17 | -use ReflectionException; |
|
| 18 | - |
|
| 19 | 16 | use Kenjis\MonkeyPatch\Patcher\ConstantPatcher; |
| 20 | 17 | use Kenjis\MonkeyPatch\Patcher\Backtrace; |
| 21 | 18 | use Kenjis\MonkeyPatch\MonkeyPatchManager; |
| 22 | -use Kenjis\MonkeyPatch\Cache; |
|
| 23 | -use Kenjis\MonkeyPatch\InvocationVerifier; |
|
| 24 | 19 | |
| 25 | 20 | class Proxy |
| 26 | 21 | { |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $method = isset($info['class_method']) ? $info['class_method'] : $info['function']; |
| 66 | 66 | |
| 67 | 67 | MonkeyPatchManager::log( |
| 68 | - 'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()' |
|
| 68 | + 'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()' |
|
| 69 | 69 | ); |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -111,10 +111,10 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | if (isset(self::$patches_to_apply[$constant])) |
| 113 | 113 | { |
| 114 | - if (! self::checkCalledMethod($constant)) |
|
| 114 | + if ( ! self::checkCalledMethod($constant)) |
|
| 115 | 115 | { |
| 116 | 116 | MonkeyPatchManager::log( |
| 117 | - 'invoke_const: ' . $constant . ' not patched (out of scope)' |
|
| 117 | + 'invoke_const: '.$constant.' not patched (out of scope)' |
|
| 118 | 118 | ); |
| 119 | 119 | return constant($constant); |
| 120 | 120 | } |
@@ -122,12 +122,12 @@ discard block |
||
| 122 | 122 | |
| 123 | 123 | if (array_key_exists($constant, self::$patches)) |
| 124 | 124 | { |
| 125 | - MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched'); |
|
| 125 | + MonkeyPatchManager::log('invoke_const: '.$constant.' patched'); |
|
| 126 | 126 | return self::$patches[$constant]; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | MonkeyPatchManager::log( |
| 130 | - 'invoke_const: ' . $constant . ' not patched (no patch)' |
|
| 130 | + 'invoke_const: '.$constant.' not patched (no patch)' |
|
| 131 | 131 | ); |
| 132 | 132 | return constant($constant); |
| 133 | 133 | } |
@@ -84,6 +84,9 @@ discard block |
||
| 84 | 84 | $this->node_visitor = new NodeVisitor(); |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | + /** |
|
| 88 | + * @param string $error_msg |
|
| 89 | + */ |
|
| 87 | 90 | protected static function checkLock($error_msg) |
| 88 | 91 | { |
| 89 | 92 | if (self::$lock_function_list) |
@@ -110,6 +113,9 @@ discard block |
||
| 110 | 113 | return self::$whitelist; |
| 111 | 114 | } |
| 112 | 115 | |
| 116 | + /** |
|
| 117 | + * @param string $function_name |
|
| 118 | + */ |
|
| 113 | 119 | public static function addBlacklist($function_name) |
| 114 | 120 | { |
| 115 | 121 | self::checkLock("You can't add to blacklist after initialization"); |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | require __DIR__ . '/FunctionPatcher/Proxy.php'; |
| 15 | 15 | |
| 16 | 16 | use LogicException; |
| 17 | - |
|
| 18 | 17 | use Kenjis\MonkeyPatch\Patcher\FunctionPatcher\NodeVisitor; |
| 19 | 18 | |
| 20 | 19 | class FunctionPatcher extends AbstractPatcher |
@@ -10,8 +10,8 @@ |
||
| 10 | 10 | |
| 11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
| 12 | 12 | |
| 13 | -require __DIR__ . '/FunctionPatcher/NodeVisitor.php'; |
|
| 14 | -require __DIR__ . '/FunctionPatcher/Proxy.php'; |
|
| 13 | +require __DIR__.'/FunctionPatcher/NodeVisitor.php'; |
|
| 14 | +require __DIR__.'/FunctionPatcher/Proxy.php'; |
|
| 15 | 15 | |
| 16 | 16 | use LogicException; |
| 17 | 17 | |
@@ -181,8 +181,7 @@ discard block |
||
| 181 | 181 | if (is_string($token)) |
| 182 | 182 | { |
| 183 | 183 | $new_source .= $token; |
| 184 | - } |
|
| 185 | - elseif ($i == $replacement['key']) |
|
| 184 | + } elseif ($i == $replacement['key']) |
|
| 186 | 185 | { |
| 187 | 186 | $new_source .= $replacement['value']; |
| 188 | 187 | $replacement['key'] = key(self::$replacement); |
@@ -192,8 +191,7 @@ discard block |
||
| 192 | 191 | { |
| 193 | 192 | $replacement = false; |
| 194 | 193 | } |
| 195 | - } |
|
| 196 | - else |
|
| 194 | + } else |
|
| 197 | 195 | { |
| 198 | 196 | $new_source .= $token[1]; |
| 199 | 197 | } |
@@ -21,15 +21,11 @@ |
||
| 21 | 21 | |
| 22 | 22 | namespace Kenjis\MonkeyPatch\Patcher\FunctionPatcher; |
| 23 | 23 | |
| 24 | -use ReflectionFunction; |
|
| 25 | -use ReflectionException; |
|
| 26 | - |
|
| 27 | 24 | use PhpParser\Node; |
| 28 | 25 | use PhpParser\Node\Expr\FuncCall; |
| 29 | 26 | use PhpParser\Node\Name; |
| 30 | 27 | use PhpParser\Node\Name\FullyQualified; |
| 31 | 28 | use PhpParser\NodeVisitorAbstract; |
| 32 | - |
|
| 33 | 29 | use Kenjis\MonkeyPatch\Patcher\FunctionPatcher; |
| 34 | 30 | |
| 35 | 31 | class NodeVisitor extends NodeVisitorAbstract |
@@ -36,17 +36,17 @@ discard block |
||
| 36 | 36 | { |
| 37 | 37 | public function leaveNode(Node $node) |
| 38 | 38 | { |
| 39 | - if (! ($node instanceof FuncCall)) |
|
| 39 | + if ( ! ($node instanceof FuncCall)) |
|
| 40 | 40 | { |
| 41 | 41 | return; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - if (! ($node->name instanceof Name)) |
|
| 44 | + if ( ! ($node->name instanceof Name)) |
|
| 45 | 45 | { |
| 46 | 46 | return; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - if (! $node->name->isUnqualified()) |
|
| 49 | + if ( ! $node->name->isUnqualified()) |
|
| 50 | 50 | { |
| 51 | 51 | return; |
| 52 | 52 | } |
@@ -55,11 +55,11 @@ discard block |
||
| 55 | 55 | FunctionPatcher::isWhitelisted((string) $node->name) |
| 56 | 56 | && ! FunctionPatcher::isBlacklisted((string) $node->name) |
| 57 | 57 | ) { |
| 58 | - $replacement = new FullyQualified('\__FuncProxy__::' . (string) $node->name); |
|
| 58 | + $replacement = new FullyQualified('\__FuncProxy__::'.(string) $node->name); |
|
| 59 | 59 | |
| 60 | 60 | $pos = $node->getAttribute('startTokenPos'); |
| 61 | 61 | FunctionPatcher::$replacement[$pos] = |
| 62 | - '\__FuncProxy__::' . (string) $node->name; |
|
| 62 | + '\__FuncProxy__::'.(string) $node->name; |
|
| 63 | 63 | |
| 64 | 64 | $node->name = $replacement; |
| 65 | 65 | } |
@@ -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); |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | use LogicException; |
| 16 | 16 | use ReflectionFunction; |
| 17 | 17 | use ReflectionException; |
| 18 | - |
|
| 19 | 18 | use Kenjis\MonkeyPatch\Patcher\FunctionPatcher; |
| 20 | 19 | use Kenjis\MonkeyPatch\Patcher\Backtrace; |
| 21 | 20 | use Kenjis\MonkeyPatch\MonkeyPatchManager; |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | self::outputMessage($msg); |
| 52 | 52 | throw new LogicException($msg); |
| 53 | 53 | } |
| 54 | - if (! FunctionPatcher::isWhitelisted($function)) |
|
| 54 | + if ( ! FunctionPatcher::isWhitelisted($function)) |
|
| 55 | 55 | { |
| 56 | 56 | $msg = "<red>Can't patch on '$function'. It is not in whitelist. If you want to patch it, please add it to 'functions_to_patch' in 'tests/Bootstrap.php'. But note that there are some limitations. See <https://github.com/kenjis/ci-phpunit-test/blob/master/docs/HowToWriteTests.md#patching-functions> for details.</red>"; |
| 57 | 57 | self::outputMessage($msg); |
@@ -97,16 +97,16 @@ discard block |
||
| 97 | 97 | $line = $info['line']; |
| 98 | 98 | $method = isset($info['class_method']) ? $info['class_method'] : $info['function']; |
| 99 | 99 | |
| 100 | - $log_args = function () use ($arguments) { |
|
| 100 | + $log_args = function() use ($arguments) { |
|
| 101 | 101 | $output = ''; |
| 102 | 102 | foreach ($arguments as $arg) { |
| 103 | - $output .= var_export($arg, true) . ', '; |
|
| 103 | + $output .= var_export($arg, true).', '; |
|
| 104 | 104 | } |
| 105 | 105 | $output = rtrim($output, ', '); |
| 106 | 106 | return $output; |
| 107 | 107 | }; |
| 108 | 108 | MonkeyPatchManager::log( |
| 109 | - 'invoke_func: ' . $function . '(' . $log_args() . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()' |
|
| 109 | + 'invoke_func: '.$function.'('.$log_args().') on line '.$line.' in '.$file.' by '.$method.'()' |
|
| 110 | 110 | ); |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -148,10 +148,10 @@ discard block |
||
| 148 | 148 | |
| 149 | 149 | if (isset(self::$patches_to_apply[$function])) |
| 150 | 150 | { |
| 151 | - if (! self::checkCalledMethod($function)) |
|
| 151 | + if ( ! self::checkCalledMethod($function)) |
|
| 152 | 152 | { |
| 153 | 153 | MonkeyPatchManager::log( |
| 154 | - 'invoke_func: ' . $function . '() not patched (out of scope)' |
|
| 154 | + 'invoke_func: '.$function.'() not patched (out of scope)' |
|
| 155 | 155 | ); |
| 156 | 156 | self::checkPassedByReference($function); |
| 157 | 157 | return call_user_func_array($function, $arguments); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | if (array_key_exists($function, self::$patches)) |
| 162 | 162 | { |
| 163 | - MonkeyPatchManager::log('invoke_func: ' . $function . '() patched'); |
|
| 163 | + MonkeyPatchManager::log('invoke_func: '.$function.'() patched'); |
|
| 164 | 164 | |
| 165 | 165 | if (is_callable(self::$patches[$function])) |
| 166 | 166 | { |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | MonkeyPatchManager::log( |
| 181 | - 'invoke_func: ' . $function . '() not patched (no patch)' |
|
| 181 | + 'invoke_func: '.$function.'() not patched (no patch)' |
|
| 182 | 182 | ); |
| 183 | 183 | self::checkPassedByReference($function); |
| 184 | 184 | return call_user_func_array($function, $arguments); |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | $msg = str_replace( |
| 232 | 232 | ['<red>', '</red>'], [$red_begin, $red_end], $msg |
| 233 | 233 | ); |
| 234 | - echo $msg . "\n"; |
|
| 234 | + echo $msg."\n"; |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | /** |
@@ -13,8 +13,6 @@ |
||
| 13 | 13 | require __DIR__ . '/MethodPatcher/NodeVisitor.php'; |
| 14 | 14 | require __DIR__ . '/MethodPatcher/PatchManager.php'; |
| 15 | 15 | |
| 16 | -use LogicException; |
|
| 17 | - |
|
| 18 | 16 | use Kenjis\MonkeyPatch\Patcher\MethodPatcher\NodeVisitor; |
| 19 | 17 | |
| 20 | 18 | class MethodPatcher extends AbstractPatcher |
@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
| 12 | 12 | |
| 13 | -require __DIR__ . '/MethodPatcher/NodeVisitor.php'; |
|
| 14 | -require __DIR__ . '/MethodPatcher/PatchManager.php'; |
|
| 13 | +require __DIR__.'/MethodPatcher/NodeVisitor.php'; |
|
| 14 | +require __DIR__.'/MethodPatcher/PatchManager.php'; |
|
| 15 | 15 | |
| 16 | 16 | use LogicException; |
| 17 | 17 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | if ($start_method && $token === '{') |
| 63 | 63 | { |
| 64 | - $new_source .= '{ ' . self::CODE; |
|
| 64 | + $new_source .= '{ '.self::CODE; |
|
| 65 | 65 | $start_method = false; |
| 66 | 66 | $replacement['key'] = key(self::$replacement); |
| 67 | 67 | $replacement['value'] = current(self::$replacement); |
@@ -70,13 +70,11 @@ |
||
| 70 | 70 | { |
| 71 | 71 | $replacement = false; |
| 72 | 72 | } |
| 73 | - } |
|
| 74 | - else |
|
| 73 | + } else |
|
| 75 | 74 | { |
| 76 | 75 | $new_source .= $token; |
| 77 | 76 | } |
| 78 | - } |
|
| 79 | - else |
|
| 77 | + } else |
|
| 80 | 78 | { |
| 81 | 79 | $new_source .= $token[1]; |
| 82 | 80 | } |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | use PhpParser\Node; |
| 14 | 14 | use PhpParser\Node\Stmt\ClassMethod; |
| 15 | 15 | use PhpParser\NodeVisitorAbstract; |
| 16 | - |
|
| 17 | 16 | use Kenjis\MonkeyPatch\Patcher\MethodPatcher; |
| 18 | 17 | |
| 19 | 18 | class NodeVisitor extends NodeVisitorAbstract |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | public function leaveNode(Node $node) |
| 22 | 22 | { |
| 23 | - if (! ($node instanceof ClassMethod)) |
|
| 23 | + if ( ! ($node instanceof ClassMethod)) |
|
| 24 | 24 | { |
| 25 | 25 | return; |
| 26 | 26 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | /** |
| 238 | 238 | * Fetch an item from the GET array |
| 239 | 239 | * |
| 240 | - * @param mixed $index Index for item to be fetched from $_GET |
|
| 240 | + * @param string $index Index for item to be fetched from $_GET |
|
| 241 | 241 | * @param bool $xss_clean Whether to apply XSS filtering |
| 242 | 242 | * @return mixed |
| 243 | 243 | * |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | /** |
| 254 | 254 | * Fetch an item from the POST array |
| 255 | 255 | * |
| 256 | - * @param mixed $index Index for item to be fetched from $_POST |
|
| 256 | + * @param string $index Index for item to be fetched from $_POST |
|
| 257 | 257 | * @param bool $xss_clean Whether to apply XSS filtering |
| 258 | 258 | * @return mixed |
| 259 | 259 | * |
@@ -321,9 +321,9 @@ discard block |
||
| 321 | 321 | /** |
| 322 | 322 | * Fetch an item from the SERVER array |
| 323 | 323 | * |
| 324 | - * @param mixed $index Index for item to be fetched from $_SERVER |
|
| 324 | + * @param string $index Index for item to be fetched from $_SERVER |
|
| 325 | 325 | * @param bool $xss_clean Whether to apply XSS filtering |
| 326 | - * @return mixed |
|
| 326 | + * @return string |
|
| 327 | 327 | * |
| 328 | 328 | * @codeCoverageIgnore |
| 329 | 329 | */ |
@@ -934,7 +934,7 @@ discard block |
||
| 934 | 934 | * Allows read access to protected properties |
| 935 | 935 | * |
| 936 | 936 | * @param string $name |
| 937 | - * @return mixed |
|
| 937 | + * @return string|null |
|
| 938 | 938 | * |
| 939 | 939 | * @codeCoverageIgnore |
| 940 | 940 | */ |
@@ -200,29 +200,30 @@ discard block |
||
| 200 | 200 | if (isset($array[$index])) |
| 201 | 201 | { |
| 202 | 202 | $value = $array[$index]; |
| 203 | - } |
|
| 204 | - elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation |
|
| 203 | + } elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) { |
|
| 204 | + // Does the index contain array notation |
|
| 205 | 205 | { |
| 206 | 206 | $value = $array; |
| 207 | + } |
|
| 207 | 208 | for ($i = 0; $i < $count; $i++) |
| 208 | 209 | { |
| 209 | 210 | $key = trim($matches[0][$i], '[]'); |
| 210 | - if ($key === '') // Empty notation will return the value as array |
|
| 211 | + if ($key === '') { |
|
| 212 | + // Empty notation will return the value as array |
|
| 211 | 213 | { |
| 212 | 214 | break; |
| 213 | 215 | } |
| 216 | + } |
|
| 214 | 217 | |
| 215 | 218 | if (isset($value[$key])) |
| 216 | 219 | { |
| 217 | 220 | $value = $value[$key]; |
| 218 | - } |
|
| 219 | - else |
|
| 221 | + } else |
|
| 220 | 222 | { |
| 221 | 223 | return NULL; |
| 222 | 224 | } |
| 223 | 225 | } |
| 224 | - } |
|
| 225 | - else |
|
| 226 | + } else |
|
| 226 | 227 | { |
| 227 | 228 | return NULL; |
| 228 | 229 | } |
@@ -421,8 +422,7 @@ discard block |
||
| 421 | 422 | if ( ! is_numeric($expire)) |
| 422 | 423 | { |
| 423 | 424 | $expire = time() - 86500; |
| 424 | - } |
|
| 425 | - else |
|
| 425 | + } else |
|
| 426 | 426 | { |
| 427 | 427 | $expire = ($expire > 0) ? time() + $expire : 0; |
| 428 | 428 | } |
@@ -483,8 +483,7 @@ discard block |
||
| 483 | 483 | if ( ! $this->valid_ip($spoof)) |
| 484 | 484 | { |
| 485 | 485 | $spoof = NULL; |
| 486 | - } |
|
| 487 | - else |
|
| 486 | + } else |
|
| 488 | 487 | { |
| 489 | 488 | break; |
| 490 | 489 | } |
@@ -537,8 +536,7 @@ discard block |
||
| 537 | 536 | } |
| 538 | 537 | |
| 539 | 538 | $sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b'; |
| 540 | - } |
|
| 541 | - else |
|
| 539 | + } else |
|
| 542 | 540 | { |
| 543 | 541 | $ip = explode('.', $this->ip_address); |
| 544 | 542 | $sprintf = '%08b%08b%08b%08b'; |
@@ -558,8 +556,7 @@ discard block |
||
| 558 | 556 | { |
| 559 | 557 | $netaddr[$j] = intval($netaddr[$j], 16); |
| 560 | 558 | } |
| 561 | - } |
|
| 562 | - else |
|
| 559 | + } else |
|
| 563 | 560 | { |
| 564 | 561 | $netaddr = explode('.', $netaddr); |
| 565 | 562 | } |
@@ -646,8 +643,7 @@ discard block |
||
| 646 | 643 | if ($this->_allow_get_array === FALSE) |
| 647 | 644 | { |
| 648 | 645 | $_GET = array(); |
| 649 | - } |
|
| 650 | - elseif (is_array($_GET)) |
|
| 646 | + } elseif (is_array($_GET)) |
|
| 651 | 647 | { |
| 652 | 648 | foreach ($_GET as $key => $val) |
| 653 | 649 | { |
@@ -683,8 +679,7 @@ discard block |
||
| 683 | 679 | if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE) |
| 684 | 680 | { |
| 685 | 681 | $_COOKIE[$cookie_key] = $this->_clean_input_data($val); |
| 686 | - } |
|
| 687 | - else |
|
| 682 | + } else |
|
| 688 | 683 | { |
| 689 | 684 | unset($_COOKIE[$key]); |
| 690 | 685 | } |
@@ -774,8 +769,7 @@ discard block |
||
| 774 | 769 | if ($fatal === TRUE) |
| 775 | 770 | { |
| 776 | 771 | return FALSE; |
| 777 | - } |
|
| 778 | - else |
|
| 772 | + } else |
|
| 779 | 773 | { |
| 780 | 774 | set_status_header(503); |
| 781 | 775 | echo 'Disallowed Key Characters.'; |
@@ -814,8 +808,7 @@ discard block |
||
| 814 | 808 | if (function_exists('apache_request_headers')) |
| 815 | 809 | { |
| 816 | 810 | $this->headers = apache_request_headers(); |
| 817 | - } |
|
| 818 | - else |
|
| 811 | + } else |
|
| 819 | 812 | { |
| 820 | 813 | isset($_SERVER['CONTENT_TYPE']) && $this->headers['Content-Type'] = $_SERVER['CONTENT_TYPE']; |
| 821 | 814 | |
@@ -944,8 +937,7 @@ discard block |
||
| 944 | 937 | { |
| 945 | 938 | isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input'); |
| 946 | 939 | return $this->_raw_input_stream; |
| 947 | - } |
|
| 948 | - elseif ($name === 'ip_address') |
|
| 940 | + } elseif ($name === 'ip_address') |
|
| 949 | 941 | { |
| 950 | 942 | return $this->ip_address; |
| 951 | 943 | } |
@@ -139,17 +139,17 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | public function __construct() |
| 141 | 141 | { |
| 142 | - $this->_allow_get_array = (config_item('allow_get_array') !== FALSE); |
|
| 143 | - $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
| 144 | - $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
| 145 | - $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
| 142 | + $this->_allow_get_array = (config_item('allow_get_array') !== FALSE); |
|
| 143 | + $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
| 144 | + $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
| 145 | + $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
| 146 | 146 | |
| 147 | - $this->security =& load_class('Security', 'core'); |
|
| 147 | + $this->security = & load_class('Security', 'core'); |
|
| 148 | 148 | |
| 149 | 149 | // Do we need the UTF-8 class? |
| 150 | 150 | if (UTF8_ENABLED === TRUE) |
| 151 | 151 | { |
| 152 | - $this->uni =& load_class('Utf8', 'core'); |
|
| 152 | + $this->uni = & load_class('Utf8', 'core'); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | // Sanitize global arrays |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | |
| 430 | 430 | // Save cookie in Output object |
| 431 | 431 | // added by ci-phpunit-test |
| 432 | - $CI =& get_instance(); |
|
| 432 | + $CI = & get_instance(); |
|
| 433 | 433 | $output = $CI->output; |
| 434 | 434 | $output->_cookies[$prefix.$name][] = [ |
| 435 | 435 | 'value' => $value, |