Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Cache/Dba: fixed notices on tearDown db4 tests #2681

Closed
wants to merge 2 commits into from

2 participants

@marc-mabe

No description provided.

@weierophinney

This is a hotfix -- can you please re-submit this against master? Alternately, I can cherry-pick the commits against master; let me know how you'd like to proceed.

@weierophinney weierophinney was assigned
@marc-mabe

Oh sorry - was a mistake - please cherry-pick against master
thanks

@weierophinney weierophinney referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/2681' into develop
Forward port #2681
e3a1daa
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/2681'
Close #2681
7a9d4cd
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/2681' into develop
Forward port #2681
ac88cde
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-cache
@weierophinney weierophinney Merge branch 'hotfix/2681' 2e348c3
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-cache
@weierophinney weierophinney Merge branch 'hotfix/2681' into develop 978113e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
2  library/Zend/Cache/Storage/Adapter/Dba.php
@@ -516,7 +516,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;
View
2  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,
Something went wrong with that request. Please try again.