Completed
Push — master ( 0f80c8...3e88ff )
by Sander
13s
created
lib/Service/CredentialService.php 3 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
 	/**
83 83
 	 * Get credentials by vault id
84
-	 * @param $vault_id
84
+	 * @param integer $vault_id
85 85
 	 * @param $user_id
86 86
 	 * @return \OCA\Passman\Db\Vault[]
87 87
 	 */
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
 	/**
93 93
 	 * Get a random credential from given vault
94
-	 * @param $vault_id
94
+	 * @param integer $vault_id
95 95
 	 * @param $user_id
96 96
 	 * @return mixed
97 97
 	 */
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 
103 103
 	/**
104 104
 	 * Get expired credentials.
105
-	 * @param $timestamp
105
+	 * @param integer $timestamp
106 106
 	 * @return \OCA\Passman\Db\Credential[]
107 107
 	 */
108 108
 	public function getExpiredCredentials($timestamp) {
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
 	/**
134 134
 	 * Get credential label by credential id.
135
-	 * @param $credential_id
135
+	 * @param integer $credential_id
136 136
 	 * @return Credential
137 137
 	 */
138 138
 	public function getCredentialLabelById($credential_id){
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 * @param Credential $credential
76 76
 	 * @return \OCP\AppFramework\Db\Entity
77 77
 	 */
78
-	public function deleteCredential(Credential $credential){
78
+	public function deleteCredential(Credential $credential) {
79 79
 		return $this->credentialMapper->deleteCredential($credential);
80 80
 	}
81 81
 
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 	 * @return Credential
117 117
 	 * @throws DoesNotExistException
118 118
 	 */
119
-	public function getCredentialById($credential_id, $user_id){
119
+	public function getCredentialById($credential_id, $user_id) {
120 120
         $credential = $this->credentialMapper->getCredentialById($credential_id);
121
-        if ($credential->getUserId() === $user_id){
121
+        if ($credential->getUserId() === $user_id) {
122 122
             return $credential;
123 123
         }
124 124
         else {
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	 * @param $credential_id
136 136
 	 * @return Credential
137 137
 	 */
138
-	public function getCredentialLabelById($credential_id){
138
+	public function getCredentialLabelById($credential_id) {
139 139
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
140 140
 	}
141 141
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	 * @param null $user_id
146 146
 	 * @return Credential
147 147
 	 */
148
-	public function getCredentialByGUID($credential_guid, $user_id = null){
148
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
149 149
 	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
150 150
     }
151 151
 }
152 152
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 * @param Credential $credential
76 76
 	 * @return \OCP\AppFramework\Db\Entity
77 77
 	 */
78
-	public function deleteCredential(Credential $credential){
78
+	public function deleteCredential(Credential $credential) {
79 79
 		return $this->credentialMapper->deleteCredential($credential);
80 80
 	}
81 81
 
@@ -116,12 +116,11 @@  discard block
 block discarded – undo
116 116
 	 * @return Credential
117 117
 	 * @throws DoesNotExistException
118 118
 	 */
119
-	public function getCredentialById($credential_id, $user_id){
119
+	public function getCredentialById($credential_id, $user_id) {
120 120
         $credential = $this->credentialMapper->getCredentialById($credential_id);
121
-        if ($credential->getUserId() === $user_id){
121
+        if ($credential->getUserId() === $user_id) {
122 122
             return $credential;
123
-        }
124
-        else {
123
+        } else {
125 124
             $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
126 125
             if ($acl->hasPermission(SharingACL::READ));
127 126
             return $credential;
@@ -135,7 +134,7 @@  discard block
 block discarded – undo
135 134
 	 * @param $credential_id
136 135
 	 * @return Credential
137 136
 	 */
138
-	public function getCredentialLabelById($credential_id){
137
+	public function getCredentialLabelById($credential_id) {
139 138
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
140 139
 	}
141 140
 
@@ -145,7 +144,7 @@  discard block
 block discarded – undo
145 144
 	 * @param null $user_id
146 145
 	 * @return Credential
147 146
 	 */
148
-	public function getCredentialByGUID($credential_guid, $user_id = null){
147
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
149 148
 	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
150 149
     }
151 150
 }
152 151
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Db/CredentialMapper.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -73,20 +73,20 @@  discard block
 block discarded – undo
73 73
 		return $this->findEntities($sql, [$timestamp]);
74 74
 	}
75 75
 
76
-    /**
76
+	/**
77 77
 	 * Get an credential by id.
78 78
 	 * Optional user id
79
-     * @param $credential_id
80
-     * @param null $user_id
81
-     * @return Credential
82
-     */
79
+	 * @param $credential_id
80
+	 * @param null $user_id
81
+	 * @return Credential
82
+	 */
83 83
 	public function getCredentialById($credential_id, $user_id = null){
84 84
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
85 85
 			'WHERE `id` = ?';
86
-        // If we want to check the owner, add it to the query
86
+		// If we want to check the owner, add it to the query
87 87
 		$params = [$credential_id];
88
-        if ($user_id !== null){
89
-        	$sql .= ' and `user_id` = ? ';
88
+		if ($user_id !== null){
89
+			$sql .= ' and `user_id` = ? ';
90 90
 			array_push($params, $user_id);
91 91
 		}
92 92
 		return $this->findEntity($sql,$params);
@@ -176,18 +176,18 @@  discard block
 block discarded – undo
176 176
 		$this->update($credential);
177 177
 	}
178 178
 
179
-    /**
180
-     * Finds a credential by the given guid
181
-     * @param $credential_guid
182
-     * @return Credential
183
-     */
179
+	/**
180
+	 * Finds a credential by the given guid
181
+	 * @param $credential_guid
182
+	 * @return Credential
183
+	 */
184 184
 	public function getCredentialByGUID($credential_guid, $user_id = null){
185
-	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
185
+		$q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
186 186
 		$params = [$credential_guid];
187 187
 		if ($user_id !== null){
188 188
 			$q .= ' and `user_id` = ? ';
189 189
 			array_push($params, $user_id);
190 190
 		}
191
-        return $this->findEntity($q, $params);
192
-    }
191
+		return $this->findEntity($q, $params);
192
+	}
193 193
 }
194 194
\ No newline at end of file
Please login to merge, or discard this patch.