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

test: adjust PHP code to support v8.4

Browse Source 
The implicite nullable type has been deprecated.
This fixes it by explicitely typing every nullable type.
PHP is also bumped in composer and drone to v8.4.
This commit is contained in:
Lukas Hirt
2025-06-24 11:39:50 +02:00
parent 9031871ec0
commit b933f48b68
20 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/acceptance/bootstrap/OcmContext.php
View File

@@ -73,13 +73,17 @@ class OcmContext implements Context {
/**
* @param string $user
* @param string $email
* @param string $description
* @param string|null $email
* @param string|null $description
*
* @return ResponseInterface
* @throws GuzzleException
*/
public function createInvitation(string $user, $email = null, $description = null): ResponseInterface {
public function createInvitation(
string $user,
?string $email = null,
?string $description = null,
): ResponseInterface {
$response = OcmHelper::createInvitation(
$this->featureContext->getBaseUrl(),
$user,
@@ -99,13 +103,17 @@ class OcmContext implements Context {
* @When :user creates the federation share invitation with email :email and description :description
*
* @param string $user
* @param string $email
* @param string $description
* @param string|null $email
* @param string|null $description
*
* @return void
* @throws GuzzleException
*/
public function userCreatesTheFederationShareInvitation(string $user, $email = null, $description = null): void {
public function userCreatesTheFederationShareInvitation(
string $user,
?string $email = null,
?string $description = null,
): void {
$this->featureContext->setResponse($this->createInvitation($user, $email, $description));
}
@@ -114,25 +122,29 @@ class OcmContext implements Context {
* @Given :user has created the federation share invitation with email :email and description :description
*
* @param string $user
* @param string $email
* @param string $description
* @param string|null $email
* @param string|null $description
*
* @return void
* @throws GuzzleException
*/
public function userHasCreatedTheFederationShareInvitation(string $user, $email = null, $description = null): void {
public function userHasCreatedTheFederationShareInvitation(
string $user,
?string $email = null,
?string $description = null,
): void {
$response = $this->createInvitation($user, $email, $description);
$this->featureContext->theHTTPStatusCodeShouldBe(200, '', $response);
}
/**
* @param string $user
* @param string $token
* @param string|null $token
*
* @return ResponseInterface
* @throws GuzzleException
*/
public function acceptInvitation(string $user, string $token = null): ResponseInterface {
public function acceptInvitation(string $user, ?string $token = null): ResponseInterface {
$providerDomain = $this->featureContext->getLocalBaseUrlWithoutScheme();
if ($this->featureContext->getCurrentServer() === "LOCAL") {
$providerDomain = $this->featureContext->getRemoteBaseUrlWithoutScheme();
@@ -350,7 +362,7 @@ class OcmContext implements Context {
* @return ResponseInterface
* @throws GuzzleException
*/
public function deleteConnection(string $user, string $ocmUser, string $idp = null): ResponseInterface {
public function deleteConnection(string $user, string $ocmUser, ?string $idp = null): ResponseInterface {
$ocmUser = $this->getAcceptedUserByName($user, $ocmUser);
$ocmUser['idp'] = $idp ?? $ocmUser['idp'];
return OcmHelper::deleteConnection(