X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStubObject.php;h=5b26d45fb13e3200272b23e23f394aa170ea982d;hb=3c3ba5e03e406bbfe0ae7e13991d421512c63dec;hp=cc0adb743d52484114771b214599114fa0c96f4e;hpb=4b3c86cc6ee79647c10dcbb90a1d11db03501931;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/StubObject.php b/includes/StubObject.php
index cc0adb743d..5b26d45fb1 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -41,9 +41,9 @@ class StubObject {
 	/**
 	 * Constructor.
 	 *
-	 * @param $global String: name of the global variable.
-	 * @param $class String: name of the class of the real object.
-	 * @param $params Array: parameters to pass to contructor of the real
+	 * @param string $global name of the global variable.
+	 * @param string $class name of the class of the real object.
+	 * @param array $params parameters to pass to constructor of the real
 	 *               object.
 	 */
 	function __construct( $global = null, $class = null, $params = array() ) {
@@ -53,7 +53,7 @@ class StubObject {
 	}
 
 	/**
-	 * Returns a bool value whetever $obj is a stub object. Can be used to break
+	 * Returns a bool value whenever $obj is a stub object. Can be used to break
 	 * a infinite loop when unstubbing an object.
 	 *
 	 * @param $obj Object to check.
@@ -70,8 +70,8 @@ class StubObject {
 	 * This function will also call the function with the same name in the real
 	 * object.
 	 *
-	 * @param $name String: name of the function called
-	 * @param $args Array: arguments
+	 * @param string $name name of the function called
+	 * @param array $args arguments
 	 * @return mixed
 	 */
 	function _call( $name, $args ) {
@@ -91,8 +91,8 @@ class StubObject {
 	 * Function called by PHP if no function with that name exists in this
 	 * object.
 	 *
-	 * @param $name String: name of the function called
-	 * @param $args Array: arguments
+	 * @param string $name name of the function called
+	 * @param array $args arguments
 	 * @return mixed
 	 */
 	function __call( $name, $args ) {
@@ -105,8 +105,8 @@ class StubObject {
 	 * This is public, for the convenience of external callers wishing to access
 	 * properties, e.g. eval.php
 	 *
-	 * @param $name String: name of the method called in this object.
-	 * @param $level Integer: level to go in the stact trace to get the function
+	 * @param string $name name of the method called in this object.
+	 * @param $level Integer: level to go in the stack trace to get the function
 	 *               who called this function.
 	 * @throws MWException
 	 */
@@ -118,10 +118,11 @@ class StubObject {
 		}
 
 		if ( get_class( $GLOBALS[$this->mGlobal] ) != $this->mClass ) {
-			$fname = __METHOD__.'-'.$this->mGlobal;
+			$fname = __METHOD__ . '-' . $this->mGlobal;
 			wfProfileIn( $fname );
 			$caller = wfGetCaller( $level );
 			if ( ++$recursionLevel > 2 ) {
+				wfProfileOut( $fname );
 				throw new MWException( "Unstub loop detected on call of \${$this->mGlobal}->$name from $caller\n" );
 			}
 			wfDebug( "Unstubbing \${$this->mGlobal} on call of \${$this->mGlobal}::$name from $caller\n" );