george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

applying patch based on StyleCI ruleset

Browse Source
This commit is contained in:
El RIDO
2016-10-29 10:24:08 +02:00
parent c8b1296929
commit 1f46823942
33 changed files with 430 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tst/PrivateBinWithDbTest.php
View File

@@ -1,9 +1,7 @@
<?php
use PrivateBin\Data\Database;
use PrivateBin\PrivateBin;
use PrivateBin\Persistence\ServerSalt;
use PrivateBin\Persistence\TrafficLimiter;
require_once 'PrivateBinTest.php';
@@ -13,8 +11,8 @@ class PrivateBinWithDbTest extends PrivateBinTest
'usr' => null,
'pwd' => null,
'opt' => array(
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_PERSISTENT => true
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_PERSISTENT => true,
),
);
@@ -27,7 +25,7 @@ class PrivateBinWithDbTest extends PrivateBinTest
}
ServerSalt::setPath($this->_path);
$this->_options['dsn'] = 'sqlite:' . $this->_path . DIRECTORY_SEPARATOR . 'tst.sq3';
$this->_model = Database::getInstance($this->_options);
$this->_model = Database::getInstance($this->_options);
$this->reset();
}
@@ -35,13 +33,13 @@ class PrivateBinWithDbTest extends PrivateBinTest
{
parent::reset();
// but then inject a db config
$options = parse_ini_file(CONF, true);
$options = parse_ini_file(CONF, true);
$options['model'] = array(
'class' => 'Database',
);
$options['purge']['dir'] = $this->_path;
$options['purge']['dir'] = $this->_path;
$options['traffic']['dir'] = $this->_path;
$options['model_options'] = $this->_options;
$options['model_options'] = $this->_options;
Helper::confBackup();
Helper::createIniFile(CONF, $options);
}