Failed Conditions
Pull Request — master (#309)
by Sander
04:37
created
lib/Service/ShareService.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,6 +49,7 @@  discard block
 block discarded – undo
49 49
 	 * @param $target_item_guid string      The shared item GUID
50 50
 	 * @param $request_array    array
51 51
 	 * @param $permissions      integer     Must be created with a bitmask from options on the ShareRequest class
52
+	 * @param string $credential_owner
52 53
 	 * @return array                        Array of sharing requests
53 54
 	 */
54 55
 	public function createBulkRequests($target_item_id, $target_item_guid, $request_array, $permissions, $credential_owner) {
@@ -253,7 +254,6 @@  discard block
 block discarded – undo
253 254
 	/**
254 255
 	 * Delete ACL
255 256
 	 *
256
-	 * @param  ShareRequest $request
257 257
 	 * @return \OCA\Passman\Db\ShareRequest[]
258 258
 	 */
259 259
 	public function deleteShareACL(SharingACL $ACL) {
@@ -277,7 +277,6 @@  discard block
 block discarded – undo
277 277
 	/**
278 278
 	 * Get pending share requests by guid and uid
279 279
 	 *
280
-	 * @param  ShareRequest $request
281 280
 	 * @return \OCA\Passman\Db\ShareRequest[]
282 281
 	 */
283 282
 	public function getPendingShareRequestsForCredential($item_guid, $user_id) {
Please login to merge, or discard this patch.
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -90,7 +90,9 @@  discard block
 block discarded – undo
90 90
 	}
91 91
 
92 92
 	public function createACLEntry(SharingACL $acl) {
93
-		if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp());
93
+		if ($acl->getCreated() === null) {
94
+			$acl->setCreated((new \DateTime())->getTimestamp());
95
+		}
94 96
 		return $this->sharingACL->createACLEntry($acl);
95 97
 	}
96 98
 
@@ -143,13 +145,17 @@  discard block
 block discarded – undo
143 145
 		$return = [];
144 146
 		foreach ($entries as $entry) {
145 147
 			// Check if the user can read the credential, probably unnecesary, but just to be sure
146
-			if (!$entry->hasPermission(SharingACL::READ)) continue;
148
+			if (!$entry->hasPermission(SharingACL::READ)) {
149
+				continue;
150
+			}
147 151
 			$tmp = $entry->jsonSerialize();
148 152
 			$credential = $this->credential->getCredentialById($entry->getItemId());
149 153
 			$credential = $this->encryptService->decryptCredential($credential);
150 154
 			$tmp['credential_data'] = $credential->jsonSerialize();
151 155
 
152
-			if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
156
+			if (!$entry->hasPermission(SharingACL::FILES)) {
157
+				unset($tmp['credential_data']['files']);
158
+			}
153 159
 			unset($tmp['credential_data']['shared_key']);
154 160
 			$return[] = $tmp;
155 161
 		}
@@ -171,7 +177,9 @@  discard block
 block discarded – undo
171 177
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
172 178
 
173 179
 		// Check if the user can read the credential, probably unnecesary, but just to be sure
174
-		if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level");
180
+		if (!$acl->hasPermission(SharingACL::READ)) {
181
+			throw new DoesNotExistException("Item not found or wrong access level");
182
+		}
175 183
 
176 184
 		$tmp = $acl->jsonSerialize();
177 185
 		$credential = $this->credential->getCredentialById($acl->getItemId());
@@ -179,7 +187,9 @@  discard block
 block discarded – undo
179 187
 
180 188
 		$tmp['credential_data'] = $credential->jsonSerialize();
181 189
 
182
-		if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
190
+		if (!$acl->hasPermission(SharingACL::FILES)) {
191
+			unset($tmp['credential_data']['files']);
192
+		}
183 193
 		unset($tmp['credential_data']['shared_key']);
184 194
 
185 195
 		return $tmp;
@@ -194,7 +204,9 @@  discard block
 block discarded – undo
194 204
 	 */
195 205
 	public function getItemHistory($user_id, $item_guid) {
196 206
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
197
-		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return [];
207
+		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) {
208
+			return [];
209
+		}
198 210
 
199 211
 		return $this->revisions->getRevisions($acl->getItemId());
200 212
 	}
Please login to merge, or discard this patch.
lib/Service/NotificationService.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		$this->manager = \OC::$server->getNotificationManager();
26 26
 	}
27 27
 
