Bladeren bron

[ZF-10189] Zend_Cache:

- fixed added require_once 'Zend/Log.php'.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22651 44c647ce-9c0f-0410-b52a-842ac1e357ba
ramon 15 jaren geleden
bovenliggende
commit
d31733ac71
2 gewijzigde bestanden met toevoegingen van 16 en 1 verwijderingen
  1. 1 0
      library/Zend/Cache/Core.php
  2. 15 1
      tests/Zend/Cache/CoreTest.php

+ 1 - 0
library/Zend/Cache/Core.php

@@ -714,6 +714,7 @@ class Zend_Cache_Core
 
         // Create a default logger to the standard output stream
         require_once 'Zend/Log/Writer/Stream.php';
+        require_once 'Zend/Log.php';
         $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output'));
         $this->_options['logger'] = $logger;
     }

+ 15 - 1
tests/Zend/Cache/CoreTest.php

@@ -86,7 +86,7 @@ class Zend_Cache_CoreTest extends PHPUnit_Framework_TestCase
         $test->setConfig($config);
         $this->assertEquals(3600, $test->getOption('lifetime'));
     }
-    
+
     /**
      * @group ZF-9092
      */
@@ -522,4 +522,18 @@ class Zend_Cache_CoreTest extends PHPUnit_Framework_TestCase
         $this->assertContains('id6', $ids);
     }
 
+    /**
+     * @group ZF-10189
+     */
+    public function testIfFileZendLogWasIncluded()
+    {
+        if (class_exists('Zend_Log', false)) {
+            $this->markTestSkipped('File Zend/Log.php already included');
+        }
+
+        $cacheCore = new Zend_Cache_Core(
+            array('logging' => true)
+        );
+        $this->assertTrue($cacheCore->getOption('logger') instanceof Zend_Log);
+    }
 }