Merge pull request #8102 from owncloud/fix-appconfig-master
Fix appconfig master
This commit is contained in:
commit
9360dbf8a4
|
@ -147,7 +147,7 @@ class AppConfig implements \OCP\IAppConfig {
|
|||
*/
|
||||
public function hasKey($app, $key) {
|
||||
$values = $this->getAppValues($app);
|
||||
return isset($values[$key]);
|
||||
return array_key_exists($key, $values);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -64,7 +64,7 @@ class Config {
|
|||
public static function setSystemValue( $key, $value ) {
|
||||
try {
|
||||
\OC_Config::setValue( $key, $value );
|
||||
} catch (Exception $e) {
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
@ -96,7 +96,7 @@ class Config {
|
|||
public static function setAppValue( $app, $key, $value ) {
|
||||
try {
|
||||
\OC_Appconfig::setValue( $app, $key, $value );
|
||||
} catch (Exception $e) {
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
@ -131,7 +131,7 @@ class Config {
|
|||
public static function setUserValue( $user, $app, $key, $value ) {
|
||||
try {
|
||||
\OC_Preferences::setValue( $user, $app, $key, $value );
|
||||
} catch (Exception $e) {
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud
|
||||
*
|
||||
* @author Thomas Müller
|
||||
* @copyright 2014 Thomas Müller thomas.mueller@tmit.eu
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
class Test_Config extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
|
||||
public function testSetAppValueIfSetToNull() {
|
||||
|
||||
$key = uniqid("key-");
|
||||
|
||||
$result = \OCP\Config::setAppValue('unit-test', $key, null);
|
||||
$this->assertTrue($result);
|
||||
|
||||
$result = \OCP\Config::setAppValue('unit-test', $key, '12');
|
||||
$this->assertTrue($result);
|
||||
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue