diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php index 6cdfd190da7a..d7f563d36680 100644 --- a/lib/private/Group/Group.php +++ b/lib/private/Group/Group.php @@ -87,10 +87,16 @@ public function __construct($gid, $backends, $userManager, EventDispatcherInterf $this->displayName = $displayName; } + /** + * @return string + */ public function getGID() { return $this->gid; } + /** + * @return string|null + */ public function getDisplayName() { if ($this->displayName === null) { return $this->gid; diff --git a/tests/acceptance/features/bootstrap/ChecksumContext.php b/tests/acceptance/features/bootstrap/ChecksumContext.php index 17f8496b0706..4e15c8a8e5d8 100644 --- a/tests/acceptance/features/bootstrap/ChecksumContext.php +++ b/tests/acceptance/features/bootstrap/ChecksumContext.php @@ -370,7 +370,7 @@ public function theOcChecksumHeaderShouldNotBeThere():void { Assert::assertFalse( $isHeader, "Expected no checksum header but got " - . $this->featureContext->getResponse()->getHeader('OC-Checksum') + . $this->featureContext->getResponse()->getHeaderLine('OC-Checksum') ); } diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php index f1bd50755761..e4245f6cd50f 100644 --- a/tests/acceptance/features/bootstrap/Sharing.php +++ b/tests/acceptance/features/bootstrap/Sharing.php @@ -2438,10 +2438,10 @@ public function theFieldsOfTheResponseForUserForResourceShouldInclude( $this->getShareData($user, $share_id); foreach ($bodyRows as $field => $value) { - if ($type === "user" && \in_array($field, ["share_with"])) { + if ($type === "user" && $field == "share_with") { $value = $this->getActualUsername($value); } - if (\in_array($field, ["uid_owner"])) { + if ($field == "uid_owner") { $value = $this->getActualUsername($value); } $value = $this->replaceValuesFromTable($field, $value); diff --git a/tests/acceptance/features/bootstrap/WebUILoginContext.php b/tests/acceptance/features/bootstrap/WebUILoginContext.php index 6790659b0633..008ab390f2db 100644 --- a/tests/acceptance/features/bootstrap/WebUILoginContext.php +++ b/tests/acceptance/features/bootstrap/WebUILoginContext.php @@ -733,7 +733,7 @@ public function theUserFollowsThePasswordResetLinkFromTheirEmailUsingInvalidToke $goodToken = \array_pop($linkParts); // reverse the token string, an easy way to make the token invalid $invalidToken = \strrev($goodToken); - \array_push($linkParts, $invalidToken); + $linkParts[] = $invalidToken; $linkParts[] = $username; $adjustedLink = \implode('/', $linkParts); $this->visitPath($adjustedLink);