From 0615675c2e216e4c9f09673e28b07e0681da8d10 Mon Sep 17 00:00:00 2001
From: macbre <maciej.brencz@bethink.pl>
Date: Mon, 22 Mar 2021 13:46:54 +0100
Subject: [PATCH] \PHPUnit_Framework_MockObject_MockObject is now
 PHPUnit\Framework\MockObject\MockObject

https://github.com/sebastianbergmann/phpunit/issues/3123
---
 classes/NanoBaseTest.class.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/classes/NanoBaseTest.class.php b/classes/NanoBaseTest.class.php
index f2f56b34..befa14d3 100644
--- a/classes/NanoBaseTest.class.php
+++ b/classes/NanoBaseTest.class.php
@@ -3,6 +3,7 @@
 namespace Nano;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Base class for PHPUnit-based unit tests
@@ -25,7 +26,7 @@ protected function setUp(): void {
 	 * @param callable|null $onQuery optional callback
 	 * @return NanoDatabaseMock
 	 */
-	protected function getDatabaseMock(array $result = [], callable $onQuery = null) {
+	protected function getDatabaseMock(array $result = [], callable $onQuery = null): NanoDatabaseMock {
 		$mock = new NanoDatabaseMock($this->app);
 
 		$mock->setOnQueryCallback($onQuery);
@@ -38,9 +39,9 @@ protected function getDatabaseMock(array $result = [], callable $onQuery = null)
 	 * Creates a mock of NanoApp with a given method mocked
 	 * @param string $method
 	 * @param mixed $value
-	 * @return \PHPUnit_Framework_MockObject_MockObject
+	 * @return MockObject
 	 */
-	protected function getNanoAppMock($method, $value) {
+	protected function getNanoAppMock(string $method, $value): MockObject {
 		$mock = $this->createMock(\NanoApp::class);
 		$mock->method($method)->willReturn($value);
 
@@ -49,9 +50,9 @@ protected function getNanoAppMock($method, $value) {
 
 	/**
 	 * @param NanoObject $obj
-	 * @param \PHPUnit_Framework_MockObject_MockObject $mock
+	 * @param MockObject $mock
 	 */
-	protected function setNanoAppMock(NanoObject $obj, \PHPUnit_Framework_MockObject_MockObject $mock) {
+	protected function setNanoAppMock(NanoObject $obj, MockObject $mock) {
 		// make sphinx property a public one
 		$reflection = new \ReflectionClass($obj);
 		$reflection_property = $reflection->getProperty('app');