Просмотр исходного кода

ZF-9112: s/asArray/toArray/ in log filter abstract class

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20981 44c647ce-9c0f-0410-b52a-842ac1e357ba
matthew 16 лет назад
Родитель
Сommit
16ab1b9976

+ 1 - 1
library/Zend/Log/Filter/Abstract.php

@@ -47,7 +47,7 @@ abstract class Zend_Log_Filter_Abstract
     static protected function _parseConfig($config)
     {
         if ($config instanceof Zend_Config) {
-            $config = $config->asArray();
+            $config = $config->toArray();
         }
 
         if (!is_array($config)) {

+ 2 - 2
library/Zend/Log/Filter/Message.php

@@ -20,8 +20,8 @@
  * @version    $Id$
  */
 
-/** Zend_Log_Filter_Interface */
-require_once 'Zend/Log/Filter/Interface.php';
+/** Zend_Log_Filter_Abstract */
+require_once 'Zend/Log/Filter/Abstract.php';
 
 /**
  * @category   Zend

+ 16 - 2
tests/Zend/Log/Filter/MessageTest.php

@@ -20,8 +20,7 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log */
 require_once 'Zend/Log.php';
@@ -70,4 +69,19 @@ class Zend_Log_Filter_MessageTest extends PHPUnit_Framework_TestCase
         $logger = Zend_Log::factory($cfg['log']);
         $this->assertTrue($logger instanceof Zend_Log);
     }
+
+    public function testFactoryWithConfig()
+    {
+        require_once 'Zend/Config.php';
+        $config = new Zend_Config(array('log' => array('memory' => array(
+            'writerName'   => "Mock", 
+            'filterName'   => "Message", 
+            'filterParams' => array(
+                'regexp'   => "/42/" 
+             ),        
+        ))));
+
+        $filter = Zend_Log_Filter_Message::factory($config->log->memory->filterParams);
+        $this->assertTrue($filter instanceof Zend_Log_Filter_Message);
+    }
 }