N°9319 increase php min. version to 8.2 (#887)

* Update minimum PHP version to 8.2
* Fix previous wrong resolution of merge conflict
This commit is contained in:
jf-cbd
2026-04-20 14:47:44 +02:00
committed by GitHub
parent f439490bfc
commit 805087a01b
171 changed files with 5629 additions and 1446 deletions

View File

@@ -1,3 +1,9 @@
6.11.2 (2026-03-03)
- Refactor setCompression().
6.11.1 (2026-03-03)
- Remove debug line preventing compression.
6.11.0 (2026-03-01)
- Updated copyright year.
- Updated linked http urls to https.

View File

@@ -1 +1 @@
6.11.0
6.11.2

View File

@@ -12,7 +12,7 @@
"barcodes"
],
"homepage": "http://www.tcpdf.org/",
"version": "6.11.0",
"version": "6.11.2",
"license": "LGPL-3.0-or-later",
"authors": [
{

View File

@@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version.
* @private static
*/
private static $tcpdf_version = '6.11.0';
private static $tcpdf_version = '6.11.2';
/**
* String alias for total number of pages.

View File

@@ -1,9 +1,9 @@
<?php
//============================================================+
// File name : tcpdf.php
// Version : 6.11.0
// Version : 6.11.2
// Begin : 2002-08-03
// Last Update : 2026-03-01
// Last Update : 2026-03-03
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
@@ -104,7 +104,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @package com.tecnick.tcpdf
* @author Nicola Asuni
* @version 6.11.0
* @version 6.11.2
*/
// TCPDF configuration
@@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
* @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions.
* @version 6.11.0
* @version 6.11.2
* @author Nicola Asuni - info@tecnick.com
* @IgnoreAnnotation("protected")
* @IgnoreAnnotation("public")
@@ -2907,12 +2907,7 @@ class TCPDF {
* @since 1.4
*/
public function setCompression($compress=true) {
$this->compress = false; return;
if (function_exists('gzcompress')) {
if ($compress) {
$this->compress = true;
}
}
$this->compress = ($compress && function_exists('gzcompress'));
}
/**

0
lib/tecnickcom/tcpdf/tools/tcpdf_addfont.php Normal file → Executable file
View File