1 files changed, 92 insertions, 86 deletions

diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php
index 82830dcc05a..0f18ef3f204 100644
--- a/tests/lib/AppFramework/Db/QBMapperTest.php
+++ b/tests/lib/AppFramework/Db/QBMapperTest.php
@@ -1,24 +1,8 @@
 <?php
+
 /**
- * @copyright 2019, Marius David Wieschollek <git.public@mdns.eu>
- *
- * @author Marius David Wieschollek <git.public@mdns.eu>
- *
- * @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\AppFramework\Db;
@@ -27,7 +11,9 @@ use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IExpressionBuilder;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\DB\Types;
 use OCP\IDBConnection;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @method bool getBoolProp()
@@ -40,6 +26,8 @@ use OCP\IDBConnection;
  * @method void setBooleanProp(bool $booleanProp)
  * @method integer getIntegerProp()
  * @method void setIntegerProp(integer $integerProp)
+ * @method ?\DateTimeImmutable getDatetimeProp()
+ * @method void setDatetimeProp(?\DateTimeImmutable $datetime)
  */
 class QBTestEntity extends Entity {
 	protected $intProp;
@@ -48,14 +36,16 @@ class QBTestEntity extends Entity {
 	protected $integerProp;
 	protected $booleanProp;
 	protected $jsonProp;
+	protected $datetimeProp;
 
 	public function __construct() {
 		$this->addType('intProp', 'int');
 		$this->addType('boolProp', 'bool');
-		$this->addType('stringProp', 'string');
-		$this->addType('integerProp', 'integer');
-		$this->addType('booleanProp', 'boolean');
-		$this->addType('jsonProp', 'json');
+		$this->addType('stringProp', Types::STRING);
+		$this->addType('integerProp', Types::INTEGER);
+		$this->addType('booleanProp', Types::BOOLEAN);
+		$this->addType('jsonProp', Types::JSON);
+		$this->addType('datetimeProp', Types::DATETIME_IMMUTABLE);
 	}
 }
 
@@ -80,25 +70,11 @@ class QBTestMapper extends QBMapper {
  * @package Test\AppFramework\Db
  */
 class QBMapperTest extends \Test\TestCase {
-	/**
-	 * @var \PHPUnit\Framework\MockObject\MockObject|IDBConnection
-	 */
-	protected $db;
 
-	/**
-	 * @var \PHPUnit\Framework\MockObject\MockObject|IQueryBuilder
-	 */
-	protected $qb;
-
-	/**
-	 * @var \PHPUnit\Framework\MockObject\MockObject|IExpressionBuilder
-	 */
-	protected $expr;
-
-	/**
-	 * @var \Test\AppFramework\Db\QBTestMapper
-	 */
-	protected $mapper;
+	protected IDBConnection&MockObject $db;
+	protected IQueryBuilder&MockObject $qb;
+	protected IExpressionBuilder&MockObject $expr;
+	protected QBTestMapper $mapper;
 
 	/**
 	 * @throws \ReflectionException
@@ -124,45 +100,60 @@ class QBMapperTest extends \Test\TestCase {
 		$this->mapper = new QBTestMapper($this->db);
 	}
 
-	
-	public function testInsertEntityParameterTypeMapping() {
+
+	public function testInsertEntityParameterTypeMapping(): void {
+		$datetime = new \DateTimeImmutable();
 		$entity = new QBTestEntity();
 		$entity->setIntProp(123);
 		$entity->setBoolProp(true);
 		$entity->setStringProp('string');
 		$entity->setIntegerProp(456);
 		$entity->setBooleanProp(false);
+		$entity->setDatetimeProp($datetime);
 
 		$intParam = $this->qb->createNamedParameter('int_prop', IQueryBuilder::PARAM_INT);
 		$boolParam = $this->qb->createNamedParameter('bool_prop', IQueryBuilder::PARAM_BOOL);
 		$stringParam = $this->qb->createNamedParameter('string_prop', IQueryBuilder::PARAM_STR);
 		$integerParam = $this->qb->createNamedParameter('integer_prop', IQueryBuilder::PARAM_INT);
 		$booleanParam = $this->qb->createNamedParameter('boolean_prop', IQueryBuilder::PARAM_BOOL);
-
-		$this->qb->expects($this->exactly(5))
+		$datetimeParam = $this->qb->createNamedParameter('datetime_prop', IQueryBuilder::PARAM_DATETIME_IMMUTABLE);
+
+		$createNamedParameterCalls = [
+			[123, IQueryBuilder::PARAM_INT, null],
+			[true, IQueryBuilder::PARAM_BOOL, null],
+			['string', IQueryBuilder::PARAM_STR, null],
+			[456, IQueryBuilder::PARAM_INT, null],
+			[false, IQueryBuilder::PARAM_BOOL, null],
+			[$datetime, IQueryBuilder::PARAM_DATETIME_IMMUTABLE, null],
+		];
+		$this->qb->expects($this->exactly(6))
 			->method('createNamedParameter')
-			->withConsecutive(
-				[$this->equalTo(123), $this->equalTo(IQueryBuilder::PARAM_INT)],
-				[$this->equalTo(true), $this->equalTo(IQueryBuilder::PARAM_BOOL)],
-				[$this->equalTo('string'), $this->equalTo(IQueryBuilder::PARAM_STR)],
-				[$this->equalTo(456), $this->equalTo(IQueryBuilder::PARAM_INT)],
-				[$this->equalTo(false), $this->equalTo(IQueryBuilder::PARAM_BOOL)]
-			);
-		$this->qb->expects($this->exactly(5))
+			->willReturnCallback(function () use (&$createNamedParameterCalls): void {
+				$expected = array_shift($createNamedParameterCalls);
+				$this->assertEquals($expected, func_get_args());
+			});
+
+		$setValueCalls = [
+			['int_prop', $intParam],
+			['bool_prop', $boolParam],
+			['string_prop', $stringParam],
+			['integer_prop', $integerParam],
+			['boolean_prop', $booleanParam],
+			['datetime_prop', $datetimeParam],
+		];
+		$this->qb->expects($this->exactly(6))
 			->method('setValue')
-			->withConsecutive(
-				[$this->equalTo('int_prop'), $this->equalTo($intParam)],
-				[$this->equalTo('bool_prop'), $this->equalTo($boolParam)],
-				[$this->equalTo('string_prop'), $this->equalTo($stringParam)],
-				[$this->equalTo('integer_prop'), $this->equalTo($integerParam)],
-				[$this->equalTo('boolean_prop'), $this->equalTo($booleanParam)]
-			);
+			->willReturnCallback(function () use (&$setValueCalls): void {
+				$expected = array_shift($setValueCalls);
+				$this->assertEquals($expected, func_get_args());
+			});
 
 		$this->mapper->insert($entity);
 	}
 
-	
-	public function testUpdateEntityParameterTypeMapping() {
+
+	public function testUpdateEntityParameterTypeMapping(): void {
+		$datetime = new \DateTimeImmutable();
 		$entity = new QBTestEntity();
 		$entity->setId(789);
 		$entity->setIntProp(123);
@@ -170,7 +161,8 @@ class QBMapperTest extends \Test\TestCase {
 		$entity->setStringProp('string');
 		$entity->setIntegerProp(456);
 		$entity->setBooleanProp(false);
-		$entity->setJsonProp(["hello" => "world"]);
+		$entity->setJsonProp(['hello' => 'world']);
+		$entity->setDatetimeProp($datetime);
 
 		$idParam = $this->qb->createNamedParameter('id', IQueryBuilder::PARAM_INT);
 		$intParam = $this->qb->createNamedParameter('int_prop', IQueryBuilder::PARAM_INT);
@@ -179,29 +171,40 @@ class QBMapperTest extends \Test\TestCase {
 		$integerParam = $this->qb->createNamedParameter('integer_prop', IQueryBuilder::PARAM_INT);
 		$booleanParam = $this->qb->createNamedParameter('boolean_prop', IQueryBuilder::PARAM_BOOL);
 		$jsonParam = $this->qb->createNamedParameter('json_prop', IQueryBuilder::PARAM_JSON);
-
-		$this->qb->expects($this->exactly(7))
+		$datetimeParam = $this->qb->createNamedParameter('datetime_prop', IQueryBuilder::PARAM_DATETIME_IMMUTABLE);
+
+		$createNamedParameterCalls = [
+			[123, IQueryBuilder::PARAM_INT, null],
+			[true, IQueryBuilder::PARAM_BOOL, null],
+			['string', IQueryBuilder::PARAM_STR, null],
+			[456, IQueryBuilder::PARAM_INT, null],
+			[false, IQueryBuilder::PARAM_BOOL, null],
+			[['hello' => 'world'], IQueryBuilder::PARAM_JSON, null],
+			[$datetime, IQueryBuilder::PARAM_DATETIME_IMMUTABLE, null],
+			[789, IQueryBuilder::PARAM_INT, null],
+		];
+		$this->qb->expects($this->exactly(8))
 			->method('createNamedParameter')
-			->withConsecutive(
-				[$this->equalTo(123), $this->equalTo(IQueryBuilder::PARAM_INT)],
-				[$this->equalTo(true), $this->equalTo(IQueryBuilder::PARAM_BOOL)],
-				[$this->equalTo('string'), $this->equalTo(IQueryBuilder::PARAM_STR)],
-				[$this->equalTo(456), $this->equalTo(IQueryBuilder::PARAM_INT)],
-				[$this->equalTo(false), $this->equalTo(IQueryBuilder::PARAM_BOOL)],
-				[$this->equalTo(["hello" => "world"]), $this->equalTo(IQueryBuilder::PARAM_JSON)],
-				[$this->equalTo(789), $this->equalTo(IQueryBuilder::PARAM_INT)],
-			);
-
-		$this->qb->expects($this->exactly(6))
+			->willReturnCallback(function () use (&$createNamedParameterCalls): void {
+				$expected = array_shift($createNamedParameterCalls);
+				$this->assertEquals($expected, func_get_args());
+			});
+
+		$setCalls = [
+			['int_prop', $intParam],
+			['bool_prop', $boolParam],
+			['string_prop', $stringParam],
+			['integer_prop', $integerParam],
+			['boolean_prop', $booleanParam],
+			['json_prop', $datetimeParam],
+			['datetime_prop', $datetimeParam],
+		];
+		$this->qb->expects($this->exactly(7))
 			->method('set')
-			->withConsecutive(
-				[$this->equalTo('int_prop'), $this->equalTo($intParam)],
-				[$this->equalTo('bool_prop'), $this->equalTo($boolParam)],
-				[$this->equalTo('string_prop'), $this->equalTo($stringParam)],
-				[$this->equalTo('integer_prop'), $this->equalTo($integerParam)],
-				[$this->equalTo('boolean_prop'), $this->equalTo($booleanParam)],
-				[$this->equalTo('json_prop'), $this->equalTo($jsonParam)]
-			);
+			->willReturnCallback(function () use (&$setCalls): void {
+				$expected = array_shift($setCalls);
+				$this->assertEquals($expected, func_get_args());
+			});
 
 		$this->expr->expects($this->once())
 			->method('eq')
@@ -211,8 +214,8 @@ class QBMapperTest extends \Test\TestCase {
 		$this->mapper->update($entity);
 	}
 
-	
-	public function testGetParameterTypeForProperty() {
+
+	public function testGetParameterTypeForProperty(): void {
 		$entity = new QBTestEntity();
 
 		$intType = $this->mapper->getParameterTypeForPropertyForTest($entity, 'intProp');
@@ -233,6 +236,9 @@ class QBMapperTest extends \Test\TestCase {
 		$jsonType = $this->mapper->getParameterTypeForPropertyForTest($entity, 'jsonProp');
 		$this->assertEquals(IQueryBuilder::PARAM_JSON, $jsonType, 'JSON type property mapping incorrect');
 
+		$datetimeType = $this->mapper->getParameterTypeForPropertyForTest($entity, 'datetimeProp');
+		$this->assertEquals(IQueryBuilder::PARAM_DATETIME_IMMUTABLE, $datetimeType, 'DateTimeImmutable type property mapping incorrect');
+
 		$unknownType = $this->mapper->getParameterTypeForPropertyForTest($entity, 'someProp');
 		$this->assertEquals(IQueryBuilder::PARAM_STR, $unknownType, 'Unknown type property mapping incorrect');
 	}