sciactive / hookphp

src/HookOverride_extend.php

Indentation +27 added lines, -27 removed lines

@@ -30,63 +30,63 @@
   protected $_hookPrefix = '';
 
   public function _hookObject() {
-    return $this->_hookObject;
+	return $this->_hookObject;
   }
 
   public function __construct(&$object, $prefix = '') {
-    $this->_hookObject = $object;
-    $this->_hookPrefix = $prefix;
+	$this->_hookObject = $object;
+	$this->_hookPrefix = $prefix;
   }
 
   public function &__get($name) {
-    $val =& $this->_hookObject->$name;
-    return $val;
+	$val =& $this->_hookObject->$name;
+	return $val;
   }
 
   public function __set($name, $value) {
-    return $this->_hookObject->$name = $value;
+	return $this->_hookObject->$name = $value;
   }
 
   public function __isset($name) {
-    return isset($this->_hookObject->$name);
+	return isset($this->_hookObject->$name);
   }
 
   public function __unset($name) {
-    unset($this->_hookObject->$name);
+	unset($this->_hookObject->$name);
   }
 
   public function __toString() {
-    return (string) $this->_hookObject;
+	return (string) $this->_hookObject;
   }
 
   public function __invoke() {
-    if (method_exists($this->_hookObject, '__invoke')) {
-      $args = func_get_args();
-      return call_user_func_array(array($this->_hookObject, '__invoke'), $args);
-    }
+	if (method_exists($this->_hookObject, '__invoke')) {
+	  $args = func_get_args();
+	  return call_user_func_array(array($this->_hookObject, '__invoke'), $args);
+	}
   }
 
   public function __set_state() {
-    if (method_exists($this->_hookObject, '__set_state')) {
-      $args = func_get_args();
-      return call_user_func_array(array($this->_hookObject, '__set_state'), $args);
-    }
+	if (method_exists($this->_hookObject, '__set_state')) {
+	  $args = func_get_args();
+	  return call_user_func_array(array($this->_hookObject, '__set_state'), $args);
+	}
   }
 
   public function __clone() {
-    // TODO: Test this. Make sure cloning works properly.
-    $newObject = clone $this->_hookObject;
-    Hook::hookObject($newObject, get_class($newObject).'->', false);
-    return $newObject;
+	// TODO: Test this. Make sure cloning works properly.
+	$newObject = clone $this->_hookObject;
+	Hook::hookObject($newObject, get_class($newObject).'->', false);
+	return $newObject;
   }
 
   public function jsonSerialize() {
-    if (is_callable($this->_hookObject, 'jsonSerialize')) {
-      $args = func_get_args();
-      return call_user_func_array(array($this->_hookObject, 'jsonSerialize'), $args);
-    } else {
-      return $this->_hookObject;
-    }
+	if (is_callable($this->_hookObject, 'jsonSerialize')) {
+	  $args = func_get_args();
+	  return call_user_func_array(array($this->_hookObject, 'jsonSerialize'), $args);
+	} else {
+	  return $this->_hookObject;
+	}
   }
 
 //#CODEHERE#

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
   }
 
   public function &__get($name) {
-    $val =& $this->_hookObject->$name;
+    $val = & $this->_hookObject->$name;
     return $val;
   }
 

src/Hook.php

Indentation +139 added lines, -139 removed lines

