Inspection of "Merge pull request #54737 from nextcloud/feat/text..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 6ee282...61bb2d )

by Marcel

created 2025-09-01 11:36 UTC

Status

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 	/**
 	 * @throws Exception
 	 */
-	private function updateMimetypes($updatedMimetypes): IResult|int|null {
+	private function updateMimetypes($updatedMimetypes): IResult | int | null {
 		if ($this->dryRun) {
 			$this->changeCount += count($updatedMimetypes);
 			return null;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
 		if (empty($this->folderMimeTypeId)) {
 			$query->setParameter('mimetype', 'httpd/unix-directory');
 			$result = $query->execute();
-			$this->folderMimeTypeId = (int)$result->fetchOne();
+			$this->folderMimeTypeId = (int) $result->fetchOne();
 			$result->closeCursor();
 		}
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 			// get target mimetype id
 			$query->setParameter('mimetype', $mimetype);
 			$result = $query->execute();
-			$mimetypeId = (int)$result->fetchOne();
+			$mimetypeId = (int) $result->fetchOne();
 			$result->closeCursor();
 
 			if (!$mimetypeId) {
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 
 			// change mimetype for files with x extension
 			$update->setParameter('mimetype', $mimetypeId)
-				->setParameter('name', '%' . $this->connection->escapeLikeParameter('.' . $extension));
+				->setParameter('name', '%'.$this->connection->escapeLikeParameter('.'.$extension));
 			$count += $update->execute();
 		}
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 12.0.0.14
 	 */
-	private function introduceImageTypes(): IResult|int|null {
+	private function introduceImageTypes(): IResult | int | null {
 		$updatedMimetypes = [
 			'jp2' => 'image/jp2',
 			'webp' => 'image/webp',
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 12.0.0.13
 	 */
-	private function introduceWindowsProgramTypes(): IResult|int|null {
+	private function introduceWindowsProgramTypes(): IResult | int | null {
 		$updatedMimetypes = [
 			'htaccess' => 'text/plain',
 			'bat' => 'application/x-msdos-program',
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 13.0.0.0
 	 */
-	private function introduceLocationTypes(): IResult|int|null {
+	private function introduceLocationTypes(): IResult | int | null {
 		$updatedMimetypes = [
 			'gpx' => 'application/gpx+xml',
 			'kml' => 'application/vnd.google-earth.kml+xml',
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 13.0.0.3
 	 */
-	private function introduceInternetShortcutTypes(): IResult|int|null {
+	private function introduceInternetShortcutTypes(): IResult | int | null {
 		$updatedMimetypes = [
 			'url' => 'application/internet-shortcut',
 			'webloc' => 'application/internet-shortcut'
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 13.0.0.6
 	 */
-	private function introduceStreamingTypes(): IResult|int|null {
+	private function introduceStreamingTypes(): IResult | int | null {
 		$updatedMimetypes = [
 			'm3u' => 'audio/mpegurl',
 			'm3u8' => 'audio/mpegurl',
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 14.0.0.8
 	 */
-	private function introduceVisioTypes(): IResult|int|null {
+	private function introduceVisioTypes(): IResult | int | null {
 		$updatedMimetypes = [
 			'vsdm' => 'application/vnd.visio',
 			'vsdx' => 'application/vnd.visio',
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 14.0.0.10
 	 */
-	private function introduceComicbookTypes(): IResult|int|null {
+	private function introduceComicbookTypes(): IResult | int | null {
 		$updatedMimetypes = [
 			'cb7' => 'application/comicbook+7z',
 			'cba' => 'application/comicbook+ace',
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 20.0.0.5
 	 */
-	private function introduceOpenDocumentTemplates(): IResult|int|null {
+	private function introduceOpenDocumentTemplates(): IResult | int | null {
 		$updatedMimetypes = [
 			'ott' => 'application/vnd.oasis.opendocument.text-template',
 			'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 21.0.0.7
 	 */
-	private function introduceOrgModeType(): IResult|int|null {
+	private function introduceOrgModeType(): IResult | int | null {
 		$updatedMimetypes = [
 			'org' => 'text/org'
 		];
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 23.0.0.2
 	 */
-	private function introduceFlatOpenDocumentType(): IResult|int|null {
+	private function introduceFlatOpenDocumentType(): IResult | int | null {
 		$updatedMimetypes = [
 			'fodt' => 'application/vnd.oasis.opendocument.text-flat-xml',
 			'fods' => 'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 25.0.0.2
 	 */
-	private function introduceOnlyofficeFormType(): IResult|int|null {
+	private function introduceOnlyofficeFormType(): IResult | int | null {
 		$updatedMimetypes = [
 			'oform' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform',
 			'docxf' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf',
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 26.0.0.1
 	 */
-	private function introduceAsciidocType(): IResult|int|null {
+	private function introduceAsciidocType(): IResult | int | null {
 		$updatedMimetypes = [
 			'adoc' => 'text/asciidoc',
 			'asciidoc' => 'text/asciidoc',
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 28.0.0.5
 	 */
-	private function introduceEnhancedMetafileFormatType(): IResult|int|null {
+	private function introduceEnhancedMetafileFormatType(): IResult | int | null {
 		$updatedMimetypes = [
 			'emf' => 'image/emf',
 		];
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 29.0.0.2
 	 */
-	private function introduceEmlAndMsgFormatType(): IResult|int|null {
+	private function introduceEmlAndMsgFormatType(): IResult | int | null {
 		$updatedMimetypes = [
 			'eml' => 'message/rfc822',
 			'msg' => 'application/vnd.ms-outlook',
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 29.0.0.6
 	 */
-	private function introduceAacAudioType(): IResult|int|null {
+	private function introduceAacAudioType(): IResult | int | null {
 		$updatedMimetypes = [
 			'aac' => 'audio/aac',
 		];
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 29.0.10
 	 */
-	private function introduceReStructuredTextFormatType(): IResult|int|null {
+	private function introduceReStructuredTextFormatType(): IResult | int | null {
 		$updatedMimetypes = [
 			'rst' => 'text/x-rst',
 		];
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 30.0.0
 	 */
-	private function introduceExcalidrawType(): IResult|int|null {
+	private function introduceExcalidrawType(): IResult | int | null {
 		$updatedMimetypes = [
 			'excalidraw' => 'application/vnd.excalidraw+json',
 		];
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 31.0.0
 	 */
-	private function introduceZstType(): IResult|int|null {
+	private function introduceZstType(): IResult | int | null {
 		$updatedMimetypes = [
 			'zst' => 'application/zstd',
 			'nfo' => 'text/x-nfo',
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 32.0.0
 	 */
-	private function introduceMusicxmlType(): IResult|int|null {
+	private function introduceMusicxmlType(): IResult | int | null {
 		$updatedMimetypes = [
 			'mxl' => 'application/vnd.recordare.musicxml',
 			'musicxml' => 'application/vnd.recordare.musicxml+xml',
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
 	 * @throws Exception
 	 * @since 32.0.0
 	 */
-	private function introduceTextType(): IResult|int|null {
+	private function introduceTextType(): IResult | int | null {
 		$updatedMimetypes = [
 			'text' => 'text/plain',
 		];

Please login to merge, or discard this patch.

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	/**
38	38	* @throws Exception
39	39	*/
40		- private function updateMimetypes($updatedMimetypes): IResult\|int\|null {
	40	+ private function updateMimetypes($updatedMimetypes): IResult \| int \| null {
41	41	if ($this->dryRun) {
42	42	$this->changeCount += count($updatedMimetypes);
43	43	return null;
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	if (empty($this->folderMimeTypeId)) {
55	55	$query->setParameter('mimetype', 'httpd/unix-directory');
56	56	$result = $query->execute();
57		- $this->folderMimeTypeId = (int)$result->fetchOne();
	57	+ $this->folderMimeTypeId = (int) $result->fetchOne();
58	58	$result->closeCursor();
59	59	}
60	60
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	// get target mimetype id
73	73	$query->setParameter('mimetype', $mimetype);
74	74	$result = $query->execute();
75		- $mimetypeId = (int)$result->fetchOne();
	75	+ $mimetypeId = (int) $result->fetchOne();
76	76	$result->closeCursor();
77	77
78	78	if (!$mimetypeId) {
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84
85	85	// change mimetype for files with x extension
86	86	$update->setParameter('mimetype', $mimetypeId)
87		- ->setParameter('name', '%' . $this->connection->escapeLikeParameter('.' . $extension));
	87	+ ->setParameter('name', '%'.$this->connection->escapeLikeParameter('.'.$extension));
88	88	$count += $update->execute();
89	89	}
90	90
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	* @throws Exception
96	96	* @since 12.0.0.14
97	97	*/
98		- private function introduceImageTypes(): IResult\|int\|null {
	98	+ private function introduceImageTypes(): IResult \| int \| null {
99	99	$updatedMimetypes = [
100	100	'jp2' => 'image/jp2',
101	101	'webp' => 'image/webp',
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	* @throws Exception
109	109	* @since 12.0.0.13
110	110	*/
111		- private function introduceWindowsProgramTypes(): IResult\|int\|null {
	111	+ private function introduceWindowsProgramTypes(): IResult \| int \| null {
112	112	$updatedMimetypes = [
113	113	'htaccess' => 'text/plain',
114	114	'bat' => 'application/x-msdos-program',
		@@ -122,7 +122,7 @@ discard block
		block discarded – undo
122	122	* @throws Exception
123	123	* @since 13.0.0.0
124	124	*/
125		- private function introduceLocationTypes(): IResult\|int\|null {
	125	+ private function introduceLocationTypes(): IResult \| int \| null {
126	126	$updatedMimetypes = [
127	127	'gpx' => 'application/gpx+xml',
128	128	'kml' => 'application/vnd.google-earth.kml+xml',
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	* @throws Exception
138	138	* @since 13.0.0.3
139	139	*/
140		- private function introduceInternetShortcutTypes(): IResult\|int\|null {
	140	+ private function introduceInternetShortcutTypes(): IResult \| int \| null {
141	141	$updatedMimetypes = [
142	142	'url' => 'application/internet-shortcut',
143	143	'webloc' => 'application/internet-shortcut'
		@@ -150,7 +150,7 @@ discard block
		block discarded – undo
150	150	* @throws Exception
151	151	* @since 13.0.0.6
152	152	*/
153		- private function introduceStreamingTypes(): IResult\|int\|null {
	153	+ private function introduceStreamingTypes(): IResult \| int \| null {
154	154	$updatedMimetypes = [
155	155	'm3u' => 'audio/mpegurl',
156	156	'm3u8' => 'audio/mpegurl',
		@@ -164,7 +164,7 @@ discard block
		block discarded – undo
164	164	* @throws Exception
165	165	* @since 14.0.0.8
166	166	*/
167		- private function introduceVisioTypes(): IResult\|int\|null {
	167	+ private function introduceVisioTypes(): IResult \| int \| null {
168	168	$updatedMimetypes = [
169	169	'vsdm' => 'application/vnd.visio',
170	170	'vsdx' => 'application/vnd.visio',
		@@ -181,7 +181,7 @@ discard block
		block discarded – undo
181	181	* @throws Exception
182	182	* @since 14.0.0.10
183	183	*/
184		- private function introduceComicbookTypes(): IResult\|int\|null {
	184	+ private function introduceComicbookTypes(): IResult \| int \| null {
185	185	$updatedMimetypes = [
186	186	'cb7' => 'application/comicbook+7z',
187	187	'cba' => 'application/comicbook+ace',
		@@ -198,7 +198,7 @@ discard block
		block discarded – undo
198	198	* @throws Exception
199	199	* @since 20.0.0.5
200	200	*/
201		- private function introduceOpenDocumentTemplates(): IResult\|int\|null {
	201	+ private function introduceOpenDocumentTemplates(): IResult \| int \| null {
202	202	$updatedMimetypes = [
203	203	'ott' => 'application/vnd.oasis.opendocument.text-template',
204	204	'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	* @throws Exception
214	214	* @since 21.0.0.7
215	215	*/
216		- private function introduceOrgModeType(): IResult\|int\|null {
	216	+ private function introduceOrgModeType(): IResult \| int \| null {
217	217	$updatedMimetypes = [
218	218	'org' => 'text/org'
219	219	];
		@@ -225,7 +225,7 @@ discard block
		block discarded – undo
225	225	* @throws Exception
226	226	* @since 23.0.0.2
227	227	*/
228		- private function introduceFlatOpenDocumentType(): IResult\|int\|null {
	228	+ private function introduceFlatOpenDocumentType(): IResult \| int \| null {
229	229	$updatedMimetypes = [
230	230	'fodt' => 'application/vnd.oasis.opendocument.text-flat-xml',
231	231	'fods' => 'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
		@@ -240,7 +240,7 @@ discard block
		block discarded – undo
240	240	* @throws Exception
241	241	* @since 25.0.0.2
242	242	*/
243		- private function introduceOnlyofficeFormType(): IResult\|int\|null {
	243	+ private function introduceOnlyofficeFormType(): IResult \| int \| null {
244	244	$updatedMimetypes = [
245	245	'oform' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform',
246	246	'docxf' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf',
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	* @throws Exception
254	254	* @since 26.0.0.1
255	255	*/
256		- private function introduceAsciidocType(): IResult\|int\|null {
	256	+ private function introduceAsciidocType(): IResult \| int \| null {
257	257	$updatedMimetypes = [
258	258	'adoc' => 'text/asciidoc',
259	259	'asciidoc' => 'text/asciidoc',
		@@ -266,7 +266,7 @@ discard block
		block discarded – undo
266	266	* @throws Exception
267	267	* @since 28.0.0.5
268	268	*/
269		- private function introduceEnhancedMetafileFormatType(): IResult\|int\|null {
	269	+ private function introduceEnhancedMetafileFormatType(): IResult \| int \| null {
270	270	$updatedMimetypes = [
271	271	'emf' => 'image/emf',
272	272	];
		@@ -278,7 +278,7 @@ discard block
		block discarded – undo
278	278	* @throws Exception
279	279	* @since 29.0.0.2
280	280	*/
281		- private function introduceEmlAndMsgFormatType(): IResult\|int\|null {
	281	+ private function introduceEmlAndMsgFormatType(): IResult \| int \| null {
282	282	$updatedMimetypes = [
283	283	'eml' => 'message/rfc822',
284	284	'msg' => 'application/vnd.ms-outlook',
		@@ -291,7 +291,7 @@ discard block
		block discarded – undo
291	291	* @throws Exception
292	292	* @since 29.0.0.6
293	293	*/
294		- private function introduceAacAudioType(): IResult\|int\|null {
	294	+ private function introduceAacAudioType(): IResult \| int \| null {
295	295	$updatedMimetypes = [
296	296	'aac' => 'audio/aac',
297	297	];
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	* @throws Exception
304	304	* @since 29.0.10
305	305	*/
306		- private function introduceReStructuredTextFormatType(): IResult\|int\|null {
	306	+ private function introduceReStructuredTextFormatType(): IResult \| int \| null {
307	307	$updatedMimetypes = [
308	308	'rst' => 'text/x-rst',
309	309	];
		@@ -315,7 +315,7 @@ discard block
		block discarded – undo
315	315	* @throws Exception
316	316	* @since 30.0.0
317	317	*/
318		- private function introduceExcalidrawType(): IResult\|int\|null {
	318	+ private function introduceExcalidrawType(): IResult \| int \| null {
319	319	$updatedMimetypes = [
320	320	'excalidraw' => 'application/vnd.excalidraw+json',
321	321	];
		@@ -328,7 +328,7 @@ discard block
		block discarded – undo
328	328	* @throws Exception
329	329	* @since 31.0.0
330	330	*/
331		- private function introduceZstType(): IResult\|int\|null {
	331	+ private function introduceZstType(): IResult \| int \| null {
332	332	$updatedMimetypes = [
333	333	'zst' => 'application/zstd',
334	334	'nfo' => 'text/x-nfo',
		@@ -341,7 +341,7 @@ discard block
		block discarded – undo
341	341	* @throws Exception
342	342	* @since 32.0.0
343	343	*/
344		- private function introduceMusicxmlType(): IResult\|int\|null {
	344	+ private function introduceMusicxmlType(): IResult \| int \| null {
345	345	$updatedMimetypes = [
346	346	'mxl' => 'application/vnd.recordare.musicxml',
347	347	'musicxml' => 'application/vnd.recordare.musicxml+xml',
		@@ -354,7 +354,7 @@ discard block
		block discarded – undo
354	354	* @throws Exception
355	355	* @since 32.0.0
356	356	*/
357		- private function introduceTextType(): IResult\|int\|null {
	357	+ private function introduceTextType(): IResult \| int \| null {
358	358	$updatedMimetypes = [
359	359	'text' => 'text/plain',
360	360	];

nextcloud / server

Push — master ( 6ee282...61bb2d )

Status

Category

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