mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use a generic exception 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-03-20 10:02:05 +01:00
parent c4b6ff0bab
commit 591e75df5c
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/App/AppManager.php
View File

@ -32,7 +32,6 @@
namespace OC\App;
use OCP\App\AppPathNotFoundException;
use OC_App;
use OCP\App\IAppManager;
use OCP\App\ManagerEvent;
use OCP\IAppConfig;
@ -211,12 +210,12 @@ class AppManager implements IAppManager {
* Enable an app for every user
*
* @param string $appId
* @throws \Exception
* @throws AppPathNotFoundException
*/
public function enableApp($appId) {
if(OC_App::getAppPath($appId) === false) {
throw new \Exception("$appId can't be enabled since it is not installed.");
}
// Check if app exists
$this->getAppPath($appId);
$this->installedAppsCache[$appId] = 'yes';
$this->appConfig->setValue($appId, 'enabled', 'yes');
$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(

1
lib/public/App/IAppManager.php
View File

@ -57,6 +57,7 @@ interface IAppManager {
* Enable an app for every user
*
* @param string $appId
* @throws AppPathNotFoundException
* @since 8.0.0
*/
public function enableApp($appId);

7
tests/lib/App/ManagerTest.php
View File

@ -134,10 +134,11 @@ class ManagerTest extends TestCase {
try {
$this->manager->enableApp('some_random_name_which_i_hope_is_not_an_app');
$this->assertFalse(true, 'If this line is reached the expected exception is not thrown.');
} catch (\Exception $e) {
// excpetion is expected
$this->assertEquals("some_random_name_which_i_hope_is_not_an_app can't be enabled since it is not installed.", $e->getMessage());
} catch (AppPathNotFoundException $e) {
// Exception is expected
$this->assertEquals('Could not find path for some_random_name_which_i_hope_is_not_an_app', $e->getMessage());
}
$this->assertEquals('no', $this->appConfig->getValue(
'some_random_name_which_i_hope_is_not_an_app', 'enabled', 'no'
));