Completed
Pull Request — master (#109)
by Sander
03:15
created
lib/Db/Vault.php 1 patch
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.
lib/Db/File.php 1 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.
lib/Db/Credential.php 1 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.
lib/Db/CredentialRevisionMapper.php 1 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.
lib/Db/ShareRequestMapper.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         $this->utils = $utils;
23 23
     }
24 24
 
25
-    public function createRequest(ShareRequest $request){
25
+    public function createRequest(ShareRequest $request) {
26 26
         return $this->insert($request);
27 27
     }
28 28
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      * @param $target_vault_guid
33 33
      * @return ShareRequest
34 34
      */
35
-    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
35
+    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) {
36 36
         $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
37 37
         return $this->findEntity($q, [$item_guid, $target_vault_guid]);
38 38
     }
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      * @param $item_guid
43 43
      * @return ShareRequest[]
44 44
      */
45
-    public function getRequestsByItemGuid($item_guid){
45
+    public function getRequestsByItemGuid($item_guid) {
46 46
         $this->db->executeQuery("SET sql_mode = '';");
47 47
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
48 48
         return $this->findEntities($q, [$item_guid]);
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
      * @param $target_user_id   The target user
55 55
      * @return \PDOStatement    The result of running the db query
56 56
      */
57
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
57
+    public function cleanItemRequestsForUser($item_id, $target_user_id) {
58 58
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
59 59
 		$this->execute($q, [$item_id, $target_user_id]);
60 60
         return $this->execute($q, [$item_id, $target_user_id]);
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
      * @param $user_id
66 66
      * @return ShareRequest[]
67 67
      */
68
-    public function getUserPendingRequests($user_id){
69
-        $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
68
+    public function getUserPendingRequests($user_id) {
69
+        $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?";
70 70
         return $this->findEntities($q, [$user_id]);
71 71
     }
72 72
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
      * @param ShareRequest $shareRequest    Request to delete
76 76
      * @return ShareRequest                 The deleted request
77 77
      */
78
-    public function deleteShareRequest(ShareRequest $shareRequest){
78
+    public function deleteShareRequest(ShareRequest $shareRequest) {
79 79
     	return $this->delete($shareRequest);
80 80
 	}
81 81
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
      * @param $id
85 85
      * @return ShareRequest
86 86
      */
87
-	public function getShareRequestById($id){
87
+	public function getShareRequestById($id) {
88 88
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
89 89
 		return $this->findEntity($q, [$id]);
90 90
 	}
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
      * @param $item_guid
95 95
      * @return ShareRequest[]
96 96
      */
97
-	public function getShareRequestsByItemGuid($item_guid){
97
+	public function getShareRequestsByItemGuid($item_guid) {
98 98
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
99 99
 		return $this->findEntities($q, [$item_guid]);
100 100
 	}
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      * @param ShareRequest $shareRequest
105 105
      * @return ShareRequest
106 106
      */
107
-	public function updateShareRequest(ShareRequest $shareRequest){
107
+	public function updateShareRequest(ShareRequest $shareRequest) {
108 108
 		return $this->update($shareRequest);
109 109
 	}
110 110
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
      * @param $user_id
115 115
      * @return ShareRequest[]
116 116
      */
117
-	public function getPendingShareRequests($item_guid, $user_id){
117
+	public function getPendingShareRequests($item_guid, $user_id) {
118 118
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
119 119
 		return $this->findEntities($q, [$item_guid, $user_id]);
120 120
 	}
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
      * @param $permissions      The new permissions to apply
127 127
      * @return \PDOStatement    The result of the operation
128 128
      */
129
-	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){
129
+	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions) {
130 130
 	    $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
131 131
         return $this->execute($q, [$permissions, $item_guid, $user_id]);
132 132
     }
Please login to merge, or discard this patch.
lib/Db/VaultMapper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
49 49
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
50 50
 	 * @return Vault
51 51
 	 */
52
-	public function findVaultsFromUser($userId){
52
+	public function findVaultsFromUser($userId) {
53 53
 		$sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' .
54 54
 			'WHERE `user_id` = ? ';
55 55
 		$params = [$userId];
56 56
 		return $this->findEntities($sql, $params);
57 57
 	}
58 58
 
59
-	public function create($vault_name, $userId){
59
+	public function create($vault_name, $userId) {
60 60
 		$vault = new Vault();
61 61
 		$vault->setName($vault_name);
62 62
 		$vault->setUserId($userId);
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		return parent::insert($vault);
67 67
 	}
68 68
 
69
-	public function setLastAccess($vault_id, $user_id){
69
+	public function setLastAccess($vault_id, $user_id) {
70 70
 		$vault = new Vault();
71 71
 		$vault->setId($vault_id);
72 72
 		$vault->setUserId($user_id);
@@ -74,11 +74,11 @@  discard block
 block discarded – undo
74 74
 		$this->update($vault);
75 75
 	}
76 76
 
77
-	public function updateVault(Vault $vault){
77
+	public function updateVault(Vault $vault) {
78 78
 		$this->update($vault);
79 79
 	}
80 80
 
81
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
81
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
82 82
 		$vault = new Vault();
83 83
 		$vault->setId($vault_id);
84 84
 		$vault->setPrivateSharingKey($privateKey);
Please login to merge, or discard this patch.
lib/Db/ShareRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
         ];
79 79
     }
80 80
 
81
-    function asACLJson(){
81
+    function asACLJson() {
82 82
         return [
83 83
             'item_id' => $this->getItemId(),
84 84
             'item_guid' => $this->getItemGuid(),
Please login to merge, or discard this patch.
lib/Db/EntityJSONSerializer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 trait EntityJSONSerializer {
13 13
 	public function serializeFields($properties) {
14 14
 		$result = [];
15
-		foreach($properties as $property) {
15
+		foreach ($properties as $property) {
16 16
 			$result[$property] = $this->$property;
17 17
 		}
18 18
 		return $result;
Please login to merge, or discard this patch.
lib/Utility/PermissionEntity.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@
 block discarded – undo
13 13
 use OCP\AppFramework\Db\Entity;
14 14
 
15 15
 class PermissionEntity extends Entity {
16
-    CONST READ  =   0b00000001;
17
-    CONST WRITE =   0b00000010;
18
-    CONST FILES =   0b00000100;
16
+    CONST READ  = 0b00000001;
17
+    CONST WRITE = 0b00000010;
18
+    CONST FILES = 0b00000100;
19 19
     CONST HISTORY = 0b00001000;
20
-    CONST OWNER =   0b10000000;
20
+    CONST OWNER = 0b10000000;
21 21
 
22 22
     /**
23 23
      * Checks wether a user matches one or more permissions at once
Please login to merge, or discard this patch.