Merge pull request #18 from pontedilana/feature/more_tests

endelwar · web-flow · commit df9185954744 · 2025-10-03T18:32:14.000+02:00
Split GitHub workflow
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,10 +1,46 @@
 name: CI
+
 on:
   - push
   - pull_request
+
+permissions:
+  contents: read
+
 jobs:
-  test:
-    runs-on: ubuntu-latest
+  phpstan:
+    runs-on: ubuntu-24.04
+    name: PHPStan
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.1"
+          tools: phpstan
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Run PHPStan
+        run: phpstan analyse src
+
+  phpunit:
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         php-version:
@@ -16,17 +52,16 @@ jobs:
           - "8.4"
           - "8.5"
 
-    name: PHP ${{ matrix.php-version }}
+    name: PHPUnit - PHP ${{ matrix.php-version }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
-      - name: Setup PHP, with composer and extensions
+      - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          tools: phpstan
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -48,8 +83,5 @@ jobs:
       - name: Install dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Run PHPStan
-        run: phpstan analyse src
-
       - name: Test with PHPUnit
         run: ./vendor/bin/phpunit
diff --git a/tests/Unit/AbstractGeneratorTest.php b/tests/Unit/AbstractGeneratorTest.php
@@ -926,4 +926,17 @@ public function testFailingGenerateWithOutputContainingPharPrefix(): void
 
         $media->generate('the_input_file', 'phar://the_output_file', ['foo' => 'bar']);
     }
+
+    /**
+     * @covers \Pontedilana\PhpWeasyPrint\AbstractGenerator::getCommand
+     */
+    public function testGetCommandThrowsExceptionWhenBinaryNotSet(): void
+    {
+        $media = $this->getMockForAbstractClass(AbstractGenerator::class, [], '', false);
+
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('You must define a binary prior to conversion.');
+
+        $media->getCommand('input.html', 'output.pdf');
+    }
 }
diff --git a/tests/Unit/PdfTest.php b/tests/Unit/PdfTest.php
@@ -161,6 +161,16 @@ public function dataOptions(): array
         ];
     }
 
+    public function testSetTimeoutConfiguresBothProcessAndWeasyPrintTimeout(): void
+    {
+        $testObject = new PdfSpy();
+        $testObject->setTimeout(30);
+        $testObject->getOutputFromHtml('<html></html>');
+
+        // Verify that --timeout 30 is in the command
+        $this->assertMatchesRegularExpression('/--timeout 30/', $testObject->getLastCommand());
+    }
+
     public function testDisableTimeout(): void
     {
         $testObject = new PdfSpy();
