Skip to content

Commit 55ddad5

Browse files
nicolaasuninicolaasuni
authored
Merge pull request #795 from tecnickcom/20250330_prs
Group Pull requests.
2 parents f7a7810 + 0bc88c1 commit 55ddad5

File tree

12 files changed

+42
-951
lines changed

12 files changed

+42
-951
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 3 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') }}
@@ -90,7 +90,7 @@ jobs:
9090
# For debugging issues
9191
- name: Archive test results
9292
if: failure()
93-
uses: actions/upload-artifact@v3
93+
uses: actions/upload-artifact@v4
9494
with:
9595
name: test-run-output-${{ matrix.php-version }}-${{ matrix.os }}
9696
retention-days: 1

‎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.8.3

‎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
}

‎examples/example_065.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Last Update : 2013-05-14
66
//
77
// Description : Example 065 for TCPDF class
8-
// Creates an example PDF/A-1b document using TCPDF
8+
// Creates an example PDF/A-3b document using TCPDF
99
//
1010
// Author: Nicola Asuni
1111
//
@@ -17,20 +17,20 @@
1717
//============================================================+
1818

1919
/**
20-
* Creates an example PDF/A-1b document using TCPDF
20+
* Creates an example PDF/A-3b document using TCPDF
2121
* @package com.tecnick.tcpdf
22-
* @abstract TCPDF - Example: PDF/A-1b mode
22+
* @abstract TCPDF - Example: PDF/A-3b mode
2323
* @author Nicola Asuni
2424
* @since 2011-09-28
25-
* @group A-1b
25+
* @group A-3b
2626
* @group pdf
2727
*/
2828

2929
// Include the main TCPDF library (search for installation path).
3030
require_once('tcpdf_include.php');
3131

3232
// create new PDF document
33-
$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false, true);
33+
$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false, 3);
3434

3535
// set document information
3636
$pdf->setCreator(PDF_CREATOR);
@@ -80,8 +80,8 @@
8080

8181
// Set some content to print
8282
$html = <<<EOD
83-
<h1>Example of <a href="http://www.tcpdf.org" style="text-decoration:none;background-color:#CC0000;color:black;">&nbsp;<span style="color:black;">TC</span><span style="color:white;">PDF</span>&nbsp;</a> document in <span style="background-color:#99ccff;color:black;"> PDF/A-1b </span> mode.</h1>
84-
<i>This document conforms to the standard <b>PDF/A-1b (ISO 19005-1:2005)</b>.</i>
83+
<h1>Example of <a href="http://www.tcpdf.org" style="text-decoration:none;background-color:#CC0000;color:black;">&nbsp;<span style="color:black;">TC</span><span style="color:white;">PDF</span>&nbsp;</a> document in <span style="background-color:#99ccff;color:black;"> PDF/A-3b </span> mode.</h1>
84+
<i>This document conforms to the standard <b>PDF/A-3b (ISO 19005-3:2012)</b>.</i>
8585
<p>Please check the source code documentation and other examples for further information (<a href="http://www.tcpdf.org">http://www.tcpdf.org</a>).</p>
8686
<p style="color:#CC0000;">TO IMPROVE AND EXPAND TCPDF I NEED YOUR SUPPORT, PLEASE <a href="http://sourceforge.net/donate/index.php?group_id=128076">MAKE A DONATION!</a></p>
8787
EOD;

‎examples/example_066.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
/**
44
* Example 066 for TCPDF library
55
*
6-
* @description Creates an example PDF/A-1b document using TCPDF
6+
* @description Creates an example PDF/A-3b document using TCPDF
77
* @author Nicola Asuni - Tecnick.com LTD <[email protected]>
88
* @license LGPL-3.0
99
*/
1010

1111
/**
12-
* Creates an example PDF/A-1b document using TCPDF
12+
* Creates an example PDF/A-3b document using TCPDF
1313
*
14-
* @abstract TCPDF - Example: PDF/A-1b mode
14+
* @abstract TCPDF - Example: PDF/A-3b mode
1515
* @author Nicola Asuni
1616
* @since 2021-03-26
17-
* @group A-1b
17+
* @group A-3b
1818
* @group pdf
1919
*/
2020

2121
// Include the main TCPDF library (search for installation path).
2222
require_once('tcpdf_include.php');
2323

2424
// create new PDF document
25-
$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false, true);
25+
$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false, 3);
2626

2727
// set document information
2828
$pdf->setCreator(PDF_CREATOR);
@@ -73,8 +73,8 @@
7373

7474
// Set some content to print
7575
$html = <<<HTML
76-
<h1>Example of <a href="http://www.tcpdf.org" style="text-decoration:none;background-color:#CC0000;color:black;">&nbsp;<span style="color:black;">TC</span><span style="color:white;">PDF</span>&nbsp;</a> document in <span style="background-color:#99ccff;color:black;"> PDF/A-1b </span> mode.</h1>
77-
<i>This document conforms to the standard <b>PDF/A-1b (ISO 19005-1:2005)</b>.</i>
76+
<h1>Example of <a href="http://www.tcpdf.org" style="text-decoration:none;background-color:#CC0000;color:black;">&nbsp;<span style="color:black;">TC</span><span style="color:white;">PDF</span>&nbsp;</a> document in <span style="background-color:#99ccff;color:black;"> PDF/A-3b </span> mode.</h1>
77+
<i>This document conforms to the standard <b>PDF/A-3b (ISO 19005-3:2012)</b>.</i>
7878
<p>Please check the source code documentation and other examples for further information (<a href="http://www.tcpdf.org">http://www.tcpdf.org</a>).</p>
7979
HTML;
8080

‎examples/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<li>XObject Templates: [<a href="example_062.php" title="PDF [new window]" target="_blank">PDF</a>]</li>
8585
<li>Text stretching and spacing (tracking/kerning): [<a href="example_063.php" title="PDF [new window]" target="_blank">PDF</a>]</li>
8686
<li>No-write page regions: [<a href="example_064.php" title="PDF [new window]" target="_blank">PDF</a>]</li>
87-
<li>PDF/A-1b (ISO 19005-1:2005) document: [<a href="example_065.php" title="PDF [new window]" target="_blank">PDF</a>]</li>
87+
<li>PDF/A-3b (ISO 19005-3:2012) document: [<a href="example_065.php" title="PDF [new window]" target="_blank">PDF</a>]</li>
8888
<li>Using WriteHTMLCell: [<a href="example_066.php" title="PDF [new window]" target="_blank">PDF</a>]</li>
8989
<li>Shorthand border styles including !important: [<a href="example_067.php" title="PDF [new window]" target="_blank">PDF</a>]</li>
9090
</ol>

‎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)