1 files changed, 35 insertions, 35 deletions

diff --git a/tests/lib/InitialStateServiceTest.php b/tests/lib/InitialStateServiceTest.php
index 30eca056206..9081aa93b84 100644
--- a/tests/lib/InitialStateServiceTest.php
+++ b/tests/lib/InitialStateServiceTest.php
@@ -3,68 +3,54 @@
 declare(strict_types=1);
 
 /**
- * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test;
 
-use OC\AppFramework\Bootstrap\Coordinator;
-use OCP\IServerContainer;
-use function json_encode;
 use JsonSerializable;
+use OC\AppFramework\Bootstrap\Coordinator;
 use OC\InitialStateService;
-use OCP\ILogger;
+use OCP\IServerContainer;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 use stdClass;
+use function json_encode;
 
 class InitialStateServiceTest extends TestCase {
-
 	/** @var InitialStateService */
 	private $service;
+	/** @var MockObject|LoggerInterface|(LoggerInterface&MockObject) */
+	protected $logger;
 
 	protected function setUp(): void {
 		parent::setUp();
 
+		$this->logger = $this->createMock(LoggerInterface::class);
+
 		$this->service = new InitialStateService(
-			$this->createMock(ILogger::class),
+			$this->logger,
 			$this->createMock(Coordinator::class),
 			$this->createMock(IServerContainer::class)
 		);
 	}
 
-	public function staticData() {
+	public static function staticData(): array {
 		return [
 			['string'],
 			[23],
 			[2.3],
 			[new class implements JsonSerializable {
-				public function jsonSerialize() {
+				public function jsonSerialize(): int {
 					return 3;
 				}
 			}],
 		];
 	}
 
-	/**
-	 * @dataProvider staticData
-	 */
-	public function testStaticData($value) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('staticData')]
+	public function testStaticData(mixed $value): void {
 		$this->service->provideInitialState('test', 'key', $value);
 		$data = $this->service->getInitialStates();
 
@@ -74,7 +60,23 @@ class InitialStateServiceTest extends TestCase {
 		);
 	}
 
-	public function testStaticButInvalidData() {
+	public function testValidDataButFailsToJSONEncode(): void {
+		$this->logger->expects($this->once())
+			->method('error');
+
+		$this->service->provideInitialState('test', 'key', ['upload' => INF]);
+		$data = $this->service->getInitialStates();
+
+		$this->assertEquals(
+			[],
+			$data
+		);
+	}
+
+	public function testStaticButInvalidData(): void {
+		$this->logger->expects($this->once())
+			->method('warning');
+
 		$this->service->provideInitialState('test', 'key', new stdClass());
 		$data = $this->service->getInitialStates();
 
@@ -84,10 +86,8 @@ class InitialStateServiceTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @dataProvider staticData
-	 */
-	public function testLazyData($value) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('staticData')]
+	public function testLazyData(mixed $value): void {
 		$this->service->provideLazyInitialState('test', 'key', function () use ($value) {
 			return $value;
 		});