@@ -85,13 +85,13 @@ 
    * @uses \SciActive\Hook::sortCallbacks() To resort the callback array in the correct order.
    */
   public static function addCallback($hook, $order, $function) {
-    $callback = array($order, $function);
-    if (!isset(Hook::$hooks[$hook])) {
-      Hook::$hooks[$hook] = array();
-    }
-    Hook::$hooks[$hook][] = $callback;
-    uasort(Hook::$hooks[$hook], '\\SciActive\\Hook::sortCallbacks');
-    return array_keys(Hook::$hooks[$hook], $callback);
+	$callback = array($order, $function);
+	if (!isset(Hook::$hooks[$hook])) {
+	  Hook::$hooks[$hook] = array();
+	}
+	Hook::$hooks[$hook][] = $callback;
+	uasort(Hook::$hooks[$hook], '\\SciActive\\Hook::sortCallbacks');
+	return array_keys(Hook::$hooks[$hook], $callback);
   }
 
   /**
@@ -102,11 +102,11 @@ 
    * @return int 1 if the callback was deleted, 2 if it didn't exist.
    */
   public static function delCallbackByID($hook, $id) {
-    if (!isset(Hook::$hooks[$hook][$id])) {
-      return 2;
-    }
-    unset(Hook::$hooks[$hook][$id]);
-    return 1;
+	if (!isset(Hook::$hooks[$hook][$id])) {
+	  return 2;
+	}
+	unset(Hook::$hooks[$hook][$id]);
+	return 1;
   }
 
   /**
@@ -119,7 +119,7 @@ 
    * @return array An array of callbacks.
    */
   public static function getCallbacks() {
-    return Hook::$hooks;
+	return Hook::$hooks;
   }
 
   /**
@@ -133,113 +133,113 @@ 
    * @return bool True on success, false on failure.
    */
   public static function hookObject(&$object, $prefix = '', $recursive = true) {
-    if ((object) $object === $object) {
-      $isString = false;
-    } else {
-      $isString = true;
-    }
+	if ((object) $object === $object) {
+	  $isString = false;
+	} else {
+	  $isString = true;
+	}
 
-    // Make sure we don't take over the hook object, or we'll end up
-    // recursively calling ourself. Some system classes shouldn't be hooked.
-    $className = str_replace('\\', '_', $isString ? $object : get_class($object));
-    global $_;
-    if (isset($_) && in_array($className, array('\SciActive\Hook', 'depend', 'config', 'info'))) {
-      return false;
-    }
+	// Make sure we don't take over the hook object, or we'll end up
+	// recursively calling ourself. Some system classes shouldn't be hooked.
+	$className = str_replace('\\', '_', $isString ? $object : get_class($object));
+	global $_;
+	if (isset($_) && in_array($className, array('\SciActive\Hook', 'depend', 'config', 'info'))) {
+	  return false;
+	}
 
-    if ($recursive && !$isString) {
-      foreach ($object as $curName => &$curProperty) {
-        if ((object) $curProperty === $curProperty) {
-          Hook::hookObject($curProperty, $prefix.$curName.'->');
-        }
-      }
-    }
+	if ($recursive && !$isString) {
+	  foreach ($object as $curName => &$curProperty) {
+		if ((object) $curProperty === $curProperty) {
+		  Hook::hookObject($curProperty, $prefix.$curName.'->');
+		}
+	  }
+	}
 
-    if (!class_exists("\SciActive\HookOverride_$className")) {
-      if ($isString) {
-        $reflection = new \ReflectionClass($object);
-      } else {
-        $reflection = new \ReflectionObject($object);
-      }
-      $methods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC);
+	if (!class_exists("\SciActive\HookOverride_$className")) {
+	  if ($isString) {
+		$reflection = new \ReflectionClass($object);
+	  } else {
+		$reflection = new \ReflectionObject($object);
+	  }
+	  $methods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC);
 
-      $code = '';
-      foreach ($methods as &$curMethod) {
-        $fname = $curMethod->getName();
-        if (in_array($fname, array('__construct', '__destruct', '__get', '__set', '__isset', '__unset', '__toString', '__invoke', '__set_state', '__clone', '__sleep', 'jsonSerialize'))) {
-          continue;
-        }
+	  $code = '';
+	  foreach ($methods as &$curMethod) {
+		$fname = $curMethod->getName();
+		if (in_array($fname, array('__construct', '__destruct', '__get', '__set', '__isset', '__unset', '__toString', '__invoke', '__set_state', '__clone', '__sleep', 'jsonSerialize'))) {
+		  continue;
+		}
 
-        //$fprefix = $curMethod->isFinal() ? 'final ' : '';
-        $fprefix = $curMethod->isStatic() ? 'static ' : '';
-        $params = $curMethod->getParameters();
-        $paramArray = $paramNameArray = array();
-        foreach ($params as &$curParam) {
-          $paramName = $curParam->getName();
-          $paramPrefix = $curParam->isVariadic() ? '...' : '';
-          $paramPrefix .= $curParam->isPassedByReference() ? '&' : '';
-          if ($curParam->isDefaultValueAvailable()) {
-            $paramSuffix = ' = '.var_export($curParam->getDefaultValue(), true);
-          } else {
-            $paramSuffix = '';
-          }
-          $paramArray[] = "{$paramPrefix}\${$paramName}{$paramSuffix}";
-          $paramNameArray[] = "{$paramPrefix}\${$paramName}";
-        }
-        unset($curParam);
-        $code .= $fprefix."function $fname(".implode(', ', $paramArray).") {\n"
-        .(defined('HHVM_VERSION') ?
-          (
-            // There is bad behavior in HHVM where debug_backtrace
-            // won't return arguments, but calling func_get_args
-            // somewhere in the function changes that behavior to be
-            // consistent with official PHP. However, it also
-            // returns arguments by value, instead of by reference.
-            // So, we must use a more direct method.
-            "    \$arguments = array();\n"
-            .(count($paramNameArray) > 0 ?
-              "    \$arguments[] = ".implode('; $arguments[] = ', $paramNameArray).";\n" :
-              ''
-            )
-            ."    \$real_arg_count = func_num_args();\n"
-            ."    \$arg_count = count(\$arguments);\n"
-            ."    if (\$real_arg_count > \$arg_count) {\n"
-            ."        for (\$i = \$arg_count; \$i < \$real_arg_count; \$i++)\n"
-            ."            \$arguments[] = func_get_arg(\$i);\n"
-            ."    }\n"
-          ) : (
-            // We must use a debug_backtrace, because that's the
-            // best way to get all the passed arguments, by
-            // reference. 5.4 and up lets us limit it to 1 frame.
-            (version_compare(PHP_VERSION, '5.4.0') >= 0 ?
-              "    \$arguments = debug_backtrace(false, 1);\n" :
-              "    \$arguments = debug_backtrace(false);\n"
-            )
-            ."    \$arguments = \$arguments[0]['args'];\n"
-          )
-        )
-        ."    \$function = array(\$this->_hookObject, '$fname');\n"
-        ."    \$data = array();\n"
-        ."    \\SciActive\\Hook::runCallbacks(\$this->_hookPrefix.'$fname', \$arguments, 'before', \$this->_hookObject, \$function, \$data);\n"
-        ."    if (\$arguments !== false) {\n"
-        ."        \$return = call_user_func_array(\$function, \$arguments);\n"
-        ."        if ((object) \$return === \$return && get_class(\$return) === '$className')\n"
-        ."            \\SciActive\\Hook::hookObject(\$return, '$prefix', false);\n"
-        ."        \$return = array(\$return);\n"
-        ."        \\SciActive\\Hook::runCallbacks(\$this->_hookPrefix.'$fname', \$return, 'after', \$this->_hookObject, \$function, \$data);\n"
-        ."        if ((array) \$return === \$return)\n"
-        ."            return \$return[0];\n"
-        ."    }\n"
-        ."}\n\n";
-      }
-      unset($curMethod);
-      // Build a HookOverride class.
-      $include = str_replace(array('_NAMEHERE_', '//#CODEHERE#', '<?php', '?>'), array($className, $code, '', ''), Hook::$hookFile);
-      eval($include);
-    }
+		//$fprefix = $curMethod->isFinal() ? 'final ' : '';
+		$fprefix = $curMethod->isStatic() ? 'static ' : '';
+		$params = $curMethod->getParameters();
+		$paramArray = $paramNameArray = array();
+		foreach ($params as &$curParam) {
+		  $paramName = $curParam->getName();
+		  $paramPrefix = $curParam->isVariadic() ? '...' : '';
+		  $paramPrefix .= $curParam->isPassedByReference() ? '&' : '';
+		  if ($curParam->isDefaultValueAvailable()) {
+			$paramSuffix = ' = '.var_export($curParam->getDefaultValue(), true);
+		  } else {
+			$paramSuffix = '';
+		  }
+		  $paramArray[] = "{$paramPrefix}\${$paramName}{$paramSuffix}";
+		  $paramNameArray[] = "{$paramPrefix}\${$paramName}";
+		}
+		unset($curParam);
+		$code .= $fprefix."function $fname(".implode(', ', $paramArray).") {\n"
+		.(defined('HHVM_VERSION') ?
+		  (
+			// There is bad behavior in HHVM where debug_backtrace
+			// won't return arguments, but calling func_get_args
+			// somewhere in the function changes that behavior to be
+			// consistent with official PHP. However, it also
+			// returns arguments by value, instead of by reference.
+			// So, we must use a more direct method.
+			"    \$arguments = array();\n"
+			.(count($paramNameArray) > 0 ?
+			  "    \$arguments[] = ".implode('; $arguments[] = ', $paramNameArray).";\n" :
+			  ''
+			)
+			."    \$real_arg_count = func_num_args();\n"
+			."    \$arg_count = count(\$arguments);\n"
+			."    if (\$real_arg_count > \$arg_count) {\n"
+			."        for (\$i = \$arg_count; \$i < \$real_arg_count; \$i++)\n"
+			."            \$arguments[] = func_get_arg(\$i);\n"
+			."    }\n"
+		  ) : (
+			// We must use a debug_backtrace, because that's the
+			// best way to get all the passed arguments, by
+			// reference. 5.4 and up lets us limit it to 1 frame.
+			(version_compare(PHP_VERSION, '5.4.0') >= 0 ?
+			  "    \$arguments = debug_backtrace(false, 1);\n" :
+			  "    \$arguments = debug_backtrace(false);\n"
+			)
+			."    \$arguments = \$arguments[0]['args'];\n"
+		  )
+		)
+		."    \$function = array(\$this->_hookObject, '$fname');\n"
+		."    \$data = array();\n"
+		."    \\SciActive\\Hook::runCallbacks(\$this->_hookPrefix.'$fname', \$arguments, 'before', \$this->_hookObject, \$function, \$data);\n"
+		."    if (\$arguments !== false) {\n"
+		."        \$return = call_user_func_array(\$function, \$arguments);\n"
+		."        if ((object) \$return === \$return && get_class(\$return) === '$className')\n"
+		."            \\SciActive\\Hook::hookObject(\$return, '$prefix', false);\n"
+		."        \$return = array(\$return);\n"
+		."        \\SciActive\\Hook::runCallbacks(\$this->_hookPrefix.'$fname', \$return, 'after', \$this->_hookObject, \$function, \$data);\n"
+		."        if ((array) \$return === \$return)\n"
+		."            return \$return[0];\n"
+		."    }\n"
+		."}\n\n";
+	  }
+	  unset($curMethod);
+	  // Build a HookOverride class.
+	  $include = str_replace(array('_NAMEHERE_', '//#CODEHERE#', '<?php', '?>'), array($className, $code, '', ''), Hook::$hookFile);
+	  eval($include);
+	}
 
