ensure that plain CakeLogInterface still works

cakephp · May 13, 2012 · 595cad8 · 595cad8
1 parent 8e8763d
commit 595cad8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/Cake/Log/CakeLog.php b/lib/Cake/Log/CakeLog.php
@@ -374,8 +374,12 @@ public static function write($type, $message, $scope = array()) {
 			$scopes = array();
 			if ($logger instanceof BaseLog) {
 				$config = $logger->config();
-				$types = $config['types'];
-				$scopes = $config['scopes'];
+				if (isset($config['types'])) {
+					$types = $config['types'];
+				}
+				if (isset($config['scopes'])) {
+					$scopes = $config['scopes'];
+				}
 			}
 			if (is_string($scope)) {
 				$inScope = in_array($scope, $scopes);

diff --git a/lib/Cake/Test/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php
@@ -64,6 +64,8 @@ public function testImportingLoggers() {
 		$this->assertTrue($result);
 		$this->assertEquals(CakeLog::configured(), array('libtest', 'plugintest'));
 
+		CakeLog::write(LOG_INFO, 'TestPluginLog is not a BaseLog descendant');
+
 		App::build();
 		CakePlugin::unload();
 	}

diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
@@ -17,9 +17,10 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('BaseLog', 'Log/Engine');
+App::uses('CakeLogInterface', 'Log');
 
-class TestPluginLog extends BaseLog {
+class TestPluginLog implements CakeLogInterface
+{
 
 	public function write($type, $message) {
 	}