Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
Revert "Merge branch 'weierophinney-hotfix/cache-dba-inifile'"
Browse files Browse the repository at this point in the history
This reverts commit 1419dce, reversing
changes made to eb58777.

Change was re-targeted to develop, as it's a BC break.
  • Loading branch information
weierophinney committed Feb 26, 2015
1 parent 1419dce commit b952b35
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
6 changes: 0 additions & 6 deletions library/Zend/Cache/Storage/Adapter/DbaOptions.php
Expand Up @@ -117,12 +117,6 @@ public function setHandler($handler)
throw new Exception\ExtensionNotLoadedException("DBA-Handler '{$handler}' not supported");
}

if ($handler === 'inifile') {
throw new Exception\ExtensionNotLoadedException(
"DBA-Handler 'inifile' does not reliably support write operations"
);
}

$this->triggerOptionEvent('handler', $handler);
$this->handler = $handler;
return $this;
Expand Down
13 changes: 2 additions & 11 deletions tests/ZendTest/Cache/Storage/Adapter/DbaInifileTest.php
Expand Up @@ -9,20 +9,11 @@

namespace ZendTest\Cache\Storage\Adapter;

use PHPUnit_Framework_TestCase as TestCase;
use Zend\Cache\Storage\Adapter\Dba;

/**
* @group Zend_Cache
*/
class DbaInifileTest extends TestCase
class DbaInifileTest extends AbstractDbaTest
{
public function testSpecifyingInifileHandlerRaisesException()
{
$this->setExpectedException('Zend\Cache\Exception\ExtensionNotLoadedException', 'inifile');
$cache = new Dba(array(
'pathname' => sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('zfcache_dba_') . '.inifile',
'handler' => 'inifile',
));
}
protected $handler = 'inifile';
}

0 comments on commit b952b35

Please sign in to comment.