Merge pull request #6236 from nextcloud/dependabot/composer/nextcloud/coding-standard-1.2.3

composer.lock

@@ -399,16 +399,16 @@
         },
         {
             "name": "nextcloud/coding-standard",
-            "version": "v1.2.1",
+            "version": "v1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud/coding-standard.git",
-                "reference": "cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e"
+                "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e",
+                "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/bc9c53a5306114b60c4363057aff9c2ed10a54da",
-                "reference": "cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e",
+                "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da",
                 "shasum": ""
             },
             "require": {
@@ -434,9 +434,9 @@
             "description": "Nextcloud coding standards for the php cs fixer",
             "support": {
                 "issues": "https://github.com/nextcloud/coding-standard/issues",
-                "source": "https://github.com/nextcloud/coding-standard/tree/v1.2.1"
+                "source": "https://github.com/nextcloud/coding-standard/tree/v1.2.3"
             },
-            "time": "2024-02-01T14:54:37+00:00"
+            "time": "2024-08-23T14:32:32+00:00"
         },
         {
             "name": "nextcloud/ocp",
@@ -661,16 +661,16 @@
         },
         {
             "name": "php-cs-fixer/shim",
-            "version": "v3.49.0",
+            "version": "v3.62.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/shim.git",
-                "reference": "f7d3219cac46632f12362c9aa7c2ac0d2fe92c52"
+                "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/f7d3219cac46632f12362c9aa7c2ac0d2fe92c52",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/7a91d5ce45c486f5b445d95901228507a02f60ae",
-                "reference": "f7d3219cac46632f12362c9aa7c2ac0d2fe92c52",
+                "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae",
                 "shasum": ""
             },
             "require": {
@@ -707,9 +707,9 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/shim/issues",
-                "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.49.0"
+                "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.62.0"
             },
-            "time": "2024-02-02T00:42:09+00:00"
+            "time": "2024-08-07T17:03:46+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

lib/Command/TransferOwnership.php

