1 files changed, 15 insertions, 36 deletions

diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php
index 504876b2d88..56f67b23f0d 100644
--- a/tests/lib/AppFramework/Http/JSONResponseTest.php
+++ b/tests/lib/AppFramework/Http/JSONResponseTest.php
@@ -1,26 +1,9 @@
 <?php
 
 /**
- * ownCloud - App Framework
- *
- * @author Bernhard Posselt
- * @author Morris Jobke
- * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright 2013 Morris Jobke <morris.jobke@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test\AppFramework\Http;
@@ -29,7 +12,6 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 
 class JSONResponseTest extends \Test\TestCase {
-
 	/**
 	 * @var JSONResponse
 	 */
@@ -41,13 +23,13 @@ class JSONResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testHeader() {
+	public function testHeader(): void {
 		$headers = $this->json->getHeaders();
 		$this->assertEquals('application/json; charset=utf-8', $headers['Content-Type']);
 	}
 
 
-	public function testSetData() {
+	public function testSetData(): void {
 		$params = ['hi', 'yo'];
 		$this->json->setData($params);
 
@@ -55,7 +37,7 @@ class JSONResponseTest extends \Test\TestCase {
 	}
 
 
-	public function testSetRender() {
+	public function testSetRender(): void {
 		$params = ['test' => 'hi'];
 		$this->json->setData($params);
 
@@ -64,10 +46,7 @@ class JSONResponseTest extends \Test\TestCase {
 		$this->assertEquals($expected, $this->json->render());
 	}
 
-	/**
-	 * @return array
-	 */
-	public function renderDataProvider() {
+	public static function renderDataProvider(): array {
 		return [
 			[
 				['test' => 'hi'], '{"test":"hi"}',
@@ -79,26 +58,26 @@ class JSONResponseTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider renderDataProvider
 	 * @param array $input
 	 * @param string $expected
 	 */
-	public function testRender(array $input, $expected) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('renderDataProvider')]
+	public function testRender(array $input, $expected): void {
 		$this->json->setData($input);
 		$this->assertEquals($expected, $this->json->render());
 	}
 
-	
-	public function testRenderWithNonUtf8Encoding() {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('Could not json_encode due to invalid non UTF-8 characters in the array: array (');
+
+	public function testRenderWithNonUtf8Encoding(): void {
+		$this->expectException(\JsonException::class);
+		$this->expectExceptionMessage('Malformed UTF-8 characters, possibly incorrectly encoded');
 
 		$params = ['test' => hex2bin('e9')];
 		$this->json->setData($params);
 		$this->json->render();
 	}
 
-	public function testConstructorAllowsToSetData() {
+	public function testConstructorAllowsToSetData(): void {
 		$data = ['hi'];
 		$code = 300;
 		$response = new JSONResponse($data, $code);
@@ -108,7 +87,7 @@ class JSONResponseTest extends \Test\TestCase {
 		$this->assertEquals($code, $response->getStatus());
 	}
 
-	public function testChainability() {
+	public function testChainability(): void {
 		$params = ['hi', 'yo'];
 		$this->json->setData($params)
 			->setStatus(Http::STATUS_NOT_FOUND);