if ( !isset( $frame['function'] ) ) {
return 'NO_FUNCTION_GIVEN';
}
- return isset( $frame['class'] ) ?
- $frame['class'] . '::' . $frame['function'] :
+ return isset( $frame['class'] ) && isset( $frame['type'] ) ?
+ $frame['class'] . $frame['type'] . $frame['function'] :
$frame['function'];
}
*/
class WfGetCallerTest extends MediaWikiTestCase {
public function testZero() {
- $this->assertEquals( __METHOD__, wfGetCaller( 1 ) );
+ $this->assertEquals( 'WfGetCallerTest->testZero', wfGetCaller( 1 ) );
}
function callerOne() {
}
public function testOne() {
- $this->assertEquals( 'WfGetCallerTest::testOne', self::callerOne() );
+ $this->assertEquals( 'WfGetCallerTest->testOne', self::callerOne() );
}
- function intermediateFunction( $level = 2, $n = 0 ) {
+ static function intermediateFunction( $level = 2, $n = 0 ) {
if ( $n > 0 ) {
return self::intermediateFunction( $level, $n - 1 );
}
}
public function testTwo() {
- $this->assertEquals( 'WfGetCallerTest::testTwo', self::intermediateFunction() );
+ $this->assertEquals( 'WfGetCallerTest->testTwo', self::intermediateFunction() );
}
public function testN() {
- $this->assertEquals( 'WfGetCallerTest::testN', self::intermediateFunction( 2, 0 ) );
+ $this->assertEquals( 'WfGetCallerTest->testN', self::intermediateFunction( 2, 0 ) );
$this->assertEquals(
'WfGetCallerTest::intermediateFunction',
self::intermediateFunction( 1, 0 )