@@ -12,7 +12,6 @@ |
||
12 | 12 | |
13 | 13 | use LogicException; |
14 | 14 | use RuntimeException; |
15 | - |
|
16 | 15 | use RecursiveIteratorIterator; |
17 | 16 | use RecursiveDirectoryIterator; |
18 | 17 |
@@ -11,7 +11,6 @@ |
||
11 | 11 | namespace Kenjis\MonkeyPatch; |
12 | 12 | |
13 | 13 | use LogicException; |
14 | -use RuntimeException; |
|
15 | 14 | use PhpParser\ParserFactory; |
16 | 15 | use Kenjis\MonkeyPatch\Patcher\FunctionPatcher; |
17 | 16 |
@@ -70,8 +70,7 @@ |
||
70 | 70 | if (isset($config['root_dir'])) |
71 | 71 | { |
72 | 72 | Cache::setProjectRootDir($config['root_dir']); |
73 | - } |
|
74 | - else |
|
73 | + } else |
|
75 | 74 | { |
76 | 75 | // APPPATH is constant in CodeIgniter |
77 | 76 | Cache::setProjectRootDir(APPPATH . '../'); |
@@ -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 | { |
@@ -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; |
@@ -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 |
@@ -66,8 +66,7 @@ discard block |
||
66 | 66 | { |
67 | 67 | if(self::isVoidFunction($tokens, $key)){ |
68 | 68 | $new_source .= '{ ' . self::CODENORET; |
69 | - } |
|
70 | - else{ |
|
69 | + } else{ |
|
71 | 70 | $new_source .= '{ ' . self::CODE; |
72 | 71 | } |
73 | 72 | $start_method = false; |
@@ -78,13 +77,11 @@ discard block |
||
78 | 77 | { |
79 | 78 | $replacement = false; |
80 | 79 | } |
81 | - } |
|
82 | - else |
|
80 | + } else |
|
83 | 81 | { |
84 | 82 | $new_source .= $token; |
85 | 83 | } |
86 | - } |
|
87 | - else |
|
84 | + } else |
|
88 | 85 | { |
89 | 86 | $new_source .= $token[1]; |
90 | 87 | } |
@@ -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 |
@@ -48,8 +48,7 @@ |
||
48 | 48 | { |
49 | 49 | $patched = true; |
50 | 50 | $new_source = static::generateNewSource($source_); |
51 | - } |
|
52 | - else |
|
51 | + } else |
|
53 | 52 | { |
54 | 53 | $new_source = $source; |
55 | 54 | } |
@@ -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; |
@@ -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 | } |