X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDeprecatedGlobal.php;h=242cecf1772c4055a3576bc4590e84779acf82bf;hb=9e232dea613b08b274ad1d1708dee7ed680cb6a7;hp=7c592c6e59ebf9a615aa12d2e2688a8bd3e580fa;hpb=3cbaa0f8615eaf0cb40a3d3745814fac522c672f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/DeprecatedGlobal.php b/includes/DeprecatedGlobal.php
index 7c592c6e59..242cecf177 100644
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@ -24,19 +24,20 @@
  * 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;
 	}
 
-	// @codingStandardsIgnoreStart
-	// PSR2.Methods.MethodDeclaration.Underscore
-	// PSR2.Classes.PropertyDeclaration.ScopeMissing
+	// phpcs:ignore 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:
@@ -51,7 +52,6 @@ class DeprecatedGlobal extends StubObject {
 		 * rather unlikely.
 		 */
 		wfDeprecated( '$' . $this->global, $this->version, false, 6 );
-		return $this->realValue;
+		return parent::_newObject();
 	}
-	// @codingStandardsIgnoreEnd
 }