From 68d182457aff5befdfb10f52f8e8a6946c9fed93 Mon Sep 17 00:00:00 2001 From: Guido Vollbach Date: Mon, 9 Oct 2023 11:52:54 +0200 Subject: [PATCH] Remove tcpdf lib --- composer.json | 14 ------ composer.lock | 74 +------------------------------ libs/composer/patches/tcpdf.patch | 29 ------------ 3 files changed, 1 insertion(+), 116 deletions(-) delete mode 100644 libs/composer/patches/tcpdf.patch diff --git a/composer.json b/composer.json index ee8fd7742938..dd09a13869fa 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,6 @@ "ezyang/htmlpurifier": "^4.16", "phpmailer/phpmailer": "^6.8", "geshi/geshi": "^1.0.9.1", - "tecnickcom/tcpdf": "^6.3", "pimple/pimple" : "^3.0", "symfony/yaml": "^5.3", "guzzlehttp/psr7": "1.9.1", @@ -241,16 +240,6 @@ "approved-date": "YYYY-MM-DD", "info": "see #28586" }, - "tecnickcom/tcpdf" : { - "source" : "https://github.com/tecnickcom/TCPDF", - "used_version" : "v6.3.5", - "wrapped_by" : "Services/PDFGeneration", - "added_by" : "Maximilian Becker ", - "last_update" : "2020-10-15", - "last_update_by" : "Michael Jansen ", - "approved-by": "Jour Fixe", - "approved-date": "YYYY-MM-DD" - }, "pimple/pimple" : { "source" : "https://github.com/silexphp/Pimple.git", "used_version" : "v3.3.0", @@ -521,9 +510,6 @@ "approved-date": "2023-03-20" }, "patches": { - "tecnickcom/tcpdf": { - "ILIAS TCPDF Patches": "./libs/composer/patches/tcpdf.patch" - }, "phpmailer/phpmailer": { "ILIAS PhpMailer Patches": "./libs/composer/patches/phpmailer.patch" }, diff --git a/composer.lock b/composer.lock index 51d07a36b340..2be979a611f1 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": "004e5195182eea7c866a853e411c3d59", + "content-hash": "68e1adc7dc49d9ab97ab0b2bbdcfb7ba", "packages": [ { "name": "brick/math", @@ -8003,78 +8003,6 @@ "abandoned": true, "time": "2012-03-14T16:36:15+00:00" }, - { - "name": "tecnickcom/tcpdf", - "version": "6.6.2", - "source": { - "type": "git", - "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "e3cffc9bcbc76e89e167e9eb0bbda0cab7518459" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/e3cffc9bcbc76e89e167e9eb0bbda0cab7518459", - "reference": "e3cffc9bcbc76e89e167e9eb0bbda0cab7518459", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "config", - "include", - "tcpdf.php", - "tcpdf_parser.php", - "tcpdf_import.php", - "tcpdf_barcodes_1d.php", - "tcpdf_barcodes_2d.php", - "include/tcpdf_colors.php", - "include/tcpdf_filters.php", - "include/tcpdf_font_data.php", - "include/tcpdf_fonts.php", - "include/tcpdf_images.php", - "include/tcpdf_static.php", - "include/barcodes/datamatrix.php", - "include/barcodes/pdf417.php", - "include/barcodes/qrcode.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0-only" - ], - "authors": [ - { - "name": "Nicola Asuni", - "email": "info@tecnick.com", - "role": "lead" - } - ], - "description": "TCPDF is a PHP class for generating PDF documents and barcodes.", - "homepage": "http://www.tcpdf.org/", - "keywords": [ - "PDFD32000-2008", - "TCPDF", - "barcodes", - "datamatrix", - "pdf", - "pdf417", - "qrcode" - ], - "support": { - "issues": "https://github.com/tecnickcom/TCPDF/issues", - "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.2" - }, - "funding": [ - { - "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations¤cy_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project", - "type": "custom" - } - ], - "time": "2022-12-17T10:28:59+00:00" - }, { "name": "twig/extensions", "version": "v1.5.4", diff --git a/libs/composer/patches/tcpdf.patch b/libs/composer/patches/tcpdf.patch deleted file mode 100644 index 58fbee1e87f5..000000000000 --- a/libs/composer/patches/tcpdf.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/tcpdf.php b/tcpdf.php -index 599a3f8..e8bdf90 100644 ---- a/tcpdf.php -+++ b/tcpdf.php -@@ -18040,9 +18050,21 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: - // total table width without cellspaces - $table_columns_width = ($table_width - ($cellspacing['H'] * ($dom[$key]['cols'] - 1))); - // minimum column width -- $table_min_column_width = ($table_columns_width / $dom[$key]['cols']); -- // array of custom column widths -- $table_colwidths = array_fill(0, $dom[$key]['cols'], $table_min_column_width); -+ // tcpdf-patch: begin -+ if ($table_columns_width == 0 || $dom[$key]['cols'] == 0) -+ { -+ $table_min_column_width = 1; -+ } -+ else -+ { -+ $table_min_column_width = ($table_columns_width / $dom[$key]['cols']); -+ } -+ if ($dom[$key]['cols'] != 0) -+ { -+ // array of custom column widths -+ $table_colwidths = array_fill(0, $dom[$key]['cols'], $table_min_column_width); -+ } -+ // tcpdf-patch: end - } - // table row - if ($dom[$key]['value'] == 'tr') {