From 1b7473365dc36f5f3a620b46ce3c484bee44d64b Mon Sep 17 00:00:00 2001 From: acognet Date: Fri, 5 Jun 2020 17:02:50 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B03075=20-=20Fix=20syntax=20error=20with?= =?UTF-8?q?=20PHP=205.6=20and=20TCPDF=206.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- composer.lock | 12 ++++----- lib/combodo/tcpdf/README.md | 2 +- lib/combodo/tcpdf/VERSION | 2 +- lib/combodo/tcpdf/composer.json | 7 +---- lib/combodo/tcpdf/include/barcodes/pdf417.php | 6 ++--- lib/combodo/tcpdf/include/tcpdf_static.php | 4 +-- lib/combodo/tcpdf/tcpdf.php | 5 ++-- lib/composer/autoload_classmap.php | 1 + lib/composer/autoload_real.php | 3 +++ lib/composer/autoload_static.php | 1 + lib/composer/installed.json | 27 ++++++++++--------- 12 files changed, 37 insertions(+), 35 deletions(-) diff --git a/composer.json b/composer.json index 240f68395..e363d44da 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "ext-json": "*", "ext-mysqli": "*", "ext-soap": "*", - "combodo/tcpdf": "6.3.4", + "combodo/tcpdf": "6.3.5", "nikic/php-parser": "^3.1", "pear/archive_tar": "1.4.9", "pelago/emogrifier": "2.1.0", diff --git a/composer.lock b/composer.lock index 40179fbc2..3a08b7f7d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b29eb2767d269b9ec2cf4d148dc083bc", + "content-hash": "ad359769d05acd25a9fc31d69acbe43a", "packages": [ { "name": "combodo/tcpdf", - "version": "6.3.4", + "version": "6.3.5", "source": { "type": "git", "url": "https://github.com/combodo-itop-libs/TCPDF.git", - "reference": "fe1c625d33e8f7d872d6fb69fb0255fd0e5cee2d" + "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/fe1c625d33e8f7d872d6fb69fb0255fd0e5cee2d", - "reference": "fe1c625d33e8f7d872d6fb69fb0255fd0e5cee2d", + "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/abbfedb8ca59843dec11c97ca3f308742265c3fc", + "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc", "shasum": "" }, "require": { @@ -64,7 +64,7 @@ ], "description": "TCPDF fork adding requirements for iTop: Specific fonts.", "homepage": "https://github.com/combodo-itop-libs/TCPDF", - "time": "2020-02-12T14:16:56+00:00" + "time": "2020-06-05T13:06:44+00:00" }, { "name": "nikic/php-parser", diff --git a/lib/combodo/tcpdf/README.md b/lib/combodo/tcpdf/README.md index 734b9879f..db0149f69 100644 --- a/lib/combodo/tcpdf/README.md +++ b/lib/combodo/tcpdf/README.md @@ -6,7 +6,7 @@ * **category** Library * **author** Nicola Asuni -* **copyright** 2002-2019 Nicola Asuni - Tecnick.com LTD +* **copyright** 2002-2020 Nicola Asuni - Tecnick.com LTD * **license** http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT) * **link** http://www.tcpdf.org * **source** https://github.com/tecnickcom/TCPDF diff --git a/lib/combodo/tcpdf/VERSION b/lib/combodo/tcpdf/VERSION index 8ac3c4451..b98d1d3fa 100644 --- a/lib/combodo/tcpdf/VERSION +++ b/lib/combodo/tcpdf/VERSION @@ -1 +1 @@ -6.3.4 +6.3.5 diff --git a/lib/combodo/tcpdf/composer.json b/lib/combodo/tcpdf/composer.json index fe90ae9eb..d9ac48435 100644 --- a/lib/combodo/tcpdf/composer.json +++ b/lib/combodo/tcpdf/composer.json @@ -6,13 +6,8 @@ "homepage": "https://github.com/combodo-itop-libs/TCPDF", "type": "library", "description": "TCPDF fork adding requirements for iTop: Specific fonts.", - "license": "LGPL-3.0-only", + "license": "LGPL-3.0", "authors": [ - { - "name": "Nicola Asuni", - "email": "info@tecnick.com", - "role": "lead" - }, { "name": "Combodo", "email": "contact@combodo.com" diff --git a/lib/combodo/tcpdf/include/barcodes/pdf417.php b/lib/combodo/tcpdf/include/barcodes/pdf417.php index 3b1774eaa..9a58a21f6 100644 --- a/lib/combodo/tcpdf/include/barcodes/pdf417.php +++ b/lib/combodo/tcpdf/include/barcodes/pdf417.php @@ -878,7 +878,7 @@ class PDF417 { $txtarr = array(); // array of characters and sub-mode switching characters $codelen = strlen($code); for ($i = 0; $i < $codelen; ++$i) { - $chval = ord($code{$i}); + $chval = ord($code[$i]); if (($k = array_search($chval, $this->textsubmodes[$submode])) !== false) { // we are on the same sub-mode $txtarr[] = $k; @@ -888,7 +888,7 @@ class PDF417 { // search new sub-mode if (($s != $submode) AND (($k = array_search($chval, $this->textsubmodes[$s])) !== false)) { // $s is the new submode - if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code{($i + 1)}), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) { + if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code[($i + 1)]), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) { // shift (temporary change only for this char) if ($s == 3) { // shift to puntuaction @@ -952,7 +952,7 @@ class PDF417 { $cw = array_merge($cw, $cw6); } else { for ($i = 0; $i < $sublen; ++$i) { - $cw[] = ord($code{$i}); + $cw[] = ord($code[$i]); } } $code = $rest; diff --git a/lib/combodo/tcpdf/include/tcpdf_static.php b/lib/combodo/tcpdf/include/tcpdf_static.php index 8e9686953..06a1dddcc 100644 --- a/lib/combodo/tcpdf/include/tcpdf_static.php +++ b/lib/combodo/tcpdf/include/tcpdf_static.php @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.3.4'; + private static $tcpdf_version = '6.3.5'; /** * String alias for total number of pages. @@ -1859,7 +1859,7 @@ class TCPDF_STATIC { public static function encodeUrlQuery($url) { $urlData = parse_url($url); if (isset($urlData['query']) && $urlData['query']) { - $urlQueryData = []; + $urlQueryData = array(); parse_str(urldecode($urlData['query']), $urlQueryData); $updatedUrl = $urlData['scheme'] . '://' . $urlData['host'] . $urlData['path'] . '?' . http_build_query($urlQueryData); } else { diff --git a/lib/combodo/tcpdf/tcpdf.php b/lib/combodo/tcpdf/tcpdf.php index be32cae7a..a71afc3a8 100644 --- a/lib/combodo/tcpdf/tcpdf.php +++ b/lib/combodo/tcpdf/tcpdf.php @@ -7178,7 +7178,7 @@ class TCPDF { } else { $ximg = $x; } - + if ($ismask OR $hidden) { // image is not displayed return $info['i']; @@ -12384,7 +12384,8 @@ class TCPDF { $x = $this->w; } $fixed = false; - if ((string)$page && (((string)$page)[0] == '*')) { + $pageAsString = (string) $page; + if ($pageAsString && $pageAsString[0] == '*') { $page = intval(substr($page, 1)); // this page number will not be changed when moving/add/deleting pages $fixed = true; diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index e1139fb16..8f8e6b200 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -197,6 +197,7 @@ return array( 'DataTableSettings' => $baseDir . '/application/datatable.class.inc.php', 'Datamatrix' => $vendorDir . '/combodo/tcpdf/include/barcodes/datamatrix.php', 'DateTimeFormat' => $baseDir . '/core/datetimeformat.class.inc.php', + 'DeadLockLog' => $baseDir . '/core/log.class.inc.php', 'DefaultLogFileNameBuilder' => $baseDir . '/core/log.class.inc.php', 'DefaultMetricComputer' => $baseDir . '/core/computing.inc.php', 'DefaultWorkingTimeComputer' => $baseDir . '/core/computing.inc.php', diff --git a/lib/composer/autoload_real.php b/lib/composer/autoload_real.php index e8c595bf1..ac16a9508 100644 --- a/lib/composer/autoload_real.php +++ b/lib/composer/autoload_real.php @@ -13,6 +13,9 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b } } + /** + * @return \Composer\Autoload\ClassLoader + */ public static function getLoader() { if (null !== self::$loader) { diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index d51cb9049..818c364ae 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -427,6 +427,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'DataTableSettings' => __DIR__ . '/../..' . '/application/datatable.class.inc.php', 'Datamatrix' => __DIR__ . '/..' . '/combodo/tcpdf/include/barcodes/datamatrix.php', 'DateTimeFormat' => __DIR__ . '/../..' . '/core/datetimeformat.class.inc.php', + 'DeadLockLog' => __DIR__ . '/../..' . '/core/log.class.inc.php', 'DefaultLogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php', 'DefaultMetricComputer' => __DIR__ . '/../..' . '/core/computing.inc.php', 'DefaultWorkingTimeComputer' => __DIR__ . '/../..' . '/core/computing.inc.php', diff --git a/lib/composer/installed.json b/lib/composer/installed.json index 9ff117e69..1ec9d2a9a 100644 --- a/lib/composer/installed.json +++ b/lib/composer/installed.json @@ -1,17 +1,17 @@ [ { "name": "combodo/tcpdf", - "version": "6.3.4", - "version_normalized": "6.3.4.0", + "version": "6.3.5", + "version_normalized": "6.3.5.0", "source": { "type": "git", "url": "https://github.com/combodo-itop-libs/TCPDF.git", - "reference": "fe1c625d33e8f7d872d6fb69fb0255fd0e5cee2d" + "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/fe1c625d33e8f7d872d6fb69fb0255fd0e5cee2d", - "reference": "fe1c625d33e8f7d872d6fb69fb0255fd0e5cee2d", + "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/abbfedb8ca59843dec11c97ca3f308742265c3fc", + "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc", "shasum": "" }, "require": { @@ -20,7 +20,7 @@ "replace": { "tecnickcom/tcpdf": "self.version" }, - "time": "2020-02-12T14:16:56+00:00", + "time": "2020-06-05T13:06:44+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -45,21 +45,22 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-3.0-only" + "LGPL-3.0" ], "authors": [ - { - "name": "Nicola Asuni", - "email": "info@tecnick.com", - "role": "lead" - }, { "name": "Combodo", "email": "contact@combodo.com" } ], "description": "TCPDF fork adding requirements for iTop: Specific fonts.", - "homepage": "https://github.com/combodo-itop-libs/TCPDF" + "homepage": "https://github.com/combodo-itop-libs/TCPDF", + "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" + } + ] }, { "name": "nikic/php-parser",