@@ -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 | } |
@@ -66,16 +66,16 @@ |
||
| 66 | 66 | $called_method = 'n/a'; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - $log_args = function () use ($params) { |
|
| 69 | + $log_args = function() use ($params) { |
|
| 70 | 70 | $output = ''; |
| 71 | 71 | foreach ($params as $arg) { |
| 72 | - $output .= var_export($arg, true) . ', '; |
|
| 72 | + $output .= var_export($arg, true).', '; |
|
| 73 | 73 | } |
| 74 | 74 | $output = rtrim($output, ', '); |
| 75 | 75 | return $output; |
| 76 | 76 | }; |
| 77 | 77 | MonkeyPatchManager::log( |
| 78 | - 'invoke_method: ' . $class.'::'.$method . '(' . $log_args() . ') on line ' . $line . ' in ' . $file . ' by ' . $called_method |
|
| 78 | + 'invoke_method: '.$class.'::'.$method.'('.$log_args().') on line '.$line.' in '.$file.' by '.$called_method |
|
| 79 | 79 | ); |
| 80 | 80 | // var_dump($trace); exit; |
| 81 | 81 | } |
@@ -56,12 +56,10 @@ discard block |
||
| 56 | 56 | if (isset($info['class_method'])) |
| 57 | 57 | { |
| 58 | 58 | $called_method = $info['class_method']; |
| 59 | - } |
|
| 60 | - elseif (isset($info['function'])) |
|
| 59 | + } elseif (isset($info['function'])) |
|
| 61 | 60 | { |
| 62 | 61 | $called_method = $info['function']; |
| 63 | - } |
|
| 64 | - else |
|
| 62 | + } else |
|
| 65 | 63 | { |
| 66 | 64 | $called_method = 'n/a'; |
| 67 | 65 | } |
@@ -88,8 +86,7 @@ discard block |
||
| 88 | 86 | ) |
| 89 | 87 | { |
| 90 | 88 | $patch = self::$patches[$class][$method]; |
| 91 | - } |
|
| 92 | - else |
|
| 89 | + } else |
|
| 93 | 90 | { |
| 94 | 91 | return __GO_TO_ORIG__; |
| 95 | 92 | } |
@@ -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; |
@@ -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 | |
@@ -173,13 +173,11 @@ |
||
| 173 | 173 | if (is_string($token)) |
| 174 | 174 | { |
| 175 | 175 | $new_source .= $token; |
| 176 | - } |
|
| 177 | - elseif ($i == $replacement['key']) |
|
| 176 | + } elseif ($i == $replacement['key']) |
|
| 178 | 177 | { |
| 179 | 178 | $new_source .= $replacement['value']; |
| 180 | 179 | $replacement = each(self::$replacement); |
| 181 | - } |
|
| 182 | - else |
|
| 180 | + } else |
|
| 183 | 181 | { |
| 184 | 182 | $new_source .= $token[1]; |
| 185 | 183 | } |
@@ -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 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | { |
| 56 | 56 | if ($start_method && $token === '{') |
| 57 | 57 | { |
| 58 | - $new_source .= '{ ' . self::CODE; |
|
| 58 | + $new_source .= '{ '.self::CODE; |
|
| 59 | 59 | $start_method = false; |
| 60 | 60 | $replacement = each(self::$replacement); |
| 61 | 61 | } |
@@ -58,13 +58,11 @@ |
||
| 58 | 58 | $new_source .= '{ ' . self::CODE; |
| 59 | 59 | $start_method = false; |
| 60 | 60 | $replacement = each(self::$replacement); |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $new_source .= $token; |
| 65 | 64 | } |
| 66 | - } |
|
| 67 | - else |
|
| 65 | + } else |
|
| 68 | 66 | { |
| 69 | 67 | $new_source .= $token[1]; |
| 70 | 68 | } |
@@ -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 | |
@@ -173,13 +173,11 @@ |
||
| 173 | 173 | if (is_string($token)) |
| 174 | 174 | { |
| 175 | 175 | $new_source .= $token; |
| 176 | - } |
|
| 177 | - elseif ($i == $replacement['key']) |
|
| 176 | + } elseif ($i == $replacement['key']) |
|
| 178 | 177 | { |
| 179 | 178 | $new_source .= $replacement['value']; |
| 180 | 179 | $replacement = each(self::$replacement); |
| 181 | - } |
|
| 182 | - else |
|
| 180 | + } else |
|
| 183 | 181 | { |
| 184 | 182 | $new_source .= $token[1]; |
| 185 | 183 | } |
@@ -10,34 +10,34 @@ |
||
| 10 | 10 | |
| 11 | 11 | // If you use Composer |
| 12 | 12 | if (class_exists('PhpParser\Autoloader')) { |
| 13 | - if (method_exists('PhpParser\Node\Name','set')) { |
|
| 13 | + if (method_exists('PhpParser\Node\Name', 'set')) { |
|
| 14 | 14 | // PHP-Parser 2.x |
| 15 | - require __DIR__ . '/2.x/MonkeyPatchManager.php'; |
|
| 15 | + require __DIR__.'/2.x/MonkeyPatchManager.php'; |
|
| 16 | 16 | } else { |
| 17 | 17 | // PHP-Parser 3.x |
| 18 | - require __DIR__ . '/3.x/MonkeyPatchManager.php'; |
|
| 18 | + require __DIR__.'/3.x/MonkeyPatchManager.php'; |
|
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | // If you don't use Composer |
| 22 | 22 | else { |
| 23 | 23 | if (version_compare(PHP_VERSION, '5.5.0', '>=')) { |
| 24 | 24 | // Use PHP-Parser 3.x |
| 25 | - require __DIR__ . '/third_party/PHP-Parser-3.0.3/lib/bootstrap.php'; |
|
| 26 | - require __DIR__ . '/3.x/MonkeyPatchManager.php'; |
|
| 25 | + require __DIR__.'/third_party/PHP-Parser-3.0.3/lib/bootstrap.php'; |
|
| 26 | + require __DIR__.'/3.x/MonkeyPatchManager.php'; |
|
| 27 | 27 | } else { |
| 28 | 28 | // Use PHP-Parser 2.x |
| 29 | - require __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php'; |
|
| 30 | - require __DIR__ . '/2.x/MonkeyPatchManager.php'; |
|
| 29 | + require __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php'; |
|
| 30 | + require __DIR__.'/2.x/MonkeyPatchManager.php'; |
|
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | -require __DIR__ . '/IncludeStream.php'; |
|
| 35 | -require __DIR__ . '/PathChecker.php'; |
|
| 36 | -require __DIR__ . '/MonkeyPatch.php'; |
|
| 37 | -require __DIR__ . '/Cache.php'; |
|
| 38 | -require __DIR__ . '/InvocationVerifier.php'; |
|
| 34 | +require __DIR__.'/IncludeStream.php'; |
|
| 35 | +require __DIR__.'/PathChecker.php'; |
|
| 36 | +require __DIR__.'/MonkeyPatch.php'; |
|
| 37 | +require __DIR__.'/Cache.php'; |
|
| 38 | +require __DIR__.'/InvocationVerifier.php'; |
|
| 39 | 39 | |
| 40 | -require __DIR__ . '/functions/exit__.php'; |
|
| 40 | +require __DIR__.'/functions/exit__.php'; |
|
| 41 | 41 | |
| 42 | 42 | const __GO_TO_ORIG__ = '__GO_TO_ORIG__'; |
| 43 | 43 | |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | // Support PHPUnit 6.0 |
| 12 | -if (! class_exists('PHPUnit_Framework_TestCase')) |
|
| 12 | +if ( ! class_exists('PHPUnit_Framework_TestCase')) |
|
| 13 | 13 | { |
| 14 | 14 | class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase'); |
| 15 | 15 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | return $this->$name; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - throw new LogicException('No such property: ' . $name); |
|
| 58 | + throw new LogicException('No such property: '.$name); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | public static function setUpBeforeClass() |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | { |
| 79 | 79 | reset_instance(); |
| 80 | 80 | CIPHPUnitTest::createCodeIgniterInstance(); |
| 81 | - $this->CI =& get_instance(); |
|
| 81 | + $this->CI = & get_instance(); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /** |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | reset_instance(); |
| 93 | 93 | $controller = new $classname; |
| 94 | - $this->CI =& get_instance(); |
|
| 94 | + $this->CI = & get_instance(); |
|
| 95 | 95 | return $controller; |
| 96 | 96 | } |
| 97 | 97 | |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | $this->assertSame( |
| 314 | 314 | $code, |
| 315 | 315 | $actual, |
| 316 | - 'Status code is not ' . $code . ' but ' . $actual . '.' |
|
| 316 | + 'Status code is not '.$code.' but '.$actual.'.' |
|
| 317 | 317 | ); |
| 318 | 318 | } |
| 319 | 319 | |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | public function assertResponseHeader($name, $value) |
| 327 | 327 | { |
| 328 | - $CI =& get_instance(); |
|
| 328 | + $CI = & get_instance(); |
|
| 329 | 329 | $actual = $CI->output->get_header($name); |
| 330 | 330 | |
| 331 | 331 | if ($actual === null) |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | */ |
| 350 | 350 | public function assertResponseCookie($name, $value, $allow_duplicate = false) |
| 351 | 351 | { |
| 352 | - $CI =& get_instance(); |
|
| 352 | + $CI = & get_instance(); |
|
| 353 | 353 | $cookies = isset($CI->output->_cookies[$name]) |
| 354 | 354 | ? $CI->output->_cookies[$name] : null; |
| 355 | 355 | |
@@ -407,23 +407,23 @@ discard block |
||
| 407 | 407 | $this->fail('redirect() is not called.'); |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | - if (! function_exists('site_url')) |
|
| 410 | + if ( ! function_exists('site_url')) |
|
| 411 | 411 | { |
| 412 | - $CI =& get_instance(); |
|
| 412 | + $CI = & get_instance(); |
|
| 413 | 413 | $CI->load->helper('url'); |
| 414 | 414 | } |
| 415 | 415 | |
| 416 | - if (! preg_match('#^(\w+:)?//#i', $uri)) |
|
| 416 | + if ( ! preg_match('#^(\w+:)?//#i', $uri)) |
|
| 417 | 417 | { |
| 418 | 418 | $uri = site_url($uri); |
| 419 | 419 | } |
| 420 | 420 | $absolute_url = $uri; |
| 421 | - $expected = 'Redirect to ' . $absolute_url; |
|
| 421 | + $expected = 'Redirect to '.$absolute_url; |
|
| 422 | 422 | |
| 423 | 423 | $this->assertSame( |
| 424 | 424 | $expected, |
| 425 | 425 | $status['redirect'], |
| 426 | - 'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.' |
|
| 426 | + 'URL to redirect is not '.$expected.' but '.$status['redirect'].'.' |
|
| 427 | 427 | ); |
| 428 | 428 | |
| 429 | 429 | if ($code !== null) |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | $this->assertSame( |
| 432 | 432 | $code, |
| 433 | 433 | $status['code'], |
| 434 | - 'Status code is not ' . $code . ' but ' . $status['code'] . '.' |
|
| 434 | + 'Status code is not '.$code.' but '.$status['code'].'.' |
|
| 435 | 435 | ); |
| 436 | 436 | } |
| 437 | 437 | } |
@@ -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); |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | |
| 264 | 264 | // Save status code in Output object |
| 265 | 265 | // added by ci-phpunit-test |
| 266 | - $CI =& get_instance(); |
|
| 266 | + $CI = & get_instance(); |
|
| 267 | 267 | $output = $CI->output; |
| 268 | 268 | $output->_status = [ |
| 269 | 269 | 'code' => $code, |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | if (empty($_config)) |
| 377 | 377 | { |
| 378 | 378 | // references cannot be directly assigned to static variables, so we use an array |
| 379 | - $_config[0] =& get_config(); |
|
| 379 | + $_config[0] = & get_config(); |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | return isset($_config[0][$item]) ? $_config[0][$item] : NULL; |
@@ -158,14 +158,16 @@ discard block |
||
| 158 | 158 | if ($status_code < 100) |
| 159 | 159 | { |
| 160 | 160 | $exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN |
| 161 | - if ($exit_status > 125) // 125 is EXIT__AUTO_MAX |
|
| 161 | + if ($exit_status > 125) { |
|
| 162 | + // 125 is EXIT__AUTO_MAX |
|
| 162 | 163 | { |
| 163 | - $exit_status = 1; // EXIT_ERROR |
|
| 164 | + $exit_status = 1; |
|
| 165 | + } |
|
| 166 | + // EXIT_ERROR |
|
| 164 | 167 | } |
| 165 | 168 | |
| 166 | 169 | $status_code = 500; |
| 167 | - } |
|
| 168 | - else |
|
| 170 | + } else |
|
| 169 | 171 | { |
| 170 | 172 | $exit_status = 1; // EXIT_ERROR |
| 171 | 173 | } |
@@ -254,8 +256,7 @@ discard block |
||
| 254 | 256 | if (isset($stati[$code])) |
| 255 | 257 | { |
| 256 | 258 | $text = $stati[$code]; |
| 257 | - } |
|
| 258 | - else |
|
| 259 | + } else |
|
| 259 | 260 | { |
| 260 | 261 | show_error('No status text available. Please check your status code number or supply your own message text.', 500); |
| 261 | 262 | } |
@@ -281,8 +282,7 @@ discard block |
||
| 281 | 282 | if (strpos(PHP_SAPI, 'cgi') === 0) |
| 282 | 283 | { |
| 283 | 284 | header('Status: '.$code.' '.$text, TRUE); |
| 284 | - } |
|
| 285 | - else |
|
| 285 | + } else |
|
| 286 | 286 | { |
| 287 | 287 | $server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1'; |
| 288 | 288 | header($server_protocol.' '.$code.' '.$text, TRUE, $code); |
@@ -325,8 +325,7 @@ discard block |
||
| 325 | 325 | if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php')) |
| 326 | 326 | { |
| 327 | 327 | require($file_path); |
| 328 | - } |
|
| 329 | - elseif ( ! $found) |
|
| 328 | + } elseif ( ! $found) |
|
| 330 | 329 | { |
| 331 | 330 | set_status_header(503); |
| 332 | 331 | echo 'The configuration file does not exist.'; |