Fix CI

Author: danog

.github/workflows/main.yml

@@ -4,19 +4,21 @@ on:
   push:
 jobs:
   run:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        tag: ["amd64"]
-        php: ["8.4"]
-    name: PHP ${{ matrix.php }} Test on ${{ matrix.tag }}
+        os: [ubuntu-latest]
+        php-versions: ["8.2", "8.3", "8.4"]
+    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Setup PHP
-        # Inputs to manual.sh are in this order - php, extensions, ini-values, coverage, tools
-        run: curl -sL https://setup-php.com/manual.sh | bash -s ${{ matrix.php }} "mbstring, intl, sockets" "memory_limit=-1" "xdebug"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, intl, sockets
 
       - name: Check environment
         run: |
@@ -28,21 +30,28 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ matrix.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ matrix.os }}-composer-${{ matrix.php }}-
-
-      - name: Install dependencies
-        run: composer install --prefer-dist
+          key: ${{ matrix.os }}-composer-${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ matrix.os }}-composer-${{ matrix.php-versions }}-
 
-      - name: Run tests
+      - name: Run codestyle check
         env:
           PHP_CS_FIXER_IGNORE_ENV: 1
-          TOKEN: ${{ secrets.TOKEN }}
-          DEST: ${{ secrets.DEST }}
         run: |
-          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
+      
+      - name: Run unit tests
+        run: |
+          vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
+
+      - name: Run Psalm analysis
+        run: |
+          vendor/bin/psalm --shepherd
+
+      #- name: Upload coverage reports to Codecov
+      #  uses: codecov/codecov-action@v4.0.1
+      #  with:
+      #    token: ${{ secrets.CODECOV_TOKEN }}
+      #    slug: danog/AsyncOrm

composer.json

@@ -11,7 +11,8 @@
         }
     ],
     "require": {
-        "php-64bit": ">=8.2"
+        "php-64bit": ">=8.2",
+        "symfony/polyfill-php83": "^1.32"
     },
     "require-dev": {
         "phpunit/phpunit": "^11",

src/FileId.php

@@ -273,6 +273,7 @@ public function getBotAPI(): string
         if ($this->photoSizeSource !== null) {
             $photoSize = $this->photoSizeSource;
             if ($this->subVersion < 32) {
+                assert($this->volumeId !== null);
                 $fileId .= Tools::packLong($this->volumeId);
             }
 

src/PhotoSizeSource/PhotoSizeSourceDialogPhotoBig.php

@@ -29,6 +29,7 @@ final class PhotoSizeSourceDialogPhotoBig extends PhotoSizeSourceDialogPhoto
      * Get whether the big or small version of the photo is being used.
      *
      */
+    #[\Override]
     public function isSmallDialogPhoto(): bool
     {
         return false;

src/PhotoSizeSource/PhotoSizeSourceDialogPhotoSmall.php

@@ -29,6 +29,7 @@ final class PhotoSizeSourceDialogPhotoSmall extends PhotoSizeSourceDialogPhoto
      * Get whether the big or small version of the photo is being used.
      *
      */
+    #[\Override]
     public function isSmallDialogPhoto(): bool
     {
         return true;