X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDeprecatedGlobal.php;h=60dde401ecc6de70a98412baa2b753f4e225d7e5;hb=e1aabf2f24aef20adc72db8a750704cbb33236c6;hp=d1fda2ebf006dc5d3705c080a47f0d0a6e892f94;hpb=5821a0ef3414b6b3ae4369d36c5d59ceafbf72b4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/DeprecatedGlobal.php b/includes/DeprecatedGlobal.php
index d1fda2ebf0..60dde401ec 100644
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@ -24,22 +24,23 @@
  * Class to allow throwing wfDeprecated warnings
  * when people use globals that we do not want them to.
  */
-
 class DeprecatedGlobal extends StubObject {
-	// The m's are to stay consistent with parent class.
-	protected $mRealValue, $mVersion;
+	protected $version;
 
-	function __construct( $name, $realValue, $version = false ) {
-		parent::__construct( $name );
-		$this->mRealValue = $realValue;
-		$this->mVersion = $version;
+	/**
+	 * @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;
 	}
 
 	// @codingStandardsIgnoreStart
 	// 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,8 +53,8 @@ class DeprecatedGlobal extends StubObject {
 		 * sequences for this method, but that seems to be
 		 * rather unlikely.
 		 */
-		wfDeprecated( '$' . $this->mGlobal, $this->mVersion, false, 6 );
-		return $this->mRealValue;
+		wfDeprecated( '$' . $this->global, $this->version, false, 6 );
+		return parent::_newObject();
 	}
 	// @codingStandardsIgnoreEnd
 }