mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-03 03:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Addressed review

Browse Source
This commit is contained in:
sagargurung1001@gmail.com
2022-12-19 11:34:25 +05:45
committed by Phil Davis
parent e15afb04d4
commit 1874280a56
4 changed files with 60 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/TestHelpers/GraphHelper.php
View File

@@ -40,7 +40,7 @@ class GraphHelper {
* @return int (1 = true | 0 = false)
*/
public static function isUUIDv4(string $id): int {
$regex = "/^" . self::getUUIDv4Regex() . "/i";
$regex = "/^" . self::getUUIDv4Regex() . "$/i";
return preg_match($regex, $id);
}
@@ -50,19 +50,10 @@ class GraphHelper {
* @return int (1 = true | 0 = false)
*/
public static function isSpaceId(string $spaceId): int {
$regex = "/^" . self::getUUIDv4Regex() . '\\$' . self::getUUIDv4Regex() . "/i";
$regex = "/^" . self::getUUIDv4Regex() . '\\$' . self::getUUIDv4Regex() . "$/i";
return preg_match($regex, $spaceId);
}
/**
* @param string $id
*
* @return string
*/
public static function isUUIDv44(string $id): string {
return "hello";
}
/**
* @param string $baseUrl
* @param string $path
@@ -272,9 +263,9 @@ class GraphHelper {
/**
* @param string $baseUrl
* @param string $xRequestId
* @param string $user
* @param string $byUser
* @param string $userPassword
* @param string|null $ofUser
* @param string|null $user
*
* @return ResponseInterface
* @throws GuzzleException
@@ -282,15 +273,15 @@ class GraphHelper {
public static function getUserWithDriveInformation(
string $baseUrl,
string $xRequestId,
string $user,
string $byUser,
string $userPassword,
?string $ofUser = null
?string $user = null
): ResponseInterface {
$url = self::getFullUrl($baseUrl, 'users/' . $ofUser . '?%24select=&%24expand=drive');
$url = self::getFullUrl($baseUrl, 'users/' . $user . '?%24select=&%24expand=drive');
return HttpRequestHelper::get(
$url,
$xRequestId,
$user,
$byUser,
$userPassword,
);
}