add file options

Author: nicolaasuni

VERSION

@@ -1 +1 @@
-2.6.42
+2.7.0

composer.json

@@ -25,7 +25,7 @@
     "ext-json": "*",
     "ext-pcre": "*",
     "ext-zlib": "*",
-    "tecnickcom/tc-lib-file": "^2.4",
+    "tecnickcom/tc-lib-file": "^2.5",
     "tecnickcom/tc-lib-unicode-data": "^2.0",
     "tecnickcom/tc-lib-pdf-encrypt": "^2.2"
   },

resources/debian/control

@@ -12,6 +12,6 @@ Vcs-Browser: https://github.com/~#VENDOR#~/~#PROJECT#~
 Package: ~#PKGNAME#~
 Provides: php-~#PROJECT#~
 Architecture: all
-Depends: php (>= 8.1.0), php-json, php-zip, php-tecnickcom-tc-lib-file (<< 3.0.0), php-tecnickcom-tc-lib-file (>= 2.4.0), php-tecnickcom-tc-lib-unicode-data (<< 3.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.51), php-tecnickcom-tc-lib-pdf-encrypt (<< 3.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 2.2.0), php-tecnickcom-tc-lib-pdf-font-core (<< 2.0.0), php-tecnickcom-tc-lib-pdf-font-data-core (>= 1.8.7), ${misc:Depends}
+Depends: php (>= 8.1.0), php-json, php-zip, php-tecnickcom-tc-lib-file (<< 3.0.0), php-tecnickcom-tc-lib-file (>= 2.5.0), php-tecnickcom-tc-lib-unicode-data (<< 3.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.51), php-tecnickcom-tc-lib-pdf-encrypt (<< 3.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 2.2.0), php-tecnickcom-tc-lib-pdf-font-core (<< 2.0.0), php-tecnickcom-tc-lib-pdf-font-data-core (>= 1.8.7), ${misc:Depends}
 Description: PHP PDF Fonts Library
  PHP library containing PDF font methods and utilities.

resources/rpm/rpm.spec

@@ -19,7 +19,7 @@ Requires:  php-json
 Requires:  php-pcre
 Requires:  php-zlib
 Requires:  php-composer(%{c_vendor}/tc-lib-file) < 3.0.0
-Requires:  php-composer(%{c_vendor}/tc-lib-file) >= 2.4.0
+Requires:  php-composer(%{c_vendor}/tc-lib-file) >= 2.5.0
 Requires:  php-composer(%{c_vendor}/tc-lib-unicode-data) < 3.0.0
 Requires:  php-composer(%{c_vendor}/tc-lib-unicode-data) >= 2.0.51
 Requires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 3.0.0

src/Buffer.php

@@ -29,6 +29,14 @@
  * @license   https://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
  * @link      https://github.com/tecnickcom/tc-lib-pdf-font
  *
+ * @phpstan-type TFileOptions array{
+ *   allowedHosts?: array<string>,
+ *   maxRemoteSize?: int,
+ *   curlopts?: array<int, bool|int|string>,
+ *   defaultCurlOpts?: array<int, bool|int|string>,
+ *   fixedCurlOpts?: array<int, bool|int|string>
+ * }
+ *
  * @phpstan-import-type TFontData from Load
  */
 abstract class Buffer
@@ -70,6 +78,13 @@ abstract class Buffer
      */
     protected array $file = [];
 
