eliott/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis synced 2026-04-25 17:25:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: add concatenation lint rules

Browse Source 
Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com>
This commit is contained in:
Saw-jan
2025-06-19 12:25:20 +05:45
parent 2c6c769695
commit c731dcd0df
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.php-cs-fixer.dist.php
View File

@@ -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",
],
]
)
);

16
tests/acceptance/TestHelpers/GraphHelper.php
View File

@@ -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,

2
tests/acceptance/bootstrap/SpacesTUSContext.php
View File

@@ -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:
}