Merge branch 'hotfix/2681'

Close #2681
zendframework · Oct 8, 2012 · 7a9d4cd · 7a9d4cd
2 parents bd596fc + 22b2065
commit 7a9d4cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Zend/Cache/Storage/Adapter/Dba.php b/library/Zend/Cache/Storage/Adapter/Dba.php
@@ -517,7 +517,7 @@ protected function _open()
     protected function _close()
     {
         if ($this->handle) {
-            ErrorHandler::start(E_WARNING);
+            ErrorHandler::start(E_NOTICE);
             dba_close($this->handle);
             ErrorHandler::stop();
             $this->handle = null;

diff --git a/tests/ZendTest/Cache/Storage/Adapter/AbstractDbaTest.php b/tests/ZendTest/Cache/Storage/Adapter/AbstractDbaTest.php
@@ -44,7 +44,7 @@ public function setUp()
             }
         }
 
-        $this->temporaryDbaFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('zfcache_dba_');
+        $this->temporaryDbaFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('zfcache_dba_') . '.' . $this->handler;
         $this->_options = new Cache\Storage\Adapter\DbaOptions(array(
             'pathname' => $this->temporaryDbaFile,
             'handler'  => $this->handler,