Update for SilverStripe 3.

README.md

@@ -15,7 +15,12 @@ Extract / clone it in the root folder of your SilverStripe repository.
 
 Change your database class in the _ss_environment.php to
 
-`define( 'SS_DATABASE_CLASS', 'ProfilerMySQLDatabase' );`
+    if(strstr($_SERVER['REQUEST_URI'], '/dev/tests/') === false) {
+    	define( 'SS_DATABASE_CLASS', 'ProfilerMySQLDatabase' );
+    }
+
+This makes sure that dbprofiler is disabled for tests, since they do not
+ run correctly if it is enabled.
 
  Flush your site by appending the ?flush=1 to the url or use sake.
 

code/ProfilerLogViewerController.php

@@ -23,7 +23,10 @@ public function init() {
 		$this->rawdata = $logData;
 		foreach( $logData as $key => $data ) {
 			if( is_array( $data ) ) {
-				$logData[ $key ] = new DataObjectSet( $logData[ $key ] );
+				$logData[ $key ] = new ArrayList();
+				foreach ($data as $i => $item) {
+					$logData[ $key ][$i] = new ArrayData($item);
+				}
 			}
 		}
 
@@ -49,7 +52,7 @@ public function index( SS_HTTPRequest $request ) {
 	 *
 	 * @return string
 	 */
-	public function Link() {
+	public function Link($action=null) {
 		return Director::absoluteURL( 'ProfilerLogViewerController', true );
 	}
 

dbdecorators/DatabaseQueryLogDecorator.php

@@ -88,11 +88,10 @@ protected function logBacktrace( $key ) {
 		foreach( $backtrace as $stackLevel => $val ) {
 			if( isset( $backtrace[ $stackLevel ][ 'file' ] ) ) {
 				$backtraceKey .= $backtrace[ $stackLevel ][ 'file' ] . '_' . $backtrace[ $stackLevel ][ 'line' ] . '____';
-			} else {
+			} else if( isset( $backtrace[ $stackLevel ][ 'class' ] ) ) { //closures have no class!
 				$backtraceKey .= $backtrace[ $stackLevel ][ 'class' ] . '_' . $backtrace[ $stackLevel ][ 'function' ] . '____';
 			}
 			unset( $backtrace[ $stackLevel ][ 'object' ] );
-			unset( $backtrace[ $stackLevel ][ 'args' ] );
 		}
 
 		$backtraceKey = md5( $backtraceKey );