Completed
Pull Request — master (#1016)
by René
04:12
created
lib/Service/OptionService.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 use OCA\Polls\Service\LogService;
36 36
 use OCA\Polls\Model\Acl;
37 37
 
38
-class OptionService  {
38
+class OptionService {
39 39
 
40 40
 	/** @var OptionMapper */
41 41
 	private $optionMapper;
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 * @return Option
113 113
 	 * @throws NotAuthorizedException
114 114
 	 */
115
-	public function add($pollId, $timestamp = 0 , $pollOptionText = '') {
115
+	public function add($pollId, $timestamp = 0, $pollOptionText = '') {
116 116
 
117 117
 		$this->poll = $this->pollMapper->find($pollId);
118 118
 		if (!$this->acl->setPollId($pollId)->getAllowEdit()) {
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	 * @return Option
137 137
 	 * @throws NotAuthorizedException
138 138
 	 */
139
-	public function update($optionId, $timestamp = 0 , $pollOptionText = '', $order = 0) {
139
+	public function update($optionId, $timestamp = 0, $pollOptionText = '', $order = 0) {
140 140
 
141 141
 		$this->option = $this->optionMapper->find($optionId);
142 142
 		$this->poll = $this->pollMapper->find($this->option->getPollId());
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	 * @param int $order
325 325
 	 * @throws BadRequestException
326 326
 	 */
327
-	private function setOption($timestamp = 0 , $pollOptionText = '', $order = 0) {
327
+	private function setOption($timestamp = 0, $pollOptionText = '', $order = 0) {
328 328
 		if ($this->poll->getType() === 'datePoll') {
329 329
 			if ($timestamp) {
330 330
 				$this->option->setTimestamp($timestamp);
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 use OCA\Polls\Service\LogService;
36 36
 use OCA\Polls\Model\Acl;
37 37
 
38
-class OptionService  {
38
+class OptionService {
39 39
 
40 40
 	/** @var OptionMapper */
41 41
 	private $optionMapper;
Please login to merge, or discard this patch.
lib/Service/VoteService.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 use OCA\Polls\Service\LogService;
35 35
 use OCA\Polls\Model\Acl;
36 36
 
37
-class VoteService  {
37
+class VoteService {
38 38
 
39 39
 	/** @var VoteMapper */
40 40
 	private $voteMapper;
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 use OCA\Polls\Service\LogService;
35 35
 use OCA\Polls\Model\Acl;
36 36
 
37
-class VoteService  {
37
+class VoteService {
38 38
 
39 39
 	/** @var VoteMapper */
40 40
 	private $voteMapper;
Please login to merge, or discard this patch.
lib/Service/SubscriptionService.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 use OCA\Polls\Db\SubscriptionMapper;
33 33
 use OCA\Polls\Model\Acl;
34 34
 
35
-class SubscriptionService  {
35
+class SubscriptionService {
36 36
 
37 37
 	/** @var Acl */
38 38
 	private $acl;
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				return ['status' => 'Subscribed to poll ' . $pollId];
93 93
 			}
94 94
 
95
-		} catch (DoesNotExistException $e){
95
+		} catch (DoesNotExistException $e) {
96 96
 
97 97
 			if ($subscribed) {
98 98
 				$subscription = new Subscription();
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 use OCA\Polls\Db\SubscriptionMapper;
33 33
 use OCA\Polls\Model\Acl;
34 34
 
35
-class SubscriptionService  {
35
+class SubscriptionService {
36 36
 
37 37
 	/** @var Acl */
38 38
 	private $acl;
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				return ['status' => 'Subscribed to poll ' . $pollId];
93 93
 			}
94 94
 
95
-		} catch (DoesNotExistException $e){
95
+		} catch (DoesNotExistException $e) {
96 96
 
97 97
 			if ($subscribed) {
98 98
 				$subscription = new Subscription();
Please login to merge, or discard this patch.
lib/Service/CommentService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 block discarded – undo
119 119
 			}
120 120
 
121 121
 		} catch (Exception $e) {
122
-			\OC::$server->getLogger()->alert('Error writing comment for pollId ' . $pollId . ': '. $e);
122
+			\OC::$server->getLogger()->alert('Error writing comment for pollId ' . $pollId . ': ' . $e);
123 123
 			throw new NotAuthorizedException($e);
124 124
 		}
125 125
 
Please login to merge, or discard this patch.
lib/Controller/OptionController.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -77,11 +77,11 @@
 block discarded – undo
77 77
 	// }
78 78
 
79 79
 	/**
80
-	* Add a new option
81
-	* @NoAdminRequired
82
-	* @param array $option
83
-	* @return DataResponse
84
-	*/
80
+	 * Add a new option
81
+	 * @NoAdminRequired
82
+	 * @param array $option
83
+	 * @return DataResponse
84
+	 */
85 85
 	public function add($pollId, $timestamp = 0, $pollOptionText = '') {
86 86
 		return new DataResponse($this->optionService->add($pollId, $timestamp, $pollOptionText), Http::STATUS_OK);
87 87
 	}
Please login to merge, or discard this patch.
lib/Controller/OptionApiController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
 	 * @param array $option
109 109
 	 * @return DataResponse
110 110
 	 */
111
-	public function update($optionId, $timestamp = 0 , $pollOptionText = '') {
111
+	public function update($optionId, $timestamp = 0, $pollOptionText = '') {
112 112
 		try {
113 113
 			return new DataResponse(['option' => $this->optionService->update($optionId, $timestamp, $pollOptionText, $order)], Http::STATUS_OK);
114 114
 		} catch (NotAuthorizedException $e) {
Please login to merge, or discard this patch.
lib/Controller/PollController.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -68,12 +68,12 @@
 block discarded – undo
68 68
  	 * @param string $appName
69 69
  	 * @param IRequest $request
70 70
  	 * @param PollService $pollService
71
-	 * @param CommentService $commentService
72
-  	 * @param OptionService $optionService
73
-  	 * @param ShareService $shareService
74
-  	 * @param VoteService $voteService
75
-  	 * @param Acl $acl
76
-	 */
71
+ 	 * @param CommentService $commentService
72
+ 	 * @param OptionService $optionService
73
+ 	 * @param ShareService $shareService
74
+ 	 * @param VoteService $voteService
75
+ 	 * @param Acl $acl
76
+ 	 */
77 77
 
78 78
  	public function __construct(
79 79
 		string $appName,
Please login to merge, or discard this patch.
lib/Controller/SubscriptionApiController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,8 +56,8 @@
 block discarded – undo
56 56
 		parent::__construct($appName,
57 57
 			$request,
58 58
 			'PUT, GET, DELETE',
59
-            'Authorization, Content-Type, Accept',
60
-            1728000);
59
+			'Authorization, Content-Type, Accept',
60
+			1728000);
61 61
 		$this->subscriptionService = $subscriptionService;
62 62
 	}
63 63
 
Please login to merge, or discard this patch.
lib/Controller/VoteController.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,6 @@
 block discarded – undo
45 45
 	 * @param string $appName
46 46
 	 * @param IRequest $request
47 47
 	 * @param VoteService $voteService
48
-
49 48
 	 */
50 49
 	public function __construct(
51 50
 		string $appName,
Please login to merge, or discard this patch.