Inspection of "Merge pull request #22043 from nextcloud/fix/21892..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( e19bbc...21095b )

by Morris

created 2020-07-31 08:14 UTC

Status

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

@@ -35,140 +35,140 @@
 block discarded – undo
  * @package OCA\User_LDAP\PagedResults
  */
 class Php73 implements IAdapter {
-	use TLinkId;
-
-	/** @var array */
-	protected $linkData = [];
-
-	public function getResponseCallFunc(): string {
-		return 'ldap_parse_result';
-	}
-
-	public function responseCall($link): bool {
-		$linkId = $this->getLinkId($link);
-		return ldap_parse_result(...$this->linkData[$linkId]['responseArgs']);
-	}
-
-	public function getResponseCallArgs(array $originalArgs): array {
-		$link = array_shift($originalArgs);
-		$linkId = $this->getLinkId($link);
-
-		if (!isset($this->linkData[$linkId])) {
-			$this->linkData[$linkId] = [];
-		}
-
-		$this->linkData[$linkId]['responseErrorCode'] = 0;
-		$this->linkData[$linkId]['responseErrorMessage'] = '';
-		$this->linkData[$linkId]['serverControls'] = [];
-		$matchedDn = null;
-		$referrals = [];
-
-		$this->linkData[$linkId]['responseArgs'] = [
-			$link,
-			array_shift($originalArgs),
-			&$this->linkData[$linkId]['responseErrorCode'],
-			$matchedDn,
-			&$this->linkData[$linkId]['responseErrorMessage'],
-			$referrals,
-			&$this->linkData[$linkId]['serverControls']
-		];
-
-
-		return $this->linkData[$linkId]['responseArgs'];
-	}
-
-	public function getCookie($link): string {
-		$linkId = $this->getLinkId($link);
-		return $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
-	}
-
-	private function resetCookie(int $linkId): void {
-		if (isset($this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'])) {
-			$this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] = '';
-		}
-	}
-
-	public function getRequestCallFunc(): ?string {
-		return null;
-	}
-
-	public function setRequestParameters($link, int $pageSize, bool $isCritical): void {
-		$linkId = $this->getLinkId($link);
-		if (!isset($this->linkData[$linkId])) {
-			$this->linkData[$linkId] = [];
-		}
-		$this->linkData[$linkId]['requestArgs'] = [];
-		$this->linkData[$linkId]['requestArgs']['pageSize'] = $pageSize;
-		$this->linkData[$linkId]['requestArgs']['isCritical'] = $isCritical;
-
-		if ($pageSize === 0) {
-			$this->resetCookie($linkId);
-		}
-	}
-
-	public function getRequestCallArgs($link): array {
-		// no separate call
-		return [];
-	}
-
-	public function requestCall($link): bool {
-		// no separate call
-		return false;
-	}
-
-	public function setSearchArgs(
-		$link,
-		string $baseDN,
-		string $filter,
-		array $attr,
-		int $attrsOnly,
-		int $limit
-	): void {
-		$linkId = $this->getLinkId($link);
-		if (!isset($this->linkData[$linkId])) {
-			$this->linkData[$linkId] = [];
-		}
-
-		$this->linkData[$linkId]['searchArgs'] = func_get_args();
-		$this->preparePagesResultsArgs($linkId, 'searchArgs');
-	}
-
-	public function getSearchArgs($link): array {
-		$linkId = $this->getLinkId($link);
-		return $this->linkData[$linkId]['searchArgs'];
-	}
-
-	public function setReadArgs($link, string $baseDN, string $filter, array $attr): void {
-		$linkId = $this->getLinkId($link);
-		if (!isset($this->linkData[$linkId])) {
-			$this->linkData[$linkId] = [];
-		}
-
-		$this->linkData[$linkId]['readArgs'] = func_get_args();
-		$this->linkData[$linkId]['readArgs'][] = 0; // $attrsonly default
-		$this->linkData[$linkId]['readArgs'][] = -1; // $sizelimit default
-	}
-
-	public function getReadArgs($link): array {
-		$linkId = $this->getLinkId($link);
-		return $this->linkData[$linkId]['readArgs'];
-	}
-
-	protected function preparePagesResultsArgs(int $linkId, string $methodKey): void {
-		if (!isset($this->linkData[$linkId]['requestArgs'])) {
-			return;
-		}
-
-		$serverControls = [[
-			'oid' => LDAP_CONTROL_PAGEDRESULTS,
-			'value' => [
-				'size' => $this->linkData[$linkId]['requestArgs']['pageSize'],
-				'cookie' => $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '',
-			]
-		]];
-
-		$this->linkData[$linkId][$methodKey][] = -1; // timelimit
-		$this->linkData[$linkId][$methodKey][] = LDAP_DEREF_NEVER;
-		$this->linkData[$linkId][$methodKey][] = $serverControls;
-	}
+    use TLinkId;
+
+    /** @var array */
+    protected $linkData = [];
+
+    public function getResponseCallFunc(): string {
+        return 'ldap_parse_result';
+    }
+
+    public function responseCall($link): bool {
+        $linkId = $this->getLinkId($link);
+        return ldap_parse_result(...$this->linkData[$linkId]['responseArgs']);
+    }
+
+    public function getResponseCallArgs(array $originalArgs): array {
+        $link = array_shift($originalArgs);
+        $linkId = $this->getLinkId($link);
+
+        if (!isset($this->linkData[$linkId])) {
+            $this->linkData[$linkId] = [];
+        }
+
+        $this->linkData[$linkId]['responseErrorCode'] = 0;
+        $this->linkData[$linkId]['responseErrorMessage'] = '';
+        $this->linkData[$linkId]['serverControls'] = [];
+        $matchedDn = null;
+        $referrals = [];
+
+        $this->linkData[$linkId]['responseArgs'] = [
+            $link,
+            array_shift($originalArgs),
+            &$this->linkData[$linkId]['responseErrorCode'],
+            $matchedDn,
+            &$this->linkData[$linkId]['responseErrorMessage'],
+            $referrals,
+            &$this->linkData[$linkId]['serverControls']
+        ];
+
+
+        return $this->linkData[$linkId]['responseArgs'];
+    }
+
+    public function getCookie($link): string {
+        $linkId = $this->getLinkId($link);
+        return $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
+    }
+
+    private function resetCookie(int $linkId): void {
+        if (isset($this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'])) {
+            $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] = '';
+        }
+    }
+
+    public function getRequestCallFunc(): ?string {
+        return null;
+    }
+
+    public function setRequestParameters($link, int $pageSize, bool $isCritical): void {
+        $linkId = $this->getLinkId($link);
+        if (!isset($this->linkData[$linkId])) {
+            $this->linkData[$linkId] = [];
+        }
+        $this->linkData[$linkId]['requestArgs'] = [];
+        $this->linkData[$linkId]['requestArgs']['pageSize'] = $pageSize;
+        $this->linkData[$linkId]['requestArgs']['isCritical'] = $isCritical;
+
+        if ($pageSize === 0) {
+            $this->resetCookie($linkId);
+        }
+    }
+
+    public function getRequestCallArgs($link): array {
+        // no separate call
+        return [];
+    }
+
+    public function requestCall($link): bool {
+        // no separate call
+        return false;
+    }
+
+    public function setSearchArgs(
+        $link,
+        string $baseDN,
+        string $filter,
+        array $attr,
+        int $attrsOnly,
+        int $limit
+    ): void {
+        $linkId = $this->getLinkId($link);
+        if (!isset($this->linkData[$linkId])) {
+            $this->linkData[$linkId] = [];
+        }
+
+        $this->linkData[$linkId]['searchArgs'] = func_get_args();
+        $this->preparePagesResultsArgs($linkId, 'searchArgs');
+    }
+
+    public function getSearchArgs($link): array {
+        $linkId = $this->getLinkId($link);
+        return $this->linkData[$linkId]['searchArgs'];
+    }
+
+    public function setReadArgs($link, string $baseDN, string $filter, array $attr): void {
+        $linkId = $this->getLinkId($link);
+        if (!isset($this->linkData[$linkId])) {
+            $this->linkData[$linkId] = [];
+        }
+
+        $this->linkData[$linkId]['readArgs'] = func_get_args();
+        $this->linkData[$linkId]['readArgs'][] = 0; // $attrsonly default
+        $this->linkData[$linkId]['readArgs'][] = -1; // $sizelimit default
+    }
+
+    public function getReadArgs($link): array {
+        $linkId = $this->getLinkId($link);
+        return $this->linkData[$linkId]['readArgs'];
+    }
+
+    protected function preparePagesResultsArgs(int $linkId, string $methodKey): void {
+        if (!isset($this->linkData[$linkId]['requestArgs'])) {
+            return;
+        }
+
+        $serverControls = [[
+            'oid' => LDAP_CONTROL_PAGEDRESULTS,
+            'value' => [
+                'size' => $this->linkData[$linkId]['requestArgs']['pageSize'],
+                'cookie' => $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '',
+            ]
+        ]];
+
+        $this->linkData[$linkId][$methodKey][] = -1; // timelimit
+        $this->linkData[$linkId][$methodKey][] = LDAP_DEREF_NEVER;
+        $this->linkData[$linkId][$methodKey][] = $serverControls;
+    }
 }

