fix(QueryBuilder): Make types even more strict

And put the files in rector strict and psalm strict

Signed-off-by: Carl Schwan <carlschwan@kde.org>

Author: CarlSchwan

apps/dav/lib/DAV/Sharing/SharingMapper.php

@@ -165,7 +165,6 @@ public function getPrincipalUrisByPrefix(string $resourceType, string $prefix):
 			->andWhere($query->expr()->eq(
 				'type',
 				$query->createNamedParameter($resourceType, IQueryBuilder::PARAM_STR)),
-				IQueryBuilder::PARAM_STR,
 			)
 			->executeQuery();
 

apps/federatedfilesharing/tests/FederatedShareProviderReshareRemoteTest.php

@@ -9,6 +9,7 @@
 namespace OCA\FederatedFileSharing\Tests;
 
 use LogicException;
+use OC\DB\QueryBuilder\Parameter;
 use OC\Federation\CloudId;
 use OC\Share20\Share;
 use OCA\FederatedFileSharing\AddressHandler;
@@ -115,7 +116,7 @@ public function testCreateRemoteOwner(): void {
 		$qb1->method('from')->willReturnSelf();
 		$qb1->method('where')->willReturnSelf();
 		$qb1->method('expr')->willReturn($expr1);
-		$qb1->method('createNamedParameter')->willReturn('');
+		$qb1->method('createNamedParameter')->willReturn(new Parameter(''));
 		$qb1->method('executeQuery')->willReturn($result1);
 
 		/*
@@ -149,7 +150,7 @@ public function testCreateRemoteOwner(): void {
 		$qb2->method('from')->willReturnSelf();
 		$qb2->method('where')->willReturnSelf();
 		$qb2->method('expr')->willReturn($expr2);
-		$qb2->method('createNamedParameter')->willReturn('');
+		$qb2->method('createNamedParameter')->willReturn(new Parameter(''));
 		$qb2->method('executeQuery')->willReturn($result2);
 
 		/*
@@ -194,7 +195,7 @@ public function testCreateRemoteOwner(): void {
 		$qb4->method('where')->willReturnSelf();
 		$qb4->method('expr')->willReturn($expr4);
 		$qb4->method('set')->willReturnSelf();
-		$qb4->method('createNamedParameter')->willReturn('');
+		$qb4->method('createNamedParameter')->willReturn(new Parameter(''));
 
 		/*
 		 * Mocks for storeRemoteId.
@@ -244,7 +245,7 @@ public function testCreateRemoteOwner(): void {
 		$qb6->method('from')->willReturnSelf();
 		$qb6->method('where')->willReturnSelf();
 		$qb6->method('expr')->willReturn($expr6);
-		$qb6->method('createNamedParameter')->willReturn('');
+		$qb6->method('createNamedParameter')->willReturn(new Parameter(''));
 		$qb6->method('executeQuery')->willReturn($result6);
 
 		$queryBuilderMatcher = $this->exactly(7);
@@ -345,7 +346,7 @@ public function testUpdateRemoteOwner(): void {
 		$qb1->method('update')->willReturnSelf();
 		$qb1->method('where')->willReturnSelf();
 		$qb1->method('expr')->willReturn($expr1);
-		$qb1->method('createNamedParameter')->willReturn('');
+		$qb1->method('createNamedParameter')->willReturn(new Parameter(''));
 		$qb1->method('set')->willReturnSelf();
 
 		/*
@@ -365,7 +366,7 @@ public function testUpdateRemoteOwner(): void {
 		$qb2->method('from')->willReturnSelf();
 		$qb2->method('where')->willReturnSelf();
 		$qb2->method('expr')->willReturn($expr2);
-		$qb2->method('createNamedParameter')->willReturn('');
+		$qb2->method('createNamedParameter')->willReturn(new Parameter(''));
 		$qb2->method('executeQuery')->willReturn($result2);
 
 		$queryBuilderMatcher = $this->exactly(2);

build/psalm-baseline.xml

@@ -4205,4 +4205,13 @@
       <code><![CDATA[getAppValue]]></code>
     </DeprecatedMethod>
   </file>
+  <file src="tests/lib/TestCase.php">
+    <DeprecatedMethod>
+      <code><![CDATA[$container]]></code>
+    </DeprecatedMethod>
+    <InternalMethod>
+      <code><![CDATA[lockFile]]></code>
+      <code><![CDATA[unlockFile]]></code>
+    </InternalMethod>
+  </file>
 </files>

build/rector-strict.php

@@ -5,6 +5,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
+
 $nextcloudDir = dirname(__DIR__);
 
 return (require __DIR__ . '/rector-shared.php')
@@ -23,8 +25,15 @@
 		$nextcloudDir . '/lib/private/Files/Cache/StorageGlobal.php',
 		$nextcloudDir . '/lib/private/Files/Storage/Wrapper/Wrapper.php',
 		$nextcloudDir . '/build/psalm/ITypedQueryBuilderTest.php',
-		$nextcloudDir . '/lib/private/DB/QueryBuilder/TypedQueryBuilder.php',
-		$nextcloudDir . '/lib/public/DB/QueryBuilder/ITypedQueryBuilder.php',
+		$nextcloudDir . '/lib/private/DB/QueryBuilder/',
+		$nextcloudDir . '/lib/public/DB/QueryBuilder/',
+		$nextcloudDir . '/tests/lib/DB/QueryBuilder/',
+	])
+	->withSkip([
+		$nextcloudDir . '/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php', // rector crashes with this file
+		ReadOnlyPropertyRector::class => [
+			$nextcloudDir . '/lib/private/DB/QueryBuilder/QueryBuilder.php', // Readonly properties are overwritten in tests
+		]
 	])
 	->withAutoloadPaths([
 		// ensure rector properly autoload the public interfaces

lib/private/DB/QueryBuilder/CompositeExpression.php

@@ -15,14 +15,15 @@
 
 class CompositeExpression implements ICompositeExpression, \Countable {
 	public const TYPE_AND = 'AND';
+
 	public const TYPE_OR = 'OR';
 
 	/**
 	 * @param self::TYPE_* $type
 	 * @param array<ICompositeExpression|string> $parts
 	 */
 	public function __construct(
-		private string $type,
+		private readonly string $type,
 		private array $parts = [],
 	) {
 	}
@@ -53,8 +54,6 @@ public function add($part): ICompositeExpression {
 
 	/**
 	 * Retrieves the amount of expressions on composite expression.
-	 *
-	 * @return integer
 	 */
 	#[\Override]
 	public function count(): int {
@@ -63,8 +62,6 @@ public function count(): int {
 
 	/**
 	 * Returns the type of this composite expression (AND/OR).
-	 *
-	 * @return string
 	 */
 	#[\Override]
 	public function getType(): string {
@@ -73,13 +70,12 @@ public function getType(): string {
 
 	/**
 	 * Retrieves the string representation of this composite expression.
-	 *
-	 * @return string
 	 */
 	public function __toString(): string {
 		if ($this->count() === 1) {
 			return (string)$this->parts[0];
 		}
+
 		return '(' . implode(') ' . $this->type . ' (', $this->parts) . ')';
 	}
 

lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php

@@ -28,7 +28,9 @@
 
 class ExpressionBuilder implements IExpressionBuilder {
 	protected DoctrineExpressionBuilder $expressionBuilder;
+
 	protected QuoteHelper $helper;
+
 	protected IFunctionBuilder $functionBuilder;
 
 	public function __construct(
@@ -43,17 +45,19 @@ public function __construct(
 
 	#[Override]
 	public function andX(ICompositeExpression|string ...$x): ICompositeExpression {
-		if (empty($x)) {
+		if ($x === []) {
 			$this->logger->debug('Calling ' . IQueryBuilder::class . '::' . __FUNCTION__ . ' without parameters is deprecated and will throw soon.', ['exception' => new \Exception('No parameters in call to ' . __METHOD__)]);
 		}
+
 		return new CompositeExpression(CompositeExpression::TYPE_AND, $x);
 	}
 
 	#[Override]
 	public function orX(ICompositeExpression|string ...$x): ICompositeExpression {
-		if (empty($x)) {
+		if ($x === []) {
 			$this->logger->debug('Calling ' . IQueryBuilder::class . '::' . __FUNCTION__ . ' without parameters is deprecated and will throw soon.', ['exception' => new \Exception('No parameters in call to ' . __METHOD__)]);
 		}
+
 		return new CompositeExpression(CompositeExpression::TYPE_OR, $x);
 	}
 

lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -79,6 +81,7 @@ public function castColumn(string|IQueryFunction|ILiteral|IParameter $column, in
 			$column = $this->helper->quoteColumnName($column);
 			return new QueryFunction('to_char(' . $column . ')');
 		}
+
 		if ($type === IQueryBuilder::PARAM_INT) {
 			$column = $this->helper->quoteColumnName($column);
 			return new QueryFunction('to_number(to_char(' . $column . '))');

lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php

@@ -227,7 +227,7 @@ public function addGroupBy(...$groupBy): self {
 	}
 
 	#[Override]
-	public function setValue(string $column, ILiteral|IParameter|IQueryFunction|string $value): self {
+	public function setValue(string $column, ILiteral|IParameter|IQueryFunction|string|int|float $value): self {
 		$this->builder->setValue($column, $value);
 		return $this;
 	}