Merge "Remove silly 'm' prefix from StubObject/DeprecatedGlobal members"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 27 May 2014 18:53:00 +0000 (18:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 27 May 2014 18:53:00 +0000 (18:53 +0000)
1  2 
includes/DeprecatedGlobal.php

@@@ -31,15 -30,11 +30,15 @@@ class DeprecatedGlobal extends StubObje
  
        function __construct( $name, $realValue, $version = false ) {
                parent::__construct( $name );
-               $this->mRealValue = $realValue;
-               $this->mVersion = $version;
+               $this->realValue = $realValue;
+               $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 -47,7 +51,8 @@@
                 * 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 $this->realValue;
        }
 +      // @codingStandardsIgnoreEnd
  }