nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

TCPDF: Updates for PHP 8.1

Browse Source
This commit is contained in:
fusionate
2023-05-29 22:23:40 +00:00
parent 488b199950
commit f444f651e5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/tcpdf/include/tcpdf_static.php
View File

@@ -1136,7 +1136,7 @@ class TCPDF_STATIC {
* @see setHtmlVSpace()
* @public static
*/
public static function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='', &$tagvspaces) {
public static function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='', &$tagvspaces=[]) {
// configure parameters for HTML Tidy
if ($tidy_options === '') {
$tidy_options = array (
@@ -1787,7 +1787,7 @@ class TCPDF_STATIC {
* @since 6.0.023
* @public static
*/
public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) {
public static function pregSplit($pattern, $modifiers, $subject, $limit=-1, $flags=0) {
// the bug only happens on PHP 5.2 when using the u modifier
if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
return preg_split($pattern.$modifiers, $subject, $limit, $flags);
@@ -2485,7 +2485,7 @@ class TCPDF_STATIC {
* @since 5.0.010 (2010-05-17)
* @public static
*/
public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false, $k, $pagedim=array()) {
public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false, $k=1, $pagedim=array()) {
if (!isset($pagedim[$page])) {
// initialize array
$pagedim[$page] = array();

6
resources/tcpdf/tcpdf.php
View File

@@ -4134,8 +4134,8 @@ class TCPDF {
// SHY character will not be printed
return (0);
}
if (isset($this->CurrentFont['cw'][$char])) {
$w = $this->CurrentFont['cw'][$char];
if (isset($this->CurrentFont['cw'][floor($char)])) {
$w = $this->CurrentFont['cw'][floor($char)];
} elseif (isset($this->CurrentFont['dw'])) {
// default width
$w = $this->CurrentFont['dw'];
@@ -7039,7 +7039,7 @@ class TCPDF {
}
if ($newimage) {
//First use of image, get info
$type = strtolower($type);
$type = strtolower($type ?? '');
if ($type == '') {
$type = TCPDF_IMAGES::getImageFileType($file, $imsize);
} elseif ($type == 'jpg') {