summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-02-10 11:16:32 +0100
committerBernhard Posselt <nukeawhale@gmail.com>2013-02-10 11:16:32 +0100
commit99cc7013f93d7233b20e3dfee945c4660263a05a (patch)
tree66cc3c103a06a7dd13e6e5d823b553e274cd24b4
parent2d293fea4328123f9d20a73f8d1bac79e746c9bd (diff)
spaces to tabs
-rw-r--r--controller/foldercontroller.php4
-rw-r--r--tests/controller/FolderControllerTest.php20
2 files changed, 12 insertions, 12 deletions
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php
index ba8ab4077..dcd6f9ca5 100644
--- a/controller/foldercontroller.php
+++ b/controller/foldercontroller.php
@@ -69,8 +69,8 @@ class FolderController extends Controller {
return $this->renderJSON(array());
} catch (DoesNotExistException $e) {
return $this->renderJSON(array(), $e->getMessage());
- } catch(MultipleObjectsReturnedException $e){
- return $this->renderJSON(array(), $e->getMessage());
+ } catch(MultipleObjectsReturnedException $e){
+ return $this->renderJSON(array(), $e->getMessage());
}
}
diff --git a/tests/controller/FolderControllerTest.php b/tests/controller/FolderControllerTest.php
index 1381f8916..a9eb85e9e 100644
--- a/tests/controller/FolderControllerTest.php
+++ b/tests/controller/FolderControllerTest.php
@@ -148,7 +148,7 @@ class FolderControllerTest extends ControllerTestUtility {
}
- private function collapseException($ex){
+ private function collapseException($ex){
$urlParams = array('folderId' => 1);
$this->folderMapper->expects($this->once())
->method('setCollapsed')
@@ -158,21 +158,21 @@ class FolderControllerTest extends ControllerTestUtility {
$response = $this->controller->collapse();
- $expected = '{"status":"error","data":[],"msg":"' . $ex->getMessage() . '"}';
+ $expected = '{"status":"error","data":[],"msg":"' . $ex->getMessage() . '"}';
$this->assertEquals($expected, $response->render());
}
- public function testCollapseDoesNotExistExceptionReturnsJSONError(){
- $ex = new DoesNotExistException('exception');
- $this->collapseException($ex);
- }
+ public function testCollapseDoesNotExistExceptionReturnsJSONError(){
+ $ex = new DoesNotExistException('exception');
+ $this->collapseException($ex);
+ }
- public function testCollapseMultipleObjectsReturnedReturnsJSONError(){
- $ex = new MultipleObjectsReturnedException('exception');
- $this->collapseException($ex);
- }
+ public function testCollapseMultipleObjectsReturnedReturnsJSONError(){
+ $ex = new MultipleObjectsReturnedException('exception');
+ $this->collapseException($ex);
+ }
} \ No newline at end of file