28
-	function credentialExpiredNotification($credential){
28
+	function credentialExpiredNotification($credential) {
29 29
 		$urlGenerator = \OC::$server->getURLGenerator();
30 30
 		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId()));
31 31
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 	}
52 52
 
53 53
 
54
-	function credentialSharedNotification($data){
54
+	function credentialSharedNotification($data) {
55 55
 		$urlGenerator = \OC::$server->getURLGenerator();
56 56
 		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/'));
57 57
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	}
74 74
 
75 75
 
76
-	function credentialDeclinedSharedNotification($data){
76
+	function credentialDeclinedSharedNotification($data) {
77 77
 		$notification = $this->manager->createNotification();
78 78
 		$notification->setApp('passman')
79 79
 			->setUser($data['target_user'])
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	}
85 85
 
86 86
 
87
-	function credentialAcceptedSharedNotification($data){
87
+	function credentialAcceptedSharedNotification($data) {
88 88
 		$notification = $this->manager->createNotification();
89 89
 		$notification->setApp('passman')
90 90
 			->setUser($data['target_user'])
Please login to merge, or discard this patch.
lib/Db/SharingACL.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,8 +35,7 @@  discard block
 block discarded – undo
35 35
  * @method string getSharedKey()
36 36
  */
37 37
 
38
-class SharingACL extends PermissionEntity implements \JsonSerializable
39
-{
38
+class SharingACL extends PermissionEntity implements \JsonSerializable {
40 39
 
41 40
     protected
42 41
         $itemId,
@@ -67,8 +66,7 @@  discard block
 block discarded – undo
67 66
      * which is a value of any type other than a resource.
68 67
      * @since 5.4.0
69 68
      */
70
-    function jsonSerialize()
71
-    {
69
+    function jsonSerialize() {
72 70
         return [
73 71
             'acl_id' => $this->getId(),
74 72
             'item_id' => $this->getItemId(),
Please login to merge, or discard this patch.
lib/Db/File.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
  */
33 33
 
34 34
 
35
-class File extends Entity implements  \JsonSerializable{
35
+class File extends Entity implements  \JsonSerializable {
36 36
 
37 37
 	use EntityJSONSerializer;
38 38
 
Please login to merge, or discard this patch.
lib/Db/Credential.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
  */
64 64
 
65 65
 
66
-class Credential extends Entity implements  \JsonSerializable{
66
+class Credential extends Entity implements  \JsonSerializable {
67 67
 
68 68
 	use EntityJSONSerializer;
69 69
 
Please login to merge, or discard this patch.
lib/Db/Vault.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
  */
37 37
 
38 38
 
39
-class Vault extends Entity implements  \JsonSerializable{
39
+class Vault extends Entity implements  \JsonSerializable {
40 40
 
41 41
 	use EntityJSONSerializer;
42 42
 
Please login to merge, or discard this patch.
lib/Db/ShareRequest.php 1 patch
Braces   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -62,8 +62,7 @@  discard block
 block discarded – undo
62 62
      * which is a value of any type other than a resource.
63 63
      * @since 5.4.0
64 64
      */
65
-    function jsonSerialize()
66
-    {
65
+    function jsonSerialize() {
67 66
         return [
68 67
             'req_id' => $this->getId(),
69 68
             'item_id' => $this->getItemId(),
@@ -78,7 +77,7 @@  discard block
 block discarded – undo
78 77
         ];
79 78
     }
80 79
 
81
-    function asACLJson(){
80
+    function asACLJson() {
82 81
         return [
83 82
             'item_id' => $this->getItemId(),
84 83
             'item_guid' => $this->getItemGuid(),
Please login to merge, or discard this patch.
controller/pagecontroller.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 	private $userId;
23 23
 
24
-	public function __construct($AppName, IRequest $request, $UserId){
24
+	public function __construct($AppName, IRequest $request, $UserId) {
25 25
 		parent::__construct($AppName, $request);
26 26
 		$this->userId = $UserId;
27 27
 	}
Please login to merge, or discard this patch.
lib/Service/CronService.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	public function expireCredentials() {
38 38
 		$this->logger->info('Passman cron test', array('app' => 'passman'));
39 39
 		$expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime());
40
-		foreach($expired_credentials as $credential){
40
+		foreach($expired_credentials as $credential) {
41 41
 			$link = ''; // @TODO create direct link to credential
42 42
 
43 43
 			$sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?';
Please login to merge, or discard this patch.