Merge pull request Setasign#67 from Setasign/development

Code style and exception handling/forwarding
Gabs78 · Sep 13, 2018 · 99a3181 · 99a3181
2 parents bb125e5 + 4dc959f
commit 99a3181
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/src/Fpdi.php b/src/Fpdi.php
@@ -10,6 +10,7 @@
 namespace setasign\Fpdi;
 
 use setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException;
+use setasign\Fpdi\PdfParser\PdfParserException;
 use setasign\Fpdi\PdfParser\Type\PdfIndirectObject;
 use setasign\Fpdi\PdfParser\Type\PdfNull;
 
@@ -84,7 +85,7 @@ public function getTemplateSize($tpl, $width = null, $height = null)
     /**
      * @inheritdoc
      * @throws CrossReferenceException
-     * @throws PdfParser\PdfParserException
+     * @throws PdfParserException
      */
     protected function _putimages()
     {

diff --git a/src/PdfParser/CrossReference/AbstractReader.php b/src/PdfParser/CrossReference/AbstractReader.php
@@ -76,7 +76,8 @@ protected function readTrailer()
         } catch (PdfTypeException $e) {
             throw new CrossReferenceException(
                 'Unexpected end of cross reference. "trailer"-keyword expected, got an invalid object type.',
-                CrossReferenceException::UNEXPECTED_END
+                CrossReferenceException::UNEXPECTED_END,
+                $e
             );
         }
 

diff --git a/src/PdfParser/CrossReference/CrossReference.php b/src/PdfParser/CrossReference/CrossReference.php
@@ -139,12 +139,11 @@ public function getOffsetFor($objectNumber)
      * @param int $objectNumber
      * @return PdfIndirectObject
      * @throws CrossReferenceException
-     * @throws PdfTypeException
      */
     public function getIndirectObject($objectNumber)
     {
         $offset = $this->getOffsetFor($objectNumber);
-        if (false === $offset) {
+        if ($offset === false) {
             throw new CrossReferenceException(
                 \sprintf('Object (id:%s) not found.', $objectNumber),
                 CrossReferenceException::OBJECT_NOT_FOUND
@@ -156,11 +155,14 @@ public function getIndirectObject($objectNumber)
         $parser->getTokenizer()->clearStack();
         $parser->getStreamReader()->reset($offset + $this->fileHeaderOffset);
 
-        $object = $parser->readValue(null, PdfIndirectObject::class);
-        if ($object === false || !($object instanceof PdfIndirectObject)) {
+        try {
+            /** @var PdfIndirectObject $object */
+            $object = $parser->readValue(null, PdfIndirectObject::class);
+        } catch (PdfTypeException $e) {
             throw new CrossReferenceException(
                 \sprintf('Object (id:%s) not found at location (%s).', $objectNumber, $offset),
-                CrossReferenceException::OBJECT_NOT_FOUND
+                CrossReferenceException::OBJECT_NOT_FOUND,
+                $e
             );
         }
 
@@ -265,7 +267,6 @@ protected function checkForEncryption(PdfDictionary $dictionary)
      *
      * @return int The byte-offset position of the first cross-reference.
      * @throws CrossReferenceException
-     * @throws PdfTypeException
      */
     protected function findStartXref()
     {
@@ -294,7 +295,8 @@ protected function findStartXref()
         } catch (PdfTypeException $e) {
             throw new CrossReferenceException(
                 'Invalid data after startxref keyword.',
-                CrossReferenceException::INVALID_DATA
+                CrossReferenceException::INVALID_DATA,
+                $e
             );
         }
 

diff --git a/src/PdfParser/Type/PdfDictionary.php b/src/PdfParser/Type/PdfDictionary.php
@@ -41,7 +41,7 @@ public static function parse(Tokenizer $tokenizer, StreamReader $streamReader, P
             }
 
             $key = $parser->readValue($token);
-            if (false === $key) {
+            if ($key === false) {
                 return false;
             }
 

diff --git a/src/Tfpdf/Fpdi.php b/src/Tfpdf/Fpdi.php
@@ -11,6 +11,7 @@
 
 use setasign\Fpdi\FpdiTrait;
 use setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException;
+use setasign\Fpdi\PdfParser\PdfParserException;
 use setasign\Fpdi\PdfParser\Type\PdfIndirectObject;
 use setasign\Fpdi\PdfParser\Type\PdfNull;
 
@@ -84,7 +85,8 @@ public function getTemplateSize($tpl, $width = null, $height = null)
 
     /**
      * @inheritdoc
-     * @throws \setasign\Fpdi\PdfParser\PdfParserException
+     * @throws CrossReferenceException
+     * @throws PdfParserException
      */
     public function _putimages()
     {

diff --git a/tests/functional/PdfParser/PdfParserTest.php b/tests/functional/PdfParser/PdfParserTest.php
@@ -3,7 +3,7 @@
 namespace setasign\Fpdi\functional\PdfParser;
 
 use PHPUnit\Framework\TestCase;
-use setasign\Fpdi\Fpdi;
+use setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException;
 use setasign\Fpdi\PdfParser\PdfParser;
 use setasign\Fpdi\PdfParser\StreamReader;
 use setasign\Fpdi\PdfParser\Type\PdfArray;
@@ -15,7 +15,6 @@
 use setasign\Fpdi\PdfParser\Type\PdfName;
 use setasign\Fpdi\PdfParser\Type\PdfNull;
 use setasign\Fpdi\PdfParser\Type\PdfNumeric;
-use setasign\Fpdi\PdfParser\Type\PdfStream;
 use setasign\Fpdi\PdfParser\Type\PdfString;
 use setasign\Fpdi\PdfParser\Type\PdfToken;
 
@@ -377,6 +376,11 @@ public function testGetIndirectObjectWithInvalidType()
             __DIR__ . '/../../_files/pdfs/specials/invalid-type-at-object-offset.pdf'
         ));
 
-        $parser->getIndirectObject(6);
+        try {
+            $parser->getIndirectObject(6);
+        } catch (CrossReferenceException $e) {
+            $this->assertSame(CrossReferenceException::OBJECT_NOT_FOUND, $e->getCode());
+            throw $e->getPrevious();
+        }
     }
 }