Fixup

danog · Apr 1, 2024 · e0013d7 · e0013d7
1 parent 703568e
commit e0013d7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -44,6 +44,6 @@ jobs:
           TOKEN: ${{ secrets.TOKEN }}
           DEST: ${{ secrets.DEST }}
         run: |
-          vendor/bin/psalm --no-cache
+          vendor/bin/psalm --no-cache --shepherd
           vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
           vendor/bin/php-cs-fixer --diff --dry-run -v fix
diff --git a/psalm.xml b/psalm.xml
@@ -11,7 +11,6 @@
 >
     <projectFiles>
         <directory name="src" />
-        <directory name="tests" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>

diff --git a/src/FileId.php b/src/FileId.php
@@ -159,8 +159,9 @@ public static function fromBotAPI(string $fileId): self
                 $local_id = Tools::unpackInt($read(4));
             }
 
-            /** @psalm-suppress MixedArgument */
-            $photosize_source = PhotoSizeSourceType::from($subVersion >= 4 ? \unpack('V', $read(4))[1] : 0);
+            /** @var int */
+            $arg = $subVersion >= 4 ? \unpack('V', $read(4))[1] : 0;
+            $photosize_source = PhotoSizeSourceType::from($arg);
             switch ($photosize_source) {
                 case PhotoSizeSourceType::LEGACY:
                     $photoSizeSource = new PhotoSizeSourceLegacy(Tools::unpackLong($read(8)));

diff --git a/src/Tools.php b/src/Tools.php
@@ -19,7 +19,7 @@ final class Tools
      */
     public static function unpackLong(string $field): int
     {
-        /** @psalm-suppress MixedReturnStatement */
+        /** @var int */
         return \unpack('q', BIG_ENDIAN ? \strrev($field) : $field)[1];
     }
     /**
@@ -30,7 +30,7 @@ public static function unpackLong(string $field): int
      */
     public static function unpackInt(string $field): int
     {
-        /** @psalm-suppress MixedReturnStatement */
+        /** @var int */
         return \unpack('l', $field)[1];
     }
     /**