Completed
Push — phpunit ( d909d7...1f30cc )
by Marcos
573:57 queued 562:54
created
controller/credentialcontroller.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 		);
85 85
 		$credential = $this->credentialService->createCredential($credential);
86 86
 		$link = ''; // @TODO create direct link to credential
87
-		if(!$credential->getHidden()) {
87
+		if (!$credential->getHidden()) {
88 88
 			$this->activityService->add(
89 89
 				Activity::SUBJECT_ITEM_CREATED_SELF, array($label, $this->userId),
90 90
 				'', array(),
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 
203 203
 			foreach ($acl_list as $sharingACL) {
204 204
 				$target_user = $sharingACL->getUserId();
205
-				if($target_user === $this->userId){
205
+				if ($target_user === $this->userId) {
206 206
 					continue;
207 207
 				}
208 208
 				$this->activityService->add(
@@ -217,15 +217,15 @@  discard block
 block discarded – undo
217 217
 					$link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION);
218 218
 			}
219 219
 		}
220
-		if($set_share_key === true){
220
+		if ($set_share_key === true) {
221 221
 			$storedCredential->setSharedKey($shared_key);
222 222
 			$credential['shared_key'] = $shared_key;
223 223
 		}
224
-		if($unshare_action === true){
224
+		if ($unshare_action === true) {
225 225
 			$storedCredential->setSharedKey('');
226 226
 			$credential['shared_key'] = '';
227 227
 		}
228
-		if(!$skip_revision) {
228
+		if (!$skip_revision) {
229 229
 			$this->credentialRevisionService->createRevision($storedCredential, $storedCredential->getUserId(), $credential_id, $this->userId);
230 230
 		}
231 231
 		$credential = $this->credentialService->updateCredential($credential);
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	    try {
259 259
             $credential = $this->credentialService->getCredentialByGUID($credential_guid);
260 260
         }
261
-        catch (DoesNotExistException $ex){
261
+        catch (DoesNotExistException $ex) {
262 262
             return new NotFoundJSONResponse();
263 263
         }
264 264
 
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
         }
269 269
         else {
270 270
             $acl = $this->sharingService->getACL($this->userId, $credential_guid);
271
-            if ($acl->hasPermission(SharingACL::HISTORY)){
271
+            if ($acl->hasPermission(SharingACL::HISTORY)) {
272 272
                 $result = $this->credentialRevisionService->getRevisions($credential->getId());
273 273
             }
274 274
             else {
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 	/**
291 291
 	 * @NoAdminRequired
292 292
 	 */
293
-	public function updateRevision($credential_guid, $revision_id, $credential_data){
293
+	public function updateRevision($credential_guid, $revision_id, $credential_data) {
294 294
 		$revision = null;
295 295
 		try {
296 296
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
@@ -298,9 +298,9 @@  discard block
 block discarded – undo
298 298
 			return new NotFoundJSONResponse();
299 299
 		}
300 300
 
301
-		try{
301
+		try {
302 302
 			$revision = $this->credentialRevisionService->getRevision($revision_id);
303
-		} catch(DoesNotExistException $exception){
303
+		} catch (DoesNotExistException $exception) {
304 304
 			return new NotFoundJSONResponse();
305 305
 		}
306 306
 
Please login to merge, or discard this patch.
lib/Db/SharingACLMapper.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
      * @param $item_guid
30 30
      * @return SharingACL[]
31 31
      */
32
-    public function getCredentialPermissions(IUser $userId, $item_guid){
33
-        $sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?";
32
+    public function getCredentialPermissions(IUser $userId, $item_guid) {
33
+        $sql = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND item_guid = ?";
34 34
 
35 35
         return $this->findEntities($sql, [$userId, $item_guid]);
36 36
     }
37 37
 
38
-    public function createACLEntry(SharingACL $acl){
38
+    public function createACLEntry(SharingACL $acl) {
39 39
         return $this->insert($acl);
40 40
     }
41 41
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
      * @return SharingACL[]
47 47
      */
48 48
     public function getVaultEntries($user_id, $vault_id) {
49
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
49
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?";
50 50
         return $this->findEntities($q, [$user_id, $vault_id]);
51 51
     }
52 52
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     public function getItemACL($user_id, $item_guid) {
60 60
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
61 61
         $filter = [$item_guid];
62
-        if ($user_id === null){
62
+        if ($user_id === null) {
63 63
             $q .= 'user_id is null';
64 64
         }
65 65
         else {
@@ -86,11 +86,11 @@  discard block
 block discarded – undo
86 86
      * @return SharingACL[]
87 87
      */
88 88
     public function getCredentialAclList($item_guid) {
89
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
89
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?";
90 90
         return $this->findEntities($q, [$item_guid]);
91 91
     }
92 92
 
93
-    public function deleteShareACL(SharingACL $ACL){
93
+    public function deleteShareACL(SharingACL $ACL) {
94 94
     	return $this->delete($ACL);
95 95
 	}
96 96
 }
97 97
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Service/CredentialService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		return $this->credentialMapper->upd($credential);
48 48
 	}
49 49
 
50
-	public function deleteCredential($credential){
50
+	public function deleteCredential($credential) {
51 51
 		return $this->credentialMapper->deleteCredential($credential);
52 52
 	}
53 53
 
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 		return $this->credentialMapper->getExpiredCredentials($timestamp);
65 65
 	}
66 66
 
67
-	public function getCredentialById($credential_id, $user_id){
67
+	public function getCredentialById($credential_id, $user_id) {
68 68
         $credential = $this->credentialMapper->getCredentialById($credential_id);
69
-        if ($credential->getUserId() === $user_id){
69
+        if ($credential->getUserId() === $user_id) {
70 70
             return $credential;
71 71
         }
72 72
         else {
@@ -77,11 +77,11 @@  discard block
 block discarded – undo
77 77
 
78 78
         throw new DoesNotExistException("Did expect one result but found none when executing");
79 79
 	}
80
-	public function getCredentialLabelById($credential_id){
80
+	public function getCredentialLabelById($credential_id) {
81 81
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
82 82
 	}
83 83
 
84
-	public function getCredentialByGUID($credential_guid, $user_id = null){
84
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
85 85
 	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
86 86
     }
87 87
 }
88 88
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Service/CronService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 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=?';
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 			$id = $credential->getId();
46 46
 			$query->bindParam(1, $id, \PDO::PARAM_INT);
47 47
 			$result = $query->execute();
48
-			$this->logger->debug($credential->getLabel() .' is expired, checking notifications!', array('app' => 'passman'));
49
-			if($result->fetchRow()['rows'] === 0) {
50
-				$this->logger->debug($credential->getLabel() .' is expired, adding notification!', array('app' => 'passman'));
48
+			$this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', array('app' => 'passman'));
49
+			if ($result->fetchRow()['rows'] === 0) {
50
+				$this->logger->debug($credential->getLabel() . ' is expired, adding notification!', array('app' => 'passman'));
51 51
 
52 52
 				$this->activityService->add(
53 53
 					Activity::SUBJECT_ITEM_EXPIRED, array($credential->getLabel(), $credential->getUserId()),
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 					$link, $credential->getUserId(), Activity::TYPE_ITEM_EXPIRED);
56 56
 				$this->notificationService->credentialExpiredNotification($credential);
57 57
 			} else {
58
-				$this->logger->debug($credential->getLabel() .' is expired, already notified!', array('app' => 'passman'));
58
+				$this->logger->debug($credential->getLabel() . ' is expired, already notified!', array('app' => 'passman'));
59 59
 			}
60 60
 
61 61
 		}
Please login to merge, or discard this patch.