@@ -72,17 +72,17 @@ final class TransferOwnership extends Command {
 		try {
 			$board = $boardId ? $this->boardMapper->find($boardId) : null;
 		} catch (\Exception $e) {
-			$output->writeln("Could not find a board for the provided id.");
+			$output->writeln('Could not find a board for the provided id.');
 			return 1;
 		}
 
 		if ($boardId !== null && $board->getOwner() !== $owner) {
-			$output->writeln("$owner is not the owner of the board $boardId (" . $board->getTitle() . ")");
+			$output->writeln("$owner is not the owner of the board $boardId (" . $board->getTitle() . ')');
 			return 1;
 		}
 
 		if ($boardId) {
-			$output->writeln("Transfer board " . $board->getTitle() . " from ". $board->getOwner() ." to $newOwner");
+			$output->writeln('Transfer board ' . $board->getTitle() . ' from '. $board->getOwner() ." to $newOwner");
 		} else {
 			$output->writeln("Transfer all boards from $owner to $newOwner");
 		}
@@ -94,12 +94,12 @@ final class TransferOwnership extends Command {
 
 		if ($boardId) {
 			$this->boardService->transferBoardOwnership($boardId, $newOwner, $remapAssignment);
-			$output->writeln("<info>Board " . $board->getTitle() . " from ". $board->getOwner() ." transferred to $newOwner completed</info>");
+			$output->writeln('<info>Board ' . $board->getTitle() . ' from '. $board->getOwner() ." transferred to $newOwner completed</info>");
 			return 0;
 		}
 
 		foreach ($this->boardService->transferOwnership($owner, $newOwner, $remapAssignment) as $board) {
-			$output->writeln(" - " . $board->getTitle() . " transferred");
+			$output->writeln(' - ' . $board->getTitle() . ' transferred');
 		}
 		$output->writeln("<info>All boards from $owner to $newOwner transferred</info>");
 

lib/Db/CardMapper.php

@@ -410,7 +410,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		foreach ($query->getDuedate() as $duedate) {
 			$dueDateColumn = $this->databaseType === 'sqlite3' ? $qb->createFunction('DATETIME(`c`.`duedate`)') : 'c.duedate';
 			$date = $duedate->getValue();
-			if ($date === "") {
+			if ($date === '') {
 				$qb->andWhere($qb->expr()->isNotNull('c.duedate'));
 				continue;
 			}
@@ -461,7 +461,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			foreach ($query->getAssigned() as $index => $assignment) {
 				$qb->innerJoin('c', 'deck_assigned_users', 'au' . $index, $qb->expr()->eq('c.id', 'au' . $index . '.card_id'));
 				$assignedQueryValue = $assignment->getValue();
-				if ($assignedQueryValue === "") {
+				if ($assignedQueryValue === '') {
 					$qb->andWhere($qb->expr()->isNotNull('au' . $index . '.participant'));
 					continue;
 				}

lib/Service/Importer/Systems/DeckJsonService.php

@@ -106,7 +106,7 @@ class DeckJsonService extends ABoardImportService {
 	public function getComments(): array {
 		$comments = [];
 		foreach ($this->tmpCards as $sourceCard) {
-			if (!property_exists($sourceCard, "comments")) {
+			if (!property_exists($sourceCard, 'comments')) {
 				continue;
 			}
 			$commentsOriginal = $sourceCard->comments;

lib/Service/Importer/Systems/TrelloJsonService.php

@@ -141,7 +141,7 @@ class TrelloJsonService extends ABoardImportService {
 					$message = $this->l10n->t(
 						"This comment has more than %s characters.\n" .
 						"Added as an attachment to the card with name %s.\n" .
-						"Accessible on URL: %s.",
+						'Accessible on URL: %s.',
 						[
 							IComment::MAX_MESSAGE_LENGTH,
 							'comment_' . $commentId . '.md',

lib/Validators/BaseValidator.php

@@ -45,7 +45,7 @@ abstract class BaseValidator {
 					} else {
 						if (!$this->{$rule}($value)) {
 							throw new BadRequestException(
-								$field . ' must be provided and must be '. str_replace("_", " ", $rule));
+								$field . ' must be provided and must be '. str_replace('_', ' ', $rule));
 						}
 					}
 				}
@@ -111,7 +111,7 @@ abstract class BaseValidator {
 	 */
 	private function max($value, $limit): bool {
 		if (!$limit || !is_numeric($limit)) {
-			throw new Exception("Validation rule max requires at least 1 parameter. " . json_encode($limit));
+			throw new Exception('Validation rule max requires at least 1 parameter. ' . json_encode($limit));
 		}
 		return $this->getSize($value) <= $limit;
 	}
@@ -121,7 +121,7 @@ abstract class BaseValidator {
 	 */
 	private function min($value, $limit): bool {
 		if (!$limit || !is_numeric($limit)) {
-			throw new Exception("Validation rule max requires at least 1 parameter.");
+			throw new Exception('Validation rule max requires at least 1 parameter.');
 		}
 		return $this->getSize($value) >= $limit;
 	}
@@ -158,6 +158,6 @@ abstract class BaseValidator {
 			: $field . ' must be at least '. $parameter . ' characters long ';
 		}
 
-		return $field . ' must be provided and must be '. str_replace("_", " ", $rule);
+		return $field . ' must be provided and must be '. str_replace('_', ' ', $rule);
 	}
 }

tests/integration/database/BoardDatabaseTest.php

@@ -31,11 +31,11 @@ use OCP\Server;
  * @group DB
  */
 class BoardDatabaseTest extends \Test\TestCase {
-	public const TEST_USER1 = "test-share-user1";
+	public const TEST_USER1 = 'test-share-user1';
-	public const TEST_USER2 = "test-share-user2";
+	public const TEST_USER2 = 'test-share-user2';
-	public const TEST_USER3 = "test-share-user3";
+	public const TEST_USER3 = 'test-share-user3';
-	public const TEST_USER4 = "test-share-user4";
+	public const TEST_USER4 = 'test-share-user4';
-	public const TEST_GROUP1 = "test-share-group1";
+	public const TEST_GROUP1 = 'test-share-group1';
 
 	/** @var BoardService */
 	private $boardService;

tests/integration/features/bootstrap/BoardContext.php

@@ -71,7 +71,7 @@ class BoardContext implements Context {
 					break;
 				}
 			}
-			Assert::assertNotNull($id, "Could not find board named ".$boardName);
+			Assert::assertNotNull($id, 'Could not find board named '.$boardName);
 		} else {
 			$id = $this->board['id'];
 		}

tests/integration/features/bootstrap/SessionContext.php

@@ -32,7 +32,7 @@ class SessionContext implements Context {
 			'boardId' => $board['id'],
 		]);
 		$res = json_decode((string)$this->getResponse()->getBody(), true);
-		Assert::assertArrayHasKey('token', $res['ocs']['data'], "session creation did not respond with a token");
+		Assert::assertArrayHasKey('token', $res['ocs']['data'], 'session creation did not respond with a token');
 
 		// store token
 		$user = $this->serverContext->getCurrentUser();
@@ -44,7 +44,7 @@ class SessionContext implements Context {
 	 */
 	public function theResponseShouldHaveActiveSessions($length) {
 		$board = $this->boardContext->getLastUsedBoard();
-		Assert::assertEquals($length, count($board['activeSessions']), "unexpected count of active sessions");
+		Assert::assertEquals($length, count($board['activeSessions']), 'unexpected count of active sessions');
 	}
 
 	/**
@@ -52,7 +52,7 @@ class SessionContext implements Context {
 	 */
 	public function theUserShouldBeInTheListOfActiveSessions($user) {
 		$board = $this->boardContext->getLastUsedBoard();
-		Assert::assertContains($user, $board['activeSessions'], "user is not found in the list of active sessions");
+		Assert::assertContains($user, $board['activeSessions'], 'user is not found in the list of active sessions');
 	}
 
 	/**
@@ -67,7 +67,7 @@ class SessionContext implements Context {
 
 		$user = $this->serverContext->getCurrentUser();
 		$token = $this->tokens[$user];
-		Assert::assertNotEmpty($token, "no token for the user found");
+		Assert::assertNotEmpty($token, 'no token for the user found');
 		$this->requestContext->sendOCSRequest('POST', '/apps/deck/api/v1.0/session/close', [
 			'boardId' => $board['id'],
 			'token' => $token

tests/unit/Command/UserExportTest.php

@@ -88,8 +88,8 @@ class UserExportTest extends \Test\TestCase {
 
 	public function getComment($id) {
 		$comment = new Comment();
-		$comment->setActor("users", "admin");
+		$comment->setActor('users', 'admin');
-		$comment->setMessage("fake comment" . $id);
+		$comment->setMessage('fake comment' . $id);
 		return $comment;
 	}
 	public function testExecute() {

tests/unit/Db/AclTest.php

@@ -27,7 +27,7 @@ class AclTest extends \Test\TestCase {
 	private function createAclUser() {
 		$acl = new Acl();
 		$acl->setId(1);
-		$acl->setParticipant("admin");
+		$acl->setParticipant('admin');
 		$acl->setType(Acl::PERMISSION_TYPE_USER);
 		$acl->setBoardId(1);
 		$acl->setPermissionEdit(true);
@@ -39,7 +39,7 @@ class AclTest extends \Test\TestCase {
 	private function createAclGroup() {
 		$acl = new Acl();
 		$acl->setId(1);
-		$acl->setParticipant("administrators");
+		$acl->setParticipant('administrators');
 		$acl->setType(Acl::PERMISSION_TYPE_GROUP);
 		$acl->setBoardId(1);
 		$acl->setPermissionEdit(true);

tests/unit/Db/AttachmentTest.php

@@ -28,7 +28,7 @@ class AttachmentTest extends \Test\TestCase {
 		$attachment = new Attachment();
 		$attachment->setId(1);
 		$attachment->setCardId(123);
-		$attachment->setData("blob");
+		$attachment->setData('blob');
 		$attachment->setCreatedBy('admin');
 		$attachment->setType('deck_file');
 		return $attachment;

tests/unit/Db/BoardTest.php

@@ -8,9 +8,9 @@ class BoardTest extends TestCase {
 	private function createBoard() {
 		$board = new Board();
 		$board->setId(1);
-		$board->setTitle("My Board");
+		$board->setTitle('My Board');
-		$board->setOwner("admin");
+		$board->setOwner('admin');
-		$board->setColor("000000");
+		$board->setColor('000000');
 		$board->setArchived(false);
 		// TODO: relation shared labels acl
 		return $board;
@@ -20,9 +20,9 @@ class BoardTest extends TestCase {
 		$board->setUsers(['user1', 'user2']);
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Board",
+			'title' => 'My Board',
-			'owner' => "admin",
+			'owner' => 'admin',
-			'color' => "000000",
+			'color' => '000000',
 			'labels' => [],
 			'permissions' => [],
 			'stacks' => [],
@@ -44,9 +44,9 @@ class BoardTest extends TestCase {
 		self::assertNull($board->getLabels());
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Board",
+			'title' => 'My Board',
-			'owner' => "admin",
+			'owner' => 'admin',
-			'color' => "000000",
+			'color' => '000000',
 			'labels' => [],
 			'permissions' => [],
 			'stacks' => [],
@@ -63,13 +63,13 @@ class BoardTest extends TestCase {
 
 	public function testSetLabels() {
 		$board = $this->createBoard();
-		$board->setLabels(["foo", "bar"]);
+		$board->setLabels(['foo', 'bar']);
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Board",
+			'title' => 'My Board',
-			'owner' => "admin",
+			'owner' => 'admin',
-			'color' => "000000",
+			'color' => '000000',
-			'labels' => ["foo", "bar"],
+			'labels' => ['foo', 'bar'],
 			'permissions' => [],
 			'stacks' => [],
 			'deletedAt' => 0,
@@ -95,9 +95,9 @@ class BoardTest extends TestCase {
 		$board->setShared(1);
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Board",
+			'title' => 'My Board',
-			'owner' => "admin",
+			'owner' => 'admin',
-			'color' => "000000",
+			'color' => '000000',
 			'labels' => [],
 			'permissions' => [],
 			'stacks' => [],

tests/unit/Db/CardTest.php

@@ -32,13 +32,13 @@ class CardTest extends TestCase {
 	private function createCard() {
 		$card = new Card();
 		$card->setId(1);
-		$card->setTitle("My Card");
+		$card->setTitle('My Card');
-		$card->setDescription("a long description");
+		$card->setDescription('a long description');
 		$card->setStackId(1);
 		$card->setType('text');
 		$card->setLastModified(234);
 		$card->setCreatedAt(123);
-		$card->setOwner("admin");
+		$card->setOwner('admin');
 		$card->setOrder(12);
 		$card->setArchived(false);
 		$card->setDone(null);
@@ -68,8 +68,8 @@ class CardTest extends TestCase {
 		$card = $this->createCard();
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Card",
+			'title' => 'My Card',
-			'description' => "a long description",
+			'description' => 'a long description',
 			'type' => 'text',
 			'lastModified' => 234,
 			'createdAt' => 123,
@@ -96,8 +96,8 @@ class CardTest extends TestCase {
 		$card->setLabels([]);
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Card",
+			'title' => 'My Card',
-			'description' => "a long description",
+			'description' => 'a long description',
 			'type' => 'text',
 			'lastModified' => 234,
 			'createdAt' => 123,
@@ -126,8 +126,8 @@ class CardTest extends TestCase {
 		$card->setLabels([]);
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Card",
+			'title' => 'My Card',
-			'description' => "a long description",
+			'description' => 'a long description',
 			'type' => 'text',
 			'lastModified' => 234,
 			'createdAt' => 123,

tests/unit/Db/LabelTest.php

@@ -29,8 +29,8 @@ class LabelTest extends TestCase {
 	private function createLabel() {
 		$label = new Label();
 		$label->setId(1);
-		$label->setTitle("My Label");
+		$label->setTitle('My Label');
-		$label->setColor("000000");
+		$label->setColor('000000');
 		return $label;
 	}
 	public function testJsonSerializeBoard() {

tests/unit/Db/StackTest.php

@@ -27,7 +27,7 @@ class StackTest extends \Test\TestCase {
 	private function createStack() {
 		$board = new Stack();
 		$board->setId(1);
-		$board->setTitle("My Stack");
+		$board->setTitle('My Stack');
 		$board->setBoardId(1);
 		$board->setOrder(1);
 		return $board;
@@ -36,7 +36,7 @@ class StackTest extends \Test\TestCase {
 		$stack = $this->createStack();
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Stack",
+			'title' => 'My Stack',
 			'order' => 1,
 			'boardId' => 1,
 			'deletedAt' => 0,
@@ -45,15 +45,15 @@ class StackTest extends \Test\TestCase {
 		], $stack->jsonSerialize());
 	}
 	public function testJsonSerializeWithCards() {
-		$cards = ["foo", "bar"];
+		$cards = ['foo', 'bar'];
 		$stack = $this->createStack();
 		$stack->setCards($cards);
 		$this->assertEquals([
 			'id' => 1,
-			'title' => "My Stack",
+			'title' => 'My Stack',
 			'order' => 1,
 			'boardId' => 1,
-			'cards' => ["foo", "bar"],
+			'cards' => ['foo', 'bar'],
 			'deletedAt' => 0,
 			'lastModified' => 0,
 			'ETag' => $stack->getETag(),

tests/unit/Middleware/ExceptionMiddlewareTest.php

@@ -69,8 +69,8 @@ class ExceptionMiddlewareTest extends \Test\TestCase {
 	public function testAfterException($exception, $status, $message) {
 		$result = $this->exceptionMiddleware->afterException($this->controller, 'bar', $exception);
 		$expected = new JSONResponse([
-			"status" => $status,
+			'status' => $status,
-			"message" => $message
+			'message' => $message
 		], $status);
 		$this->assertEquals($expected, $result);
 	}

tests/unit/Service/StackServiceTest.php

@@ -212,8 +212,8 @@ class StackServiceTest extends TestCase {
 		$this->stackMapper->expects($this->once())->method('update')->willReturn($stackToBeDeleted);
 		$this->cardMapper->expects($this->once())->method('findAll')->willReturn([]);
 		$this->stackService->delete(123);
-		$this->assertTrue($stackToBeDeleted->getDeletedAt() <= time(), "deletedAt is in the past");
+		$this->assertTrue($stackToBeDeleted->getDeletedAt() <= time(), 'deletedAt is in the past');
-		$this->assertTrue($stackToBeDeleted->getDeletedAt() > 0, "deletedAt is set");
+		$this->assertTrue($stackToBeDeleted->getDeletedAt() > 0, 'deletedAt is set');
 	}
 
 	public function testUpdate() {