Failed Conditions
Pull Request — master (#220)
by Sander
16:05 queued 05:59
created
lib/Service/ShareService.php 1 patch
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.
lib/Db/SharingACL.php 1 patch
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -38,50 +38,50 @@
 block discarded – undo
38 38
 class SharingACL extends PermissionEntity implements \JsonSerializable
39 39
 {
40 40
 
41
-    protected
42
-        $itemId,
43
-        $itemGuid,
44
-        $userId,
45
-        $created,
46
-        $expire,
41
+	protected
42
+		$itemId,
43
+		$itemGuid,
44
+		$userId,
45
+		$created,
46
+		$expire,
47 47
 		$expireViews,
48
-        $permissions,
49
-        $vaultId,
50
-        $vaultGuid,
51
-        $sharedKey;
48
+		$permissions,
49
+		$vaultId,
50
+		$vaultGuid,
51
+		$sharedKey;
52 52
 
53 53
 
54
-    public function __construct() {
55
-        // add types in constructor
56
-        $this->addType('itemId', 'integer');
57
-        $this->addType('created', 'integer');
58
-        $this->addType('expire', 'integer');
59
-        $this->addType('expireViews', 'integer');
60
-        $this->addType('permissions', 'integer');
61
-    }
54
+	public function __construct() {
55
+		// add types in constructor
56
+		$this->addType('itemId', 'integer');
57
+		$this->addType('created', 'integer');
58
+		$this->addType('expire', 'integer');
59
+		$this->addType('expireViews', 'integer');
60
+		$this->addType('permissions', 'integer');
61
+	}
62 62
 
63
-    /**
64
-     * Specify data which should be serialized to JSON
65
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
66
-     * @return mixed data which can be serialized by <b>json_encode</b>,
67
-     * which is a value of any type other than a resource.
68
-     * @since 5.4.0
69
-     */
70
-    function jsonSerialize()
71
-    {
72
-        return [
73
-            'acl_id' => $this->getId(),
74
-            'item_id' => $this->getItemId(),
75
-            'item_guid' => $this->getItemGuid(),
76
-            'user_id' => $this->getUserId(),
77
-            'created' => $this->getCreated(),
78
-            'expire' => $this->getExpire(),
79
-            'expire_views' => $this->getExpireViews(),
80
-            'permissions' => $this->getPermissions(),
81
-            'vault_id' => $this->getVaultId(),
82
-            'vault_guid' => $this->getVaultGuid(),
83
-            'shared_key' => $this->getSharedKey(),
84
-            'pending' => false,
85
-        ];
86
-    }
63
+	/**
64
+	 * Specify data which should be serialized to JSON
65
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
66
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
67
+	 * which is a value of any type other than a resource.
68
+	 * @since 5.4.0
69
+	 */
70
+	function jsonSerialize()
71
+	{
72
+		return [
73
+			'acl_id' => $this->getId(),
74
+			'item_id' => $this->getItemId(),
75
+			'item_guid' => $this->getItemGuid(),
76
+			'user_id' => $this->getUserId(),
77
+			'created' => $this->getCreated(),
78
+			'expire' => $this->getExpire(),
79
+			'expire_views' => $this->getExpireViews(),
80
+			'permissions' => $this->getPermissions(),
81
+			'vault_id' => $this->getVaultId(),
82
+			'vault_guid' => $this->getVaultGuid(),
83
+			'shared_key' => $this->getSharedKey(),
84
+			'pending' => false,
85
+		];
86
+	}
87 87
 }
88 88
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Db/File.php 1 patch
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.
lib/Db/Credential.php 1 patch
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.
lib/Db/CredentialRevisionMapper.php 1 patch
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.
lib/Db/CredentialRevision.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	protected $userId;
39 39
 	protected $created;
40 40
 	protected $credentialData;
41
-    protected $editedBy;
41
+	protected $editedBy;
42 42
 
43 43
 
44 44
 	public function __construct() {
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 			'guid' => $this->getGuid(),
57 57
 			'created' => $this->getCreated(),
58 58
 			'credential_data' => json_decode(base64_decode($this->getCredentialData())),
59
-            'edited_by' => $this->getEditedBy(),
59
+			'edited_by' => $this->getEditedBy(),
60 60
 		];
61 61
 	}
62 62
 }
63 63
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Utility/NotFoundJSONResponse.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@
 block discarded – undo
14 14
 
15 15
 class NotFoundJSONResponse extends JSONResponse {
16 16
 
17
-    /**
18
-     * Creates a new json response with a not found status code.
19
-     * @param array $response_data
20
-     */
21
-    public function __construct($response_data = []) {
22
-        parent::__construct($response_data, Http::STATUS_NOT_FOUND);
23
-    }
17
+	/**
18
+	 * Creates a new json response with a not found status code.
19
+	 * @param array $response_data
20
+	 */
21
+	public function __construct($response_data = []) {
22
+		parent::__construct($response_data, Http::STATUS_NOT_FOUND);
23
+	}
24 24
 }
25 25
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Utility/Utils.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,10 +12,10 @@  discard block
 block discarded – undo
12 12
 namespace OCA\Passman\Utility;
13 13
 
14 14
 class Utils {
15
-    /**
16
-     * Gets the unix epoch UTC timestamp
17
-     * @return int
18
-     */
15
+	/**
16
+	 * Gets the unix epoch UTC timestamp
17
+	 * @return int
18
+	 */
19 19
 	public static function getTime() {
20 20
 		return (new \DateTime())->getTimestamp();
21 21
 	}
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
 		return $secs . substr($millisecs, 2, 6);
28 28
 	}
29 29
 
30
-    /**
31
-     * Generates a Globally Unique ID
32
-     * @return string
33
-     */
30
+	/**
31
+	 * Generates a Globally Unique ID
32
+	 * @return string
33
+	 */
34 34
 	public static function GUID() {
35 35
 		if (function_exists('com_create_guid') === true)
36 36
 		{
Please login to merge, or discard this patch.
appinfo/routes.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -52,19 +52,19 @@
 block discarded – undo
52 52
 		//Sharing stuff
53 53
 		['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'],
54 54
 		['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'],
55
-        ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
56
-        ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
57
-        ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
58
-        ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
59
-        ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
60
-        ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
61
-        ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
62
-        ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
63
-        ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
64
-        ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
65
-        ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
66
-        ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
67
-        ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
55
+		['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
56
+		['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
57
+		['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
58
+		['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
59
+		['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
60
+		['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
61
+		['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
62
+		['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
63
+		['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
64
+		['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
65
+		['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
66
+		['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
67
+		['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
68 68
 
69 69
 		//Internal API
70 70
 		['name' => 'internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'],
Please login to merge, or discard this patch.