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 "Sanity check "stashedtexthash" param before checking memcached"
[lhc/web/wiklou.git]
/
includes
/
libs
/
XhprofData.php
diff --git
a/includes/libs/XhprofData.php
b/includes/libs/XhprofData.php
index
c6da432
..
0be4ff6
100644
(file)
--- a/
includes/libs/XhprofData.php
+++ b/
includes/libs/XhprofData.php
@@
-25,8
+25,7
@@
use RunningStat\RunningStat;
* <https://github.com/phacility/xhprof>. XHProf can be installed as a PECL
* package for use with PHP5 (Zend PHP) and is built-in to HHVM 3.3.0.
*
* <https://github.com/phacility/xhprof>. XHProf can be installed as a PECL
* package for use with PHP5 (Zend PHP) and is built-in to HHVM 3.3.0.
*
- * @author Bryan Davis <bd808@wikimedia.org>
- * @copyright © 2014 Bryan Davis and Wikimedia Foundation.
+ * @copyright © 2014 Wikimedia Foundation and contributors
* @since 1.28
*/
class XhprofData {
* @since 1.28
*/
class XhprofData {
@@
-108,6
+107,7
@@
class XhprofData {
* The resulting array is left padded with nulls, so a key
* with no parent (eg 'main()') will return [null, 'function'].
*
* The resulting array is left padded with nulls, so a key
* with no parent (eg 'main()') will return [null, 'function'].
*
+ * @param string $key
* @return array
*/
public static function splitKey( $key ) {
* @return array
*/
public static function splitKey( $key ) {