From fe4264dacdcf8e3cf6115104e231a57fb3085d4f Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 30 Nov 2020 09:39:21 +0100 Subject: [PATCH 1/2] Bring back more php7.2 compatibility for some Nextcloud 20 instances Signed-off-by: Christoph Wurst --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1f5df4d54a..11b7984dff 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [7.3, 7.4] + php-versions: [7.2, 7.3, 7.4] name: php${{ matrix.php-versions }} lint steps: - name: Checkout From fce0a1edbc3c65c1bc683a08660e70528b99636f Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 30 Nov 2020 10:17:00 +0100 Subject: [PATCH 2/2] Do not use trailing commas yet Signed-off-by: Christoph Wurst --- lib/Http/HtmlResponse.php | 2 +- tests/Unit/Controller/MessagesControllerTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Http/HtmlResponse.php b/lib/Http/HtmlResponse.php index c3b45a03b2..f880c077f8 100644 --- a/lib/Http/HtmlResponse.php +++ b/lib/Http/HtmlResponse.php @@ -69,7 +69,7 @@ public static function withResizer(string $content, $content, false, $nonce, - $scriptUrl, + $scriptUrl ); } diff --git a/tests/Unit/Controller/MessagesControllerTest.php b/tests/Unit/Controller/MessagesControllerTest.php index c347dd7d51..23806aadc8 100644 --- a/tests/Unit/Controller/MessagesControllerTest.php +++ b/tests/Unit/Controller/MessagesControllerTest.php @@ -153,7 +153,7 @@ protected function setUp(): void { $this->l10n, $this->mimeTypeDetector, $this->urlGenerator, - $this->nonceManager, + $this->nonceManager ); $this->account = $this->createMock(Account::class);