@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | * @uses \SciActive\Hook::sortCallbacks() To resort the callback array in the correct order. |
86 | 86 | */ |
87 | 87 | public static function addCallback($hook, $order, $function) { |
88 | - $callback = array($order, $function); |
|
89 | - if (!isset(Hook::$hooks[$hook])) { |
|
90 | - Hook::$hooks[$hook] = array(); |
|
91 | - } |
|
92 | - Hook::$hooks[$hook][] = $callback; |
|
93 | - uasort(Hook::$hooks[$hook], '\\SciActive\\Hook::sortCallbacks'); |
|
94 | - return array_keys(Hook::$hooks[$hook], $callback); |
|
88 | + $callback = array($order, $function); |
|
89 | + if (!isset(Hook::$hooks[$hook])) { |
|
90 | + Hook::$hooks[$hook] = array(); |
|
91 | + } |
|
92 | + Hook::$hooks[$hook][] = $callback; |
|
93 | + uasort(Hook::$hooks[$hook], '\\SciActive\\Hook::sortCallbacks'); |
|
94 | + return array_keys(Hook::$hooks[$hook], $callback); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | * @return int 1 if the callback was deleted, 2 if it didn't exist. |
103 | 103 | */ |
104 | 104 | public static function delCallbackByID($hook, $id) { |
105 | - if (!isset(Hook::$hooks[$hook][$id])) { |
|
106 | - return 2; |
|
107 | - } |
|
108 | - unset(Hook::$hooks[$hook][$id]); |
|
109 | - return 1; |
|
105 | + if (!isset(Hook::$hooks[$hook][$id])) { |
|
106 | + return 2; |
|
107 | + } |
|
108 | + unset(Hook::$hooks[$hook][$id]); |
|
109 | + return 1; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | * @return array An array of callbacks. |
120 | 120 | */ |
121 | 121 | public static function getCallbacks() { |
122 | - return Hook::$hooks; |
|
122 | + return Hook::$hooks; |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | /** |
@@ -133,113 +133,113 @@ discard block |
||
133 | 133 | * @return bool True on success, false on failure. |
134 | 134 | */ |
135 | 135 | public static function hookObject(&$object, $prefix = '', $recursive = true) { |
136 | - if ((object) $object === $object) { |
|
137 | - $isString = false; |
|
138 | - } else { |
|
139 | - $isString = true; |
|
140 | - } |
|
136 | + if ((object) $object === $object) { |
|
137 | + $isString = false; |
|
138 | + } else { |
|
139 | + $isString = true; |
|
140 | + } |
|
141 | 141 | |
142 | - // Make sure we don't take over the hook object, or we'll end up |
|
143 | - // recursively calling ourself. Some system classes shouldn't be hooked. |
|
144 | - $className = str_replace('\\', '_', $isString ? $object : get_class($object)); |
|
145 | - global $_; |
|
146 | - if (isset($_) && in_array($className, array('\SciActive\Hook', 'depend', 'config', 'info'))) { |
|
147 | - return false; |
|
148 | - } |
|
142 | + // Make sure we don't take over the hook object, or we'll end up |
|
143 | + // recursively calling ourself. Some system classes shouldn't be hooked. |
|
144 | + $className = str_replace('\\', '_', $isString ? $object : get_class($object)); |
|
145 | + global $_; |
|
146 | + if (isset($_) && in_array($className, array('\SciActive\Hook', 'depend', 'config', 'info'))) { |
|
147 | + return false; |
|
148 | + } |
|
149 | 149 | |
150 | - if ($recursive && !$isString) { |
|
151 | - foreach ($object as $curName => &$curProperty) { |
|
152 | - if ((object) $curProperty === $curProperty) { |
|
153 | - Hook::hookObject($curProperty, $prefix.$curName.'->'); |
|
154 | - } |
|
155 | - } |
|
156 | - } |
|
150 | + if ($recursive && !$isString) { |
|
151 | + foreach ($object as $curName => &$curProperty) { |
|
152 | + if ((object) $curProperty === $curProperty) { |
|
153 | + Hook::hookObject($curProperty, $prefix.$curName.'->'); |
|
154 | + } |
|
155 | + } |
|
156 | + } |
|
157 | 157 | |
158 | - if (!class_exists("\SciActive\HookOverride_$className")) { |
|
159 | - if ($isString) { |
|
160 | - $reflection = new \ReflectionClass($object); |
|
161 | - } else { |
|
162 | - $reflection = new \ReflectionObject($object); |
|
163 | - } |
|
164 | - $methods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC); |
|
158 | + if (!class_exists("\SciActive\HookOverride_$className")) { |
|
159 | + if ($isString) { |
|
160 | + $reflection = new \ReflectionClass($object); |
|
161 | + } else { |
|
162 | + $reflection = new \ReflectionObject($object); |
|
163 | + } |
|
164 | + $methods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC); |
|
165 | 165 | |
166 | - $code = ''; |
|
167 | - foreach ($methods as &$curMethod) { |
|
168 | - $fname = $curMethod->getName(); |
|
169 | - if (in_array($fname, array('__construct', '__destruct', '__get', '__set', '__isset', '__unset', '__toString', '__invoke', '__set_state', '__clone', '__sleep', 'jsonSerialize'))) { |
|
170 | - continue; |
|
171 | - } |
|
166 | + $code = ''; |
|
167 | + foreach ($methods as &$curMethod) { |
|
168 | + $fname = $curMethod->getName(); |
|
169 | + if (in_array($fname, array('__construct', '__destruct', '__get', '__set', '__isset', '__unset', '__toString', '__invoke', '__set_state', '__clone', '__sleep', 'jsonSerialize'))) { |
|
170 | + continue; |
|
171 | + } |
|
172 | 172 | |
173 | - //$fprefix = $curMethod->isFinal() ? 'final ' : ''; |
|
174 | - $fprefix = $curMethod->isStatic() ? 'static ' : ''; |
|
175 | - $params = $curMethod->getParameters(); |
|
176 | - $paramArray = $paramNameArray = array(); |
|
177 | - foreach ($params as &$curParam) { |
|
178 | - $paramName = $curParam->getName(); |
|
179 | - $paramPrefix = $curParam->isVariadic() ? '...' : ''; |
|
180 | - $paramPrefix .= $curParam->isPassedByReference() ? '&' : ''; |
|
181 | - if ($curParam->isDefaultValueAvailable()) { |
|
182 | - $paramSuffix = ' = '.var_export($curParam->getDefaultValue(), true); |
|
183 | - } else { |
|
184 | - $paramSuffix = ''; |
|
185 | - } |
|
186 | - $paramArray[] = "{$paramPrefix}\${$paramName}{$paramSuffix}"; |
|
187 | - $paramNameArray[] = "{$paramPrefix}\${$paramName}"; |
|
188 | - } |
|
189 | - unset($curParam); |
|
190 | - $code .= $fprefix."function $fname(".implode(', ', $paramArray).") {\n" |
|
191 | - .(defined('HHVM_VERSION') ? |
|
192 | - ( |
|
193 | - // There is bad behavior in HHVM where debug_backtrace |
|
194 | - // won't return arguments, but calling func_get_args |
|
195 | - // somewhere in the function changes that behavior to be |
|
196 | - // consistent with official PHP. However, it also |
|
197 | - // returns arguments by value, instead of by reference. |
|
198 | - // So, we must use a more direct method. |
|
199 | - " \$_HOOK_arguments = array();\n" |
|
200 | - .(count($paramNameArray) > 0 ? |
|
201 | - " \$_HOOK_arguments[] = ".implode('; $_HOOK_arguments[] = ', $paramNameArray).";\n" : |
|
202 | - '' |
|
203 | - ) |
|
204 | - ." \$_HOOK_real_arg_count = func_num_args();\n" |
|
205 | - ." \$_HOOK_arg_count = count(\$_HOOK_arguments);\n" |
|
206 | - ." if (\$_HOOK_real_arg_count > \$_HOOK_arg_count) {\n" |
|
207 | - ." for (\$i = \$_HOOK_arg_count; \$i < \$_HOOK_real_arg_count; \$i++)\n" |
|
208 | - ." \$_HOOK_arguments[] = func_get_arg(\$i);\n" |
|
209 | - ." }\n" |
|
210 | - ) : ( |
|
211 | - // We must use a debug_backtrace, because that's the |
|
212 | - // best way to get all the passed arguments, by |
|
213 | - // reference. 5.4 and up lets us limit it to 1 frame. |
|
214 | - (version_compare(PHP_VERSION, '5.4.0') >= 0 ? |
|
215 | - " \$_HOOK_arguments = debug_backtrace(false, 1);\n" : |
|
216 | - " \$_HOOK_arguments = debug_backtrace(false);\n" |
|
217 | - ) |
|
218 | - ." \$_HOOK_arguments = \$_HOOK_arguments[0]['args'];\n" |
|
219 | - ) |
|
220 | - ) |
|
221 | - ." \$_HOOK_function = array(\$this->_hookObject, '$fname');\n" |
|
222 | - ." \$_HOOK_data = array();\n" |
|
223 | - ." \\SciActive\\Hook::runCallbacks(\$this->_hookPrefix.'$fname', \$_HOOK_arguments, 'before', \$this->_hookObject, \$_HOOK_function, \$_HOOK_data);\n" |
|
224 | - ." if (\$_HOOK_arguments !== false) {\n" |
|
225 | - ." \$_HOOK_return = call_user_func_array(\$_HOOK_function, \$_HOOK_arguments);\n" |
|
226 | - ." if ((object) \$_HOOK_return === \$_HOOK_return && get_class(\$_HOOK_return) === '$className')\n" |
|
227 | - ." \\SciActive\\Hook::hookObject(\$_HOOK_return, '$prefix', false);\n" |
|
228 | - ." \$_HOOK_return = array(\$_HOOK_return);\n" |
|
229 | - ." \\SciActive\\Hook::runCallbacks(\$this->_hookPrefix.'$fname', \$_HOOK_return, 'after', \$this->_hookObject, \$_HOOK_function, \$_HOOK_data);\n" |
|
230 | - ." if ((array) \$_HOOK_return === \$_HOOK_return)\n" |
|
231 | - ." return \$_HOOK_return[0];\n" |
|
232 | - ." }\n" |
|
233 | - ."}\n\n"; |
|
234 | - } |
|
235 | - unset($curMethod); |
|
236 | - // Build a HookOverride class. |
|
237 | - $include = str_replace(array('_NAMEHERE_', '//#CODEHERE#', '<?php', '?>'), array($className, $code, '', ''), Hook::$hookFile); |
|
238 | - eval($include); |
|
239 | - } |
|
173 | + //$fprefix = $curMethod->isFinal() ? 'final ' : ''; |
|
174 | + $fprefix = $curMethod->isStatic() ? 'static ' : ''; |
|
175 | + $params = $curMethod->getParameters(); |
|
176 | + $paramArray = $paramNameArray = array(); |
|
177 | + foreach ($params as &$curParam) { |
|
178 | + $paramName = $curParam->getName(); |
|
179 | + $paramPrefix = $curParam->isVariadic() ? '...' : ''; |
|
180 | + $paramPrefix .= $curParam->isPassedByReference() ? '&' : ''; |
|
181 | + if ($curParam->isDefaultValueAvailable()) { |
|
182 | + $paramSuffix = ' = '.var_export($curParam->getDefaultValue(), true); |
|
183 | + } else { |
|
184 | + $paramSuffix = ''; |
|
185 | + } |
|
186 | + $paramArray[] = "{$paramPrefix}\${$paramName}{$paramSuffix}"; |
|
187 | + $paramNameArray[] = "{$paramPrefix}\${$paramName}"; |
|
188 | + } |
|
189 | + unset($curParam); |
|
190 | + $code .= $fprefix."function $fname(".implode(', ', $paramArray).") {\n" |
|
191 | + .(defined('HHVM_VERSION') ? |
|
192 | + ( |
|
193 | + // There is bad behavior in HHVM where debug_backtrace |
|
194 | + // won't return arguments, but calling func_get_args |
|
195 | + // somewhere in the function changes that behavior to be |
|
196 | + // consistent with official PHP. However, it also |
|
197 | + // returns arguments by value, instead of by reference. |
|
198 | + // So, we must use a more direct method. |
|
199 | + " \$_HOOK_arguments = array();\n" |
|
200 | + .(count($paramNameArray) > 0 ? |
|
201 | + " \$_HOOK_arguments[] = ".implode('; $_HOOK_arguments[] = ', $paramNameArray).";\n" : |
|
202 | + '' |
|
203 | + ) |
|
204 | + ." \$_HOOK_real_arg_count = func_num_args();\n" |
|
205 | + ." \$_HOOK_arg_count = count(\$_HOOK_arguments);\n" |
|
206 | + ." if (\$_HOOK_real_arg_count > \$_HOOK_arg_count) {\n" |
|
207 | + ." for (\$i = \$_HOOK_arg_count; \$i < \$_HOOK_real_arg_count; \$i++)\n" |
|
208 | + ." \$_HOOK_arguments[] = func_get_arg(\$i);\n" |
|
209 | + ." }\n" |
|
210 | + ) : ( |
|
211 | + // We must use a debug_backtrace, because that's the |
|
212 | + // best way to get all the passed arguments, by |
|
213 | + // reference. 5.4 and up lets us limit it to 1 frame. |
|
214 | + (version_compare(PHP_VERSION, '5.4.0') >= 0 ? |
|
215 | + " \$_HOOK_arguments = debug_backtrace(false, 1);\n" : |
|
216 | + " \$_HOOK_arguments = debug_backtrace(false);\n" |
|
217 | + ) |
|
218 | + ." \$_HOOK_arguments = \$_HOOK_arguments[0]['args'];\n" |
|
219 | + ) |
|
220 | + ) |
|
221 | + ." \$_HOOK_function = array(\$this->_hookObject, '$fname');\n" |
|
222 | + ." \$_HOOK_data = array();\n" |
|
223 | + ." \\SciActive\\Hook::runCallbacks(\$this->_hookPrefix.'$fname', \$_HOOK_arguments, 'before', \$this->_hookObject, \$_HOOK_function, \$_HOOK_data);\n" |
|
224 | + ." if (\$_HOOK_arguments !== false) {\n" |
|
225 | + ." \$_HOOK_return = call_user_func_array(\$_HOOK_function, \$_HOOK_arguments);\n" |
|
226 | + ." if ((object) \$_HOOK_return === \$_HOOK_return && get_class(\$_HOOK_return) === '$className')\n" |
|
227 | + ." \\SciActive\\Hook::hookObject(\$_HOOK_return, '$prefix', false);\n" |
|
228 | + ." \$_HOOK_return = array(\$_HOOK_return);\n" |
|
229 | + ." \\SciActive\\Hook::runCallbacks(\$this->_hookPrefix.'$fname', \$_HOOK_return, 'after', \$this->_hookObject, \$_HOOK_function, \$_HOOK_data);\n" |
|
230 | + ." if ((array) \$_HOOK_return === \$_HOOK_return)\n" |
|
231 | + ." return \$_HOOK_return[0];\n" |
|
232 | + ." }\n" |
|
233 | + ."}\n\n"; |
|
234 | + } |
|
235 | + unset($curMethod); |
|
236 | + // Build a HookOverride class. |
|
237 | + $include = str_replace(array('_NAMEHERE_', '//#CODEHERE#', '<?php', '?>'), array($className, $code, '', ''), Hook::$hookFile); |
|
238 | + eval($include); |
|
239 | + } |
|
240 | 240 | |
241 | - eval('$object = new \SciActive\HookOverride_'.$className.' ($object, $prefix);'); |
|
242 | - return true; |
|
241 | + eval('$object = new \SciActive\HookOverride_'.$className.' ($object, $prefix);'); |
|
242 | + return true; |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
@@ -257,26 +257,26 @@ discard block |
||
257 | 257 | * @param array &$data A data array for callback communication. |
258 | 258 | */ |
259 | 259 | public static function runCallbacks($name, &$arguments = array(), $type = 'all', &$object = null, &$function = null, &$data = array()) { |
260 | - if (isset(Hook::$hooks['all'])) { |
|
261 | - foreach (Hook::$hooks['all'] as $curCallback) { |
|
262 | - if (($type == 'all' && $curCallback[0] != 0) || ($type == 'before' && $curCallback[0] < 0) || ($type == 'after' && $curCallback[0] > 0)) { |
|
263 | - call_user_func_array($curCallback[1], array(&$arguments, $name, &$object, &$function, &$data)); |
|
264 | - if ($arguments === false) { |
|
265 | - return; |
|
266 | - } |
|
267 | - } |
|
268 | - } |
|
269 | - } |
|
270 | - if (isset(Hook::$hooks[$name])) { |
|
271 | - foreach (Hook::$hooks[$name] as $curCallback) { |
|
272 | - if (($type == 'all' && $curCallback[0] != 0) || ($type == 'before' && $curCallback[0] < 0) || ($type == 'after' && $curCallback[0] > 0)) { |
|
273 | - call_user_func_array($curCallback[1], array(&$arguments, $name, &$object, &$function, &$data)); |
|
274 | - if ($arguments === false) { |
|
275 | - return; |
|
276 | - } |
|
277 | - } |
|
278 | - } |
|
279 | - } |
|
260 | + if (isset(Hook::$hooks['all'])) { |
|
261 | + foreach (Hook::$hooks['all'] as $curCallback) { |
|
262 | + if (($type == 'all' && $curCallback[0] != 0) || ($type == 'before' && $curCallback[0] < 0) || ($type == 'after' && $curCallback[0] > 0)) { |
|
263 | + call_user_func_array($curCallback[1], array(&$arguments, $name, &$object, &$function, &$data)); |
|
264 | + if ($arguments === false) { |
|
265 | + return; |
|
266 | + } |
|
267 | + } |
|
268 | + } |
|
269 | + } |
|
270 | + if (isset(Hook::$hooks[$name])) { |
|
271 | + foreach (Hook::$hooks[$name] as $curCallback) { |
|
272 | + if (($type == 'all' && $curCallback[0] != 0) || ($type == 'before' && $curCallback[0] < 0) || ($type == 'after' && $curCallback[0] > 0)) { |
|
273 | + call_user_func_array($curCallback[1], array(&$arguments, $name, &$object, &$function, &$data)); |
|
274 | + if ($arguments === false) { |
|
275 | + return; |
|
276 | + } |
|
277 | + } |
|
278 | + } |
|
279 | + } |
|
280 | 280 | } |
281 | 281 | |
282 | 282 | /** |
@@ -291,14 +291,14 @@ discard block |
||
291 | 291 | * @access private |
292 | 292 | */ |
293 | 293 | private static function sortCallbacks($a, $b) { |
294 | - if ($a[0] == $b[0]) { |
|
295 | - return 0; |
|
296 | - } |
|
297 | - return ($a[0] < $b[0]) ? -1 : 1; |
|
294 | + if ($a[0] == $b[0]) { |
|
295 | + return 0; |
|
296 | + } |
|
297 | + return ($a[0] < $b[0]) ? -1 : 1; |
|
298 | 298 | } |
299 | 299 | |
300 | 300 | public static function getHookFile() { |
301 | - Hook::$hookFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'HookOverride_extend.php'); |
|
301 | + Hook::$hookFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'HookOverride_extend.php'); |
|
302 | 302 | } |
303 | 303 | } |
304 | 304 |
@@ -198,8 +198,7 @@ discard block |
||
198 | 198 | // So, we must use a more direct method. |
199 | 199 | " \$_HOOK_arguments = array();\n" |
200 | 200 | .(count($paramNameArray) > 0 ? |
201 | - " \$_HOOK_arguments[] = ".implode('; $_HOOK_arguments[] = ', $paramNameArray).";\n" : |
|
202 | - '' |
|
201 | + " \$_HOOK_arguments[] = ".implode('; $_HOOK_arguments[] = ', $paramNameArray).";\n" : '' |
|
203 | 202 | ) |
204 | 203 | ." \$_HOOK_real_arg_count = func_num_args();\n" |
205 | 204 | ." \$_HOOK_arg_count = count(\$_HOOK_arguments);\n" |
@@ -212,8 +211,7 @@ discard block |
||
212 | 211 | // best way to get all the passed arguments, by |
213 | 212 | // reference. 5.4 and up lets us limit it to 1 frame. |
214 | 213 | (version_compare(PHP_VERSION, '5.4.0') >= 0 ? |
215 | - " \$_HOOK_arguments = debug_backtrace(false, 1);\n" : |
|
216 | - " \$_HOOK_arguments = debug_backtrace(false);\n" |
|
214 | + " \$_HOOK_arguments = debug_backtrace(false, 1);\n" : " \$_HOOK_arguments = debug_backtrace(false);\n" |
|
217 | 215 | ) |
218 | 216 | ." \$_HOOK_arguments = \$_HOOK_arguments[0]['args'];\n" |
219 | 217 | ) |