Merge pull request #1438 from nextcloud/fix/master/coding-standard

fix(composer): update nextcloud/coding-standard to ^1.3

Author: Antreesy

appinfo/routes.php

@@ -1,10 +1,10 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2015 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-/** @var $this OC\Route\Router */
 return ['routes' => [
 	// page
 	['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],

composer.json

@@ -3,7 +3,7 @@
 	"type": "project",
 	"license": "AGPLv3",
 	"require-dev": {
-		"nextcloud/coding-standard": "v1.1.1",
+		"nextcloud/coding-standard": "^1.3",
 		"nextcloud/ocp": "dev-master",
 		"phpunit/phpunit": "^9",
 		"vimeo/psalm": "^5.15"

composer.lock

@@ -34,7 +34,7 @@ protected function configure() {
 		$this
 			->setName('log:tail')
 			->setDescription('Tail the nextcloud logfile')
-			->addArgument('lines', InputArgument::OPTIONAL, 'The number of log entries to print', "10")
+			->addArgument('lines', InputArgument::OPTIONAL, 'The number of log entries to print', '10')
 			->addOption('follow', 'f', InputOption::VALUE_NONE, 'Output new log entries as they appear')
 			->addOption('raw', 'r', InputOption::VALUE_NONE, 'Output raw log json instead of formatted log item');
 		parent::configure();

lib/Command/Tail.php

@@ -93,7 +93,7 @@ public function watch(bool $raw, OutputInterface $output): int {
 						$output->writeln(json_encode($line));
 					} else {
 						$this->printItem($line, $output, $messageWidth);
-						$output->writeln("");
+						$output->writeln('');
 					}
 				}
 

lib/Command/Watch.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2015 ownCloud, Inc.
@@ -24,7 +25,8 @@
  */
 class LogController extends Controller {
 
-	public function __construct($appName,
+	public function __construct(
+		$appName,
 		IRequest $request,
 		private LogIteratorFactory $logIteratorFactory,
 		private SettingsService $settingsService,
@@ -129,7 +131,7 @@ protected function responseFromIterator(\Iterator $iterator, $count, $offset): J
 		for ($i = 0; $i < $count && $iterator->valid(); $i++) {
 			$line = $iterator->current();
 			if (!is_null($line)) {
-				$line["id"] = uniqid();
+				$line['id'] = uniqid();
 				$data[] = $line;
 			}
 			$iterator->next();

lib/Controller/LogController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2015 ownCloud, Inc.

lib/Controller/PageController.php

@@ -62,7 +62,7 @@ public function updateAppConfig(string $settingsKey, $settingsValue): JSONRespon
 		// Check type of value
 		if (gettype($settingsValue) !== gettype($this->settingsService->getAppSettings()[$settingsKey])) {
 			// Invalid type
-			$this->logger->debug('Incorrect value type for appConfig key', ['settingsKey' => $settingsKey, "valueType" => gettype($settingsValue)]);
+			$this->logger->debug('Incorrect value type for appConfig key', ['settingsKey' => $settingsKey, 'valueType' => gettype($settingsValue)]);
 			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
 		}
 

lib/Controller/SettingsController.php

@@ -55,15 +55,15 @@ private static function parseLogLevel(string $level): int {
 		}
 
 		switch (strtoupper($level)) {
-			case "DEBUG":
+			case 'DEBUG':
 				return 0;
-			case "INFO":
+			case 'INFO':
 				return 1;
-			case "WARN":
+			case 'WARN':
 				return 2;
-			case "ERROR":
+			case 'ERROR':
 				return 3;
-			case "FATAL":
+			case 'FATAL':
 				return 4;
 			default:
 				throw new \Exception("Unknown log level $level");

lib/Log/Console.php

@@ -61,7 +61,7 @@ private function formatTraceLine(int $index, array $trace, int $largestIndexWidt
 				implode(",\n", array_map(function ($argumentLine) use ($argumentWhiteSpace) {
 					return $argumentWhiteSpace . '  ' . trim($argumentLine);
 				}, $arguments)) . "\n" .
-				$argumentWhiteSpace . ")";
+				$argumentWhiteSpace . ')';
 		}
 	}