From abb7d0ffe1d39961270e02c35cde2cd093e986a4 Mon Sep 17 00:00:00 2001
From: Basanta Tajpuriya <38497591+basantashubhu@users.noreply.github.com>
Date: Mon, 30 Dec 2024 14:27:02 +0545
Subject: [PATCH 1/2] Update PDFMerger.php

fixed typos in docstring
used php shorthand for better code
---
 src/PDFMerger/PDFMerger.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/PDFMerger/PDFMerger.php b/src/PDFMerger/PDFMerger.php
index 05401c9..63c312f 100755
--- a/src/PDFMerger/PDFMerger.php
+++ b/src/PDFMerger/PDFMerger.php
@@ -136,7 +136,7 @@ public function output(){
      * Set the final filename
      * @param string $fileName
      *
-     * @return string
+     * @return self
      */
     public function setFileName($fileName){
         $this->fileName = $fileName;
@@ -149,7 +149,7 @@ public function setFileName($fileName){
      * @param mixed $pages
      * @param mixed $orientation
      *
-     * @return string
+     * @return self
      */
     public function addString($string, $pages = 'all', $orientation = null){
 
@@ -221,7 +221,7 @@ protected function doMerge($orientation, $duplexSafe) {
         $oFPDI = $this->oFPDI;
 
         $this->aFiles->each(function($file) use($oFPDI, $orientation, $duplexSafe){
-            $file['orientation'] = is_null($file['orientation'])?$orientation:$file['orientation'];
+            $file['orientation'] = $file['orientation'] ?? $orientation;
             $count = $oFPDI->setSourceFile(StreamReader::createByString(file_get_contents($file['name'])));
 
             if ($file['pages'] == 'all') {
@@ -229,7 +229,7 @@ protected function doMerge($orientation, $duplexSafe) {
                 for ($i = 1; $i <= $count; $i++) {
                     $template   = $oFPDI->importPage($i);
                     $size       = $oFPDI->getTemplateSize($template);
-                    $autoOrientation = isset($file['orientation']) ? $file['orientation'] : $size['orientation'];
+                    $autoOrientation = $file['orientation'] ?? $size['orientation'];
 
                     $oFPDI->AddPage($autoOrientation, [$size['width'], $size['height']]);
                     $oFPDI->useTemplate($template);
@@ -240,7 +240,7 @@ protected function doMerge($orientation, $duplexSafe) {
                         throw new \Exception("Could not load page '$page' in PDF '" . $file['name'] . "'. Check that the page exists.");
                     }
                     $size = $oFPDI->getTemplateSize($template);
-                    $autoOrientation = isset($file['orientation']) ? $file['orientation'] : $size['orientation'];
+                    $autoOrientation = $file['orientation'] ?? $size['orientation'];
 
                     $oFPDI->AddPage($autoOrientation, [$size['width'], $size['height']]);
                     $oFPDI->useTemplate($template);

From bc610d6c36e01f4706fb909a09b23aa4d63a68a5 Mon Sep 17 00:00:00 2001
From: Basanta Tajpuriya <38497591+basantashubhu@users.noreply.github.com>
Date: Mon, 30 Dec 2024 14:34:08 +0545
Subject: [PATCH 2/2] Update docstring in PDFMerger.php

updated docstring for function addString
---
 src/PDFMerger/PDFMerger.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PDFMerger/PDFMerger.php b/src/PDFMerger/PDFMerger.php
index 63c312f..ae01fe6 100755
--- a/src/PDFMerger/PDFMerger.php
+++ b/src/PDFMerger/PDFMerger.php
@@ -144,7 +144,7 @@ public function setFileName($fileName){
     }
 
     /**
-     * Set the final filename
+     * Add a string for inclusion in the merge
      * @param string $string
      * @param mixed $pages
      * @param mixed $orientation