소스 검색

Merge pull request #1 from elrido/coding-style

fixing configuration and its test to match the new namespaces
Sobak 10 년 전
부모
커밋
23fab964ee
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      lib/configuration.php
  2. 2 2
      tst/configuration.php

+ 1 - 1
lib/configuration.php

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

+ 2 - 2
tst/configuration.php

@@ -128,12 +128,12 @@ class configurationTest extends PHPUnit_Framework_TestCase
         $options['model']['class'] = 'zerobin_data';
         helper::createIniFile(CONF, $options);
         $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';
         helper::createIniFile(CONF, $options);
         $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');
     }
 
 }