X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2FStubObject.php;h=8878660b7303be83ea3f6df91d727d523d29db78;hb=f00d9f5ec3f642b9c3cd529e57de9746161c3414;hp=fb9b3e455cb93ac8abf692eeccb7e0f6ad04bd6a;hpb=64ca212514d48330ff02fdaed34563e0b75e22c4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/StubObject.php b/includes/StubObject.php
index fb9b3e455c..8878660b73 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -58,7 +58,7 @@ class StubObject {
 	 * @param string $class Name of the class of the real object.
 	 * @param array $params Parameters to pass to constructor of the real object.
 	 */
-	function __construct( $global = null, $class = null, $params = array() ) {
+	public function __construct( $global = null, $class = null, $params = array() ) {
 		$this->global = $global;
 		$this->class = $class;
 		$this->params = $params;
@@ -71,7 +71,7 @@ class StubObject {
 	 * @param object $obj Object to check.
 	 * @return bool True if $obj is not an instance of StubObject class.
 	 */
-	static function isRealObject( $obj ) {
+	public static function isRealObject( $obj ) {
 		return is_object( $obj ) && !$obj instanceof StubObject;
 	}
 
@@ -83,7 +83,7 @@ class StubObject {
 	 * @param object $obj Object to check.
 	 * @return void
 	 */
-	static function unstub( &$obj ) {
+	public static function unstub( &$obj ) {
 		if ( $obj instanceof StubObject ) {
 			$obj = $obj->_unstub( 'unstub', 3 );
 		}
@@ -100,7 +100,7 @@ class StubObject {
 	 * @param array $args Arguments
 	 * @return mixed
 	 */
-	function _call( $name, $args ) {
+	public function _call( $name, $args ) {
 		$this->_unstub( $name, 5 );
 		return call_user_func_array( array( $GLOBALS[$this->global], $name ), $args );
 	}
@@ -109,7 +109,7 @@ class StubObject {
 	 * Create a new object to replace this stub object.
 	 * @return object
 	 */
-	function _newObject() {
+	public function _newObject() {
 		return MWFunction::newObj( $this->class, $this->params );
 	}
 
@@ -121,7 +121,7 @@ class StubObject {
 	 * @param array $args Arguments
 	 * @return mixed
 	 */
-	function __call( $name, $args ) {
+	public function __call( $name, $args ) {
 		return $this->_call( $name, $args );
 	}
 
@@ -134,10 +134,10 @@ class StubObject {
 	 * @param string $name Name of the method called in this object.
 	 * @param int $level Level to go in the stack trace to get the function
 	 *   who called this function.
-	 * @return The unstubbed version of itself
+	 * @return object The unstubbed version of itself
 	 * @throws MWException
 	 */
-	function _unstub( $name = '_unstub', $level = 2 ) {
+	public function _unstub( $name = '_unstub', $level = 2 ) {
 		static $recursionLevel = 0;
 
 		if ( !$GLOBALS[$this->global] instanceof StubObject ) {
@@ -163,35 +163,6 @@ class StubObject {
 	}
 }
 
-/**
- * Stub object for the content language of this wiki. This object have to be in
- * $wgContLang global.
- *
- * @deprecated since 1.18
- */
-class StubContLang extends StubObject {
-
-	function __construct() {
-		wfDeprecated( __CLASS__, '1.18' );
-		parent::__construct( 'wgContLang' );
-	}
-
-	function __call( $name, $args ) {
-		return $this->_call( $name, $args );
-	}
-
-	/**
-	 * @return Language
-	 */
-	function _newObject() {
-		global $wgLanguageCode;
-		$obj = Language::factory( $wgLanguageCode );
-		$obj->initEncoding();
-		$obj->initContLang();
-		return $obj;
-	}
-}
-
 /**
  * Stub object for the user language. It depends of the user preferences and
  * "uselang" parameter that can be passed to index.php. This object have to be
@@ -199,18 +170,18 @@ class StubContLang extends StubObject {
  */
 class StubUserLang extends StubObject {
 
-	function __construct() {
+	public function __construct() {
 		parent::__construct( 'wgLang' );
 	}
 
-	function __call( $name, $args ) {
+	public function __call( $name, $args ) {
 		return $this->_call( $name, $args );
 	}
 
 	/**
 	 * @return Language
 	 */
-	function _newObject() {
+	public function _newObject() {
 		return RequestContext::getMain()->getLanguage();
 	}
 }