Skip to content

Commit 724d2a5

Browse files
Merge branch 'main' into embedded-files
2 parents a487dd1 + f67b761 commit 724d2a5

File tree

8 files changed

+14
-935
lines changed

8 files changed

+14
-935
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
php-version: ["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]
25+
php-version: ["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]
2626
os: [ubuntu-latest]
2727
experimental: [false]
2828
php-extensions: ["bcmath, curl, imagick, gd"]
@@ -31,7 +31,7 @@ jobs:
3131
include:
3232
#- { php-version: '8.2', experimental: false, os: macos-latest, php-extensions: 'bcmath, curl, imagick, gd', coverage-extension: 'none' }
3333
- { php-version: '8.2', experimental: false, os: windows-latest, php-extensions: 'bcmath, curl, imagick, gd', coverage-extension: 'none' }
34-
- { php-version: '8.3', experimental: true, os: ubuntu-latest, php-extensions: 'bcmath, curl, imagick, gd', coverage-extension: 'pcov' }
34+
- { php-version: '8.4', experimental: true, os: ubuntu-latest, php-extensions: 'bcmath, curl, imagick, gd', coverage-extension: 'pcov' }
3535
- { php-version: 'nightly', experimental: true, os: ubuntu-latest, php-extensions: 'bcmath, curl, imagick, gd', coverage-extension: 'pcov' }
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') }}

CHANGELOG.TXT

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
6.9.0 (2025-03-30)
2+
- Added PHP 8.4 testing.
3+
- Removed tcpdf_import.php and tcpdf_parser.php files (for a parser check the tc-lib-pdf-parser project instead).
4+
- Fix composer.json.
5+
16
6.8.2 (2025-01-26)
27
- Fix some annotation flags values.
38
- Remove examples from packaging.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.8.2
1+
6.9.0

composer.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"barcodes"
1313
],
1414
"homepage": "http://www.tcpdf.org/",
15-
"version": "6.8.2",
15+
"version": "6.9.0",
1616
"license": "LGPL-3.0-or-later",
1717
"authors": [
1818
{
@@ -30,8 +30,6 @@
3030
"config",
3131
"include",
3232
"tcpdf.php",
33-
"tcpdf_parser.php",
34-
"tcpdf_import.php",
3533
"tcpdf_barcodes_1d.php",
3634
"tcpdf_barcodes_2d.php",
3735
"include/tcpdf_colors.php",
@@ -44,10 +42,5 @@
4442
"include/barcodes/pdf417.php",
4543
"include/barcodes/qrcode.php"
4644
]
47-
},
48-
"archive": {
49-
"exclude": [
50-
"/examples"
51-
]
5245
}
5346
}

include/tcpdf_static.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
5555
* Current TCPDF version.
5656
* @private static
5757
*/
58-
private static $tcpdf_version = '6.8.2';
58+
private static $tcpdf_version = '6.9.0';
5959

6060
/**
6161
* String alias for total number of pages.

tcpdf.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22
//============================================================+
33
// File name : tcpdf.php
4-
// Version : 6.8.2
4+
// Version : 6.9.0
55
// Begin : 2002-08-03
6-
// Last Update : 2024-12-23
6+
// Last Update : 2025-03-30
77
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - [email protected]
88
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
99
// -------------------------------------------------------------------
@@ -104,7 +104,7 @@
104104
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
105105
* @package com.tecnick.tcpdf
106106
* @author Nicola Asuni
107-
* @version 6.8.2
107+
* @version 6.9.0
108108
*/
109109

110110
// TCPDF configuration
@@ -128,7 +128,7 @@
128128
* 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>
129129
* @package com.tecnick.tcpdf
130130
* @brief PHP class for generating PDF documents without requiring external extensions.
131-
* @version 6.8.2
131+
* @version 6.9.0
132132
* @author Nicola Asuni - [email protected]
133133
* @IgnoreAnnotation("protected")
134134
* @IgnoreAnnotation("public")

tcpdf_import.php

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)