From c731dcd0df861924056b19533fb754e47ecb0cb9 Mon Sep 17 00:00:00 2001
From: Saw-jan <saw.jan.grg3e@gmail.com>
Date: Thu, 19 Jun 2025 12:25:20 +0545
Subject: [PATCH] refactor: add concatenation lint rules

Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com>
---
 .php-cs-fixer.dist.php                          |  4 ++++
 tests/acceptance/TestHelpers/GraphHelper.php    | 16 ++++++++--------
 tests/acceptance/bootstrap/SpacesTUSContext.php |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index c60f8ad9b57..6f18a834ee7 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -37,6 +37,10 @@ $config->setFinder($finder)
                 'binary_operator_spaces' => true,
                 'phpdoc_to_return_type' => true,
                 'void_return' => true,
+                'no_useless_concat_operator' => true,
+                'concat_space' => [
+                    "spacing" => "one",
+                ],
             ]
         )
     );
diff --git a/tests/acceptance/TestHelpers/GraphHelper.php b/tests/acceptance/TestHelpers/GraphHelper.php
index 4cfabb5a7d3..8f6d04377d4 100644
--- a/tests/acceptance/TestHelpers/GraphHelper.php
+++ b/tests/acceptance/TestHelpers/GraphHelper.php
@@ -1270,7 +1270,7 @@ class GraphHelper {
 		string $password,
 		string $groupId
 	): ResponseInterface {
-		$url = self::getFullUrl($baseUrl, 'users' . '?$filter=memberOf/any(m:m/id ' . "eq '$groupId')");
+		$url = self::getFullUrl($baseUrl, 'users?$filter=memberOf/any(m:m/id ' . "eq '$groupId')");
 		return HttpRequestHelper::get(
 			$url,
 			$user,
@@ -1296,7 +1296,7 @@ class GraphHelper {
 	): ResponseInterface {
 		$url = self::getFullUrl(
 			$baseUrl,
-			'users' . '?$filter=memberOf/any(m:m/id ' . "eq '$groupIdArray[0]') "
+			'users?$filter=memberOf/any(m:m/id ' . "eq '$groupIdArray[0]') "
 			. "and memberOf/any(m:m/id eq '$groupIdArray[1]')"
 		);
 		return HttpRequestHelper::get(
@@ -1326,8 +1326,8 @@ class GraphHelper {
 	): ResponseInterface {
 		$url = self::getFullUrl(
 			$baseUrl,
-			'users' . '?$filter=memberOf/any(m:m/id '
-			. "eq '$firstGroup') " . "or memberOf/any(m:m/id eq '$secondGroup')"
+			'users?$filter=memberOf/any(m:m/id '
+			. "eq '$firstGroup') or memberOf/any(m:m/id eq '$secondGroup')"
 		);
 		return HttpRequestHelper::get(
 			$url,
@@ -1352,7 +1352,7 @@ class GraphHelper {
 		string $password,
 		string $roleId
 	): ResponseInterface {
-		$url = self::getFullUrl($baseUrl, 'users' . '?$filter=appRoleAssignments/any(m:m/appRoleId ' . "eq '$roleId')");
+		$url = self::getFullUrl($baseUrl, 'users?$filter=appRoleAssignments/any(m:m/appRoleId ' . "eq '$roleId')");
 		return HttpRequestHelper::get(
 			$url,
 			$user,
@@ -1380,8 +1380,8 @@ class GraphHelper {
 	): ResponseInterface {
 		$url = self::getFullUrl(
 			$baseUrl,
-			'users' . '?$filter=appRoleAssignments/any(m:m/appRoleId '
-			. "eq '$roleId') " . "and memberOf/any(m:m/id eq '$groupId')"
+			'users?$filter=appRoleAssignments/any(m:m/appRoleId '
+			. "eq '$roleId') and memberOf/any(m:m/id eq '$groupId')"
 		);
 		return HttpRequestHelper::get(
 			$url,
@@ -2358,7 +2358,7 @@ class GraphHelper {
 	): ResponseInterface {
 		$url = self::getFullUrl(
 			$baseUrl,
-			'users' . '?$filter=memberOf/any(m:m/id ' . "eq '$groupId')" . '&$search=' . "$searchTerm"
+			'users?$filter=memberOf/any(m:m/id ' . "eq '$groupId')" . '&$search=' . "$searchTerm"
 		);
 		return HttpRequestHelper::get(
 			$url,
diff --git a/tests/acceptance/bootstrap/SpacesTUSContext.php b/tests/acceptance/bootstrap/SpacesTUSContext.php
index 7d898ceba15..e12d2101516 100644
--- a/tests/acceptance/bootstrap/SpacesTUSContext.php
+++ b/tests/acceptance/bootstrap/SpacesTUSContext.php
@@ -354,7 +354,7 @@ class SpacesTUSContext implements Context {
 				$mtime = date('Y-m-d', strtotime('first day of previous month'));
 				break;
 			case "lastYear":
-				$mtime = date('Y-m' . '-01', strtotime('-1 year'));
+				$mtime = date('Y-m-01', strtotime('-1 year'));
 				break;
 			default:
 		}