From dd881bb856161c7935852aa4dc3b676a23537a55 Mon Sep 17 00:00:00 2001 From: Input-BDF <31577144+Input-BDF@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:02:01 +0200 Subject: [PATCH] prevent whitespace on line endings in created docx invoices (#2756) --- src/Invoice/Renderer/DocxRenderer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Invoice/Renderer/DocxRenderer.php b/src/Invoice/Renderer/DocxRenderer.php index 92d7fa14..d60ed636 100644 --- a/src/Invoice/Renderer/DocxRenderer.php +++ b/src/Invoice/Renderer/DocxRenderer.php @@ -35,7 +35,7 @@ final class DocxRenderer extends AbstractRenderer implements RendererInterface foreach ($model->toArray() as $search => $replace) { $replace = $xmlEscaper->escape($replace); - $replace = str_replace(PHP_EOL, '', $replace); + $replace = preg_replace('/\n|\r\n?/', '', $replace); $template->setValue($search, $replace); } @@ -57,7 +57,7 @@ final class DocxRenderer extends AbstractRenderer implements RendererInterface $values = $model->itemToArray($entry); foreach ($values as $search => $replace) { $replace = $xmlEscaper->escape($replace); - $replace = str_replace(PHP_EOL, '', $replace); + $replace = preg_replace('/\n|\r\n?/', '', $replace); $template->setValue($search . '#' . $i, $replace); }