Skip to content

Commit 122ad5c

Browse files
authored
Merge branch 'main' into fix/null-file-id-destroy-php85
2 parents 5342602 + d4dc8ba commit 122ad5c

54 files changed

Lines changed: 262 additions & 181 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/lint-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
lint-docs:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
- name: lint php documentation
2020
uses: sudo-bot/action-doctum@v5
2121
with:

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
env:
3737
PDFINFO_BINARY: ${{ (matrix.os == 'ubuntu-latest') && '/usr/bin/pdfinfo' || ((matrix.os == 'macos-latest') && '/usr/local/bin/pdfinfo' || 'C:\ProgramData\Chocolatey\bin\pdfinfo.exe') }}
3838
steps:
39-
- uses: actions/checkout@v5
39+
- uses: actions/checkout@v6
4040
- name: Install pdfinfo, pdftopng or pdftoppm
4141
uses: ConorMacBride/install-package@v1
4242
with:
@@ -76,7 +76,7 @@ jobs:
7676
run: ./tests/launch.sh
7777
- name: Send coverage
7878
if: matrix.coverage-extension != 'none'
79-
uses: codecov/codecov-action@v3
79+
uses: codecov/codecov-action@v5
8080
with:
8181
flags: php-${{ matrix.php-version }}-${{ matrix.os }}
8282
name: php-${{ matrix.php-version }}-${{ matrix.os }}
@@ -100,7 +100,7 @@ jobs:
100100
name: Static Analysis
101101
runs-on: ubuntu-latest
102102
steps:
103-
- uses: actions/checkout@v5
103+
- uses: actions/checkout@v6
104104
- name: Use php 8.2
105105
uses: shivammathur/setup-php@v2
106106
with:

CHANGELOG.TXT

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
6.11.0 (2026-03-01)
2+
- Updated copyright year.
3+
- Updated linked http urls to https.
4+
- Fix PHP 8.5 deprecation on curl_close() - PR #838
5+
- Fix PHP 8.5 deprecation on null array offset - PR #839
6+
- Fixed: Font subsetting - incorrect placement of head checksum - PR #849
7+
- Fix imagedestroy() deprecation in PHP 8.5 - PR #851
8+
- Fix Rendering of SVG -> PDF issue - PR #855
9+
110
6.10.1 (2025-11-21)
211
- cI: Add 8.5 to CI matrix - PR #836
312
- Fix PHP 8.5 deprecation for xml_parser_free - PR #835
@@ -1830,7 +1839,7 @@
18301839
addTOCPage(), endTOCPage(), addHTMLTOC().
18311840

18321841
5.0.000 (2010-05-05)
1833-
- Method ImageSVG() was added to embedd SVG images (see example n. 58). Note that not all SVG images are supported.
1842+
- Method ImageSVG() was added to embed SVG images (see example n. 58). Note that not all SVG images are supported.
18341843
- Method setRasterizeVectorImages() was added to enable/disable rasterization for vector images via ImageMagick library.
18351844
- Method RoundedRectXY() was added.
18361845
- Method PieSectorXY() was added.
@@ -2557,7 +2566,7 @@
25572566
- A bug relative to fill color on next page was fixed.
25582567

25592568
4.2.007 (2008-11-12)
2560-
- The function setListIndentWidth() was added to set custom indentation widht for HTML lists.
2569+
- The function setListIndentWidth() was added to set custom indentation width for HTML lists.
25612570

25622571
4.2.006 (2008-11-06)
25632572
- A bug relative to HTML justification was fixed.
@@ -2751,7 +2760,7 @@
27512760

27522761
4.0.011 (2008-07-23)
27532762
- Font support was improved.
2754-
- The folder /fonts/utils contains new utilities and instructions for embedd font files.
2763+
- The folder /fonts/utils contains new utilities and instructions for embed font files.
27552764
- Documentation was updated.
27562765

27572766
4.0.010 (2008-07-22)

LICENSE.TXT

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
published by the Free Software Foundation, either version 3 of the
88
License, or (at your option) any later version.
99

10-
2002-2025 Nicola Asuni - Tecnick.com LTD
10+
2002-2026 Nicola Asuni - Tecnick.com LTD
1111

1212
**********************************************************************
1313
**********************************************************************
1414

1515
GNU LESSER GENERAL PUBLIC LICENSE
1616
Version 3, 29 June 2007
1717

18-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
18+
Copyright (C) 2007 Free Software Foundation, Inc. <https://www.fsf.org/>
1919
Everyone is permitted to copy and distribute verbatim copies
2020
of this license document, but changing it is not allowed.
2121

@@ -184,7 +184,7 @@ Library.
184184
GNU GENERAL PUBLIC LICENSE
185185
Version 3, 29 June 2007
186186

187-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
187+
Copyright (C) 2007 Free Software Foundation, Inc. <https://www.fsf.org/>
188188
Everyone is permitted to copy and distribute verbatim copies
189189
of this license document, but changing it is not allowed.
190190

@@ -828,7 +828,7 @@ the "copyright" line and a pointer to where the full notice is found.
828828
GNU General Public License for more details.
829829

830830
You should have received a copy of the GNU General Public License
831-
along with this program. If not, see <http://www.gnu.org/licenses/>.
831+
along with this program. If not, see <https://www.gnu.org/licenses/>.
832832

833833
Also add information on how to contact you by electronic and paper mail.
834834

