Remove duplicated code

tecnickcom · Aug 17, 2024 · 87dc7ee · 87dc7ee
1 parent c7e197c
commit 87dc7ee
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.4.0
+2.4.1
diff --git a/src/Output.php b/src/Output.php
@@ -85,23 +85,36 @@ public function getFontsBlock(): string
     /**
      * Get the PDF output string for Font resources dictionary.
      *
+     * @param array<string, array{'i': int, 'n': int}> $data Font data.
+     *
      * @return string
      */
-    public function getOutFontDict(): string
+    private function getOutFontResources(array $data): string
     {
-        if (empty($this->fonts)) {
+        if (empty($data)) {
             return '';
         }
 
         $out = ' /Font <<';
 
-        foreach ($this->fonts as $font) {
+        foreach ($data as $font) {
             $out .= ' /F' . $font['i'] . ' ' . $font['n'] . ' 0 R';
         }
 
         return $out . ' >>';
     }
 
+
+    /**
+     * Get the PDF output string for Font resources dictionary.
+     *
+     * @return string
+     */
+    public function getOutFontDict(): string
+    {
+        return $this->getOutFontResources($this->fonts);
+    }
+
     /**
      * Get the PDF output string for XOBject Font resources dictionary.
      *
@@ -115,13 +128,15 @@ public function getOutFontDictByKeys(array $keys): string
             return '';
         }
 
-        $out = ' /Font <<';
-
+        $data = [];
         foreach ($keys as $key) {
-            $out .= ' /F' . $this->fonts[$key]['i'] . ' ' . $this->fonts[$key]['n'] . ' 0 R';
+            $data[$key] = [
+                'i' => $this->fonts[$key]['i'],
+                'n' => $this->fonts[$key]['n'],
+            ];
         }
 
-        return $out . ' >>';
+        return $this->getOutFontResources($data);
     }
 
     /**