Inspection of "Phpunit" - nextcloud/passman - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#84)

by Marcos

created 2016-10-12 17:09 UTC

Status

Indentation +50 added lines, -50 removed lines patch added patch discarded remove patch

@@ -37,58 +37,58 @@
 block discarded – undo
 
 class ShareRequest extends PermissionEntity implements \JsonSerializable {
 
-    protected
-        $itemId,
-        $itemGuid,
-        $targetUserId,
-        $targetVaultId,
-        $targetVaultGuid,
-        $sharedKey,
-        $permissions,
-        $created,
+	protected
+		$itemId,
+		$itemGuid,
+		$targetUserId,
+		$targetVaultId,
+		$targetVaultGuid,
+		$sharedKey,
+		$permissions,
+		$created,
 		$fromUserId;
 
-    public function __construct() {
-        // add types in constructor
-        $this->addType('itemId', 'integer');
-        $this->addType('vaultId', 'integer');
-        $this->addType('permissions', 'integer');
-    }
+	public function __construct() {
+		// add types in constructor
+		$this->addType('itemId', 'integer');
+		$this->addType('vaultId', 'integer');
+		$this->addType('permissions', 'integer');
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return [
-            'req_id' => $this->getId(),
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'target_user_id' => $this->getTargetUserId(),
-            'target_vault_id' => $this->getTargetVaultId(),
-            'target_vault_guid' => $this->getTargetVaultGuid(),
-            'from_user_id' => $this->getFromUserId(),
-            'shared_key' => $this->getSharedKey(),
-            'permissions' => $this->getPermissions(),
-            'created' => $this->getCreated(),
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 * which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	function jsonSerialize()
+	{
+		return [
+			'req_id' => $this->getId(),
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'target_user_id' => $this->getTargetUserId(),
+			'target_vault_id' => $this->getTargetVaultId(),
+			'target_vault_guid' => $this->getTargetVaultGuid(),
+			'from_user_id' => $this->getFromUserId(),
+			'shared_key' => $this->getSharedKey(),
+			'permissions' => $this->getPermissions(),
+			'created' => $this->getCreated(),
+		];
+	}
 
-    function asACLJson(){
-        return [
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'user_id' => $this->getTargetUserId(),
-            'created' => $this->getCreated(),
-            'permissions' => $this->getPermissions(),
-            'vault_id' => $this->getTargetVaultId(),
-            'vault_guid' => $this->getTargetVaultGuid(),
-            'shared_key' => $this->getSharedKey(),
-            'pending'   => true,
-        ];
-    }
+	function asACLJson(){
+		return [
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'user_id' => $this->getTargetUserId(),
+			'created' => $this->getCreated(),
+			'permissions' => $this->getPermissions(),
+			'vault_id' => $this->getTargetVaultId(),
+			'vault_guid' => $this->getTargetVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending'   => true,
+		];
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

lib/Db/SharingACLMapper.php 3 patches

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
         parent::__construct($db, 'passman_sharing_acl');
     }
 
-    public function createACLEntry(SharingACL $acl){
+    public function createACLEntry(SharingACL $acl) {
         return $this->insert($acl);
     }
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
      * @return SharingACL[]
      */
     public function getVaultEntries($user_id, $vault_id) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?";
         return $this->findEntities($q, [$user_id, $vault_id]);
     }
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
     public function getItemACL($user_id, $item_guid) {
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
         $filter = [$item_guid];
-        if ($user_id === null){
+        if ($user_id === null) {
             $q .= 'user_id is null';
         }
         else {
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
      * @return SharingACL[]
      */
     public function getCredentialAclList($item_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?";
         return $this->findEntities($q, [$item_guid]);
     }
 
-    public function deleteShareACL(SharingACL $ACL){
+    public function deleteShareACL(SharingACL $ACL) {
     	return $this->delete($ACL);
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +4 added lines, -5 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
         parent::__construct($db, 'passman_sharing_acl');
     }
 
-    public function createACLEntry(SharingACL $acl){
+    public function createACLEntry(SharingACL $acl) {
         return $this->insert($acl);
     }
 
@@ -46,10 +46,9 @@  discard block
 block discarded – undo
     public function getItemACL($user_id, $item_guid) {
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
         $filter = [$item_guid];
-        if ($user_id === null){
+        if ($user_id === null) {
             $q .= 'user_id is null';
-        }
-        else {
+        } else {
             $q .= 'user_id = ? ';
             $filter[] = $user_id;
         }
@@ -77,7 +76,7 @@  discard block
 block discarded – undo
         return $this->findEntities($q, [$item_guid]);
     }
 
-    public function deleteShareACL(SharingACL $ACL){
+    public function deleteShareACL(SharingACL $ACL) {
     	return $this->delete($ACL);
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

@@ -16,68 +16,68 @@
 block discarded – undo
 use OCA\Passman\Utility\Utils;
 
 class SharingACLMapper extends Mapper {
-    const TABLE_NAME = '*PREFIX*passman_sharing_acl';
+	const TABLE_NAME = '*PREFIX*passman_sharing_acl';
 
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'passman_sharing_acl');
-    }
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'passman_sharing_acl');
+	}
 
-    public function createACLEntry(SharingACL $acl){
-        return $this->insert($acl);
-    }
+	public function createACLEntry(SharingACL $acl){
+		return $this->insert($acl);
+	}
 
-    /**
-     * Gets the currently accepted share requests from the given user for the given vault guid
-     * @param $user_id
-     * @param $vault_guid
-     * @return SharingACL[]
-     */
-    public function getVaultEntries($user_id, $vault_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
-        return $this->findEntities($q, [$user_id, $vault_guid]);
-    }
+	/**
+	 * Gets the currently accepted share requests from the given user for the given vault guid
+	 * @param $user_id
+	 * @param $vault_guid
+	 * @return SharingACL[]
+	 */
+	public function getVaultEntries($user_id, $vault_guid) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
+		return $this->findEntities($q, [$user_id, $vault_guid]);
+	}
 
-    /**
-     * Gets the acl for a given item guid
-     * @param $user_id
-     * @param $item_guid
-     * @return SharingACL
-     */
-    public function getItemACL($user_id, $item_guid) {
-        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
-        $filter = [$item_guid];
-        if ($user_id === null){
-            $q .= 'user_id is null';
-        }
-        else {
-            $q .= 'user_id = ? ';
-            $filter[] = $user_id;
-        }
-        return $this->findEntity($q, $filter);
-    }
+	/**
+	 * Gets the acl for a given item guid
+	 * @param $user_id
+	 * @param $item_guid
+	 * @return SharingACL
+	 */
+	public function getItemACL($user_id, $item_guid) {
+		$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
+		$filter = [$item_guid];
+		if ($user_id === null){
+			$q .= 'user_id is null';
+		}
+		else {
+			$q .= 'user_id = ? ';
+			$filter[] = $user_id;
+		}
+		return $this->findEntity($q, $filter);
+	}
 
-    /**
-     * Update the acl for a given item guid
-     * @param $user_id
-     * @param $item_guid
-     * @return SharingACL
-     */
-    public function updateCredentialACL(SharingACL $sharingACL) {
-        return $this->update($sharingACL);
-    }
+	/**
+	 * Update the acl for a given item guid
+	 * @param $user_id
+	 * @param $item_guid
+	 * @return SharingACL
+	 */
+	public function updateCredentialACL(SharingACL $sharingACL) {
+		return $this->update($sharingACL);
+	}
 
-    /**
-     * Gets the currently accepted share requests from the given user for the given vault guid
-     * @param $user_id
-     * @param $vault_id
-     * @return SharingACL[]
-     */
-    public function getCredentialAclList($item_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
-        return $this->findEntities($q, [$item_guid]);
-    }
+	/**
+	 * Gets the currently accepted share requests from the given user for the given vault guid
+	 * @param $user_id
+	 * @param $vault_id
+	 * @return SharingACL[]
+	 */
+	public function getCredentialAclList($item_guid) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
+		return $this->findEntities($q, [$item_guid]);
+	}
 
-    public function deleteShareACL(SharingACL $ACL){
-    	return $this->delete($ACL);
+	public function deleteShareACL(SharingACL $ACL){
+		return $this->delete($ACL);
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	parent::__construct($db, 'passman_sharing_acl');
23	23	}
24	24
25		- public function createACLEntry(SharingACL $acl){
	25	+ public function createACLEntry(SharingACL $acl) {
26	26	return $this->insert($acl);
27	27	}
28	28
		@@ -46,10 +46,9 @@ discard block
		block discarded – undo
46	46	public function getItemACL($user_id, $item_guid) {
47	47	$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
48	48	$filter = [$item_guid];
49		- if ($user_id === null){
	49	+ if ($user_id === null) {
50	50	$q .= 'user_id is null';
51		- }
52		- else {
	51	+ } else {
53	52	$q .= 'user_id = ? ';
54	53	$filter[] = $user_id;
55	54	}
		@@ -77,7 +76,7 @@ discard block
		block discarded – undo
77	76	return $this->findEntities($q, [$item_guid]);
78	77	}
79	78
80		- public function deleteShareACL(SharingACL $ACL){
	79	+ public function deleteShareACL(SharingACL $ACL) {
81	80	return $this->delete($ACL);
82	81	}
83	82	}
84	83	\ No newline at end of file

		@@ -37,58 +37,58 @@
		block discarded – undo
37	37
38	38	class ShareRequest extends PermissionEntity implements \JsonSerializable {
39	39
40		- protected
41		- $itemId,
42		- $itemGuid,
43		- $targetUserId,
44		- $targetVaultId,
45		- $targetVaultGuid,
46		- $sharedKey,
47		- $permissions,
48		- $created,
	40	+ protected
	41	+ $itemId,
	42	+ $itemGuid,
	43	+ $targetUserId,
	44	+ $targetVaultId,
	45	+ $targetVaultGuid,
	46	+ $sharedKey,
	47	+ $permissions,
	48	+ $created,
49	49	$fromUserId;
50	50
51		- public function __construct() {
52		- // add types in constructor
53		- $this->addType('itemId', 'integer');
54		- $this->addType('vaultId', 'integer');
55		- $this->addType('permissions', 'integer');
56		- }
	51	+ public function __construct() {
	52	+ // add types in constructor
	53	+ $this->addType('itemId', 'integer');
	54	+ $this->addType('vaultId', 'integer');
	55	+ $this->addType('permissions', 'integer');
	56	+ }
57	57
58		- /**
59		- * Specify data which should be serialized to JSON
60		- * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
61		- * @return mixed data which can be serialized by <b>json_encode</b>,
62		- * which is a value of any type other than a resource.
63		- * @since 5.4.0
64		- */
65		- function jsonSerialize()
66		- {
67		- return [
68		- 'req_id' => $this->getId(),
69		- 'item_id' => $this->getItemId(),
70		- 'item_guid' => $this->getItemGuid(),
71		- 'target_user_id' => $this->getTargetUserId(),
72		- 'target_vault_id' => $this->getTargetVaultId(),
73		- 'target_vault_guid' => $this->getTargetVaultGuid(),
74		- 'from_user_id' => $this->getFromUserId(),
75		- 'shared_key' => $this->getSharedKey(),
76		- 'permissions' => $this->getPermissions(),
77		- 'created' => $this->getCreated(),
78		- ];
79		- }
	58	+ /**
	59	+ * Specify data which should be serialized to JSON
	60	+ * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
	61	+ * @return mixed data which can be serialized by <b>json_encode</b>,
	62	+ * which is a value of any type other than a resource.
	63	+ * @since 5.4.0
	64	+ */
	65	+ function jsonSerialize()
	66	+ {
	67	+ return [
	68	+ 'req_id' => $this->getId(),
	69	+ 'item_id' => $this->getItemId(),
	70	+ 'item_guid' => $this->getItemGuid(),
	71	+ 'target_user_id' => $this->getTargetUserId(),
	72	+ 'target_vault_id' => $this->getTargetVaultId(),
	73	+ 'target_vault_guid' => $this->getTargetVaultGuid(),
	74	+ 'from_user_id' => $this->getFromUserId(),
	75	+ 'shared_key' => $this->getSharedKey(),
	76	+ 'permissions' => $this->getPermissions(),
	77	+ 'created' => $this->getCreated(),
	78	+ ];
	79	+ }
80	80
81		- function asACLJson(){
82		- return [
83		- 'item_id' => $this->getItemId(),
84		- 'item_guid' => $this->getItemGuid(),
85		- 'user_id' => $this->getTargetUserId(),
86		- 'created' => $this->getCreated(),
87		- 'permissions' => $this->getPermissions(),
88		- 'vault_id' => $this->getTargetVaultId(),
89		- 'vault_guid' => $this->getTargetVaultGuid(),
90		- 'shared_key' => $this->getSharedKey(),
91		- 'pending' => true,
92		- ];
93		- }
	81	+ function asACLJson(){
	82	+ return [
	83	+ 'item_id' => $this->getItemId(),
	84	+ 'item_guid' => $this->getItemGuid(),
	85	+ 'user_id' => $this->getTargetUserId(),
	86	+ 'created' => $this->getCreated(),
	87	+ 'permissions' => $this->getPermissions(),
	88	+ 'vault_id' => $this->getTargetVaultId(),
	89	+ 'vault_guid' => $this->getTargetVaultGuid(),
	90	+ 'shared_key' => $this->getSharedKey(),
	91	+ 'pending' => true,
	92	+ ];
	93	+ }
94	94	}
95	95	\ No newline at end of file

		@@ -16,68 +16,68 @@
		block discarded – undo
16	16	use OCA\Passman\Utility\Utils;
17	17
18	18	class SharingACLMapper extends Mapper {
19		- const TABLE_NAME = 'PREFIXpassman_sharing_acl';
	19	+ const TABLE_NAME = 'PREFIXpassman_sharing_acl';
20	20
21		- public function __construct(IDBConnection $db) {
22		- parent::__construct($db, 'passman_sharing_acl');
23		- }
	21	+ public function __construct(IDBConnection $db) {
	22	+ parent::__construct($db, 'passman_sharing_acl');
	23	+ }
24	24
25		- public function createACLEntry(SharingACL $acl){
26		- return $this->insert($acl);
27		- }
	25	+ public function createACLEntry(SharingACL $acl){
	26	+ return $this->insert($acl);
	27	+ }
28	28
29		- /**
30		- * Gets the currently accepted share requests from the given user for the given vault guid
31		- * @param $user_id
32		- * @param $vault_guid
33		- * @return SharingACL[]
34		- */
35		- public function getVaultEntries($user_id, $vault_guid) {
36		- $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
37		- return $this->findEntities($q, [$user_id, $vault_guid]);
38		- }
	29	+ /**
	30	+ * Gets the currently accepted share requests from the given user for the given vault guid
	31	+ * @param $user_id
	32	+ * @param $vault_guid
	33	+ * @return SharingACL[]
	34	+ */
	35	+ public function getVaultEntries($user_id, $vault_guid) {
	36	+ $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
	37	+ return $this->findEntities($q, [$user_id, $vault_guid]);
	38	+ }
39	39
40		- /**
41		- * Gets the acl for a given item guid
42		- * @param $user_id
43		- * @param $item_guid
44		- * @return SharingACL
45		- */
46		- public function getItemACL($user_id, $item_guid) {
47		- $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
48		- $filter = [$item_guid];
49		- if ($user_id === null){
50		- $q .= 'user_id is null';
51		- }
52		- else {
53		- $q .= 'user_id = ? ';
54		- $filter[] = $user_id;
55		- }
56		- return $this->findEntity($q, $filter);
57		- }
	40	+ /**
	41	+ * Gets the acl for a given item guid
	42	+ * @param $user_id
	43	+ * @param $item_guid
	44	+ * @return SharingACL
	45	+ */
	46	+ public function getItemACL($user_id, $item_guid) {
	47	+ $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
	48	+ $filter = [$item_guid];
	49	+ if ($user_id === null){
	50	+ $q .= 'user_id is null';
	51	+ }
	52	+ else {
	53	+ $q .= 'user_id = ? ';
	54	+ $filter[] = $user_id;
	55	+ }
	56	+ return $this->findEntity($q, $filter);
	57	+ }
58	58
59		- /**
60		- * Update the acl for a given item guid
61		- * @param $user_id
62		- * @param $item_guid
63		- * @return SharingACL
64		- */
65		- public function updateCredentialACL(SharingACL $sharingACL) {
66		- return $this->update($sharingACL);
67		- }
	59	+ /**
	60	+ * Update the acl for a given item guid
	61	+ * @param $user_id
	62	+ * @param $item_guid
	63	+ * @return SharingACL
	64	+ */
	65	+ public function updateCredentialACL(SharingACL $sharingACL) {
	66	+ return $this->update($sharingACL);
	67	+ }
68	68
69		- /**
70		- * Gets the currently accepted share requests from the given user for the given vault guid
71		- * @param $user_id
72		- * @param $vault_id
73		- * @return SharingACL[]
74		- */
75		- public function getCredentialAclList($item_guid) {
76		- $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
77		- return $this->findEntities($q, [$item_guid]);
78		- }
	69	+ /**
	70	+ * Gets the currently accepted share requests from the given user for the given vault guid
	71	+ * @param $user_id
	72	+ * @param $vault_id
	73	+ * @return SharingACL[]
	74	+ */
	75	+ public function getCredentialAclList($item_guid) {
	76	+ $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
	77	+ return $this->findEntities($q, [$item_guid]);
	78	+ }
79	79
80		- public function deleteShareACL(SharingACL $ACL){
81		- return $this->delete($ACL);
	80	+ public function deleteShareACL(SharingACL $ACL){
	81	+ return $this->delete($ACL);
82	82	}
83	83	}
84	84	\ No newline at end of file

nextcloud / passman

Pull Request — master (#84)

Status

Category

Indentation +50 added lines, -50 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Braces +4 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch