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

refactoring code to reduce cyclomatic complexit 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Donquixote 2016-10-29 18:00:01 +08:00 committed by Roeland Jago Douma
parent 8d954c0ece
commit 537d588726
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/public/AppFramework/Controller.php
View File

@ -92,9 +92,8 @@ abstract class Controller {
} }
$response->setHeaders(array_merge($dataHeaders, $headers)); $response->setHeaders(array_merge($dataHeaders, $headers));
return $response; return $response;
} else {
return new JSONResponse($data);
} }
return new JSONResponse($data);
} }
); );
} }
@ -153,10 +152,9 @@ abstract class Controller {
return $responder($response); return $responder($response);
} else {
throw new \DomainException('No responder registered for format ' .
$format . '!');
} }
throw new \DomainException('No responder registered for format '.
$format . '!');
} }

7
lib/public/AppFramework/OCSController.php
View File

@ -106,12 +106,9 @@ abstract class OCSController extends ApiController {
*/ */
private function buildOCSResponse($format, DataResponse $data) { private function buildOCSResponse($format, DataResponse $data) {
if ($this->ocsVersion === 1) { if ($this->ocsVersion === 1) {
$response = new \OC\AppFramework\OCS\V1Response($data, $format); return new \OC\AppFramework\OCS\V1Response($data, $format);
} else {
$response = new \OC\AppFramework\OCS\V2Response($data, $format);
} }
return new \OC\AppFramework\OCS\V2Response($data, $format);
return $response;
} }
} }