Merge "Include ICU version in cache key for collation first letters"

[lhc/web/wiklou.git] / includes / profiler / ProfilerSimpleText.php

diff --git a/includes/profiler/ProfilerSimpleText.php b/includes/profiler/ProfilerSimpleText.php
index 37350bf..0ee7aad 100644 (file)
--- a/includes/profiler/ProfilerSimpleText.php
+++ b/includes/profiler/ProfilerSimpleText.php
@@ -31,7 +31,7 @@
  *
  * @ingroup Profiler
  */
-class ProfilerSimpleText extends ProfilerSimple {
+class ProfilerSimpleText extends ProfilerStandard {
        public $visible = false; /* Show as <PRE> or <!-- ? */
        static private $out;
 
@@ -42,6 +42,10 @@ class ProfilerSimpleText extends ProfilerSimple {
                parent::__construct( $profileConfig );
        }
 
+       protected function collateOnly() {
+               return true;
+       }
+
        public function logData() {
                if ( $this->mTemplated ) {
                        $this->close();
@@ -51,17 +55,17 @@ class ProfilerSimpleText extends ProfilerSimple {
                        uasort( $this->mCollated, array( 'self', 'sort' ) );
                        array_walk( $this->mCollated, array( 'self', 'format' ), $totalReal );
                        if ( PHP_SAPI === 'cli' ) {
-                               print "<!--\n".self::$out."\n-->\n";
+                               print "<!--\n" . self::$out . "\n-->\n";
                        } elseif ( $this->getContentType() === 'text/html' ) {
                                if ( $this->visible ) {
-                                       print '<pre>'.self::$out.'</pre>';
+                                       print '<pre>' . self::$out . '</pre>';
                                } else {
-                                       print "<!--\n".self::$out."\n-->\n";
+                                       print "<!--\n" . self::$out . "\n-->\n";
                                }
                        } elseif ( $this->getContentType() === 'text/javascript' ) {
-                               print "\n/*\n".self::$out."*/\n";
+                               print "\n/*\n" . self::$out . "*/\n";
                        } elseif ( $this->getContentType() === 'text/css' ) {
-                               print "\n/*\n".self::$out."*/\n";
+                               print "\n/*\n" . self::$out . "*/\n";
                        }
                }
        }
@@ -71,7 +75,7 @@ class ProfilerSimpleText extends ProfilerSimple {
        }
 
        static function format( $item, $key, $totalReal ) {
-               $perc = $totalReal ? $item['real']/$totalReal*100 : 0;
+               $perc = $totalReal ? $item['real'] / $totalReal * 100 : 0;
                self::$out .= sprintf( "%6.2f%% %3.6f %6d - %s\n",
                        $perc, $item['real'], $item['count'], $key );
        }