-    eval('$object = new \SciActive\HookOverride_'.$className.' ($object, $prefix);');
-    return true;
+	eval('$object = new \SciActive\HookOverride_'.$className.' ($object, $prefix);');
+	return true;
   }
 
   /**
@@ -257,26 +257,26 @@ 
    * @param array &$data A data array for callback communication.
    */
   public static function runCallbacks($name, &$arguments = array(), $type = 'all', &$object = null, &$function = null, &$data = array()) {
-    if (isset(Hook::$hooks['all'])) {
-      foreach (Hook::$hooks['all'] as $curCallback) {
-        if (($type == 'all' && $curCallback[0] != 0) || ($type == 'before' && $curCallback[0] < 0) || ($type == 'after' && $curCallback[0] > 0)) {
-          call_user_func_array($curCallback[1], array(&$arguments, $name, &$object, &$function, &$data));
-          if ($arguments === false) {
-            return;
-          }
-        }
-      }
-    }
-    if (isset(Hook::$hooks[$name])) {
-      foreach (Hook::$hooks[$name] as $curCallback) {
-        if (($type == 'all' && $curCallback[0] != 0) || ($type == 'before' && $curCallback[0] < 0) || ($type == 'after' && $curCallback[0] > 0)) {
-          call_user_func_array($curCallback[1], array(&$arguments, $name, &$object, &$function, &$data));
-          if ($arguments === false) {
-            return;
-          }
-        }
-      }
-    }
+	if (isset(Hook::$hooks['all'])) {
+	  foreach (Hook::$hooks['all'] as $curCallback) {
+		if (($type == 'all' && $curCallback[0] != 0) || ($type == 'before' && $curCallback[0] < 0) || ($type == 'after' && $curCallback[0] > 0)) {
+		  call_user_func_array($curCallback[1], array(&$arguments, $name, &$object, &$function, &$data));
+		  if ($arguments === false) {
+			return;
+		  }
+		}
+	  }
+	}
+	if (isset(Hook::$hooks[$name])) {
+	  foreach (Hook::$hooks[$name] as $curCallback) {
+		if (($type == 'all' && $curCallback[0] != 0) || ($type == 'before' && $curCallback[0] < 0) || ($type == 'after' && $curCallback[0] > 0)) {
+		  call_user_func_array($curCallback[1], array(&$arguments, $name, &$object, &$function, &$data));
+		  if ($arguments === false) {
+			return;
+		  }
+		}
+	  }
+	}
   }
 
   /**
@@ -291,14 +291,14 @@ 
    * @access private
    */
   private static function sortCallbacks($a, $b) {
-    if ($a[0] == $b[0]) {
-      return 0;
-    }
-    return ($a[0] < $b[0]) ? -1 : 1;
+	if ($a[0] == $b[0]) {
+	  return 0;
+	}
+	return ($a[0] < $b[0]) ? -1 : 1;
   }
 
   public static function getHookFile() {
-    Hook::$hookFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'HookOverride_extend.php');
+	Hook::$hookFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'HookOverride_extend.php');
   }
 }
 

Spacing +2 added lines, -4 removed lines

@@ -198,8 +198,7 @@ 
             // So, we must use a more direct method.
             "    \$arguments = array();\n"
             .(count($paramNameArray) > 0 ?
-              "    \$arguments[] = ".implode('; $arguments[] = ', $paramNameArray).";\n" :
-              ''
+              "    \$arguments[] = ".implode('; $arguments[] = ', $paramNameArray).";\n" : ''
             )
             ."    \$real_arg_count = func_num_args();\n"
             ."    \$arg_count = count(\$arguments);\n"
@@ -212,8 +211,7 @@ 
             // best way to get all the passed arguments, by
             // reference. 5.4 and up lets us limit it to 1 frame.
             (version_compare(PHP_VERSION, '5.4.0') >= 0 ?
-              "    \$arguments = debug_backtrace(false, 1);\n" :
-              "    \$arguments = debug_backtrace(false);\n"
+              "    \$arguments = debug_backtrace(false, 1);\n" : "    \$arguments = debug_backtrace(false);\n"
             )
             ."    \$arguments = \$arguments[0]['args'];\n"
           )