dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Title::getContentModel(): load from DB if necessary"
[lhc/web/wiklou.git]
/
includes
/
StubObject.php
diff --git
a/includes/StubObject.php
b/includes/StubObject.php
index
ee1df29
..
8878660
100644
(file)
--- 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.
*/
* @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;
$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.
*/
* @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;
}
return is_object( $obj ) && !$obj instanceof StubObject;
}
@@
-83,7
+83,7
@@
class StubObject {
* @param object $obj Object to check.
* @return void
*/
* @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 );
}
if ( $obj instanceof StubObject ) {
$obj = $obj->_unstub( 'unstub', 3 );
}
@@
-100,7
+100,7
@@
class StubObject {
* @param array $args Arguments
* @return mixed
*/
* @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 );
}
$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
*/
* Create a new object to replace this stub object.
* @return object
*/
- function _newObject() {
+
public
function _newObject() {
return MWFunction::newObj( $this->class, $this->params );
}
return MWFunction::newObj( $this->class, $this->params );
}
@@
-121,7
+121,7
@@
class StubObject {
* @param array $args Arguments
* @return mixed
*/
* @param array $args Arguments
* @return mixed
*/
- function __call( $name, $args ) {
+
public
function __call( $name, $args ) {
return $this->_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.
* @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
*/
* @throws MWException
*/
- function _unstub( $name = '_unstub', $level = 2 ) {
+
public
function _unstub( $name = '_unstub', $level = 2 ) {
static $recursionLevel = 0;
if ( !$GLOBALS[$this->global] instanceof StubObject ) {
static $recursionLevel = 0;
if ( !$GLOBALS[$this->global] instanceof StubObject ) {
@@
-170,18
+170,18
@@
class StubObject {
*/
class StubUserLang extends StubObject {
*/
class StubUserLang extends StubObject {
- function __construct() {
+
public
function __construct() {
parent::__construct( 'wgLang' );
}
parent::__construct( 'wgLang' );
}
- function __call( $name, $args ) {
+
public
function __call( $name, $args ) {
return $this->_call( $name, $args );
}
/**
* @return Language
*/
return $this->_call( $name, $args );
}
/**
* @return Language
*/
- function _newObject() {
+
public
function _newObject() {
return RequestContext::getMain()->getLanguage();
}
}
return RequestContext::getMain()->getLanguage();
}
}