Add level to ArrayLog

This helps enable tests that compare the log level.

src/Log/Engine/ArrayLog.php

@@ -43,7 +43,7 @@ class ArrayLog extends BaseLog
      */
     public function log($level, $message, array $context = [])
     {
-        $this->content[] = $this->_format($message, $context);
+        $this->content[] = $level . ' ' . $this->_format($message, $context);
     }
 
     /**

tests/TestCase/Database/ConnectionTest.php

@@ -952,7 +952,7 @@ class ConnectionTest extends TestCase
 
         $messages = Log::engine('queries')->read();
         $this->assertCount(1, $messages);
-        $this->assertSame('duration=0 rows=0 SELECT 1', $messages[0]);
+        $this->assertSame('debug duration=0 rows=0 SELECT 1', $messages[0]);
     }
 
     /**
@@ -980,8 +980,8 @@ class ConnectionTest extends TestCase
 
         $messages = Log::engine('queries')->read();
         $this->assertCount(2, $messages);
-        $this->assertSame('duration=0 rows=0 BEGIN', $messages[0]);
-        $this->assertSame('duration=0 rows=0 ROLLBACK', $messages[1]);
+        $this->assertSame('debug duration=0 rows=0 BEGIN', $messages[0]);
+        $this->assertSame('debug duration=0 rows=0 ROLLBACK', $messages[1]);
     }
 
     /**
@@ -1004,8 +1004,8 @@ class ConnectionTest extends TestCase
 
         $messages = Log::engine('queries')->read();
         $this->assertCount(2, $messages);
-        $this->assertSame('duration=0 rows=0 BEGIN', $messages[0]);
-        $this->assertSame('duration=0 rows=0 COMMIT', $messages[1]);
+        $this->assertSame('debug duration=0 rows=0 BEGIN', $messages[0]);
+        $this->assertSame('debug duration=0 rows=0 COMMIT', $messages[1]);
     }
 
     /**

tests/TestCase/Database/Log/LoggingStatementTest.php

@@ -64,7 +64,7 @@ class LoggingStatementTest extends TestCase
 
         $messages = Log::engine('queries')->read();
         $this->assertCount(1, $messages);
-        $this->assertRegExp('/^duration=\d rows=3 SELECT bar FROM foo$/', $messages[0]);
+        $this->assertRegExp('/^debug duration=\d rows=3 SELECT bar FROM foo$/', $messages[0]);
     }
 
     /**
@@ -86,7 +86,7 @@ class LoggingStatementTest extends TestCase
 
         $messages = Log::engine('queries')->read();
         $this->assertCount(1, $messages);
-        $this->assertRegExp('/^duration=\d rows=4 SELECT bar FROM foo WHERE x=1 AND y=2$/', $messages[0]);
+        $this->assertRegExp('/^debug duration=\d rows=4 SELECT bar FROM foo WHERE x=1 AND y=2$/', $messages[0]);
     }
 
     /**
@@ -117,8 +117,8 @@ class LoggingStatementTest extends TestCase
 
         $messages = Log::engine('queries')->read();
         $this->assertCount(2, $messages);
-        $this->assertRegExp("/^duration=\d rows=4 SELECT bar FROM foo WHERE a='1' AND b='2013-01-01'$/", $messages[0]);
-        $this->assertRegExp("/^duration=\d rows=4 SELECT bar FROM foo WHERE a='1' AND b='2014-01-01'$/", $messages[1]);
+        $this->assertRegExp("/^debug duration=\d rows=4 SELECT bar FROM foo WHERE a='1' AND b='2013-01-01'$/", $messages[0]);
+        $this->assertRegExp("/^debug duration=\d rows=4 SELECT bar FROM foo WHERE a='1' AND b='2014-01-01'$/", $messages[1]);
     }
 
     /**
@@ -147,7 +147,7 @@ class LoggingStatementTest extends TestCase
 
         $messages = Log::engine('queries')->read();
         $this->assertCount(1, $messages);
-        $this->assertRegExp("/^duration=\d rows=0 SELECT bar FROM foo$/", $messages[0]);
+        $this->assertRegExp("/^debug duration=\d rows=0 SELECT bar FROM foo$/", $messages[0]);
     }
 
     /**

tests/TestCase/Error/ErrorHandlerTest.php

@@ -200,8 +200,9 @@ class ErrorHandlerTest extends TestCase
         $out = $out + 1;
 
         $messages = $this->logger->read();
+        $this->assertRegExp('/^(notice|debug)/', $messages[0]);
         $this->assertStringContainsString(
-            'Notice (8): Undefined variable: out in [' . __FILE__ . ', line ' . (__LINE__ - 4) . ']' . "\n\n",
+            'Notice (8): Undefined variable: out in [' . __FILE__ . ', line ' . (__LINE__ - 5) . ']' . "\n\n",
             $messages[0]
         );
     }
@@ -221,8 +222,9 @@ class ErrorHandlerTest extends TestCase
         $out = $out + 1;
 
         $messages = $this->logger->read();
+        $this->assertRegExp('/^(notice|debug)/', $messages[0]);
         $this->assertStringContainsString(
-            'Notice (8): Undefined variable: out in [' . __FILE__ . ', line ' . (__LINE__ - 4) . ']',
+            'Notice (8): Undefined variable: out in [' . __FILE__ . ', line ' . (__LINE__ - 5) . ']',
             $messages[0]
         );
         $this->assertStringContainsString('Trace:', $messages[0]);
@@ -262,6 +264,7 @@ class ErrorHandlerTest extends TestCase
         $this->assertStringContainsString('Kaboom!', (string)$errorHandler->response->getBody(), 'message missing.');
 
         $messages = $this->logger->read();
+        $this->assertRegExp('/^error/', $messages[0]);
         $this->assertStringContainsString('[Cake\Http\Exception\NotFoundException] Kaboom!', $messages[0]);
         $this->assertStringContainsString(
             str_replace('/', DS, 'vendor/phpunit/phpunit/src/Framework/TestCase.php'),
@@ -275,6 +278,7 @@ class ErrorHandlerTest extends TestCase
         $errorHandler->handleException($error);
 
         $messages = $this->logger->read();
+        $this->assertRegExp('/^error/', $messages[1]);
         $this->assertStringContainsString('[Cake\Http\Exception\NotFoundException] Kaboom!', $messages[1]);
         $this->assertStringNotContainsString(
             str_replace('/', DS, 'vendor/phpunit/phpunit/src/Framework/TestCase.php'), 
@@ -301,6 +305,7 @@ class ErrorHandlerTest extends TestCase
         $errorHandler->handleException($error);
 
         $messages = $this->logger->read();
+        $this->assertRegExp('/^error/', $messages[0]);
         $this->assertStringContainsString(
             '[Cake\Http\Exception\MissingControllerException] Controller class Derp could not be found.',
             $messages[0]
@@ -366,6 +371,7 @@ class ErrorHandlerTest extends TestCase
 
         $messages = $this->logger->read();
         $this->assertCount(1, $messages);
+        $this->assertRegExp('/^error/', $messages[0]);
         $this->assertStringContainsString(
             '[Cake\Http\Exception\ForbiddenException] Fooled you!',
             $messages[0]