chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from elrido/coding-style 

fixing configuration and its test to match the new namespaces
This commit is contained in:
Sobak 2016-07-26 07:59:47 +02:00 committed by GitHub
parent b1305beb0f d14eb0efe4
commit 23fab964ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configuration.php
View File

@ -82,7 +82,7 @@ class configuration
'dir' => 'data', 'dir' => 'data',
), ),
'model' => array( 'model' => array(
'class' => 'privatebin_data', 'class' => 'PrivateBin\data\data',
), ),
'model_options' => array( 'model_options' => array(
'dir' => 'data', 'dir' => 'data',

4
tst/configuration.php
View File

@ -128,12 +128,12 @@ class configurationTest extends PHPUnit_Framework_TestCase
$options['model']['class'] = 'zerobin_data'; $options['model']['class'] = 'zerobin_data';
helper::createIniFile(CONF, $options); helper::createIniFile(CONF, $options);
$conf = new configuration; $conf = new configuration;
$this->assertEquals('privatebin_data', $conf->getKey('class', 'model'), 'old data class gets renamed'); $this->assertEquals('PrivateBin\data\data', $conf->getKey('class', 'model'), 'old data class gets renamed');
$options['model']['class'] = 'zerobin_db'; $options['model']['class'] = 'zerobin_db';
helper::createIniFile(CONF, $options); helper::createIniFile(CONF, $options);
$conf = new configuration; $conf = new configuration;
$this->assertEquals('privatebin_db', $conf->getKey('class', 'model'), 'old db class gets renamed'); $this->assertEquals('PrivateBin\data\db', $conf->getKey('class', 'model'), 'old db class gets renamed');
} }
} }