Completed
Branch phpunit (bc0f47)
by Marcos
03:27 queued 52s
created
lib/Service/VaultService.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@
 block discarded – undo
47 47
 		return $this->vaultMapper->updateVault($vault);
48 48
 	}
49 49
 
50
-	public function setLastAccess($vault_id, $user_id){
50
+	public function setLastAccess($vault_id, $user_id) {
51 51
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
52 52
 	}
53 53
 
54
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
54
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
55 55
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
56 56
 	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@
 block discarded – undo
47 47
 		return $this->vaultMapper->updateVault($vault);
48 48
 	}
49 49
 
50
-	public function setLastAccess($vault_id, $user_id){
50
+	public function setLastAccess($vault_id, $user_id) {
51 51
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
52 52
 	}
53 53
 
54
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
54
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
55 55
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
56 56
 	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Service/ActivityService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,9 +49,9 @@
 block discarded – undo
49 49
 	 * @type = Can be passman_password or passman_password_shared
50 50
 	 * @priority = Int -> [10,20,30,40,50]
51 51
 	 */
52
-	public function add($subject,$subjectParams=array(),
53
-						$message='',$messageParams=array(),
54
-						$link='',$user=null,$type='') {
52
+	public function add($subject, $subjectParams = array(),
53
+						$message = '', $messageParams = array(),
54
+						$link = '', $user = null, $type = '') {
55 55
 		$activity = $this->manager->generateEvent();
56 56
 		$activity->setType($type);
57 57
 		$activity->setApp('passman');
Please login to merge, or discard this patch.
lib/Service/CredentialRevisionService.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,19 +30,19 @@
 block discarded – undo
30 30
 		return $this->credentialRevisionMapper->create($credential, $userId, $credential_id, $edited_by);
31 31
 	}
32 32
 
33
-	public function getRevisions($credential_id, $user_id = null){
33
+	public function getRevisions($credential_id, $user_id = null) {
34 34
 		return $this->credentialRevisionMapper->getRevisions($credential_id, $user_id);
35 35
 	}
36 36
 
37
-	public function getRevision($credential_id, $user_id = null){
37
+	public function getRevision($credential_id, $user_id = null) {
38 38
 		return $this->credentialRevisionMapper->getRevision($credential_id, $user_id);
39 39
 	}
40 40
 
41
-	public function deleteRevision($revision_id, $user_id){
41
+	public function deleteRevision($revision_id, $user_id) {
42 42
 		return $this->credentialRevisionMapper->deleteRevision($revision_id, $user_id);
43 43
 	}
44 44
 
45
-	public function updateRevision(CredentialRevision $credentialRevision){
45
+	public function updateRevision(CredentialRevision $credentialRevision) {
46 46
 		return $this->credentialRevisionMapper->update($credentialRevision);
47 47
 	}
48 48
 }
49 49
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,19 +30,19 @@
 block discarded – undo
30 30
 		return $this->credentialRevisionMapper->create($credential, $userId, $credential_id, $edited_by);
31 31
 	}
32 32
 
33
-	public function getRevisions($credential_id, $user_id = null){
33
+	public function getRevisions($credential_id, $user_id = null) {
34 34
 		return $this->credentialRevisionMapper->getRevisions($credential_id, $user_id);
35 35
 	}
36 36
 
37
-	public function getRevision($credential_id, $user_id = null){
37
+	public function getRevision($credential_id, $user_id = null) {
38 38
 		return $this->credentialRevisionMapper->getRevision($credential_id, $user_id);
39 39
 	}
40 40
 
41
-	public function deleteRevision($revision_id, $user_id){
41
+	public function deleteRevision($revision_id, $user_id) {
42 42
 		return $this->credentialRevisionMapper->deleteRevision($revision_id, $user_id);
43 43
 	}
44 44
 
45
-	public function updateRevision(CredentialRevision $credentialRevision){
45
+	public function updateRevision(CredentialRevision $credentialRevision) {
46 46
 		return $this->credentialRevisionMapper->update($credentialRevision);
47 47
 	}
48 48
 }
49 49
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Activity.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -241,7 +241,7 @@
 block discarded – undo
241 241
 				array(
242 242
 					'id' => 'passman',
243 243
 					'name' => (string) $l->t('Passwords'),
244
-					'url' => '',//FIXME: $this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
244
+					'url' => '', //FIXME: $this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
245 245
 				),
246 246
 			),
247 247
 		);
Please login to merge, or discard this patch.
lib/Db/CredentialMapper.php 3 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -44,18 +44,18 @@  discard block
 block discarded – undo
44 44
 		return $this->findEntities($sql, [$timestamp]);
45 45
 	}
46 46
 
47
-    /**
48
-     * @param $credential_id
49
-     * @param null $user_id
50
-     * @return Credential
51
-     */
47
+	/**
48
+	 * @param $credential_id
49
+	 * @param null $user_id
50
+	 * @return Credential
51
+	 */
52 52
 	public function getCredentialById($credential_id, $user_id = null){
53 53
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
54 54
 			'WHERE `id` = ?';
55
-        // If we want to check the owner, add it to the query
55
+		// If we want to check the owner, add it to the query
56 56
 		$params = [$credential_id];
57
-        if ($user_id !== null){
58
-        	$sql .= ' and `user_id` = ? ';
57
+		if ($user_id !== null){
58
+			$sql .= ' and `user_id` = ? ';
59 59
 			array_push($params, $user_id);
60 60
 		}
61 61
 		return $this->findEntity($sql,$params);
@@ -135,18 +135,18 @@  discard block
 block discarded – undo
135 135
 		$this->update($credential);
136 136
 	}
137 137
 
138
-    /**
139
-     * Finds a credential by the given guid
140
-     * @param $credential_guid
141
-     * @return Credential
142
-     */
138
+	/**
139
+	 * Finds a credential by the given guid
140
+	 * @param $credential_guid
141
+	 * @return Credential
142
+	 */
143 143
 	public function getCredentialByGUID($credential_guid, $user_id = null){
144
-	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
144
+		$q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
145 145
 		$params = [$credential_guid];
146 146
 		if ($user_id !== null){
147 147
 			$q .= ' and `user_id` = ? ';
148 148
 			array_push($params, $user_id);
149 149
 		}
150
-        return $this->findEntity($q, $params);
151
-    }
150
+		return $this->findEntity($q, $params);
151
+	}
152 152
 }
153 153
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		return $this->findEntities($sql, [$user_id, $vault_id]);
39 39
 	}
40 40
 
41
-	public function getExpiredCredentials($timestamp){
41
+	public function getExpiredCredentials($timestamp) {
42 42
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
43 43
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';
44 44
 		return $this->findEntities($sql, [$timestamp]);
@@ -49,25 +49,25 @@  discard block
 block discarded – undo
49 49
      * @param null $user_id
50 50
      * @return Credential
51 51
      */
52
-	public function getCredentialById($credential_id, $user_id = null){
52
+	public function getCredentialById($credential_id, $user_id = null) {
53 53
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
54 54
 			'WHERE `id` = ?';
55 55
         // If we want to check the owner, add it to the query
56 56
 		$params = [$credential_id];
57
-        if ($user_id !== null){
57
+        if ($user_id !== null) {
58 58
         	$sql .= ' and `user_id` = ? ';
59 59
 			array_push($params, $user_id);
60 60
 		}
61
-		return $this->findEntity($sql,$params);
61
+		return $this->findEntity($sql, $params);
62 62
 	}
63 63
 
64
-	public function getCredentialLabelById($credential_id){
64
+	public function getCredentialLabelById($credential_id) {
65 65
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
66 66
 			'WHERE `id` = ? ';
67
-		return $this->findEntity($sql,[$credential_id]);
67
+		return $this->findEntity($sql, [$credential_id]);
68 68
 	}
69 69
 
70
-	public function create($raw_credential){
70
+	public function create($raw_credential) {
71 71
 		$credential = new Credential();
72 72
 
73 73
 		$credential->setGuid($this->utils->GUID());
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
 		return parent::insert($credential);
95 95
 	}
96 96
 
97
-	public function updateCredential($raw_credential){
98
-		if(!$raw_credential['guid']){
99
-			$raw_credential['guid'] =  $this->utils->GUID();
97
+	public function updateCredential($raw_credential) {
98
+		if (!$raw_credential['guid']) {
99
+			$raw_credential['guid'] = $this->utils->GUID();
100 100
 		}
101
-		if(!$raw_credential['created']){
101
+		if (!$raw_credential['created']) {
102 102
 			$raw_credential['created'] = $this->utils->getTime();
103 103
 		}
104 104
 		$credential = new Credential();
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 		return parent::update($credential);
128 128
 	}
129 129
 
130
-	public function deleteCredential(Credential $credential){
130
+	public function deleteCredential(Credential $credential) {
131 131
 		$this->delete($credential);
132 132
 	}
133 133
 
134
-	public function upd(Credential $credential){
134
+	public function upd(Credential $credential) {
135 135
 		$this->update($credential);
136 136
 	}
137 137
 
@@ -140,10 +140,10 @@  discard block
 block discarded – undo
140 140
      * @param $credential_guid
141 141
      * @return Credential
142 142
      */
143
-	public function getCredentialByGUID($credential_guid, $user_id = null){
143
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
144 144
 	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
145 145
 		$params = [$credential_guid];
146
-		if ($user_id !== null){
146
+		if ($user_id !== null) {
147 147
 			$q .= ' and `user_id` = ? ';
148 148
 			array_push($params, $user_id);
149 149
 		}
Please login to merge, or discard this patch.
Braces   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		return $this->findEntities($sql, [$user_id, $vault_id]);
39 39
 	}
40 40
 
41
-	public function getExpiredCredentials($timestamp){
41
+	public function getExpiredCredentials($timestamp) {
42 42
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
43 43
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';
44 44
 		return $this->findEntities($sql, [$timestamp]);
@@ -49,25 +49,25 @@  discard block
 block discarded – undo
49 49
      * @param null $user_id
50 50
      * @return Credential
51 51
      */
52
-	public function getCredentialById($credential_id, $user_id = null){
52
+	public function getCredentialById($credential_id, $user_id = null) {
53 53
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
54 54
 			'WHERE `id` = ?';
55 55
         // If we want to check the owner, add it to the query
56 56
 		$params = [$credential_id];
57
-        if ($user_id !== null){
57
+        if ($user_id !== null) {
58 58
         	$sql .= ' and `user_id` = ? ';
59 59
 			array_push($params, $user_id);
60 60
 		}
61 61
 		return $this->findEntity($sql,$params);
62 62
 	}
63 63
 
64
-	public function getCredentialLabelById($credential_id){
64
+	public function getCredentialLabelById($credential_id) {
65 65
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
66 66
 			'WHERE `id` = ? ';
67 67
 		return $this->findEntity($sql,[$credential_id]);
68 68
 	}
69 69
 
70
-	public function create($raw_credential){
70
+	public function create($raw_credential) {
71 71
 		$credential = new Credential();
72 72
 
73 73
 		$credential->setGuid($this->utils->GUID());
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
 		return parent::insert($credential);
95 95
 	}
96 96
 
97
-	public function updateCredential($raw_credential){
98
-		if(!$raw_credential['guid']){
97
+	public function updateCredential($raw_credential) {
98
+		if(!$raw_credential['guid']) {
99 99
 			$raw_credential['guid'] =  $this->utils->GUID();
100 100
 		}
101
-		if(!$raw_credential['created']){
101
+		if(!$raw_credential['created']) {
102 102
 			$raw_credential['created'] = $this->utils->getTime();
103 103
 		}
104 104
 		$credential = new Credential();
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 		return parent::update($credential);
128 128
 	}
129 129
 
130
-	public function deleteCredential(Credential $credential){
130
+	public function deleteCredential(Credential $credential) {
131 131
 		$this->delete($credential);
132 132
 	}
133 133
 
134
-	public function upd(Credential $credential){
134
+	public function upd(Credential $credential) {
135 135
 		$this->update($credential);
136 136
 	}
137 137
 
@@ -140,10 +140,10 @@  discard block
 block discarded – undo
140 140
      * @param $credential_guid
141 141
      * @return Credential
142 142
      */
143
-	public function getCredentialByGUID($credential_guid, $user_id = null){
143
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
144 144
 	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
145 145
 		$params = [$credential_guid];
146
-		if ($user_id !== null){
146
+		if ($user_id !== null) {
147 147
 			$q .= ' and `user_id` = ? ';
148 148
 			array_push($params, $user_id);
149 149
 		}
Please login to merge, or discard this patch.
lib/Db/Vault.php 2 patches
Spacing   +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.
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/File.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 /**
16 16
  * @method integer getId()
17 17
  * @method void setId(integer $value)
18
-  * @method void setGuid(string $value)
18
+ * @method void setGuid(string $value)
19 19
  * @method string getGuid()
20 20
  * @method void setUserId(string $value)
21 21
  * @method string getUserid()
Please login to merge, or discard this patch.
Spacing   +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.
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 3 patches
Indentation   -3 removed lines patch added patch discarded remove patch
@@ -57,9 +57,6 @@
 block discarded – undo
57 57
  * @method string getHidden()
58 58
  * @method void setSharedKey(string $value)
59 59
  * @method string getSharedKey()
60
-
61
-
62
-
63 60
  */
64 61
 
65 62
 
Please login to merge, or discard this patch.
Spacing   +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.
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/CredentialRevisionMapper.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
30 30
 	public function getRevisions($credential_id, $user_id = null) {
31 31
 		$sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' .
32 32
 			'WHERE `credential_id` = ?';
33
-        $params = [$credential_id];
34
-        if ($user_id !== null) {
35
-            $sql.= ' and `user_id` = ? ';
36
-            $params[] = $user_id;
37
-        }
33
+		$params = [$credential_id];
34
+		if ($user_id !== null) {
35
+			$sql.= ' and `user_id` = ? ';
36
+			$params[] = $user_id;
37
+		}
38 38
 		return $this->findEntities($sql, $params);
39 39
 	}
40 40
 
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 	public function getRevision($revision_id, $user_id = null) {
47 47
 		$sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' .
48 48
 			'WHERE `id` = ?';
49
-        $params = [$revision_id];
50
-        if ($user_id !== null) {
51
-            $sql.= ' and `user_id` = ? ';
52
-            $params[] = $user_id;
53
-        }
49
+		$params = [$revision_id];
50
+		if ($user_id !== null) {
51
+			$sql.= ' and `user_id` = ? ';
52
+			$params[] = $user_id;
53
+		}
54 54
 		return $this->findEntity($sql, $params);
55 55
 	}
56 56
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 			'WHERE `credential_id` = ?';
33 33
         $params = [$credential_id];
34 34
         if ($user_id !== null) {
35
-            $sql.= ' and `user_id` = ? ';
35
+            $sql .= ' and `user_id` = ? ';
36 36
             $params[] = $user_id;
37 37
         }
38 38
 		return $this->findEntities($sql, $params);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 			'WHERE `id` = ?';
49 49
         $params = [$revision_id];
50 50
         if ($user_id !== null) {
51
-            $sql.= ' and `user_id` = ? ';
51
+            $sql .= ' and `user_id` = ? ';
52 52
             $params[] = $user_id;
53 53
         }
54 54
 		return $this->findEntity($sql, $params);
Please login to merge, or discard this patch.