From 47504f227d9faf450e2cdaeef5d4cc79e7f4a322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 2 Aug 2022 13:50:14 +0300 Subject: [PATCH] increased `dompdf` version --- composer.json | 2 +- composer.lock | 101 +++++++++++++++++++++++++++++++++++++++------- config/dompdf.php | 45 ++++++++++++++++++--- 3 files changed, 126 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index 437289379..cd3735b0b 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "akaunting/module-offline-payments": "^3.0", "akaunting/module-paypal-standard": "^3.0", "barryvdh/laravel-debugbar": "^3.6", - "barryvdh/laravel-dompdf": "^1.0", + "barryvdh/laravel-dompdf": "^2.0", "barryvdh/laravel-ide-helper": "^2.9", "bkwld/cloner": "^3.10", "doctrine/dbal": "^3.1", diff --git a/composer.lock b/composer.lock index f1e429e59..f77867af4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6c3a2a6a3c42db86f322eeb09182f012", + "content-hash": "e03cb791860742d0ede59fd842fa32cb", "packages": [ { "name": "akaunting/laravel-apexcharts", @@ -1129,20 +1129,20 @@ }, { "name": "barryvdh/laravel-dompdf", - "version": "v1.0.2", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-dompdf.git", - "reference": "de83130d029289e1b59f28b41c314ce1d157b4a0" + "reference": "1d47648c6cef37f715ecb8bcc5f5a656ad372e27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/de83130d029289e1b59f28b41c314ce1d157b4a0", - "reference": "de83130d029289e1b59f28b41c314ce1d157b4a0", + "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27", + "reference": "1d47648c6cef37f715ecb8bcc5f5a656ad372e27", "shasum": "" }, "require": { - "dompdf/dompdf": "^1.2.1", + "dompdf/dompdf": "^2", "illuminate/support": "^6|^7|^8|^9", "php": "^7.2 || ^8.0" }, @@ -1155,13 +1155,14 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" }, "laravel": { "providers": [ "Barryvdh\\DomPDF\\ServiceProvider" ], "aliases": { + "Pdf": "Barryvdh\\DomPDF\\Facade\\Pdf", "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf" } } @@ -1189,7 +1190,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-dompdf/issues", - "source": "https://github.com/barryvdh/laravel-dompdf/tree/v1.0.2" + "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.0.0" }, "funding": [ { @@ -1201,7 +1202,7 @@ "type": "github" } ], - "time": "2022-05-19T15:08:38+00:00" + "time": "2022-07-06T11:12:10+00:00" }, { "name": "barryvdh/laravel-ide-helper", @@ -2256,21 +2257,22 @@ }, { "name": "dompdf/dompdf", - "version": "v1.2.2", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "5031045d9640b38cfc14aac9667470df09c9e090" + "reference": "79573d8b8a141ec8a17312515de8740eed014fa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090", - "reference": "5031045d9640b38cfc14aac9667470df09c9e090", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9", + "reference": "79573d8b8a141ec8a17312515de8740eed014fa9", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", + "masterminds/html5": "^2.0", "phenx/php-font-lib": "^0.5.4", "phenx/php-svg-lib": "^0.3.3 || ^0.4.0", "php": "^7.1 || ^8.0" @@ -2319,9 +2321,9 @@ "homepage": "https://github.com/dompdf/dompdf", "support": { "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/v1.2.2" + "source": "https://github.com/dompdf/dompdf/tree/v2.0.0" }, - "time": "2022-04-27T13:50:54+00:00" + "time": "2022-06-21T21:14:57+00:00" }, { "name": "dragonmantank/cron-expression", @@ -5960,6 +5962,75 @@ }, "time": "2021-07-01T19:01:15+00:00" }, + { + "name": "masterminds/html5", + "version": "2.7.5", + "source": { + "type": "git", + "url": "https://github.com/Masterminds/html5-php.git", + "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab", + "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-dom": "*", + "ext-libxml": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Masterminds\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Butcher", + "email": "technosophos@gmail.com" + }, + { + "name": "Matt Farina", + "email": "matt@mattfarina.com" + }, + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + } + ], + "description": "An HTML5 parser and serializer.", + "homepage": "http://masterminds.github.io/html5-php", + "keywords": [ + "HTML5", + "dom", + "html", + "parser", + "querypath", + "serializer", + "xml" + ], + "support": { + "issues": "https://github.com/Masterminds/html5-php/issues", + "source": "https://github.com/Masterminds/html5-php/tree/2.7.5" + }, + "time": "2021-07-01T14:25:37+00:00" + }, { "name": "maximebf/debugbar", "version": "v1.18.0", diff --git a/config/dompdf.php b/config/dompdf.php index 51879fb5b..82ebbcb20 100644 --- a/config/dompdf.php +++ b/config/dompdf.php @@ -13,14 +13,14 @@ return [ */ 'show_warnings' => false, // Throw an Exception on warnings from dompdf - 'orientation' => 'portrait', + 'public_path' => null, // Override the public path if needed /* * Dejavu Sans font is missing glyphs for converted entities, turn it off if you need to show € and £. */ - 'convert_entities' => false, + 'convert_entities' => true, - 'defines' => [ + 'options' => [ /** * The location of the DOMPDF font directory * @@ -76,10 +76,31 @@ return [ * should be an absolute path. * This is only checked on command line call by dompdf.php, but not by * direct class use like: - * $dompdf = new DOMPDF(); $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output(); + * $dompdf = new DOMPDF(); $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output(); */ "chroot" => realpath(base_path()), + /** + * Protocol whitelist + * + * Protocols and PHP wrappers allowed in URIs, and the validation rules + * that determine if a resouce may be loaded. Full support is not guaranteed + * for the protocols/wrappers specified + * by this array. + * + * @var array + */ + 'allowed_protocols' => [ + "file://" => ["rules" => []], + "http://" => ["rules" => []], + "https://" => ["rules" => []] + ], + + /** + * @var string + */ + 'log_output_file' => null, + /** * Whether to enable font subsetting or not. */ @@ -150,6 +171,15 @@ return [ */ "default_paper_size" => "a4", + /** + * The default paper orientation. + * + * The orientation of the page (portrait or landscape). + * + * @var string + */ + 'default_paper_orientation' => "portrait", + /** * The default font family * @@ -242,9 +272,12 @@ return [ "font_height_ratio" => 1.1, /** - * Use the more-than-experimental HTML5 Lib parser + * Use the HTML5 Lib parser + * + * @deprecated This feature is now always on in dompdf 2.x + * @var bool */ - "enable_html5_parser" => false, + "enable_html5_parser" => true, ], ];