Merge pull request #344 from itk-dev/feature/switch-dompdf

Feature/switch dompdf

Author: martinyde

CHANGELOG.md

@@ -8,28 +8,38 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-- [PR-341](https://github.com/itk-dev/os2loop/pull/341): Notify of collection changed when document is changed.
+- [PR-341](https://github.com/itk-dev/os2loop/pull/341):
+Notify of collection changed when document is changed.
 
-## [feature/update-drupal-and-php]
+## [feature/update-drupal-and-php] - 2023-08-25
+
+- Switch to dompdf
 - Upgrade drupal core (9.5.10)
 - Upgrade contrib module
-- Change code analysis tool (drupal-check -> phpstan for more configuration options)
+- Change code analysis tool
+drupal-check -> phpstan for more configuration options
 - Update custom modules with phpcs and phpstan tools.
 - Update configuration to match drupal upgrade.
 - Upgrade docker setup to use php 8.1
 
 ## [develop]
-- [LOOP-862](https://jira.itkdev.dk/browse/LOOP-862): Added documentation for modules and hooks.
+
+- [LOOP-862](https://jira.itkdev.dk/browse/LOOP-862): Added documentation for
+modules and hooks.
 - [LOOP-947](https://jira.itkdev.dk/browse/LOOP-947): Styling user profile page
-- [LOOP-948](https://jira.itkdev.dk/browse/LOOP-948): Fix position of user dropdown menu, that extends outside the viewport on narrow screens.
+- [LOOP-948](https://jira.itkdev.dk/browse/LOOP-948): Fix position of user
+dropdown menu, that extends outside the viewport on narrow screens.
 - [LOOP-950](https://jira.itkdev.dk/browse/LOOP-950): Styling of messages list
-- [LOOP-949](https://jira.itkdev.dk/browse/LOOP-949): Styling of subscriptions page
+- [LOOP-949](https://jira.itkdev.dk/browse/LOOP-949): Styling of subscriptions
+page
 - [LOOP-732](https://jira.itkdev.dk/browse/LOOP-732),
   [LOOP-733](https://jira.itkdev.dk/browse/LOOP-733) and
   [LOOP-734](https://jira.itkdev.dk/browse/LOOP-734): Drupal, SAML and OpenID
   Connect login
 - [LOOP-874](https://jira.itkdev.dk/browse/LOOP-874): Fine-grained
   administrator permissions.
 - [LOOP-934](https://jira.itkdev.dk/browse/LOOP-934): Several changes to design
-- [LOOP-809](https://jira.itkdev.dk/browse/LOOP-809): Changed search settings, Add tagging to media library, fix bugged file reference in display
-- [LOOP-968](https://jira.itkdev.dk/browse/LOOP-968): Remove Connected accounts tab
+- [LOOP-809](https://jira.itkdev.dk/browse/LOOP-809): Changed search settings,
+Add tagging to media library, fix bugged file reference in display
+- [LOOP-968](https://jira.itkdev.dk/browse/LOOP-968): Remove Connected accounts
+tab

composer.json

@@ -40,6 +40,7 @@
         "php": "^8.1",
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
+        "dompdf/dompdf": "^2.0.1",
         "drupal/adminimal_theme": "^1.6",
         "drupal/autocomplete_deluxe": "2.0.0",
         "drupal/better_formats": "1.x-dev",
@@ -87,8 +88,7 @@
         "drupal/views_flag_refresh": "dev-2929394-drupal-8-port",
         "drupal/viewsreference": "^2.0",
         "drupal/xls_serialization": "^1.2",
-        "drush/drush": "^10.4",
-        "mikehaertl/phpwkhtmltopdf": "^2.5"
+        "drush/drush": "^10.4"
     },
     "scripts": {
         "post-install-cmd": [
@@ -229,6 +229,9 @@
             },
             "drupal/view_unpublished": {
                 "Grants are not cached if the user has \"view any unpublished content\" permission (https://www.drupal.org/project/view_unpublished/issues/3226756)": "https://www.drupal.org/files/issues/2021-08-04/view_unpublished-cache_ignored-3226756-2-8.x.patch"
+            },
+            "drupal/entity_print": {
+              "Add page count https://www.drupal.org/project/entity_print/issues/2823430": "https://www.drupal.org/files/issues/2023-07-10/entity_print-dompdf_page_count-2823430-14.patch"
             }
         }
     },

composer.lock

@@ -24,7 +24,7 @@ content:
     region: content
   os2loop_documents_tbl_desc:
     type: basic_string
-    label: visually_hidden
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     weight: 2

config/sync/core.entity_view_display.paragraph.os2loop_documents_table.default.yml

@@ -5,12 +5,14 @@ dependencies: {  }
 id: dompdf
 settings:
   default_paper_size: a4
+  default_paper_orientation: portrait
   username: ''
   password: ''
   enable_html5_parser: true
   enable_remote: true
+  font_subsetting: true
+  embedded_php: false
   cafile: ''
   verify_peer: true
   verify_peer_name: true
   disable_log: 0
-  default_paper_orientation: portrait

config/sync/entity_print.print_engine.dompdf.yml

@@ -3,6 +3,7 @@ _core:
 default_css: false
 force_download: true
 print_engines:
-  pdf_engine: phpwkhtmltopdf
+  pdf_engine: dompdf
   epub_engine: ''
   word_docx_engine: ''
+base_url: ''

config/sync/entity_print.settings.yml

@@ -7,7 +7,7 @@
     "prettier": "^2.2.1"
   },
   "scripts": {
-    "coding-standards-check/markdownlint": "markdownlint README.md 'docs/**/*.md' 'web/profiles/custom/os2loop/**/*.md' --ignore 'web/profiles/custom/os2loop/**/node_modules/**/*.md'",
+    "coding-standards-check/markdownlint": "markdownlint CHANGELOG.md README.md 'docs/**/*.md' 'web/profiles/custom/os2loop/**/*.md' --ignore 'web/profiles/custom/os2loop/**/node_modules/**/*.md'",
     "coding-standards-check/prettier": "prettier --check \"web/profiles/custom/os2loop/themes/os2loop_theme/assets/**/*.{js,scss}\"",
     "coding-standards-check": "yarn coding-standards-check/markdownlint && yarn coding-standards-check/prettier",
     "coding-standards-apply/markdownlint": "markdownlint --fix README.md 'docs/**/*.md' 'web/profiles/custom/os2loop/**/*.md' --ignore 'web/profiles/custom/os2loop/**/node_modules/**/*.md'",

config/sync/os2loop_flag_content.settings.yml

@@ -14,17 +14,17 @@ We use [Entity Print](https://www.drupal.org/project/entity_print) for
 printing documents and collections, i.e converting them to PDF.
 
 Entity Print is configured to use
-[`phpwkhtmltopdf`](https://github.com/mikehaertl/phpwkhtmltopdf) for converting
-HTML to PDF, and in order to make this work you need a working installation of
-wkhtmltopdf 0.12.6 (see
-<https://github.com/mikehaertl/phpwkhtmltopdf#installation-of-wkhtmltopdf>)
-available as `/usr/local/bin/wkhtmltopdf`.
+[`dompdf`](https://github.com/dompdf/dompdf) for converting
+HTML to PDF.
 
-If need be, you can override the path to the `wkhtmltopdf` binary in
-`settings.local.php`, e.g.:
+### Assets in Docker
+
+When using docker we need to help phpfpm locate assets. We use an event
+subscriber to alter the pdf and use our custom base url. The base url is defined
+in settings.php
 
 ```php
-$config['entity_print.print_engine.phpwkhtmltopdf']['settings']['binary_location'] = '/opt/wkhtmltopdf/wkhtmltopdf';
+$settings['pdf_custom_base_url'] = 'http://nginx:8080/';
 ```
 
 ### Debugging entity print input

package.json

@@ -26,6 +26,7 @@ services:
   Drupal\os2loop_documents\EventSubscriber\EntityPrintEventSubscriber:
     tags:
       - { name: event_subscriber }
+    arguments: ['@request_stack']
 
   Drupal\os2loop_documents\Helper\UpdateHelper:
     arguments: