Changeset 4607 for trunk/core/debug/doctrineprofiler.core.php

Timestamp:

08/29/10 18:30:31 (21 months ago)

Author:

vain

Message:

• clansuite doctrine profiler is now called statically

File:

• trunk/core/debug/doctrineprofiler.core.php (modified) (10 diffs)

trunk/core/debug/doctrineprofiler.core.php

@@ -47 +47 @@
 class Clansuite_Doctrine_Profiler
 {
-    public function __construct()
-    {
-        $this->connection = Doctrine_Manager::connection();
-    }
-    
     /**
      * Returns Doctrine's connection profiler
@@ -57 +52 @@
      * @return Doctrine_Connection_Profiler
      */
-    public function getProfiler()
+    public static function getProfiler()
     {
-        return $this->connection->getListener();
+        return Doctrine_Manager::connection()->getListener();
     }
 
@@ -65 +60 @@
      * Attached the Doctrine Profiler as Listener to the connection
      */
-    public function attachProfiler()
+    public static function attachProfiler()
     {
         # instantiate Profiler and attach to doctrine connection
-        $this->connection->setListener(new Doctrine_Connection_Profiler);
-        
-        register_shutdown_function(array($this,'shutdown'));  
+        Doctrine_Manager::connection()->setListener(new Doctrine_Connection_Profiler);
+
+        register_shutdown_function('Clansuite_Doctrine_Profiler::shutdown');
     }
 
@@ -79 +74 @@
      * @return Direct HTML Output
      */
-    public function displayProfilingHTML()
+    public static function displayProfilingHTML()
     {
         /**
@@ -85 +80 @@
          */
         $query_counter = 0;
+
         /**
          * @var int time in seconds, counting the elapsed time for all queries
@@ -90 +86 @@
         $time = 0;
 
-
-        echo '<!-- Disable Debug Mode to remove this!-->
+        $html = '';
+        $html .= '<!-- Disable Debug Mode to remove this!-->
               <style type="text/css">
               /*<![CDATA[*/
@@ -126 +122 @@
                 </style>';
 
-        echo '<p>&nbsp;</p><fieldset class="doctrine-profiler"><legend>Debug Console for Doctrine Queries</legend>';
-        echo '<table class="doctrine-profiler" width="95%">';
-        echo '<tr>
+        $html .= '<p>&nbsp;</p><fieldset class="doctrine-profiler"><legend>Debug Console for Doctrine Queries</legend>';
+        $html .= '<table class="doctrine-profiler" width="95%">';
+        $html .= '<tr>
                 <th>Query Counter</th>
                 <th>Command</th>
@@ -136 +132 @@
               </tr>';
 
-        foreach ( $this->getProfiler() as $event )
+        foreach(self::getProfiler() as $event)
         {
             /**
@@ -155 +151 @@
             $time += $event->getElapsedSecs();
 
-            echo '<tr>';
-            echo '<td style="text-align: center;">' . $query_counter . '</td>';
-            echo '<td style="text-align: center;">' . $event->getName() . '</td>';
-            echo '<td>' . sprintf('%f', $event->getElapsedSecs() ) . '</td>';
-            echo '<td>' . $event->getQuery() . '</td>';
+            $html .= '<tr>';
+            $html .= '<td style="text-align: center;">' . $query_counter . '</td>';
+            $html .= '<td style="text-align: center;">' . $event->getName() . '</td>';
+            $html .= '<td>' . sprintf('%f', $event->getElapsedSecs()) . '</td>';
+            $html .= '<td>' . $event->getQuery() . '</td>';
+
             $params = $event->getParams();
-            if ( empty($params) == false)
+            if(empty($params) == false)
             {
-                  echo '<td>';
-                  echo wordwrap(join(', ', $params),150,"\n",true);
-                  echo '</td>';
+                $html .= '<td>';
+                $html .= wordwrap(join(', ', $params), 150, "\n", true);
+                $html .= '</td>';
             }
             else
             {
-                  echo '<td>';
-                  echo '&nbsp;';
-                  echo '</td>';
+                $html .= '<td>';
+                $html .= '&nbsp;';
+                $html .= '</td>';
             }
-            echo '</tr>';
+
+            $html .= '</tr>';
         }
-        echo '</table>';
-        echo '<p style="font-weight: bold;">&nbsp; &raquo; &nbsp; '.$query_counter.' statements in ' . sprintf('%2.5f', $time) . ' secs.</p>';
-        echo '</fieldset>';
+
+        $html .= '</table>';
+        $html .= '<p style="font-weight: bold;">&nbsp; &raquo; &nbsp; '.$query_counter.' statements in ' . sprintf('%2.5f', $time) . ' secs.</p>';
+        $html .= '</fieldset>';
+
+        echo $html;
     }
 
@@ -183 +184 @@
      * shutdown function for register_shutdown_function
      */
-    public function shutdown()
+    public static function shutdown()
     {
         # append Doctrine's SQL-Profiling Report
-        $this->displayProfilingHTML();
+        self::displayProfilingHTML();
 
         # save session before exit