From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/debug/Debug.php | 541 ----------------------------------------- includes/debug/MWDebug.php | 584 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 584 insertions(+), 541 deletions(-) delete mode 100644 includes/debug/Debug.php create mode 100644 includes/debug/MWDebug.php (limited to 'includes/debug') diff --git a/includes/debug/Debug.php b/includes/debug/Debug.php deleted file mode 100644 index 6e9ccc41..00000000 --- a/includes/debug/Debug.php +++ /dev/null @@ -1,541 +0,0 @@ -addModules( 'mediawiki.debug.init' ); - } - } - - /** - * Adds a line to the log - * - * @todo Add support for passing objects - * - * @since 1.19 - * @param $str string - */ - public static function log( $str ) { - if ( !self::$enabled ) { - return; - } - - self::$log[] = array( - 'msg' => htmlspecialchars( $str ), - 'type' => 'log', - 'caller' => wfGetCaller(), - ); - } - - /** - * Returns internal log array - * @since 1.19 - * @return array - */ - public static function getLog() { - return self::$log; - } - - /** - * Clears internal log array and deprecation tracking - * @since 1.19 - */ - public static function clearLog() { - self::$log = array(); - self::$deprecationWarnings = array(); - } - - /** - * Adds a warning entry to the log - * - * @since 1.19 - * @param $msg string - * @param $callerOffset int - * @param $level int A PHP error level. See sendWarning() - * @param $log string: 'production' will always trigger a php error, 'auto' - * will trigger an error if $wgDevelopmentWarnings is true, and 'debug' - * will only write to the debug log(s). - * - * @return mixed - */ - public static function warning( $msg, $callerOffset = 1, $level = E_USER_NOTICE, $log = 'auto' ) { - global $wgDevelopmentWarnings; - - if ( $log === 'auto' && !$wgDevelopmentWarnings ) { - $log = 'debug'; - } - - if ( $log === 'debug' ) { - $level = false; - } - - $callerDescription = self::getCallerDescription( $callerOffset ); - - self::sendWarning( $msg, $callerDescription, $level ); - - if ( self::$enabled ) { - self::$log[] = array( - 'msg' => htmlspecialchars( $msg ), - 'type' => 'warn', - 'caller' => $callerDescription['func'], - ); - } - } - - /** - * Show a warning that $function is deprecated. - * This will send it to the following locations: - * - Debug toolbar, with one item per function and caller, if $wgDebugToolbar - * is set to true. - * - PHP's error log, with level E_USER_DEPRECATED, if $wgDevelopmentWarnings - * is set to true. - * - MediaWiki's debug log, if $wgDevelopmentWarnings is set to false. - * - * @since 1.19 - * @param string $function Function that is deprecated. - * @param string|bool $version Version in which the function was deprecated. - * @param string|bool $component Component to which the function belongs. - * If false, it is assumbed the function is in MediaWiki core. - * @param $callerOffset integer: How far up the callstack is the original - * caller. 2 = function that called the function that called - * MWDebug::deprecated() (Added in 1.20). - * @return mixed - */ - public static function deprecated( $function, $version = false, $component = false, $callerOffset = 2 ) { - $callerDescription = self::getCallerDescription( $callerOffset ); - $callerFunc = $callerDescription['func']; - - $sendToLog = true; - - // Check to see if there already was a warning about this function - if ( isset( self::$deprecationWarnings[$function][$callerFunc] ) ) { - return; - } elseif ( isset( self::$deprecationWarnings[$function] ) ) { - if ( self::$enabled ) { - $sendToLog = false; - } else { - return; - } - } - - self::$deprecationWarnings[$function][$callerFunc] = true; - - if ( $version ) { - global $wgDeprecationReleaseLimit; - if ( $wgDeprecationReleaseLimit && $component === false ) { - # Strip -* off the end of $version so that branches can use the - # format #.##-branchname to avoid issues if the branch is merged into - # a version of MediaWiki later than what it was branched from - $comparableVersion = preg_replace( '/-.*$/', '', $version ); - - # If the comparableVersion is larger than our release limit then - # skip the warning message for the deprecation - if ( version_compare( $wgDeprecationReleaseLimit, $comparableVersion, '<' ) ) { - $sendToLog = false; - } - } - - $component = $component === false ? 'MediaWiki' : $component; - $msg = "Use of $function was deprecated in $component $version."; - } else { - $msg = "Use of $function is deprecated."; - } - - if ( $sendToLog ) { - global $wgDevelopmentWarnings; // we could have a more specific $wgDeprecationWarnings setting. - self::sendWarning( $msg, $callerDescription, $wgDevelopmentWarnings ? E_USER_DEPRECATED : false ); - } - - if ( self::$enabled ) { - $logMsg = htmlspecialchars( $msg ) . - Html::rawElement( 'div', array( 'class' => 'mw-debug-backtrace' ), - Html::element( 'span', array(), 'Backtrace:' ) . wfBacktrace() - ); - - self::$log[] = array( - 'msg' => $logMsg, - 'type' => 'deprecated', - 'caller' => $callerFunc, - ); - } - } - - /** - * Get an array describing the calling function at a specified offset. - * - * @param $callerOffset integer: How far up the callstack is the original - * caller. 0 = function that called getCallerDescription() - * @return array with two keys: 'file' and 'func' - */ - private static function getCallerDescription( $callerOffset ) { - $callers = wfDebugBacktrace(); - - if ( isset( $callers[$callerOffset] ) ) { - $callerfile = $callers[$callerOffset]; - if ( isset( $callerfile['file'] ) && isset( $callerfile['line'] ) ) { - $file = $callerfile['file'] . ' at line ' . $callerfile['line']; - } else { - $file = '(internal function)'; - } - } else { - $file = '(unknown location)'; - } - - if ( isset( $callers[$callerOffset + 1] ) ) { - $callerfunc = $callers[$callerOffset + 1]; - $func = ''; - if ( isset( $callerfunc['class'] ) ) { - $func .= $callerfunc['class'] . '::'; - } - if ( isset( $callerfunc['function'] ) ) { - $func .= $callerfunc['function']; - } - } else { - $func = 'unknown'; - } - - return array( 'file' => $file, 'func' => $func ); - } - - /** - * Send a warning to the debug log and optionally also trigger a PHP - * error, depending on the $level argument. - * - * @param $msg string Message to send - * @param $caller array caller description get from getCallerDescription() - * @param $level int|bool error level to use; set to false to not trigger an error - */ - private static function sendWarning( $msg, $caller, $level ) { - $msg .= ' [Called from ' . $caller['func'] . ' in ' . $caller['file'] . ']'; - - if ( $level !== false ) { - trigger_error( $msg, $level ); - } - - wfDebug( "$msg\n" ); - } - - /** - * This is a method to pass messages from wfDebug to the pretty debugger. - * Do NOT use this method, use MWDebug::log or wfDebug() - * - * @since 1.19 - * @param $str string - */ - public static function debugMsg( $str ) { - global $wgDebugComments, $wgShowDebug; - - if ( self::$enabled || $wgDebugComments || $wgShowDebug ) { - self::$debug[] = rtrim( UtfNormal::cleanUp( $str ) ); - } - } - - /** - * Begins profiling on a database query - * - * @since 1.19 - * @param $sql string - * @param $function string - * @param $isMaster bool - * @return int ID number of the query to pass to queryTime or -1 if the - * debugger is disabled - */ - public static function query( $sql, $function, $isMaster ) { - if ( !self::$enabled ) { - return -1; - } - - self::$query[] = array( - 'sql' => $sql, - 'function' => $function, - 'master' => (bool)$isMaster, - 'time' => 0.0, - '_start' => microtime( true ), - ); - - return count( self::$query ) - 1; - } - - /** - * Calculates how long a query took. - * - * @since 1.19 - * @param $id int - */ - public static function queryTime( $id ) { - if ( $id === -1 || !self::$enabled ) { - return; - } - - self::$query[$id]['time'] = microtime( true ) - self::$query[$id]['_start']; - unset( self::$query[$id]['_start'] ); - } - - /** - * Returns a list of files included, along with their size - * - * @param $context IContextSource - * @return array - */ - protected static function getFilesIncluded( IContextSource $context ) { - $files = get_included_files(); - $fileList = array(); - foreach ( $files as $file ) { - $size = filesize( $file ); - $fileList[] = array( - 'name' => $file, - 'size' => $context->getLanguage()->formatSize( $size ), - ); - } - - return $fileList; - } - - /** - * Returns the HTML to add to the page for the toolbar - * - * @since 1.19 - * @param $context IContextSource - * @return string - */ - public static function getDebugHTML( IContextSource $context ) { - global $wgDebugComments; - - $html = ''; - - if ( self::$enabled ) { - MWDebug::log( 'MWDebug output complete' ); - $debugInfo = self::getDebugInfo( $context ); - - // Cannot use OutputPage::addJsConfigVars because those are already outputted - // by the time this method is called. - $html = Html::inlineScript( - ResourceLoader::makeLoaderConditionalScript( - ResourceLoader::makeConfigSetScript( array( 'debugInfo' => $debugInfo ) ) - ) - ); - } - - if ( $wgDebugComments ) { - $html .= ""; - } - - return $html; - } - - /** - * Generate debug log in HTML for displaying at the bottom of the main - * content area. - * If $wgShowDebug is false, an empty string is always returned. - * - * @since 1.20 - * @return string HTML fragment - */ - public static function getHTMLDebugLog() { - global $wgDebugTimestamps, $wgShowDebug; - - if ( !$wgShowDebug ) { - return ''; - } - - $curIdent = 0; - $ret = "\n
\nDebug data:\n", -$diff ) . "
  • \n"; - } elseif ( $diff == 0 ) { - $ret .= "
  • \n"; - } else { - $ret .= str_repeat( "', $curIdent ) . "
    • \n\n"; - - return $ret; - } - - /** - * Append the debug info to given ApiResult - * - * @param $context IContextSource - * @param $result ApiResult - */ - public static function appendDebugInfoToApiResult( IContextSource $context, ApiResult $result ) { - if ( !self::$enabled ) { - return; - } - - // output errors as debug info, when display_errors is on - // this is necessary for all non html output of the api, because that clears all errors first - $obContents = ob_get_contents(); - if ( $obContents ) { - $obContentArray = explode( '
    ', $obContents ); - foreach ( $obContentArray as $obContent ) { - if ( trim( $obContent ) ) { - self::debugMsg( Sanitizer::stripAllTags( $obContent ) ); - } - } - } - - MWDebug::log( 'MWDebug output complete' ); - $debugInfo = self::getDebugInfo( $context ); - - $result->setIndexedTagName( $debugInfo, 'debuginfo' ); - $result->setIndexedTagName( $debugInfo['log'], 'line' ); - $result->setIndexedTagName( $debugInfo['debugLog'], 'msg' ); - $result->setIndexedTagName( $debugInfo['queries'], 'query' ); - $result->setIndexedTagName( $debugInfo['includes'], 'queries' ); - $result->addValue( null, 'debuginfo', $debugInfo ); - } - - /** - * Returns the HTML to add to the page for the toolbar - * - * @param $context IContextSource - * @return array - */ - public static function getDebugInfo( IContextSource $context ) { - if ( !self::$enabled ) { - return array(); - } - - global $wgVersion, $wgRequestTime; - $request = $context->getRequest(); - return array( - 'mwVersion' => $wgVersion, - 'phpVersion' => PHP_VERSION, - 'gitRevision' => GitInfo::headSHA1(), - 'gitBranch' => GitInfo::currentBranch(), - 'gitViewUrl' => GitInfo::headViewUrl(), - 'time' => microtime( true ) - $wgRequestTime, - 'log' => self::$log, - 'debugLog' => self::$debug, - 'queries' => self::$query, - 'request' => array( - 'method' => $request->getMethod(), - 'url' => $request->getRequestURL(), - 'headers' => $request->getAllHeaders(), - 'params' => $request->getValues(), - ), - 'memory' => $context->getLanguage()->formatSize( memory_get_usage() ), - 'memoryPeak' => $context->getLanguage()->formatSize( memory_get_peak_usage() ), - 'includes' => self::getFilesIncluded( $context ), - ); - } -} diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php new file mode 100644 index 00000000..c2f22233 --- /dev/null +++ b/includes/debug/MWDebug.php @@ -0,0 +1,584 @@ +addModules( 'mediawiki.debug.init' ); + } + } + + /** + * Adds a line to the log + * + * @todo Add support for passing objects + * + * @since 1.19 + * @param string $str + */ + public static function log( $str ) { + if ( !self::$enabled ) { + return; + } + + self::$log[] = array( + 'msg' => htmlspecialchars( $str ), + 'type' => 'log', + 'caller' => wfGetCaller(), + ); + } + + /** + * Returns internal log array + * @since 1.19 + * @return array + */ + public static function getLog() { + return self::$log; + } + + /** + * Clears internal log array and deprecation tracking + * @since 1.19 + */ + public static function clearLog() { + self::$log = array(); + self::$deprecationWarnings = array(); + } + + /** + * Adds a warning entry to the log + * + * @since 1.19 + * @param string $msg + * @param int $callerOffset + * @param int $level A PHP error level. See sendMessage() + * @param string $log 'production' will always trigger a php error, 'auto' + * will trigger an error if $wgDevelopmentWarnings is true, and 'debug' + * will only write to the debug log(s). + * + * @return mixed + */ + public static function warning( $msg, $callerOffset = 1, $level = E_USER_NOTICE, $log = 'auto' ) { + global $wgDevelopmentWarnings; + + if ( $log === 'auto' && !$wgDevelopmentWarnings ) { + $log = 'debug'; + } + + if ( $log === 'debug' ) { + $level = false; + } + + $callerDescription = self::getCallerDescription( $callerOffset ); + + self::sendMessage( $msg, $callerDescription, 'warning', $level ); + + if ( self::$enabled ) { + self::$log[] = array( + 'msg' => htmlspecialchars( $msg ), + 'type' => 'warn', + 'caller' => $callerDescription['func'], + ); + } + } + + /** + * Show a warning that $function is deprecated. + * This will send it to the following locations: + * - Debug toolbar, with one item per function and caller, if $wgDebugToolbar + * is set to true. + * - PHP's error log, with level E_USER_DEPRECATED, if $wgDevelopmentWarnings + * is set to true. + * - MediaWiki's debug log, if $wgDevelopmentWarnings is set to false. + * + * @since 1.19 + * @param string $function Function that is deprecated. + * @param string|bool $version Version in which the function was deprecated. + * @param string|bool $component Component to which the function belongs. + * If false, it is assumbed the function is in MediaWiki core. + * @param int $callerOffset How far up the callstack is the original + * caller. 2 = function that called the function that called + * MWDebug::deprecated() (Added in 1.20). + */ + public static function deprecated( $function, $version = false, + $component = false, $callerOffset = 2 + ) { + $callerDescription = self::getCallerDescription( $callerOffset ); + $callerFunc = $callerDescription['func']; + + $sendToLog = true; + + // Check to see if there already was a warning about this function + if ( isset( self::$deprecationWarnings[$function][$callerFunc] ) ) { + return; + } elseif ( isset( self::$deprecationWarnings[$function] ) ) { + if ( self::$enabled ) { + $sendToLog = false; + } else { + return; + } + } + + self::$deprecationWarnings[$function][$callerFunc] = true; + + if ( $version ) { + global $wgDeprecationReleaseLimit; + if ( $wgDeprecationReleaseLimit && $component === false ) { + # Strip -* off the end of $version so that branches can use the + # format #.##-branchname to avoid issues if the branch is merged into + # a version of MediaWiki later than what it was branched from + $comparableVersion = preg_replace( '/-.*$/', '', $version ); + + # If the comparableVersion is larger than our release limit then + # skip the warning message for the deprecation + if ( version_compare( $wgDeprecationReleaseLimit, $comparableVersion, '<' ) ) { + $sendToLog = false; + } + } + + $component = $component === false ? 'MediaWiki' : $component; + $msg = "Use of $function was deprecated in $component $version."; + } else { + $msg = "Use of $function is deprecated."; + } + + if ( $sendToLog ) { + global $wgDevelopmentWarnings; // we could have a more specific $wgDeprecationWarnings setting. + self::sendMessage( + $msg, + $callerDescription, + 'deprecated', + $wgDevelopmentWarnings ? E_USER_DEPRECATED : false + ); + } + + if ( self::$enabled ) { + $logMsg = htmlspecialchars( $msg ) . + Html::rawElement( 'div', array( 'class' => 'mw-debug-backtrace' ), + Html::element( 'span', array(), 'Backtrace:' ) . wfBacktrace() + ); + + self::$log[] = array( + 'msg' => $logMsg, + 'type' => 'deprecated', + 'caller' => $callerFunc, + ); + } + } + + /** + * Get an array describing the calling function at a specified offset. + * + * @param int $callerOffset How far up the callstack is the original + * caller. 0 = function that called getCallerDescription() + * @return array Array with two keys: 'file' and 'func' + */ + private static function getCallerDescription( $callerOffset ) { + $callers = wfDebugBacktrace(); + + if ( isset( $callers[$callerOffset] ) ) { + $callerfile = $callers[$callerOffset]; + if ( isset( $callerfile['file'] ) && isset( $callerfile['line'] ) ) { + $file = $callerfile['file'] . ' at line ' . $callerfile['line']; + } else { + $file = '(internal function)'; + } + } else { + $file = '(unknown location)'; + } + + if ( isset( $callers[$callerOffset + 1] ) ) { + $callerfunc = $callers[$callerOffset + 1]; + $func = ''; + if ( isset( $callerfunc['class'] ) ) { + $func .= $callerfunc['class'] . '::'; + } + if ( isset( $callerfunc['function'] ) ) { + $func .= $callerfunc['function']; + } + } else { + $func = 'unknown'; + } + + return array( 'file' => $file, 'func' => $func ); + } + + /** + * Send a message to the debug log and optionally also trigger a PHP + * error, depending on the $level argument. + * + * @param string $msg Message to send + * @param array $caller Caller description get from getCallerDescription() + * @param string $group Log group on which to send the message + * @param int|bool $level Error level to use; set to false to not trigger an error + */ + private static function sendMessage( $msg, $caller, $group, $level ) { + $msg .= ' [Called from ' . $caller['func'] . ' in ' . $caller['file'] . ']'; + + if ( $level !== false ) { + trigger_error( $msg, $level ); + } + + wfDebugLog( $group, $msg, 'log' ); + } + + /** + * This is a method to pass messages from wfDebug to the pretty debugger. + * Do NOT use this method, use MWDebug::log or wfDebug() + * + * @since 1.19 + * @param string $str + */ + public static function debugMsg( $str ) { + global $wgDebugComments, $wgShowDebug; + + if ( self::$enabled || $wgDebugComments || $wgShowDebug ) { + self::$debug[] = rtrim( UtfNormal::cleanUp( $str ) ); + } + } + + /** + * Begins profiling on a database query + * + * @since 1.19 + * @param string $sql + * @param string $function + * @param bool $isMaster + * @return int ID number of the query to pass to queryTime or -1 if the + * debugger is disabled + */ + public static function query( $sql, $function, $isMaster ) { + if ( !self::$enabled ) { + return -1; + } + + // Replace invalid UTF-8 chars with a square UTF-8 character + // This prevents json_encode from erroring out due to binary SQL data + $sql = preg_replace( + '/( + [\xC0-\xC1] # Invalid UTF-8 Bytes + | [\xF5-\xFF] # Invalid UTF-8 Bytes + | \xE0[\x80-\x9F] # Overlong encoding of prior code point + | \xF0[\x80-\x8F] # Overlong encoding of prior code point + | [\xC2-\xDF](?![\x80-\xBF]) # Invalid UTF-8 Sequence Start + | [\xE0-\xEF](?![\x80-\xBF]{2}) # Invalid UTF-8 Sequence Start + | [\xF0-\xF4](?![\x80-\xBF]{3}) # Invalid UTF-8 Sequence Start + | (?<=[\x0-\x7F\xF5-\xFF])[\x80-\xBF] # Invalid UTF-8 Sequence Middle + | (? $sql, + 'function' => $function, + 'master' => (bool)$isMaster, + 'time' => 0.0, + '_start' => microtime( true ), + ); + + return count( self::$query ) - 1; + } + + /** + * Calculates how long a query took. + * + * @since 1.19 + * @param int $id + */ + public static function queryTime( $id ) { + if ( $id === -1 || !self::$enabled ) { + return; + } + + self::$query[$id]['time'] = microtime( true ) - self::$query[$id]['_start']; + unset( self::$query[$id]['_start'] ); + } + + /** + * Returns a list of files included, along with their size + * + * @param IContextSource $context + * @return array + */ + protected static function getFilesIncluded( IContextSource $context ) { + $files = get_included_files(); + $fileList = array(); + foreach ( $files as $file ) { + $size = filesize( $file ); + $fileList[] = array( + 'name' => $file, + 'size' => $context->getLanguage()->formatSize( $size ), + ); + } + + return $fileList; + } + + /** + * Returns the HTML to add to the page for the toolbar + * + * @since 1.19 + * @param IContextSource $context + * @return string + */ + public static function getDebugHTML( IContextSource $context ) { + global $wgDebugComments; + + $html = ''; + + if ( self::$enabled ) { + MWDebug::log( 'MWDebug output complete' ); + $debugInfo = self::getDebugInfo( $context ); + + // Cannot use OutputPage::addJsConfigVars because those are already outputted + // by the time this method is called. + $html = Html::inlineScript( + ResourceLoader::makeLoaderConditionalScript( + ResourceLoader::makeConfigSetScript( array( 'debugInfo' => $debugInfo ) ) + ) + ); + } + + if ( $wgDebugComments ) { + $html .= ""; + } + + return $html; + } + + /** + * Generate debug log in HTML for displaying at the bottom of the main + * content area. + * If $wgShowDebug is false, an empty string is always returned. + * + * @since 1.20 + * @return string HTML fragment + */ + public static function getHTMLDebugLog() { + global $wgDebugTimestamps, $wgShowDebug; + + if ( !$wgShowDebug ) { + return ''; + } + + $curIdent = 0; + $ret = "\n
    \nDebug data:\n", -$diff ) . "
  • \n"; + } elseif ( $diff == 0 ) { + $ret .= "
  • \n"; + } else { + $ret .= str_repeat( "', $curIdent ) . "
    • \n\n"; + + return $ret; + } + + /** + * Append the debug info to given ApiResult + * + * @param IContextSource $context + * @param ApiResult $result + */ + public static function appendDebugInfoToApiResult( IContextSource $context, ApiResult $result ) { + if ( !self::$enabled ) { + return; + } + + // output errors as debug info, when display_errors is on + // this is necessary for all non html output of the api, because that clears all errors first + $obContents = ob_get_contents(); + if ( $obContents ) { + $obContentArray = explode( '
    ', $obContents ); + foreach ( $obContentArray as $obContent ) { + if ( trim( $obContent ) ) { + self::debugMsg( Sanitizer::stripAllTags( $obContent ) ); + } + } + } + + MWDebug::log( 'MWDebug output complete' ); + $debugInfo = self::getDebugInfo( $context ); + + $result->setIndexedTagName( $debugInfo, 'debuginfo' ); + $result->setIndexedTagName( $debugInfo['log'], 'line' ); + $result->setIndexedTagName( $debugInfo['debugLog'], 'msg' ); + $result->setIndexedTagName( $debugInfo['queries'], 'query' ); + $result->setIndexedTagName( $debugInfo['includes'], 'queries' ); + $result->setIndexedTagName( $debugInfo['profile'], 'function' ); + $result->addValue( null, 'debuginfo', $debugInfo ); + } + + /** + * Returns the HTML to add to the page for the toolbar + * + * @param IContextSource $context + * @return array + */ + public static function getDebugInfo( IContextSource $context ) { + if ( !self::$enabled ) { + return array(); + } + + global $wgVersion, $wgRequestTime; + $request = $context->getRequest(); + + // HHVM's reported memory usage from memory_get_peak_usage() + // is not useful when passing false, but we continue passing + // false for consistency of historical data in zend. + // see: https://github.com/facebook/hhvm/issues/2257#issuecomment-39362246 + $realMemoryUsage = wfIsHHVM(); + + return array( + 'mwVersion' => $wgVersion, + 'phpEngine' => wfIsHHVM() ? 'HHVM' : 'PHP', + 'phpVersion' => wfIsHHVM() ? HHVM_VERSION : PHP_VERSION, + 'gitRevision' => GitInfo::headSHA1(), + 'gitBranch' => GitInfo::currentBranch(), + 'gitViewUrl' => GitInfo::headViewUrl(), + 'time' => microtime( true ) - $wgRequestTime, + 'log' => self::$log, + 'debugLog' => self::$debug, + 'queries' => self::$query, + 'request' => array( + 'method' => $request->getMethod(), + 'url' => $request->getRequestURL(), + 'headers' => $request->getAllHeaders(), + 'params' => $request->getValues(), + ), + 'memory' => $context->getLanguage()->formatSize( memory_get_usage( $realMemoryUsage ) ), + 'memoryPeak' => $context->getLanguage()->formatSize( memory_get_peak_usage( $realMemoryUsage ) ), + 'includes' => self::getFilesIncluded( $context ), + 'profile' => Profiler::instance()->getRawData(), + ); + } +} -- cgit v1.2.3-54-g00ecf