From: Derick Alangi Date: Wed, 17 Apr 2019 13:01:17 +0000 (+0100) Subject: StubObject: Use 'self' instead of 'StubObject' (or ) X-Git-Tag: 1.34.0-rc.0~1884^2 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=98ebedaa6e59cb80276919ef7513e9c7c814a23d StubObject: Use 'self' instead of 'StubObject' (or ) 'self' is only 4 chars (shorter to type) and reduces risk (if class name is changed) which is very unlikely to break things. PHP replaces self with the actual class name. Plus we're already using this in our code base. Change-Id: Ia565ab2e4258d0ac201b14b712d1bc3bfe4e4d94 --- diff --git a/includes/StubObject.php b/includes/StubObject.php index 1583dbf9f7..2052c44842 100644 --- a/includes/StubObject.php +++ b/includes/StubObject.php @@ -79,7 +79,7 @@ class StubObject { * @return bool True if $obj is not an instance of StubObject class. */ public static function isRealObject( $obj ) { - return is_object( $obj ) && !$obj instanceof StubObject; + return is_object( $obj ) && !$obj instanceof self; } /** @@ -91,7 +91,7 @@ class StubObject { * @return void */ public static function unstub( &$obj ) { - if ( $obj instanceof StubObject ) { + if ( $obj instanceof self ) { $obj = $obj->_unstub( 'unstub', 3 ); } } @@ -153,7 +153,7 @@ class StubObject { public function _unstub( $name = '_unstub', $level = 2 ) { static $recursionLevel = 0; - if ( !$GLOBALS[$this->global] instanceof StubObject ) { + if ( !$GLOBALS[$this->global] instanceof self ) { return $GLOBALS[$this->global]; // already unstubbed. }