Update tcpdf.php for #681

.github/workflows/lint-docs.yml

@@ -1,5 +1,8 @@
 name: lint php documentation
 
+permissions:
+ contents: read
+
 on:
  push:
  branches:
@@ -12,7 +15,7 @@ jobs:
  lint-docs:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: lint php documentation
  uses: sudo-bot/action-doctum@dev
  with:

.github/workflows/tests.yml

@@ -1,5 +1,11 @@
 name: Run tests
 
+env:
+ XDEBUG_MODE: coverage
+
+permissions:
+ contents: read
+
 on:
  push:
  branches:
@@ -16,45 +22,26 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- php-version: ["5.3", "5.4", "5.5", "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]
- os: [macos-latest, windows-latest]
+ php-version: ["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]
+ os: [ubuntu-latest]
  experimental: [false]
  php-extensions: ["bcmath, imagick, gd"]
  coverage-extension: ["none"]
- exclude:
- # For now, we do not know how to run workflow on Windows
- # with imagick PHP extension for PHP 5.3 - 5.6
- - { php-version: '5.3', os: windows-latest }
- - { php-version: '5.4', os: windows-latest }
- - { php-version: '5.5', os: windows-latest }
- - { php-version: '5.6', os: windows-latest }
- # Somehow some tests fail under Windows and PHP 7.0,
- # so we disable that run for now
- - { php-version: '7.0', os: windows-latest }
+ # Add more specific tests
  include:
- - { php-version: '5.3', os: windows-latest, experimental: false, php-extensions: 'bcmath, gd', coverage-extension: 'none' }
- - { php-version: '5.4', os: windows-latest, experimental: false, php-extensions: 'bcmath, gd', coverage-extension: 'none' }
- - { php-version: '5.5', os: windows-latest, experimental: false, php-extensions: 'bcmath, gd', coverage-extension: 'none' }
- - { php-version: '5.6', os: windows-latest, experimental: false, php-extensions: 'bcmath, gd', coverage-extension: 'none' }
- # Specify coverage extension for Ubuntu runs
- - { php-version: '5.3', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
- - { php-version: '5.4', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
- - { php-version: '5.5', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
- - { php-version: '5.6', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
- - { php-version: '7.0', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
- # pcov is available from PHP 7.1
- - { php-version: '7.1', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
- - { php-version: '7.2', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
- - { php-version: '7.3', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
- - { php-version: '7.4', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
- - { php-version: '8.0', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
- - { php-version: '8.1', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
- - { php-version: '8.2', os: ubuntu-latest, experimental: false, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
- - { php-version: 'nightly', os: ubuntu-latest, experimental: true, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
+ - { php-version: '5.3', experimental: false, os: ubuntu-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
+ - { php-version: '5.4', experimental: false, os: ubuntu-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
+ - { php-version: '5.5', experimental: false, os: ubuntu-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
+ - { php-version: '5.6', experimental: false, os: ubuntu-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
+ - { php-version: '7.0', experimental: false, os: ubuntu-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'xdebug' }
+ - { php-version: '8.2', experimental: false, os: macos-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'none' }
+ - { php-version: '8.2', experimental: false, os: windows-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'none' }
+ - { php-version: '8.3', experimental: true, os: ubuntu-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
+ - { php-version: 'nightly', experimental: true, os: ubuntu-latest, php-extensions: 'bcmath, imagick, gd', coverage-extension: 'pcov' }
  env:
  PDFINFO_BINARY: ${{ (matrix.os == 'ubuntu-latest') && '/usr/bin/pdfinfo' || ((matrix.os == 'macos-latest') && '/usr/local/bin/pdfinfo' || 'C:\ProgramData\Chocolatey\bin\pdfinfo.exe') }}
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Install pdfinfo, pdftopng or pdftoppm
  uses: ConorMacBride/install-package@v1
  with:
@@ -86,9 +73,9 @@ jobs:
  path: ~/.composer/cache/
  key: composer-cache
  - name: Install dependencies
- run: composer install --no-interaction
+ run: composer update --no-interaction
  - name: Install test dependencies
- run: cd ./tests && composer install --no-interaction && cd ../
+ run: cd ./tests && composer update --no-interaction && cd ../
  - name: Run shell-based test suite
  if: runner.os == 'Linux'
  run: ./tests/launch.sh
@@ -118,12 +105,11 @@ jobs:
  name: Static Analysis
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
- - name: Use php 8.0
+ - uses: actions/checkout@v4
+ - name: Use php 8.2
  uses: shivammathur/setup-php@v2
  with:
- php-version: 8.0
- tools: composer:v2
+ php-version: 8.2
  - name: Cache module
  uses: actions/cache@v3
  with:
@@ -132,4 +118,4 @@ jobs:
  - name: Install phpstan
  run: composer require --dev phpstan/phpstan
  - name: Analyse files
- run: ./vendor/bin/phpstan --memory-limit=2G
+ run: ./vendor/bin/phpstan --memory-limit=6G

CHANGELOG.TXT

@@ -1,3 +1,23 @@
+6.6.5 (2023-09-06)
+ - Fix corrupted file.
+
+6.6.4 (2023-09-06)
+ - Fix GitHub automation tests.
+
+6.6.3 (2023-09-06)
+ - Fix SPDX license ID (#591)
+ - Fix warning "array offset on value of type null" (#620)
+ - Improve the README about the status of this library (#589)
+ - Fix deprecation warning with PHP 8.1 (#614)
+ - Fixes for PHP 8.2 in tcpdf_fonts.php (#632)
+ - Fix some php 8+ edge cases (#630)
+ - Fix composite glyph output (#581)
+ - Fix "access array offset on value of type bool" with PDF/A (#583)
+ - Fix non-numeric value warning (#627)
+ - Fix issues with S25 barcode (#611)
+ - Fix return type annotations (#613)
+ - Fix some inconsistencies in type hints (#598)
+
 6.6.2 (2022-12-17)
  - Ensure pregSplit return type is always array.
  - Add ability to run tests on various operating systems (#566)

LICENSE.TXT

@@ -7,7 +7,7 @@
  published by the Free Software Foundation, either version 3 of the
  License, or (at your option) any later version.
 
- 2002-2022 Nicola Asuni - Tecnick.com LTD
+ 2002-2023 Nicola Asuni - Tecnick.com LTD
 
 **********************************************************************
 **********************************************************************

README.md

@@ -6,15 +6,14 @@
 
 * **category** Library
 * **author** Nicola Asuni <[email protected]>
-* **copyright** 2002-2022 Nicola Asuni - Tecnick.com LTD
+* **copyright** 2002-2023 Nicola Asuni - Tecnick.com LTD
 * **license** http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
 * **link** http://www.tcpdf.org
 * **source** https://github.com/tecnickcom/TCPDF
 
 
-## IMPORTANT
-A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this version will not receive any additional development or support.
-This version should be considered obsolete, new projects should use the new version as soon it will become stable.
+## NOTE
+A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this library is in support only mode.
 
 
 

VERSION

@@ -1 +1 @@
-6.6.2
+6.6.5

composer.json

@@ -12,8 +12,8 @@
  "barcodes"
  ],
  "homepage": "http://www.tcpdf.org/",
- "version": "6.6.2",
- "license": "LGPL-3.0-only",
+ "version": "6.6.5",
+ "license": "LGPL-3.0-or-later",
  "authors": [
  {
  "name": "Nicola Asuni",

include/barcodes/qrcode.php

@@ -888,6 +888,7 @@ protected function getCode() {
  if ($col >= $this->rsblocks[0]['dataLength']) {
  $row += $this->b1;
  }
+ $row = (int) $row;
  $ret = $this->rsblocks[$row]['data'][$col];
  } elseif ($this->count < $this->dataLength + $this->eccLength) {
  $row = ($this->count - $this->dataLength) % $this->blocks;

include/tcpdf_fonts.php

@@ -1323,43 +1323,43 @@ public static function _getTrueTypeFontSubset($font, $subsetchars) {
  // set the checkSumAdjustment to 0
  $table[$tag]['data'] = substr($table[$tag]['data'], 0, 8)."\x0\x0\x0\x0".substr($table[$tag]['data'], 12);
  }
- $pad = 4 - ($table[$tag]['length'] % 4);
- if ($pad != 4) {
- // the length of a table must be a multiple of four bytes
- $table[$tag]['length'] += $pad;
- $table[$tag]['data'] .= str_repeat("\x0", $pad);
- }
  $table[$tag]['offset'] = $offset;
  $offset += $table[$tag]['length'];
+ $numPad = ($offset + 3 & ~3) - $offset;
+ if($numPad > 0) {
+ $table[$tag]['data'] .= str_repeat("\x0", $numPad);
+ $offset += $numPad;
+ }
  // check sum is not changed (so keep the following line commented)
- //$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length']);
+ //$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length'] + $numPad);
  } else {
  unset($table[$tag]);
  }
  }
  // add loca
+ $table['loca'] = array();
  $table['loca']['data'] = $loca;
  $table['loca']['length'] = strlen($loca);
- $pad = 4 - ($table['loca']['length'] % 4);
- if ($pad != 4) {
- // the length of a table must be a multiple of four bytes
- $table['loca']['length'] += $pad;
- $table['loca']['data'] .= str_repeat("\x0", $pad);
- }
  $table['loca']['offset'] = $offset;
- $table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length']);
  $offset += $table['loca']['length'];
+ $numPad = ($offset + 3 & ~3) - $offset;
+ if($numPad > 0) {
+ $table['loca']['data'] .= str_repeat("\x0", $numPad);
+ $offset += $numPad;
+ }
+ $table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length'] + $numPad);
  // add glyf
+ $table['glyf'] = array();
  $table['glyf']['data'] = $glyf;
  $table['glyf']['length'] = strlen($glyf);
- $pad = 4 - ($table['glyf']['length'] % 4);
- if ($pad != 4) {
- // the length of a table must be a multiple of four bytes
- $table['glyf']['length'] += $pad;
- $table['glyf']['data'] .= str_repeat("\x0", $pad);
- }
  $table['glyf']['offset'] = $offset;
- $table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length']);
+ $offset += $table['glyf']['length'];
+ $numPad = ($offset + 3 & ~3) - $offset;
+ if($numPad > 0) {
+ $table['glyf']['data'] .= str_repeat("\x0", $numPad);
+ $offset += $numPad;
+ }
+ $table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length'] + $numPad);
  // rebuild font
  $font = '';
  $font .= pack('N', 0x10000); // sfnt version
@@ -1383,7 +1383,7 @@ public static function _getTrueTypeFontSubset($font, $subsetchars) {
  }
  // set checkSumAdjustment on head table
  $checkSumAdjustment = 0xB1B0AFBA - self::_getTTFtableChecksum($font, strlen($font));
- $font = substr($font, 0, $table['head']['offset'] + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + 12);
+ $font = substr($font, 0, $table['head']['offset'] + $offset + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + $offset + 12);
  return $font;
  }
 
@@ -1780,9 +1780,9 @@ public static function arrUTF8ToUTF16BE($unicode, $setbom=false) {
  */
  public static function UTF8ArrayToUniArray($ta, $isunicode=true) {
  if ($isunicode) {
- return array_map(array('TCPDF_FONTS', 'unichrUnicode'), $ta);
+ return array_map(get_called_class().'::unichrUnicode', $ta);
  }
- return array_map(array('TCPDF_FONTS', 'unichrASCII'), $ta);
+ return array_map(get_called_class().'::unichrASCII', $ta);
  }
 
  /**
@@ -2002,7 +2002,7 @@ public static function UTF8StringToArray($str, $isunicode, &$currentfont) {
  if ($isunicode) {
  // requires PCRE unicode support turned on
  $chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
- $carr = array_map(array('TCPDF_FONTS', 'uniord'), $chars);
+ $carr = array_map(get_called_class().'::uniord', $chars);
  } else {
  $chars = str_split($str);
  $carr = array_map('ord', $chars);

include/tcpdf_static.php

@@ -3,11 +3,11 @@
 // File name : tcpdf_static.php
 // Version : 1.1.4
 // Begin : 2002-08-03
-// Last Update : 2022-08-12
+// Last Update : 2023-09-06
 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - [email protected]
 // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2022 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2023 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
  * Current TCPDF version.
  * @private static
  */
- private static $tcpdf_version = '6.6.2';
+ private static $tcpdf_version = '6.6.5';
 
  /**
  * String alias for total number of pages.
@@ -1780,7 +1780,7 @@ public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $f
  if ($ret === false) {
  return array();
  }
- return $ret;
+ return is_array($ret) ? $ret : array();
  }
  // preg_split is bugged - try alternative solution
  $ret = array();
@@ -2124,7 +2124,7 @@ public static function _freadint($f) {
  * Array of page formats
  * measures are calculated in this way: (inches * 72) or (millimeters * 72 / 25.4)
  * @public static
- * 
+ *
  * @var array<string,float[]>
  */
  public static $page_formats = array(

phpstan.neon.dist

@@ -4,8 +4,6 @@ parameters:
  - ./
  excludePaths:
  - vendor/
- # remove once https://github.com/phpstan/phpstan/issues/7955 is fixed
- - fonts/
  - tests/
 
  scanFiles: