Psalm fixing

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

apps/user_ldap/lib/Access.php

@@ -1753,7 +1753,7 @@ private function detectUuidAttribute($dn, $isUser = true, $force = false, array
 			}
 
 			$attribute = $this->connection->getFromCache($uuidAttr);
-			if (!$attribute === null) {
+			if ($attribute !== null) {
 				$this->connection->$uuidAttr = $attribute;
 				return true;
 			}

apps/user_status/lib/Db/UserStatusMapper.php

@@ -35,6 +35,8 @@
  *
  * @package OCA\UserStatus\Db
  *
+ * @psalm-suppress MoreSpecificImplementedParamType
+ *
  * @method UserStatus insert(UserStatus $entity)
  * @method UserStatus update(UserStatus $entity)
  * @method UserStatus insertOrUpdate(UserStatus $entity)

build/files-checker.php

@@ -38,7 +38,7 @@
 	'.jshintrc',
 	'.mailmap',
 	'.npmignore',
-	'.php_cs.dist',
+	'.php-cs-fixer.dist.php',
 	'.scrutinizer.yml',
 	'.tag',
 	'.tx',
@@ -85,6 +85,7 @@
 	'tests',
 	'themes',
 	'version.php',
+	'vendor-bin',
 	'webpack.common.js',
 	'webpack.dev.js',
 	'webpack.prod.js',

build/psalm-baseline.xml

@@ -2466,14 +2466,6 @@
       <code>registerProvider</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="apps/user_status/lib/Db/UserStatusMapper.php">
-    <MoreSpecificImplementedParamType occurrences="4">
-      <code>UserStatus insert(UserStatus $entity)</code>
-      <code>UserStatus insert(UserStatus $entity)</code>
-      <code>UserStatus insert(UserStatus $entity)</code>
-      <code>UserStatus insert(UserStatus $entity)</code>
-    </MoreSpecificImplementedParamType>
-  </file>
   <file src="apps/workflowengine/lib/AppInfo/Application.php">
     <InvalidArgument occurrences="1">
       <code>registerEventListener</code>

lib/private/Collaboration/Resources/Manager.php

@@ -131,7 +131,7 @@ public function getCollectionForUser(int $id, ?IUser $user): ICollection {
 	 */
 	public function searchCollections(IUser $user, string $filter, int $limit = 50, int $start = 0): array {
 		$query = $this->connection->getQueryBuilder();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
+		$userId = $user->getUID();
 
 		$query->select('c.*', 'a.access')
 			->from(self::TABLE_COLLECTIONS, 'c')

lib/private/Notification/Manager.php

@@ -338,12 +338,12 @@ public function prepare(INotification $notification, string $languageCode): INot
 				throw new \InvalidArgumentException('The given notification has been processed');
 			}
 
-			if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+			if (!$notification->isValidParsed()) {
 				throw new \InvalidArgumentException('The given notification has not been handled');
 			}
 		}
 
-		if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+		if (!$notification->isValidParsed()) {
 			throw new \InvalidArgumentException('The given notification has not been handled');
 		}
 

lib/private/legacy/OC_Util.php

@@ -848,6 +848,7 @@ public static function checkServer(\OC\SystemConfig $config) {
 				'default_charset' => 'UTF-8',
 			],
 		];
+		/** @var array<array-key, bool|string|int> $missingDependencies */
 		$missingDependencies = [];
 		$invalidIniSettings = [];
 
@@ -894,7 +895,7 @@ public static function checkServer(\OC\SystemConfig $config) {
 		}
 		foreach ($invalidIniSettings as $setting) {
 			if (is_bool($setting[1])) {
-				$setting[1] = $setting[1] ? 'on' : 'off';
+				$setting[1] = $setting[1] === true ? 'on' : 'off';
 			}
 			$errors[] = [
 				'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),