Support typeset.sh v0.18

Author: jsiefer

composer.json

@@ -16,7 +16,7 @@
     "minimum-stability": "stable",
     "require": {
         "laravel/framework": "^7.0 || ^8.0",
-        "typesetsh/typesetsh": "^0.17"
+        "typesetsh/typesetsh": "^0.18"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16"

config/typesetsh.php

@@ -25,7 +25,7 @@
     |
     */
 
-    'base_dir' => public_path(),
+    'base_dir' => '/',
 
     /*
     |--------------------------------------------------------------------------
@@ -74,4 +74,14 @@
     */
 
     'download_limit' => 1024 * 1024 * 5,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pdf Version
+    |--------------------------------------------------------------------------
+    |
+    | PDF version to save the document in.
+    */
+
+    'pdf_version' => '1.4',
 ];

src/ServiceProvider.php

@@ -41,6 +41,7 @@ protected function registerPdfRenderer(): void
             $cacheDir = $app['config']['typesetsh.cache_dir'] ?? null;
             $timeout = (int)($app['config']['typesetsh.timeout'] ?? 15);
             $downloadLimit = (int)($app['config']['typesetsh.download_limit'] ?? 1024 * 1024 * 5);
+            $pdfVersion = (string)($app['config']['typesetsh.pdf_version'] ?? '1.6');
 
             $schemes = [];
             $schemes['data'] = new UriResolver\Data($cacheDir);
@@ -55,7 +56,7 @@ protected function registerPdfRenderer(): void
                 $schemes['file'] = new UriResolver\File($allowedDirectories);
             }
 
-            return new Typesetsh(new UriResolver($schemes, $baseDir));
+            return new Typesetsh(new UriResolver($schemes, $baseDir), null, $pdfVersion);
         });
 
         $this->app->singleton('typesetsh.pdf', function ($app) {

src/Typesetsh.php

@@ -22,22 +22,32 @@ class Typesetsh
     /** @var callable|UriResolver */
     private $uriResolver;
 
-    public function __construct(callable $uriResolver = null, HtmlToPdf $html2pdf = null)
+    /** @var string */
+    private $version;
+
+    public function __construct(callable $uriResolver = null, HtmlToPdf $html2pdf = null, string $version = '1.6')
     {
         $this->uriResolver = $uriResolver ?? UriResolver::httpOnly();
         $this->html2pdf = $html2pdf ?? new HtmlToPdf();
+        $this->version = $version;
     }
 
     public function render(string $html): Result
     {
-        return $this->html2pdf->render($html, $this->uriResolver);
+        $result = $this->html2pdf->render($html, $this->uriResolver);
+        $result->version = $this->version;
+
+        return $result;
     }
 
     /**
      * @param non-empty-list<string> $html
      */
     public function renderMultiple(array $html): Result
     {
-        return $this->html2pdf->renderMultiple($html, $this->uriResolver);
+        $result = $this->html2pdf->renderMultiple($html, $this->uriResolver);
+        $result->version = $this->version;
+
+        return $result;
     }
 }