+    /**
+     * Optional configuration forwarded to the file helper.
+     *
+     * @var TFileOptions|null
+     */
+    protected ?array $fileOptions = null;
+
     /**
      * Initialize fonts buffer
      *
@@ -91,13 +106,16 @@ abstract class Buffer
      *                       intensive.
      * @param bool  $unicode True if we are in Unicode mode, False otherwise.
      * @param bool  $pdfa    True if we are in PDF/A mode, False otherwise.
+     * @param TFileOptions|null $fileOptions Optional configuration for the font file helper.
      */
     public function __construct(
         protected float $kunit,
         protected bool $subset = false,
         protected bool $unicode = true,
-        protected bool $pdfa = false
+        protected bool $pdfa = false,
+        ?array $fileOptions = null
     ) {
+        $this->fileOptions = $fileOptions;
     }
 
     /**
@@ -225,7 +243,7 @@ public function add(
             $subset = $this->subset;
         }
 
-        $fobj = new Font($font, $style, $ifile, $subset, $this->unicode, $this->pdfa);
+        $fobj = new Font($font, $style, $ifile, $subset, $this->unicode, $this->pdfa, true, $this->fileOptions);
         $key = $fobj->getFontkey();
 
         if (isset($this->font[$key])) {

src/Font.php

@@ -30,6 +30,8 @@
  * @license   https://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
  * @link      https://github.com/tecnickcom/tc-lib-pdf-font
  *
+ * @phpstan-import-type TFileOptions from Load
+ *
  * @phpstan-import-type TFontData from Load
  */
 class Font extends \Com\Tecnick\Pdf\Font\Load
@@ -68,6 +70,7 @@ class Font extends \Com\Tecnick\Pdf\Font\Load
      * @param bool   $unicode  True in Unicode mode, False otherwise.
      * @param bool   $pdfa     True in PDF/A mode, False otherwise.
      * @param bool   $compress Set to false to disable stream compression.
+     * @param TFileOptions|null $fileOptions Optional configuration for the font file helper.
      *
      * @throws FontException in case of error
      */
@@ -78,8 +81,11 @@ public function __construct(
         bool $subset = false,
         bool $unicode = true,
         bool $pdfa = false,
-        bool $compress = true
+        bool $compress = true,
+        ?array $fileOptions = null
     ) {
+        parent::__construct($fileOptions);
+
         if ($font === '') {
             throw new FontException('empty font family name');
         }

src/Load.php

@@ -17,6 +17,7 @@
 namespace Com\Tecnick\Pdf\Font;
 
 use Com\Tecnick\File\Dir;
+use Com\Tecnick\File\File as ObjFile;
 use Com\Tecnick\Pdf\Font\Exception as FontException;
 
 /**
@@ -30,6 +31,14 @@
  * @license   https://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
  * @link      https://github.com/tecnickcom/tc-lib-pdf-font
  *
+ * @phpstan-type TFileOptions array{
+ *   allowedHosts?: array<string>,
+ *   maxRemoteSize?: int,
+ *   curlopts?: array<int, bool|int|string>,
+ *   defaultCurlOpts?: array<int, bool|int|string>,
+ *   fixedCurlOpts?: array<int, bool|int|string>
+ * }
+ *
  * @phpstan-type TFontDataCidInfo array{
  *            'Ordering': string,
  *            'Registry': string,
@@ -166,6 +175,11 @@
  */
 abstract class Load
 {
+    /**
+     * File helper used to load font definition files.
+     */
+    protected ObjFile $file;
+
     /**
      * Valid Font types
      *
@@ -299,6 +313,20 @@ abstract class Load
         'weight' => '',
     ];
 
+    /**
+     * @param TFileOptions|null $fileOptions Optional configuration for the font file helper.
+     */
+    public function __construct(?array $fileOptions = null)
+    {
+        $this->file = new ObjFile(
+            $fileOptions['allowedHosts'] ?? [],
+            $fileOptions['maxRemoteSize'] ?? 52428800,
+            $fileOptions['curlopts'] ?? [],
+            $fileOptions['defaultCurlOpts'] ?? null,
+            $fileOptions['fixedCurlOpts'] ?? null
+        );
+    }
+
     /**
      * Load the font data
      *
@@ -329,11 +357,7 @@ protected function getFontInfo(): void
         $this->findFontFile();
 
         // read the font definition file
-        if (! @\is_readable($this->data['ifile'])) {
-            throw new FontException('unable to read file: ' . $this->data['ifile']);
-        }
-
-        $fdt = @\file_get_contents($this->data['ifile']);
+        $fdt = $this->file->getFileData($this->data['ifile']);
         if ($fdt === false) {
             throw new FontException('unable to read file: ' . $this->data['ifile']);
         }