From 6ecc2299dc68715183fdb672a22d6df49598d908 Mon Sep 17 00:00:00 2001 From: Wolfgang Ginolas Date: Tue, 2 Apr 2024 18:23:27 +0200 Subject: [PATCH] Use specific nextcloud versions in tests --- .github/workflows/phpunit-mysql.yml | 2 +- .github/workflows/phpunit-oci.yml | 2 +- .github/workflows/phpunit-pgsql.yml | 2 +- .github/workflows/phpunit-sqlite.yml | 2 +- lib/Service/CryptPadSessionService.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 11422d0..9dee4f8 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: php-versions: ['7.4', '8.0', '8.1'] - server-versions: ['master'] + server-versions: ['v28.0.4', 'v27.1.8'] services: mysql: diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 79daa6f..ce19981 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['v28.0.4', 'v27.1.8'] services: oracle: diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 61d8d85..cfe5a2d 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['v28.0.4', 'v27.1.8'] services: postgres: diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index c72fdde..0e44933 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['v28.0.4', 'v27.1.8'] steps: - name: Set app env diff --git a/lib/Service/CryptPadSessionService.php b/lib/Service/CryptPadSessionService.php index 3c28aef..5b9c78c 100644 --- a/lib/Service/CryptPadSessionService.php +++ b/lib/Service/CryptPadSessionService.php @@ -69,7 +69,7 @@ public function optimisticUpdateImpl(int $id, ?string $oldSessionKey, string $ne if ($actualOldKey == $oldSessionKey) { if ($newSessionKey == null) { - return this->delete($id); + return $this->delete($id); } else { if ($actualOldKey == null) { return $this->create($id, $newSessionKey);