drop unused isDebugMode and setDebugMode of OC_Config
This commit is contained in:
parent
0d4f0ab871
commit
9a7362dd0d
|
@ -39,24 +39,6 @@ class Config {
|
||||||
$this->debugMode = (defined('DEBUG') && DEBUG);
|
$this->debugMode = (defined('DEBUG') && DEBUG);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Enables or disables the debug mode
|
|
||||||
* @param bool $state True to enable, false to disable
|
|
||||||
*/
|
|
||||||
public function setDebugMode($state) {
|
|
||||||
$this->debugMode = $state;
|
|
||||||
$this->writeData();
|
|
||||||
$this->cache;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether the debug mode is enabled or disabled
|
|
||||||
* @return bool True when enabled, false otherwise
|
|
||||||
*/
|
|
||||||
public function isDebugMode() {
|
|
||||||
return $this->debugMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lists all available config keys
|
* Lists all available config keys
|
||||||
* @return array an array of key names
|
* @return array an array of key names
|
||||||
|
|
|
@ -47,7 +47,6 @@ class Test_Config extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSetValue() {
|
public function testSetValue() {
|
||||||
$this->config->setDebugMode(false);
|
|
||||||
$this->config->setValue('foo', 'moo');
|
$this->config->setValue('foo', 'moo');
|
||||||
$expectedConfig = $this->initialConfig;
|
$expectedConfig = $this->initialConfig;
|
||||||
$expectedConfig['foo'] = 'moo';
|
$expectedConfig['foo'] = 'moo';
|
||||||
|
@ -73,7 +72,6 @@ class Test_Config extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testDeleteKey() {
|
public function testDeleteKey() {
|
||||||
$this->config->setDebugMode(false);
|
|
||||||
$this->config->deleteKey('foo');
|
$this->config->deleteKey('foo');
|
||||||
$expectedConfig = $this->initialConfig;
|
$expectedConfig = $this->initialConfig;
|
||||||
unset($expectedConfig['foo']);
|
unset($expectedConfig['foo']);
|
||||||
|
@ -85,37 +83,6 @@ class Test_Config extends \Test\TestCase {
|
||||||
$this->assertEquals($expected, $content);
|
$this->assertEquals($expected, $content);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSetDebugMode() {
|
|
||||||
$this->config->setDebugMode(true);
|
|
||||||
$this->assertAttributeEquals($this->initialConfig, 'cache', $this->config);
|
|
||||||
$this->assertAttributeEquals(true, 'debugMode', $this->config);
|
|
||||||
$content = file_get_contents($this->configFile);
|
|
||||||
$expected = "<?php\ndefine('DEBUG',true);\n\$CONFIG = array (\n 'foo' => 'bar',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " .
|
|
||||||
" 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n 'alcohol_free' => false,\n);\n";
|
|
||||||
$this->assertEquals($expected, $content);
|
|
||||||
|
|
||||||
$this->config->setDebugMode(false);
|
|
||||||
$this->assertAttributeEquals($this->initialConfig, 'cache', $this->config);
|
|
||||||
$this->assertAttributeEquals(false, 'debugMode', $this->config);
|
|
||||||
$content = file_get_contents($this->configFile);
|
|
||||||
$expected = "<?php\n\$CONFIG = array (\n 'foo' => 'bar',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " .
|
|
||||||
" 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n 'alcohol_free' => false,\n);\n";
|
|
||||||
$this->assertEquals($expected, $content);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testIsDebugMode() {
|
|
||||||
// Default
|
|
||||||
$this->assertFalse($this->config->isDebugMode());
|
|
||||||
|
|
||||||
// Manually set to false
|
|
||||||
$this->config->setDebugMode(false);
|
|
||||||
$this->assertFalse($this->config->isDebugMode());
|
|
||||||
|
|
||||||
// Manually set to true
|
|
||||||
$this->config->setDebugMode(true);
|
|
||||||
$this->assertTrue($this->config->isDebugMode());
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testConfigMerge() {
|
public function testConfigMerge() {
|
||||||
// Create additional config
|
// Create additional config
|
||||||
$additionalConfig = '<?php $CONFIG=array("php53"=>"totallyOutdated");';
|
$additionalConfig = '<?php $CONFIG=array("php53"=>"totallyOutdated");';
|
||||||
|
|
Loading…
Reference in New Issue