Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "PHP >= 5.4.0 started taking advantage of $limit optimization of wfDebugBacktrace(), which we weren't treating right."

Browse source
This commit is contained in:
Aaron Schulz 2012-06-02 16:58:41 +00:00 committed by Gerrit Code Review
commit c20f708ffd
4 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/GlobalFunctions.php
View file

@ -1831,7 +1831,7 @@ function wfDebugBacktrace( $limit = 0 ) {
}
if ( $limit && version_compare( PHP_VERSION, '5.4.0', '>=' ) ) {
return array_slice( debug_backtrace( DEBUG_BACKTRACE_PROVIDE_OBJECT, $limit ), 1 );
return array_slice( debug_backtrace( DEBUG_BACKTRACE_PROVIDE_OBJECT, $limit + 1 ), 1 );
} else {
return array_slice( debug_backtrace(), 1 );
}
@ -1890,12 +1890,15 @@ function wfBacktrace() {
/**
* Get the name of the function which called this function
* wfGetCaller( 1 ) is the function with the wfGetCaller() call (ie. __FUNCTION__)
* wfGetCaller( 2 ) [default] is the caller of the function running wfGetCaller()
* wfGetCaller( 3 ) is the parent of that.
*
* @param $level Int
* @return Bool|string
*/
function wfGetCaller( $level = 2 ) {
$backtrace = wfDebugBacktrace( $level );
$backtrace = wfDebugBacktrace( $level + 1 );
if ( isset( $backtrace[$level] ) ) {
return wfFormatStackFrame( $backtrace[$level] );
} else {

5
includes/debug/Debug.php
View file

@ -145,9 +145,10 @@ class MWDebug {
// Check to see if there was already a deprecation notice, so not to
// get a duplicate warning
$logCount = count( self::$log );
$caller = wfGetCaller( $callerOffset + 1 );
if ( $logCount ) {
$lastLog = self::$log[ $logCount - 1 ];
if ( $lastLog['type'] == 'deprecated' && $lastLog['caller'] == wfGetCaller( $callerOffset + 1 ) ) {
if ( $lastLog['type'] == 'deprecated' && $lastLog['caller'] == $caller ) {
return;
}
}
@ -155,7 +156,7 @@ class MWDebug {
self::$log[] = array(
'msg' => htmlspecialchars( $msg ),
'type' => 'warn',
'caller' => wfGetCaller( $callerOffset ),
'caller' => $caller,
);
}

35
tests/phpunit/includes/GlobalFunctions/wfGetCallerTest.php Normal file
View file

@ -0,0 +1,35 @@
<?php
class wfGetCaller extends MediaWikiTestCase {
function testZero() {
$this->assertEquals( __METHOD__, wfGetCaller( 1 ) );
}
function callerOne() {
return wfGetCaller();
}
function testOne() {
$this->assertEquals( "wfGetCaller::testOne", self::callerOne() );
}
function intermediateFunction( $level = 2, $n = 0 ) {
if ( $n > 0 )
return self::intermediateFunction( $level, $n - 1 );
return wfGetCaller( $level );
}
function testTwo() {
$this->assertEquals( "wfGetCaller::testTwo", self::intermediateFunction() );
}
function testN() {
$this->assertEquals( "wfGetCaller::testN", self::intermediateFunction( 2, 0 ) );
$this->assertEquals( "wfGetCaller::intermediateFunction", self::intermediateFunction( 1, 0 ) );
for ($i=0; $i < 10; $i++)
$this->assertEquals( "wfGetCaller::intermediateFunction", self::intermediateFunction( $i + 1, $i ) );
}
}

2
tests/phpunit/includes/debug/MWDebugTest.php
View file

@ -30,7 +30,7 @@ class MWDebugTest extends MediaWikiTestCase {
$this->assertEquals( array( array(
'msg' => 'Warning message',
'type' => 'warn',
'caller' => 'MWDebug::warning',
'caller' => 'MWDebugTest::testAddWarning',
) ),
MWDebug::getLog()
);