From cd97bd5993dc803c11067cf77aa0f93e3d4fc9f8 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <git@daniel-seifert.com>
Date: Thu, 15 May 2025 08:29:22 +0200
Subject: [PATCH] fix strict errors

---
 Application/Model/AbstractClasses/pdfdocumentsGeneric.php | 6 +++---
 Application/Model/Documents/invoicePdf.php                | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php
index 42b7e9e..84fa1c6 100644
--- a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php
+++ b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php
@@ -43,7 +43,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     const PDF_ORIENTATION_LANDSCAPE = 'L';
 
     public string $filenameExtension = 'pdf';
-    public string $filename;
+    public ?string $filename = null;
 
     public function runPreAction()
     {
@@ -262,12 +262,12 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     }
 
     /**
-     * Gets proper file name
+     * Gets a proper file name
      */
     public function makeValidFileName(string $filename): string
     {
         // replace transliterations (umlauts, accents ...)
-        $unicodeString = new UnicodeString(utf8_encode($filename));
+        $unicodeString = new UnicodeString(mb_convert_encoding($filename, 'UTF-8', 'ISO-8859-15'));
         $filename = (string) $unicodeString->ascii();
 
         // sanitize filename
diff --git a/Application/Model/Documents/invoicePdf.php b/Application/Model/Documents/invoicePdf.php
index 6ebfcb9..dd02695 100644
--- a/Application/Model/Documents/invoicePdf.php
+++ b/Application/Model/Documents/invoicePdf.php
@@ -80,8 +80,8 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
         $filename = parent::getFilename();
 
         $filename = str_replace(
-            $this->getOrder()->getFieldData('oxordernr'),
-            $this->getOrder()->getFieldData('oxbillnr'),
+            (string) $this->getOrder()->getFieldData('oxordernr'),
+            (string) $this->getOrder()->getFieldData('oxbillnr'),
             $filename
         );