X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FDeprecatedGlobal.php;h=60dde401ecc6de70a98412baa2b753f4e225d7e5;hp=14329d3213d90a1b264fb7958dd2758c0f422e03;hb=bc12345f4bb7893030c31e1133abc4b20153f59b;hpb=93405c852cb0a731d31b711c50f527c6aff52664

diff --git a/includes/DeprecatedGlobal.php b/includes/DeprecatedGlobal.php
index 14329d3213..60dde401ec 100644
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@ -24,13 +24,16 @@
  * Class to allow throwing wfDeprecated warnings
  * when people use globals that we do not want them to.
  */
-
 class DeprecatedGlobal extends StubObject {
-	protected $realValue, $version;
+	protected $version;
 
-	function __construct( $name, $realValue, $version = false ) {
-		parent::__construct( $name );
-		$this->realValue = $realValue;
+	/**
+	 * @param string $name Global name
+	 * @param callable|string $callback Factory function or class name to construct
+	 * @param bool|string $version Version global was deprecated in
+	 */
+	function __construct( $name, $callback, $version = false ) {
+		parent::__construct( $name, $callback );
 		$this->version = $version;
 	}
 
@@ -38,7 +41,6 @@ class DeprecatedGlobal extends StubObject {
 	// PSR2.Methods.MethodDeclaration.Underscore
 	// PSR2.Classes.PropertyDeclaration.ScopeMissing
 	function _newObject() {
-
 		/* Put the caller offset for wfDeprecated as 6, as
 		 * that gives the function that uses this object, since:
 		 * 1 = this function ( _newObject )
@@ -52,7 +54,7 @@ class DeprecatedGlobal extends StubObject {
 		 * rather unlikely.
 		 */
 		wfDeprecated( '$' . $this->global, $this->version, false, 6 );
-		return $this->realValue;
+		return parent::_newObject();
 	}
 	// @codingStandardsIgnoreEnd
 }