Support typeset.sh v0.19

Author: jsiefer

.gitignore

@@ -6,4 +6,5 @@
 /pdf-parser/var
 /.phpunit.result.cache
 .php_cs.cache
-composer.lock
+composer.lock
+/.php-cs-fixer.cache

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -5,18 +5,17 @@
     ->in(__DIR__ . '/src')
 ;
 
-return PhpCsFixer\Config::create()
-    ->setRules([
-        '@PSR2' => true,
+$config = new PhpCsFixer\Config();
+return $config->setRules([
         '@Symfony' => true,
-        //'strict_param' => true,
-        'cast_spaces' => ['space' => 'none'],
-        'array_syntax' => ['syntax' => 'short'],
-        'no_unneeded_curly_braces' => false,
-        'no_unset_on_property' => false,
-        'php_unit_method_casing' => ['case' => 'snake_case'],
-        'phpdoc_align' => ['align' => 'left'],
+
+        /*
+         * Personal opinion.
+         */
         'yoda_style' => false,
+        'phpdoc_align' => ['align' => 'left'],
+        'php_unit_method_casing' => ['case' => 'snake_case'],
+
     ])
     ->setFinder($finder)
-;
+;

composer.json

@@ -16,10 +16,10 @@
     "minimum-stability": "stable",
     "require": {
         "laravel/framework": "^7.0 || ^8.0",
-        "typesetsh/typesetsh": "^0.18"
+        "typesetsh/typesetsh": "^0.19"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16"
+        "friendsofphp/php-cs-fixer": "~v3.4.0"
     },
     "autoload": {
         "psr-4": {

config/typesetsh.php

@@ -23,9 +23,13 @@
     |
     | The base directory to use for relative paths.
     |
+    | Use public_path() to convert any /some-file.css to your public directory.
+    | Use an empty '' string if you prefer absolute paths in your source.
+    |
+    | Make sure the paths you pick are inside the allowed_directories.
     */
 
-    'base_dir' => '/',
+    'base_dir' => '',
 
     /*
     |--------------------------------------------------------------------------

src/ServiceProvider.php

@@ -13,7 +13,7 @@
 
 class ServiceProvider extends Support\ServiceProvider implements Contracts\Support\DeferrableProvider
 {
-    const CONFIG_PATH = __DIR__.'/../config/typesetsh.php';
+    public const CONFIG_PATH = __DIR__.'/../config/typesetsh.php';
 
     /**
      * Register the service provider.
@@ -39,9 +39,9 @@ protected function registerPdfRenderer(): void
             $baseDir = $app['config']['typesetsh.base_dir'] ?? [];
             $allowProtocols = $app['config']['typesetsh.allowed_protocols'] ?? [];
             $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');
+            $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);

src/Typesetsh.php

@@ -37,6 +37,12 @@ public function render(string $html): Result
         $result = $this->html2pdf->render($html, $this->uriResolver);
         $result->version = $this->version;
 
+        // Append any issues from URI resolver to result
+        if ($this->uriResolver instanceof UriResolver && $this->uriResolver->errors) {
+            array_push($result->issues, ...$this->uriResolver->errors);
+            $this->uriResolver->errors = [];
+        }
+
         return $result;
     }
 
@@ -48,6 +54,12 @@ public function renderMultiple(array $html): Result
         $result = $this->html2pdf->renderMultiple($html, $this->uriResolver);
         $result->version = $this->version;
 
+        // Append any issues from URI resolver to result
+        if ($this->uriResolver instanceof UriResolver && $this->uriResolver->errors) {
+            array_push($result->issues, ...$this->uriResolver->errors);
+            $this->uriResolver->errors = [];
+        }
+
         return $result;
     }
 }