fix: Update psalm and fix new psalm errors

Signed-off-by: Marcel Klehr <[email protected]>
nextcloud · Apr 17, 2024 · 92dc6c9 · 92dc6c9
1 parent 4d526f9
commit 92dc6c9
Show file tree

Hide file tree

Showing 13 changed files with 912 additions and 1,011 deletions.
diff --git a/README.md b/README.md
@@ -95,7 +95,6 @@ Recognize uses
   - Processor: x86 64-bit, arm64, armv7l (no AVX needed)
   - System with glibc or musl (incl. Alpine linux and thus also Nextcloud AIO)
 - ~4GB of free RAM (if you're cutting it close, make sure you have some swap available)
-- This app is currently incompatible with the *Suspicious Login* app due to a dependency conflict (ie. you can only have one of the two installed)
 
 #### Tmp
 This app temporarily stores files to be recognized in /tmp. If you're using docker, you might find

diff --git a/lib/BackgroundJobs/StorageCrawlJob.php b/lib/BackgroundJobs/StorageCrawlJob.php
@@ -40,7 +40,7 @@ public function __construct(ITimeFactory $timeFactory, Logger $logger, QueueServ
 	}
 
 	/**
-	 * @param array{storage_id:int, root_id:int, override_root:int, last_file_id:int} $argument
+	 * @param array{storage_id:int, root_id:int, override_root:int, last_file_id:int, models?: list<string>} $argument
 	 * @return void
 	 */
 	protected function run($argument): void {

diff --git a/lib/Classifiers/Classifier.php b/lib/Classifiers/Classifier.php
@@ -65,7 +65,7 @@ abstract public function classify(array $queueFiles): void;
 	 * @param QueueFile[] $queueFiles
 	 * @param int $timeout
 	 * @return \Generator
-	 * @psalm-return \Generator<QueueFile, mixed, mixed, void>
+	 * @psalm-return \Generator<QueueFile, mixed, mixed, null>
 	 * @throws \ErrorException|\RuntimeException
 	 */
 	public function classifyFiles(string $model, array $queueFiles, int $timeout): \Generator {

diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php
@@ -168,6 +168,9 @@ public function platform(): JSONResponse {
 		}
 
 		$lscpu = \json_decode(trim(implode("\n", $output)), true);
+		if (!isset($lscpu['lscpu'][0]['data'])) {
+			return new JSONResponse(['platform' => null]);
+		}
 		return new JSONResponse(['platform' => $lscpu['lscpu'][0]['data']]);
 	}
 

diff --git a/lib/Db/FaceClusterMapper.php b/lib/Db/FaceClusterMapper.php
@@ -11,6 +11,9 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/**
+ * @psalm-extends QBMapper<FaceCluster>
+ */
 class FaceClusterMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'recognize_face_clusters', FaceCluster::class);

diff --git a/lib/Db/FaceDetectionMapper.php b/lib/Db/FaceDetectionMapper.php
@@ -14,6 +14,9 @@
 use OCP\IConfig;
 use OCP\IDBConnection;
 
+/**
+ * @psalm-extends QBMapper<FaceDetection>
+ */
 class FaceDetectionMapper extends QBMapper {
 	private IConfig $config;
 

diff --git a/lib/Db/QueueMapper.php b/lib/Db/QueueMapper.php
@@ -18,6 +18,9 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/**
+ * @psalm-extends QBMapper<QueueFile>
+ */
 class QueueMapper extends QBMapper {
 	public const MODELS = [
 		ImagenetClassifier::MODEL_NAME,

diff --git a/lib/Helper/TAR.php b/lib/Helper/TAR.php
@@ -209,7 +209,7 @@ public function getFolder($path) {
 			}
 			if (substr($file, 0, $pathLength) == $path and $file != $path) {
 				$result = substr($file, $pathLength);
-				if ($pos = strpos($result, '/')) {
+				if (($pos = strpos($result, '/')) !== false) {
 					$result = substr($result, 0, $pos + 1);
 				}
 				if (array_search($result, $folderContent) === false) {

diff --git a/lib/Hooks/FileListener.php b/lib/Hooks/FileListener.php
@@ -38,6 +38,9 @@
 use OCP\Share\IManager;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @psalm-implements IEventListener<Event>
+ */
 class FileListener implements IEventListener {
 	private FaceDetectionMapper $faceDetectionMapper;
 	private LoggerInterface $logger;
@@ -70,7 +73,7 @@ public function handle(Event $event): void {
 			$node = $share->getNode();
 
 			$accessList = $this->shareManager->getAccessList($node, true, true);
-			$userIds = array_map(fn ($id) => (string)$id, array_keys($accessList['users']));
+			$userIds = array_map(fn (int|string $id) => (string)$id, array_keys($accessList['users']));
 
 			if ($node->getType() === FileInfo::TYPE_FOLDER) {
 				$mount = $node->getMountPoint();

diff --git a/lib/Service/FaceClusterAnalyzer.php b/lib/Service/FaceClusterAnalyzer.php
@@ -99,7 +99,7 @@ public function calculateClusters(string $userId, int $batchSize = 0): void {
 			/** @var int[] $detectionKeys */
 			$detectionKeys = array_keys($flatCluster->getClusterVertices());
 
-			$clusterDetections = array_filter($detections, function (int $key) use ($detectionKeys) {
+			$clusterDetections = array_filter($detections, function ($key) use ($detectionKeys) {
 				return isset($detectionKeys[$key]);
 			}, ARRAY_FILTER_USE_KEY);
 			$clusterCentroid = self::calculateCentroidOfDetections($clusterDetections);