From c3ec528594bb98f4411bb7841929b350e073d1e9 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 25 Apr 2024 13:05:30 +0200 Subject: [PATCH 1/2] Removed unused package --- composer.json | 1 - .../patches/tcpdf-doesnt-render-base64.patch | 14 -------------- 2 files changed, 15 deletions(-) delete mode 100644 modules/os2forms_webform_maps/patches/tcpdf-doesnt-render-base64.patch diff --git a/composer.json b/composer.json index 5134e249..1e565f1b 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,6 @@ "php-http/guzzle7-adapter": "^1.0", "phpoffice/phpword": "^0.18.2", "symfony/options-resolver": "^5.4 || ^6.0", - "tecnickcom/tcpdf": "~6", "webmozart/path-util": "^2.3", "wsdltophp/packagebase": "^5.0", "zaporylie/composer-drupal-optimizations": "^1.2", diff --git a/modules/os2forms_webform_maps/patches/tcpdf-doesnt-render-base64.patch b/modules/os2forms_webform_maps/patches/tcpdf-doesnt-render-base64.patch deleted file mode 100644 index 522c85b6..00000000 --- a/modules/os2forms_webform_maps/patches/tcpdf-doesnt-render-base64.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php -index a118d05..c4657fd 100644 ---- a/include/tcpdf_static.php -+++ b/include/tcpdf_static.php -@@ -1906,6 +1906,9 @@ class TCPDF_STATIC { - if (preg_match('|^https?://|', $filename) == 1) { - return self::url_exists($filename); - } -+ if(stripos($filename,'data:')===0) { -+ return true; -+ } - if (strpos($filename, '://')) { - return false; // only support http and https wrappers for security reasons - } From 26c900e6751b58d4f1f30a002882bc81c84642d1 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 25 Apr 2024 13:08:25 +0200 Subject: [PATCH 2/2] Updated CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d04df2a..850eccf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa - [#192](https://github.com/OS2Forms/os2forms/pull/129) Added audit logging module from os2web - Remove dependency on webform migration module +- [#100](https://github.com/OS2Forms/os2forms/pull/100) + Removed unused `tecnickcom/tcpdf` package. ## [3.16.0-beta1] 2024-08-27