@@ -847,14 +847,14 @@ might be different; for a GUI interface, you would use an "about box".
847847
You should also get your employer (if you work as a programmer) or school,
848848
if any, to sign a "copyright disclaimer" for the program, if necessary.
849849
For more information on this, and how to apply and follow the GNU GPL, see
850-
<http://www.gnu.org/licenses/>.
850+
<https://www.gnu.org/licenses/>.
851851

852852
The GNU General Public License does not permit incorporating your program
853853
into proprietary programs. If your program is a subroutine library, you
854854
may consider it more useful to permit linking proprietary applications with
855855
the library. If this is what you want to do, use the GNU Lesser General
856856
Public License instead of this License. But first, please read
857-
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
857+
<https://www.gnu.org/philosophy/why-not-lgpl.html>.
858858

859859
**********************************************************************
860860
**********************************************************************

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
* **category** Library
88
* **author** Nicola Asuni <info@tecnick.com>
9-
* **copyright** 2002-2025 Nicola Asuni - Tecnick.com LTD
10-
* **license** http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
9+
* **copyright** 2002-2026 Nicola Asuni - Tecnick.com LTD
10+
* **license** https://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
1111
* **link** http://www.tcpdf.org
1212
* **source** https://github.com/tecnickcom/TCPDF
1313

@@ -63,7 +63,7 @@ All the original binary TTF font files have been renamed for compatibility with
6363
The binary files (.z) that begins with the prefix "free" have been extracted from the GNU FreeFont collection (GNU-GPLv3).
6464
The binary files (.z) that begins with the prefix "pdfa" have been derived from the GNU FreeFont, so they are subject to the same license.
6565
For the details of Copyright, License and other information, please check the files inside the directory fonts/freefont-20120503
66-
Link : http://www.gnu.org/software/freefont/
66+
Link : https://www.gnu.org/software/freefont/
6767

6868
The binary files (.z) that begins with the prefix "dejavu" have been extracted from the DejaVu fonts 2.33 (Bitstream) collection.
6969
For the details of Copyright, License and other information, please check the files inside the directory fonts/dejavu-fonts-ttf-2.33
@@ -80,4 +80,4 @@ https://packages.debian.org/source/stable/icc-profiles-free
8080

8181
## Developer(s) Contact
8282

83-
* Nicola Asuni <info@tecnick.com>
83+
*2026 Nicola Asuni <info@tecnick.com>

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.10.1
1+
6.11.0

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"barcodes"
1313
],
1414
"homepage": "http://www.tcpdf.org/",
15-
"version": "6.10.1",
15+
"version": "6.11.0",
1616
"license": "LGPL-3.0-or-later",
1717
"authors": [
1818
{

config/tcpdf_config.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77
// Description : Configuration file for TCPDF.
88
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
9-
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
9+
// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
1010
// -------------------------------------------------------------------
11-
// Copyright (C) 2004-2014 Nicola Asuni - Tecnick.com LTD
11+
// Copyright (C) 2004-2014 2026 Nicola Asuni - Tecnick.com LTD
1212
//
1313
// This file is part of TCPDF software library.
1414
//
@@ -23,7 +23,7 @@
2323
// See the GNU Lesser General Public License for more details.
2424
//
2525
// You should have received a copy of the GNU Lesser General Public License
26-
// along with TCPDF. If not, see <http://www.gnu.org/licenses/>.
26+
// along with TCPDF. If not, see <https://www.gnu.org/licenses/>.
2727
//
2828
// See LICENSE.TXT file for more information.
2929
//============================================================+
@@ -114,7 +114,7 @@
114114
/**
115115
* Header description string.
116116
*/
117-
define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
117+
define ('PDF_HEADER_STRING', "by2026 Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
118118

119119
/**
120120
* Document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch].

examples/barcodes/example_1d_html.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// Begin : 2011-07-21
66
// Last Update : 2013-03-19
77
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
8-
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
8+
// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
99
// -------------------------------------------------------------------
10-
// Copyright (C) 2009-2013 Nicola Asuni - Tecnick.com LTD
10+
// Copyright (C) 2009-2026 Nicola Asuni - Tecnick.com LTD
1111
//
1212
// This file is part of TCPDF software library.
1313
//
@@ -22,7 +22,7 @@
2222
// See the GNU Lesser General Public License for more details.
2323
//
2424
// You should have received a copy of the GNU Lesser General Public License
25-
// along with TCPDF. If not, see <http://www.gnu.org/licenses/>.
25+
// along with TCPDF. If not, see <https://www.gnu.org/licenses/>.
2626
//
2727
// See LICENSE.TXT file for more information.
2828
// -------------------------------------------------------------------

examples/barcodes/example_1d_png.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// Begin : 2011-07-21
66
// Last Update : 2013-03-19
77
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
8-
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
8+
// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
99
// -------------------------------------------------------------------
10-
// Copyright (C) 2009-2013 Nicola Asuni - Tecnick.com LTD
10+
// Copyright (C) 2009-2026 Nicola Asuni - Tecnick.com LTD
1111
//
1212
// This file is part of TCPDF software library.
1313
//
@@ -22,7 +22,7 @@
2222
// See the GNU Lesser General Public License for more details.
2323
//
2424
// You should have received a copy of the GNU Lesser General Public License
25-
// along with TCPDF. If not, see <http://www.gnu.org/licenses/>.
25+
// along with TCPDF. If not, see <https://www.gnu.org/licenses/>.
2626
//
2727
// See LICENSE.TXT file for more information.
2828
// -------------------------------------------------------------------

0 commit comments

Comments
 (0)