update CI to run inside container

Intervention · Dec 31, 2024 · 42d1af9 · 42d1af9
1 parent c061552
commit 42d1af9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,13 +10,18 @@ jobs:
       matrix:
         php: [ '8.1', '8.2', '8.3', '8.4' ]
         stability: [ prefer-stable ]
+    container:
+      image: php:${{ matrix.php }}-cli
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
 
+      - name: Install vips
+        run: sudo apt install -y --no-install-recommends libvips42 libffi-dev libexif-dev zip unzip
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -25,9 +30,6 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Install vips
-        run: sudo apt install -y libvips --no-install-recommends
-
       - name: Get composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

diff --git a/src/Decoders/NativeObjectDecoder.php b/src/Decoders/NativeObjectDecoder.php
@@ -13,7 +13,7 @@
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\SpecializedInterface;
 use Intervention\Image\MediaType;
-use Jcupitt\Vips\Exception;
+use Jcupitt\Vips\Exception as VipsException;
 use Jcupitt\Vips\Image as VipsImage;
 
 class NativeObjectDecoder extends SpecializableDecoder implements SpecializedInterface
@@ -76,7 +76,7 @@ protected function vipsMediaType(VipsImage $vips): ?MediaType
     {
         try {
             $loader = $vips->get('vips-loader');
-        } catch (Exception) {
+        } catch (VipsException) {
             return null;
         }
 

diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -140,7 +140,9 @@ protected function assertTransparency(ColorInterface $color): void
 
     protected function assertImageSize(string|EncodedImage $image, int $width, int $height): void
     {
-        $vipsImage = VipsImage::newFromBuffer((string) $image, 'n=-1', ['access' => Access::SEQUENTIAL,]);
+        $vipsImage = VipsImage::newFromBuffer((string) $image, 'n=-1', [
+            'access' => Access::SEQUENTIAL,
+        ]);
 
         $detectedWidth = $vipsImage->width;
         $detectedHeight = $vipsImage->getType('page-height') === 0 ?