fix psalm

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · May 29, 2024 · c867b25 · c867b25
1 parent 199f14e
commit c867b25
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 52 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -71,4 +71,4 @@ jobs:
 
       - name: PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
-        run: composer run text:unit
+        run: composer run test:unit
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -38,7 +38,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: [ '^28', 'dev-master' ]
+        ocp-version: [ 'dev-master' ]
         php-version: [ '8.0', '8.1', '8.2', '8.3' ]
 
 
@@ -63,7 +63,7 @@ jobs:
         run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
 
       - name: Install dependencies
-        run: composer require --dev 
+        run: composer require --dev
 
       - name: Run coding standards check
         run: composer run psalm

diff --git a/composer.json b/composer.json
@@ -20,6 +20,8 @@
 		"cs:fix": "php-cs-fixer fix",
 		"test:unit": "phpunit --config tests/phpunit.xml",
 		"psalm": "psalm.phar --no-cache",
+		"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
+		"psalm:update-baseline:force": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
 		"post-install-cmd": [
 			"@composer bin all install --ansi",
 			"composer dump-autoload"

diff --git a/composer.lock b/composer.lock
diff --git a/lib/TaskProcessing/HeadlineProvider.php b/lib/TaskProcessing/HeadlineProvider.php
@@ -16,9 +16,6 @@
 use OCP\TaskProcessing\TaskTypes\TextToTextHeadline;
 use RuntimeException;
 
-/**
- * @template-implements ISynchronousProvider
- */
 class HeadlineProvider implements ISynchronousProvider {
 
 	public function __construct(

diff --git a/lib/TaskProcessing/STTProvider.php b/lib/TaskProcessing/STTProvider.php
@@ -15,9 +15,6 @@
 use Psr\Log\LoggerInterface;
 use RuntimeException;
 
-/**
- * @template-implements ISynchronousProvider
- */
 class STTProvider implements ISynchronousProvider {
 
 	public function __construct(

diff --git a/lib/TaskProcessing/SummaryProvider.php b/lib/TaskProcessing/SummaryProvider.php
@@ -16,9 +16,6 @@
 use OCP\TaskProcessing\TaskTypes\TextToTextSummary;
 use RuntimeException;
 
-/**
- * @template-implements ISynchronousProvider
- */
 class SummaryProvider implements ISynchronousProvider {
 
 	public function __construct(

diff --git a/lib/TaskProcessing/TextToImageProvider.php b/lib/TaskProcessing/TextToImageProvider.php
@@ -15,9 +15,6 @@
 use Psr\Log\LoggerInterface;
 use RuntimeException;
 
-/**
- * @template-implements ISynchronousProvider
- */
 class TextToImageProvider implements ISynchronousProvider {
 
 	public function __construct(
@@ -95,6 +92,7 @@ public function process(?string $userId, array $input, callable $reportProgress)
 			}
 			$endTime = time();
 			$this->openAiAPIService->updateExpImgProcessingTime($endTime - $startTime);
+			/** @var array<string, list<numeric|string>|numeric|string> $output */
 			return $output;
 		} catch(\Exception $e) {
 			$this->logger->warning('OpenAI/LocalAI\'s text to image generation failed with: ' . $e->getMessage(), ['exception' => $e]);

diff --git a/lib/TaskProcessing/TextToTextProvider.php b/lib/TaskProcessing/TextToTextProvider.php
@@ -16,9 +16,6 @@
 use OCP\TaskProcessing\TaskTypes\TextToText;
 use RuntimeException;
 
-/**
- * @template-implements ISynchronousProvider
- */
 class TextToTextProvider implements ISynchronousProvider {
 
 	public function __construct(

diff --git a/lib/TaskProcessing/TopicsProvider.php b/lib/TaskProcessing/TopicsProvider.php
@@ -16,9 +16,6 @@
 use OCP\TaskProcessing\TaskTypes\TextToTextTopics;
 use RuntimeException;
 
-/**
- * @template-implements ISynchronousProvider
- */
 class TopicsProvider implements ISynchronousProvider {
 
 	public function __construct(

diff --git a/psalm.xml b/psalm.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <psalm
+	errorBaseline="tests/psalm-baseline.xml"
 	errorLevel="4"
 	findUnusedBaselineEntry="true"
 	findUnusedCode="false"
@@ -29,6 +30,8 @@
 				<referencedClass name="Symfony\Component\Console\Command\Command" />
 				<referencedClass name="GuzzleHttp\Exception\ServerException" />
 				<referencedClass name="GuzzleHttp\Exception\ClientException" />
+				<referencedClass name="OCP\TaskProcessing\ISynchronousProvider" />
+				<referencedClass name="OCP\TaskProcessing\EShapeType" />
 			</errorLevel>
 		</UndefinedClass>
 		<UndefinedDocblockClass>

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
+</files>
diff --git a/vendor-bin/php-cs-fixer/composer.lock b/vendor-bin/php-cs-fixer/composer.lock
diff --git a/vendor-bin/phpunit/composer.lock b/vendor-bin/phpunit/composer.lock
diff --git a/vendor-bin/psalm-phar/composer.lock b/vendor-bin/psalm-phar/composer.lock