Please login to merge, or discard this patch.

		@@ -35,140 +35,140 @@
		block discarded – undo
35	35	* @package OCA\User_LDAP\PagedResults
36	36	*/
37	37	class Php73 implements IAdapter {
38		- use TLinkId;
39		-
40		- /** @var array */
41		- protected $linkData = [];
42		-
43		- public function getResponseCallFunc(): string {
44		- return 'ldap_parse_result';
45		- }
46		-
47		- public function responseCall($link): bool {
48		- $linkId = $this->getLinkId($link);
49		- return ldap_parse_result(...$this->linkData[$linkId]['responseArgs']);
50		- }
51		-
52		- public function getResponseCallArgs(array $originalArgs): array {
53		- $link = array_shift($originalArgs);
54		- $linkId = $this->getLinkId($link);
55		-
56		- if (!isset($this->linkData[$linkId])) {
57		- $this->linkData[$linkId] = [];
58		- }
59		-
60		- $this->linkData[$linkId]['responseErrorCode'] = 0;
61		- $this->linkData[$linkId]['responseErrorMessage'] = '';
62		- $this->linkData[$linkId]['serverControls'] = [];
63		- $matchedDn = null;
64		- $referrals = [];
65		-
66		- $this->linkData[$linkId]['responseArgs'] = [
67		- $link,
68		- array_shift($originalArgs),
69		- &$this->linkData[$linkId]['responseErrorCode'],
70		- $matchedDn,
71		- &$this->linkData[$linkId]['responseErrorMessage'],
72		- $referrals,
73		- &$this->linkData[$linkId]['serverControls']
74		- ];
75		-
76		-
77		- return $this->linkData[$linkId]['responseArgs'];
78		- }
79		-
80		- public function getCookie($link): string {
81		- $linkId = $this->getLinkId($link);
82		- return $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
83		- }
84		-
85		- private function resetCookie(int $linkId): void {
86		- if (isset($this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'])) {
87		- $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] = '';
88		- }
89		- }
90		-
91		- public function getRequestCallFunc(): ?string {
92		- return null;
93		- }
94		-
95		- public function setRequestParameters($link, int $pageSize, bool $isCritical): void {
96		- $linkId = $this->getLinkId($link);
97		- if (!isset($this->linkData[$linkId])) {
98		- $this->linkData[$linkId] = [];
99		- }
100		- $this->linkData[$linkId]['requestArgs'] = [];
101		- $this->linkData[$linkId]['requestArgs']['pageSize'] = $pageSize;
102		- $this->linkData[$linkId]['requestArgs']['isCritical'] = $isCritical;
103		-
104		- if ($pageSize === 0) {
105		- $this->resetCookie($linkId);
106		- }
107		- }
108		-
109		- public function getRequestCallArgs($link): array {
110		- // no separate call
111		- return [];
112		- }
113		-
114		- public function requestCall($link): bool {
115		- // no separate call
116		- return false;
117		- }
118		-
119		- public function setSearchArgs(
120		- $link,
121		- string $baseDN,
122		- string $filter,
123		- array $attr,
124		- int $attrsOnly,
125		- int $limit
126		- ): void {
127		- $linkId = $this->getLinkId($link);
128		- if (!isset($this->linkData[$linkId])) {
129		- $this->linkData[$linkId] = [];
130		- }
131		-
132		- $this->linkData[$linkId]['searchArgs'] = func_get_args();
133		- $this->preparePagesResultsArgs($linkId, 'searchArgs');
134		- }
135		-
136		- public function getSearchArgs($link): array {
137		- $linkId = $this->getLinkId($link);
138		- return $this->linkData[$linkId]['searchArgs'];
139		- }
140		-
141		- public function setReadArgs($link, string $baseDN, string $filter, array $attr): void {
142		- $linkId = $this->getLinkId($link);
143		- if (!isset($this->linkData[$linkId])) {
144		- $this->linkData[$linkId] = [];
145		- }
146		-
147		- $this->linkData[$linkId]['readArgs'] = func_get_args();
148		- $this->linkData[$linkId]['readArgs'][] = 0; // $attrsonly default
149		- $this->linkData[$linkId]['readArgs'][] = -1; // $sizelimit default
150		- }
151		-
152		- public function getReadArgs($link): array {
153		- $linkId = $this->getLinkId($link);
154		- return $this->linkData[$linkId]['readArgs'];
155		- }
156		-
157		- protected function preparePagesResultsArgs(int $linkId, string $methodKey): void {
158		- if (!isset($this->linkData[$linkId]['requestArgs'])) {
159		- return;
160		- }
161		-
162		- $serverControls = [[
163		- 'oid' => LDAP_CONTROL_PAGEDRESULTS,
164		- 'value' => [
165		- 'size' => $this->linkData[$linkId]['requestArgs']['pageSize'],
166		- 'cookie' => $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '',
167		- ]
168		- ]];
169		-
170		- $this->linkData[$linkId][$methodKey][] = -1; // timelimit
171		- $this->linkData[$linkId][$methodKey][] = LDAP_DEREF_NEVER;
172		- $this->linkData[$linkId][$methodKey][] = $serverControls;
173		- }
	38	+ use TLinkId;
	39	+
	40	+ /** @var array */
	41	+ protected $linkData = [];
	42	+
	43	+ public function getResponseCallFunc(): string {
	44	+ return 'ldap_parse_result';
	45	+ }
	46	+
	47	+ public function responseCall($link): bool {
	48	+ $linkId = $this->getLinkId($link);
	49	+ return ldap_parse_result(...$this->linkData[$linkId]['responseArgs']);
	50	+ }
	51	+
	52	+ public function getResponseCallArgs(array $originalArgs): array {
	53	+ $link = array_shift($originalArgs);
	54	+ $linkId = $this->getLinkId($link);
	55	+
	56	+ if (!isset($this->linkData[$linkId])) {
	57	+ $this->linkData[$linkId] = [];
	58	+ }
	59	+
	60	+ $this->linkData[$linkId]['responseErrorCode'] = 0;
	61	+ $this->linkData[$linkId]['responseErrorMessage'] = '';
	62	+ $this->linkData[$linkId]['serverControls'] = [];
	63	+ $matchedDn = null;
	64	+ $referrals = [];
	65	+
	66	+ $this->linkData[$linkId]['responseArgs'] = [
	67	+ $link,
	68	+ array_shift($originalArgs),
	69	+ &$this->linkData[$linkId]['responseErrorCode'],
	70	+ $matchedDn,
	71	+ &$this->linkData[$linkId]['responseErrorMessage'],
	72	+ $referrals,
	73	+ &$this->linkData[$linkId]['serverControls']
	74	+ ];
	75	+
	76	+
	77	+ return $this->linkData[$linkId]['responseArgs'];
	78	+ }
	79	+
	80	+ public function getCookie($link): string {
	81	+ $linkId = $this->getLinkId($link);
	82	+ return $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
	83	+ }
	84	+
	85	+ private function resetCookie(int $linkId): void {
	86	+ if (isset($this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'])) {
	87	+ $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] = '';
	88	+ }
	89	+ }
	90	+
	91	+ public function getRequestCallFunc(): ?string {
	92	+ return null;
	93	+ }
	94	+
	95	+ public function setRequestParameters($link, int $pageSize, bool $isCritical): void {
	96	+ $linkId = $this->getLinkId($link);
	97	+ if (!isset($this->linkData[$linkId])) {
	98	+ $this->linkData[$linkId] = [];
	99	+ }
	100	+ $this->linkData[$linkId]['requestArgs'] = [];
	101	+ $this->linkData[$linkId]['requestArgs']['pageSize'] = $pageSize;
	102	+ $this->linkData[$linkId]['requestArgs']['isCritical'] = $isCritical;
	103	+
	104	+ if ($pageSize === 0) {
	105	+ $this->resetCookie($linkId);
	106	+ }
	107	+ }
	108	+
	109	+ public function getRequestCallArgs($link): array {
	110	+ // no separate call
	111	+ return [];
	112	+ }
	113	+
	114	+ public function requestCall($link): bool {
	115	+ // no separate call
	116	+ return false;
	117	+ }
	118	+
	119	+ public function setSearchArgs(
	120	+ $link,
	121	+ string $baseDN,
	122	+ string $filter,
	123	+ array $attr,
	124	+ int $attrsOnly,
	125	+ int $limit
	126	+ ): void {
	127	+ $linkId = $this->getLinkId($link);
	128	+ if (!isset($this->linkData[$linkId])) {
	129	+ $this->linkData[$linkId] = [];
	130	+ }
	131	+
	132	+ $this->linkData[$linkId]['searchArgs'] = func_get_args();
	133	+ $this->preparePagesResultsArgs($linkId, 'searchArgs');
	134	+ }
	135	+
	136	+ public function getSearchArgs($link): array {
	137	+ $linkId = $this->getLinkId($link);
	138	+ return $this->linkData[$linkId]['searchArgs'];
	139	+ }
	140	+
	141	+ public function setReadArgs($link, string $baseDN, string $filter, array $attr): void {
	142	+ $linkId = $this->getLinkId($link);
	143	+ if (!isset($this->linkData[$linkId])) {
	144	+ $this->linkData[$linkId] = [];
	145	+ }
	146	+
	147	+ $this->linkData[$linkId]['readArgs'] = func_get_args();
	148	+ $this->linkData[$linkId]['readArgs'][] = 0; // $attrsonly default
	149	+ $this->linkData[$linkId]['readArgs'][] = -1; // $sizelimit default
	150	+ }
	151	+
	152	+ public function getReadArgs($link): array {
	153	+ $linkId = $this->getLinkId($link);
	154	+ return $this->linkData[$linkId]['readArgs'];
	155	+ }
	156	+
	157	+ protected function preparePagesResultsArgs(int $linkId, string $methodKey): void {
	158	+ if (!isset($this->linkData[$linkId]['requestArgs'])) {
	159	+ return;
	160	+ }
	161	+
	162	+ $serverControls = [[
	163	+ 'oid' => LDAP_CONTROL_PAGEDRESULTS,
	164	+ 'value' => [
	165	+ 'size' => $this->linkData[$linkId]['requestArgs']['pageSize'],
	166	+ 'cookie' => $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '',
	167	+ ]
	168	+ ]];
	169	+
	170	+ $this->linkData[$linkId][$methodKey][] = -1; // timelimit
	171	+ $this->linkData[$linkId][$methodKey][] = LDAP_DEREF_NEVER;
	172	+ $this->linkData[$linkId][$methodKey][] = $serverControls;
	173	+ }
174	174	}

nextcloud / server

Push — master ( e19bbc...21095b )

Status

Category

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