Support typeset.sh v0.16

Author: jsiefer

README.md

@@ -48,7 +48,7 @@ Alternative you can use the helper.
 Route::get('/invoice/print', function () {
     $invoice = new stdClass();
 
-    return typesetsh\pdf('invoice', ['invoice' => $invoice]);
+    return Typesetsh\pdf('invoice', ['invoice' => $invoice]);
 });
 ```
 
@@ -59,7 +59,7 @@ or force a download
 Route::get('/invoice/print', function () {
     $invoice = new stdClass();
 
-    return typesetsh\pdf('invoice', ['invoice' => $invoice])->forceDownload('invoice.pdf');
+    return Typesetsh\pdf('invoice', ['invoice' => $invoice])->forceDownload('invoice.pdf');
 });
 ```
 

composer.json

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

config/typesetsh.php

@@ -51,4 +51,16 @@
     */
 
     'timeout' => 15,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Download Limit
+    |--------------------------------------------------------------------------
+    |
+    | Max file-size when downloading remote resources. Only works when ext-curl
+    | is available.
+    |
+    */
+
+    'download_limit' => 1024 * 1024 * 5,
 ];

src/Facades/Pdf.php

@@ -3,7 +3,6 @@
  * Copyright (c) 2020 Jacob Siefer
  * See LICENSE bundled with this package for license details.
  */
-
 declare(strict_types=1);
 
 namespace Typesetsh\LaravelWrapper\Facades;

src/Pdf/Factory.php

@@ -3,7 +3,6 @@
  * Copyright (c) 2020 Jacob Siefer
  * See LICENSE bundled with this package for license details.
  */
-
 declare(strict_types=1);
 
 namespace Typesetsh\LaravelWrapper\Pdf;

src/Pdf/View.php

@@ -3,7 +3,6 @@
  * Copyright (c) 2020 Jacob Siefer
  * See LICENSE bundled with this package for license details.
  */
-
 declare(strict_types=1);
 
 namespace Typesetsh\LaravelWrapper\Pdf;

src/ServiceProvider.php

@@ -3,16 +3,15 @@
  * Copyright (c) 2020 Jacob Siefer
  * See LICENSE bundled with this package for license details.
  */
-
 declare(strict_types=1);
 
 namespace Typesetsh\LaravelWrapper;
 
-use Illuminate\Contracts\Support\DeferrableProvider;
+use Illuminate\Contracts;
 use Illuminate\Support;
-use typesetsh\UriResolver;
+use Typesetsh\UriResolver;
 
-class ServiceProvider extends Support\ServiceProvider implements DeferrableProvider
+class ServiceProvider extends Support\ServiceProvider implements Contracts\Support\DeferrableProvider
 {
     const CONFIG_PATH = __DIR__.'/../config/typesetsh.php';
 
@@ -39,11 +38,14 @@ protected function registerPdfRenderer(): void
             $allowedDirectories = $app['config']['typesetsh.allowed_directories'] ?? [];
             $allowProtocols = $app['config']['typesetsh.allowed_protocols'] ?? [];
             $cacheDir = $app['config']['typesetsh.cache_dir'] ?? null;
-            $timeout = $app['config']['typesetsh.timeout'] ?? 15;
+            $timeout = (int)($app['config']['typesetsh.timeout'] ?? 15);
+            $downloadLimit = (int)($app['config']['typesetsh.download_limit'] ?? 1024 * 1024 * 5);
 
             $schemes = [];
+            $schemes['data'] = new UriResolver\Data($cacheDir);
+
             if ($allowProtocols) {
-                $http = new UriResolver\Http($cacheDir, $timeout);
+                $http = new UriResolver\Http($cacheDir, $timeout, $downloadLimit);
                 foreach ($allowProtocols as $protocol) {
                     $schemes[$protocol] = $http;
                 }

src/Typesetsh.php

@@ -3,28 +3,23 @@
  * Copyright (c) 2020 Jacob Siefer
  * See LICENSE bundled with this package for license details.
  */
-
 declare(strict_types=1);
 
 namespace Typesetsh\LaravelWrapper;
 
-use typesetsh\HtmlToPdf;
-use typesetsh\Result;
-use typesetsh\UriResolver;
+use Typesetsh\HtmlToPdf;
+use Typesetsh\Result;
+use Typesetsh\UriResolver;
 
 /**
  * Typeset.sh pdf wrapper with a pre provided uri resolver.
  */
 class Typesetsh
 {
-    /**
-     * @var HtmlToPdf
-     */
+    /** @var HtmlToPdf */
     private $html2pdf;
 
-    /**
-     * @var callable|UriResolver
-     */
+    /** @var callable|UriResolver */
     private $uriResolver;
 
     public function __construct(callable $uriResolver = null, HtmlToPdf $html2pdf = null)
@@ -39,7 +34,7 @@ public function render(string $html): Result
     }
 
     /**
-     * @param string[] $html
+     * @param non-empty-list<string> $html
      */
     public function renderMultiple(array $html): Result
     {

src/helper.php

@@ -3,8 +3,9 @@
  * Copyright (c) 2020 Jacob Siefer
  * See LICENSE bundled with this package for license details.
  */
+declare(strict_types=1);
 
-namespace typesetsh;
+namespace Typesetsh;
 
 use Typesetsh\LaravelWrapper\Pdf;