@@ -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 | } |
@@ -85,8 +85,7 @@ discard block |
||
85 | 85 | if (! self::wiredesignzHmvcInstalled()) |
86 | 86 | { |
87 | 87 | new CI_Controller(); |
88 | - } |
|
89 | - else |
|
88 | + } else |
|
90 | 89 | { |
91 | 90 | new MX_Controller(); |
92 | 91 | } |
@@ -106,8 +105,7 @@ discard block |
||
106 | 105 | if (! self::wiredesignzHmvcInstalled()) |
107 | 106 | { |
108 | 107 | new CI_Controller(); |
109 | - } |
|
110 | - else |
|
108 | + } else |
|
111 | 109 | { |
112 | 110 | new CI(); |
113 | 111 | new MX_Controller(); |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public static function init(array $autoload_dirs = null) |
22 | 22 | { |
23 | - if (! defined('TESTPATH')) { |
|
23 | + if ( ! defined('TESTPATH')) { |
|
24 | 24 | define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR); |
25 | 25 | } |
26 | 26 | |
@@ -37,30 +37,30 @@ discard block |
||
37 | 37 | $cwd_backup = getcwd(); |
38 | 38 | |
39 | 39 | // Load autoloader for ci-phpunit-test |
40 | - require __DIR__ . '/autoloader.php'; |
|
40 | + require __DIR__.'/autoloader.php'; |
|
41 | 41 | |
42 | - require TESTPATH . 'TestCase.php'; |
|
42 | + require TESTPATH.'TestCase.php'; |
|
43 | 43 | |
44 | - $db_test_case_file = TESTPATH . 'DbTestCase.php'; |
|
44 | + $db_test_case_file = TESTPATH.'DbTestCase.php'; |
|
45 | 45 | if (is_readable($db_test_case_file)) |
46 | 46 | { |
47 | 47 | require $db_test_case_file; |
48 | 48 | } |
49 | 49 | |
50 | 50 | // Replace a few Common functions |
51 | - require __DIR__ . '/replacing/core/Common.php'; |
|
52 | - require BASEPATH . 'core/Common.php'; |
|
51 | + require __DIR__.'/replacing/core/Common.php'; |
|
52 | + require BASEPATH.'core/Common.php'; |
|
53 | 53 | |
54 | 54 | // Workaround for missing CodeIgniter's error handler |
55 | 55 | // See https://github.com/kenjis/ci-phpunit-test/issues/37 |
56 | 56 | set_error_handler('_error_handler'); |
57 | 57 | |
58 | 58 | // Load new functions of CIPHPUnitTest |
59 | - require __DIR__ . '/functions.php'; |
|
59 | + require __DIR__.'/functions.php'; |
|
60 | 60 | // Load ci-phpunit-test CI_Loader |
61 | - require __DIR__ . '/replacing/core/Loader.php'; |
|
61 | + require __DIR__.'/replacing/core/Loader.php'; |
|
62 | 62 | // Load ci-phpunit-test CI_Input |
63 | - require __DIR__ . '/replacing/core/Input.php'; |
|
63 | + require __DIR__.'/replacing/core/Input.php'; |
|
64 | 64 | |
65 | 65 | // Change current directory |
66 | 66 | chdir(FCPATH); |
@@ -72,12 +72,12 @@ discard block |
||
72 | 72 | * |
73 | 73 | * And away we go... |
74 | 74 | */ |
75 | - require __DIR__ . '/replacing/core/CodeIgniter.php'; |
|
75 | + require __DIR__.'/replacing/core/CodeIgniter.php'; |
|
76 | 76 | |
77 | 77 | self::replaceHelpers(); |
78 | 78 | |
79 | 79 | // Create CodeIgniter instance |
80 | - if (! self::wiredesignzHmvcInstalled()) |
|
80 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
81 | 81 | { |
82 | 82 | new CI_Controller(); |
83 | 83 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | public static function createCodeIgniterInstance() |
100 | 100 | { |
101 | - if (! self::wiredesignzHmvcInstalled()) |
|
101 | + if ( ! self::wiredesignzHmvcInstalled()) |
|
102 | 102 | { |
103 | 103 | new CI_Controller(); |
104 | 104 | } |
@@ -127,11 +127,11 @@ discard block |
||
127 | 127 | protected static function replaceLoader() |
128 | 128 | { |
129 | 129 | $my_loader_file = |
130 | - APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php'; |
|
130 | + APPPATH.'core/'.config_item('subclass_prefix').'Loader.php'; |
|
131 | 131 | |
132 | 132 | if (file_exists($my_loader_file)) |
133 | 133 | { |
134 | - self::$loader_class = config_item('subclass_prefix') . 'Loader'; |
|
134 | + self::$loader_class = config_item('subclass_prefix').'Loader'; |
|
135 | 135 | if ( ! class_exists(self::$loader_class)) |
136 | 136 | { |
137 | 137 | require $my_loader_file; |
@@ -150,19 +150,19 @@ discard block |
||
150 | 150 | |
151 | 151 | protected static function loadHelper($helper) |
152 | 152 | { |
153 | - $my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php'; |
|
153 | + $my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php'; |
|
154 | 154 | if (file_exists($my_helper_file)) |
155 | 155 | { |
156 | 156 | require $my_helper_file; |
157 | 157 | } |
158 | - require __DIR__ . '/replacing/helpers/' . $helper . '.php'; |
|
158 | + require __DIR__.'/replacing/helpers/'.$helper.'.php'; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | public static function setPatcherCacheDir($dir = null) |
162 | 162 | { |
163 | 163 | if ($dir === null) |
164 | 164 | { |
165 | - $dir = TESTPATH . '_ci_phpunit_test/tmp/cache'; |
|
165 | + $dir = TESTPATH.'_ci_phpunit_test/tmp/cache'; |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | MonkeyPatchManager::setCacheDir( |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | public function enterNode(Node $node) |
26 | 26 | { |
27 | - $callback = [$this, 'before' . ucfirst($node->getType())]; |
|
27 | + $callback = [$this, 'before'.ucfirst($node->getType())]; |
|
28 | 28 | if (is_callable($callback)) { |
29 | 29 | call_user_func_array($callback, [$node]); |
30 | 30 | } |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | |
33 | 33 | public function leaveNode(Node $node) |
34 | 34 | { |
35 | - if (! ($node instanceof ConstFetch)) |
|
35 | + if ( ! ($node instanceof ConstFetch)) |
|
36 | 36 | { |
37 | - $callback = [$this, 'rewrite' . ucfirst($node->getType())]; |
|
37 | + $callback = [$this, 'rewrite'.ucfirst($node->getType())]; |
|
38 | 38 | if (is_callable($callback)) { |
39 | 39 | call_user_func_array($callback, [$node]); |
40 | 40 | } |
@@ -47,23 +47,23 @@ discard block |
||
47 | 47 | return; |
48 | 48 | } |
49 | 49 | |
50 | - if (! ($node->name instanceof Name)) |
|
50 | + if ( ! ($node->name instanceof Name)) |
|
51 | 51 | { |
52 | 52 | return; |
53 | 53 | } |
54 | 54 | |
55 | - if (! $node->name->isUnqualified()) |
|
55 | + if ( ! $node->name->isUnqualified()) |
|
56 | 56 | { |
57 | 57 | return; |
58 | 58 | } |
59 | 59 | |
60 | - if (! ConstantPatcher::isBlacklisted((string) $node->name)) |
|
60 | + if ( ! ConstantPatcher::isBlacklisted((string) $node->name)) |
|
61 | 61 | { |
62 | - $replacement = new FullyQualified('\__ConstProxy__::get(\'' . (string) $node->name . '\')'); |
|
62 | + $replacement = new FullyQualified('\__ConstProxy__::get(\''.(string) $node->name.'\')'); |
|
63 | 63 | |
64 | 64 | $pos = $node->getAttribute('startTokenPos'); |
65 | 65 | ConstantPatcher::$replacement[$pos] = |
66 | - '\__ConstProxy__::get(\'' . (string) $node->name .'\')'; |
|
66 | + '\__ConstProxy__::get(\''.(string) $node->name.'\')'; |
|
67 | 67 | |
68 | 68 | $node->name = $replacement; |
69 | 69 | } |
@@ -15,7 +15,6 @@ |
||
15 | 15 | use PhpParser\Node\Name; |
16 | 16 | use PhpParser\Node\Name\FullyQualified; |
17 | 17 | use PhpParser\NodeVisitorAbstract; |
18 | - |
|
19 | 18 | use Kenjis\MonkeyPatch\Patcher\ConstantPatcher; |
20 | 19 | |
21 | 20 | class NodeVisitor extends NodeVisitorAbstract |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
12 | 12 | |
13 | -require __DIR__ . '/../Exception/ExitException.php'; |
|
13 | +require __DIR__.'/../Exception/ExitException.php'; |
|
14 | 14 | |
15 | 15 | class ExitPatcher |
16 | 16 | { |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | } |
31 | 31 | elseif ($token[0] === T_EXIT) |
32 | 32 | { |
33 | - if ($tokens[$i+1] === ';') |
|
33 | + if ($tokens[$i + 1] === ';') |
|
34 | 34 | { |
35 | 35 | $new_source .= 'exit__()'; |
36 | 36 | } |
@@ -27,20 +27,17 @@ |
||
27 | 27 | if (is_string($token)) |
28 | 28 | { |
29 | 29 | $new_source .= $token; |
30 | - } |
|
31 | - elseif ($token[0] === T_EXIT) |
|
30 | + } elseif ($token[0] === T_EXIT) |
|
32 | 31 | { |
33 | 32 | if ($tokens[$i+1] === ';') |
34 | 33 | { |
35 | 34 | $new_source .= 'exit__()'; |
36 | - } |
|
37 | - else |
|
35 | + } else |
|
38 | 36 | { |
39 | 37 | $new_source .= 'exit__'; |
40 | 38 | } |
41 | 39 | $patched = true; |
42 | - } |
|
43 | - else |
|
40 | + } else |
|
44 | 41 | { |
45 | 42 | $new_source .= $token[1]; |
46 | 43 | } |
@@ -38,8 +38,7 @@ |
||
38 | 38 | { |
39 | 39 | $patched = true; |
40 | 40 | $new_source = static::generateNewSource($source); |
41 | - } |
|
42 | - else |
|
41 | + } else |
|
43 | 42 | { |
44 | 43 | $new_source = $source; |
45 | 44 | } |
@@ -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 | } |
@@ -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 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
12 | 12 | |
13 | -require __DIR__ . '/../Exception/ExitException.php'; |
|
13 | +require __DIR__.'/../Exception/ExitException.php'; |
|
14 | 14 | |
15 | 15 | class ExitPatcher |
16 | 16 | { |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | } |
31 | 31 | elseif ($token[0] === T_EXIT) |
32 | 32 | { |
33 | - if ($tokens[$i+1] === ';') |
|
33 | + if ($tokens[$i + 1] === ';') |
|
34 | 34 | { |
35 | 35 | $new_source .= 'exit__()'; |
36 | 36 | } |
@@ -27,20 +27,17 @@ |
||
27 | 27 | if (is_string($token)) |
28 | 28 | { |
29 | 29 | $new_source .= $token; |
30 | - } |
|
31 | - elseif ($token[0] === T_EXIT) |
|
30 | + } elseif ($token[0] === T_EXIT) |
|
32 | 31 | { |
33 | 32 | if ($tokens[$i+1] === ';') |
34 | 33 | { |
35 | 34 | $new_source .= 'exit__()'; |
36 | - } |
|
37 | - else |
|
35 | + } else |
|
38 | 36 | { |
39 | 37 | $new_source .= 'exit__'; |
40 | 38 | } |
41 | 39 | $patched = true; |
42 | - } |
|
43 | - else |
|
40 | + } else |
|
44 | 41 | { |
45 | 42 | $new_source .= $token[1]; |
46 | 43 | } |