Laravel 12.x Support (#1072)

* Laravel 12.x Support * PHPStan fixes
barryvdh · Feb 13, 2025 · 8e71b99 · 8e71b99
1 parent 2a59de0
commit 8e71b99
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/.github/workflows/run-static-analysis.yml b/.github/workflows/run-static-analysis.yml
@@ -23,9 +23,11 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.1, 8.2, 8.3, 8.4]
-        laravel: [9.*, 10.*, 11.*]
+        laravel: [9.*, 10.*, 11.*, 12.*]
         dependency-version: [prefer-stable]
         exclude:
+          - laravel: 12.*
+            php: 8.1
           - laravel: 11.*
             php: 8.1
 

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -23,9 +23,11 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.1, 8.2, 8.3, 8.4]
-        laravel: ['9.*', '10.*', '11.*']
+        laravel: ['9.*', '10.*', '11.*', '12.*']
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
+          - laravel: 12.*
+            php: 8.1
           - laravel: 11.*
             php: 8.1
 
@@ -44,7 +46,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer remove phpro/grumphp --no-update --dev
+          composer remove "phpro/grumphp" "larastan/larastan" --no-update --dev
           composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
 

diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ composer.phar
 composer.lock
 .DS_Store
 /.idea
-.phpunit.result.cache
+.phpunit.cache
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -16,13 +16,13 @@
     "require": {
         "php": "^8.1",
         "dompdf/dompdf": "^3.0",
-        "illuminate/support": "^9|^10|^11"
+        "illuminate/support": "^9|^10|^11|^12"
     },
     "require-dev": {
-        "orchestra/testbench": "^7|^8|^9",
+        "orchestra/testbench": "^7|^8|^9|^10",
         "squizlabs/php_codesniffer": "^3.5",
         "phpro/grumphp": "^2.5",
-        "larastan/larastan": "^2.7.0"
+        "larastan/larastan": "^2.7|^3.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Facade/Pdf.php b/src/Facade/Pdf.php
@@ -10,23 +10,23 @@
  * @method static BasePDF setBaseHost(string $baseHost)
  * @method static BasePDF setBasePath(string $basePath)
  * @method static BasePDF setCanvas(\Dompdf\Canvas $canvas)
- * @method static BasePDF setCallbacks(array $callbacks)
+ * @method static BasePDF setCallbacks(array<string, mixed> $callbacks)
  * @method static BasePDF setCss(\Dompdf\Css\Stylesheet $css)
- * @method static BasePDF setDefaultView(string $defaultView, array $options)
+ * @method static BasePDF setDefaultView(string $defaultView, array<string, mixed> $options)
  * @method static BasePDF setDom(\DOMDocument $dom)
  * @method static BasePDF setFontMetrics(\Dompdf\FontMetrics $fontMetrics)
- * @method static BasePDF setHttpContext(resource|array $httpContext)
+ * @method static BasePDF setHttpContext(resource|array<string, mixed> $httpContext)
  * @method static BasePDF setPaper(string|float[] $paper, string $orientation = 'portrait')
  * @method static BasePDF setProtocol(string $protocol)
  * @method static BasePDF setTree(\Dompdf\Frame\FrameTree $tree)
  * @method static BasePDF setWarnings(bool $warnings)
- * @method static BasePDF setOption(array|string $attribute, $value = null)
- * @method static BasePDF setOptions(array $options)
- * @method static BasePDF loadView(string $view, array $data = [], array $mergeData = [], ?string $encoding = null)
+ * @method static BasePDF setOption(array<string, mixed>|string $attribute, $value = null)
+ * @method static BasePDF setOptions(array<string, mixed> $options)
+ * @method static BasePDF loadView(string $view, array<string, mixed> $data = [], array<string, mixed> $mergeData = [], ?string $encoding = null)
  * @method static BasePDF loadHTML(string $string, ?string $encoding = null)
  * @method static BasePDF loadFile(string $file)
- * @method static BasePDF addInfo(array $info)
- * @method static string output(array $options = [])
+ * @method static BasePDF addInfo(array<string, string> $info)
+ * @method static string output(array<string, int> $options = [])
  * @method static BasePDF save()
  * @method static \Illuminate\Http\Response download(string $filename = 'document.pdf')
  * @method static \Illuminate\Http\Response stream(string $filename = 'document.pdf')

diff --git a/src/PDF.php b/src/PDF.php
@@ -23,19 +23,19 @@
  * @method PDF setBaseHost(string $baseHost)
  * @method PDF setBasePath(string $basePath)
  * @method PDF setCanvas(\Dompdf\Canvas $canvas)
- * @method PDF setCallbacks(array $callbacks)
+ * @method PDF setCallbacks(array<string, mixed> $callbacks)
  * @method PDF setCss(\Dompdf\Css\Stylesheet $css)
- * @method PDF setDefaultView(string $defaultView, array $options)
+ * @method PDF setDefaultView(string $defaultView, array<string, mixed> $options)
  * @method PDF setDom(\DOMDocument $dom)
  * @method PDF setFontMetrics(\Dompdf\FontMetrics $fontMetrics)
- * @method PDF setHttpContext(resource|array $httpContext)
+ * @method PDF setHttpContext(resource|array<string, mixed> $httpContext)
  * @method PDF setPaper(string|float[] $paper, string $orientation = 'portrait')
  * @method PDF setProtocol(string $protocol)
  * @method PDF setTree(\Dompdf\Frame\FrameTree $tree)
  * @method string getBaseHost()
  * @method string getBasePath()
  * @method \Dompdf\Canvas getCanvas()
- * @method array getCallbacks()
+ * @method array<string, mixed> getCallbacks()
  * @method \Dompdf\Css\Stylesheet getCss()
  * @method \DOMDocument getDom()
  * @method \Dompdf\FontMetrics getFontMetrics()