Merge pull request #4 from enboig/fix_multiple_pages

When no page is set, full document is merged.

Author: DaanDeSmedt

README.md

@@ -170,6 +170,13 @@ $ghostscript->setPageEnd(int $page);
 ```
 
 
+## Clear specified page range
+
+```php
+$ghostscript->clearPageRange();
+```
+
+
 ## Subsample antialiasing
 
 These options control the use of subsample antialiasing. Their use is highly recommended for producing high quality rasterizations of the input files. 

composer.json

@@ -27,5 +27,8 @@
     "require": {
         "php": ">= 7.0.0",
         "mikehaertl/php-shellcommand": "^1.2"
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit --verbose --configuration phpunit.xml"
     }
 }

src/PHPGhostscript/Ghostscript.php

@@ -102,17 +102,17 @@ class Ghostscript
 
     /**
      * Page start
-     * 
-     * @var int
+     *
+     * @var ?int
      */
-    private $pageStart = 1;
+    private $pageStart = null;
 
     /**
      * Page end
      * 
-     * @var int
+     * @var ?int
      */
-    private $pageEnd = 1;
+    private $pageEnd = null;
 
     /**
      * Box mode used for rendering
@@ -390,7 +390,7 @@ public function getOutputFile() : string
      *
      * @return self
      */
-    public function setPageStart(int $page) : Ghostscript
+    public function setPageStart(?int $page): Ghostscript
     {
         $this->pageStart = $page;
         return $this;
@@ -402,7 +402,7 @@ public function setPageStart(int $page) : Ghostscript
      *
      * @return int $pageStart
      */
-    public function getPageStart() : int
+    public function getPageStart(): ?int
     {
         return $this->pageStart;
     }
@@ -415,7 +415,7 @@ public function getPageStart() : int
      *
      * @return self
      */
-    public function setPageEnd(int $page) : Ghostscript
+    public function setPageEnd(?int $page): Ghostscript
     {
         $this->pageEnd = $page;
         return $this;
@@ -427,7 +427,7 @@ public function setPageEnd(int $page) : Ghostscript
      *
      * @return int $pageEnd
      */
-    public function getPageEnd() : int
+    public function getPageEnd(): ?int
     {
         return $this->pageEnd;
     }
@@ -448,6 +448,19 @@ public function setPages(int $startPage, int $endPage) : Ghostscript
         return $this;
     }
 
+    /**
+     *  Clears the page range
+     *
+     * @return self
+     */
+    public function clearPageRange() : Ghostscript
+    {
+        $this->setPageStart(null);
+        $this->setPageEnd(null);
+        return $this;
+    }
+
+
 
     /**
      * Set the render box mode
@@ -515,8 +528,14 @@ public function render()
         $command->addArg('-dSAFER');
         $command->addArg('-dNOPLATFONTS');
         $command->addArg('-sOutputFile=' . $this->outputFile);
-        $command->addArg('-dFirstPage=' . $this->pageStart);
-        $command->addArg('-dLastPage=' . $this->pageEnd);
+
+        if ($this->pageStart !== null) {
+            $command->addArg('-dFirstPage=' . $this->pageStart);
+        }
+
+        if ($this->pageEnd !== null) {
+            $command->addArg('-dLastPage=' . $this->pageEnd);
+        }
 
         if (!$this->isVectorDevice()) {
             $command->addArg('-dTextAlphaBits=' . $this->getTextAntiAliasing());

tests/PHPGhostscript/PHPGhostscriptTest.php

@@ -110,11 +110,11 @@ public function testSettingPages()
     {
         $ghostscript = new Ghostscript();
 
-        $this->assertEquals(1, $ghostscript->getPageStart());
+        $this->assertEquals(null, $ghostscript->getPageStart());
         $ghostscript->setPageStart(20);
         $this->assertEquals(20, $ghostscript->getPageStart());
 
-        $this->assertEquals(1, $ghostscript->getPageEnd());
+        $this->assertEquals(null, $ghostscript->getPageEnd());
         $ghostscript->setPageEnd(99);
         $this->assertEquals(99, $ghostscript->getPageEnd());
 
@@ -171,6 +171,37 @@ public function testMerging()
         $this->assertTrue($result);
     }
 
+    public function testClearPageRange() {
+        $ghostscript = new Ghostscript();
+        $this->assertNull($ghostscript->getPageStart());
+        $this->assertNull($ghostscript->getPageEnd());
+        
+        $ghostscript->setPageStart(2);
+        $ghostscript->setPageEnd(10);
+        $this->assertEquals(2, $ghostscript->getPageStart());
+        $this->assertEquals(10, $ghostscript->getPageEnd());
+
+        $ghostscript->clearPageRange();
+        $this->assertNull($ghostscript->getPageStart());
+        $this->assertNull($ghostscript->getPageEnd());
+    }
+
+    public function testMerging2()
+    {
+        $outputFile = __DIR__ . DIRECTORY_SEPARATOR . 'output' . DIRECTORY_SEPARATOR . 'merge2.pdf';
+        $ghostscript = new Ghostscript();
+        $ghostscript
+            ->setBinaryPath($this->binaryPath)
+            ->setDevice(DeviceTypes::PDF)
+            ->setInputFile(__DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'a2.pdf')
+            ->setInputFile(__DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'b1.pdf')
+            ->setOutputFile($outputFile);
+        $result = $ghostscript->render();
+        $this->assertTrue(file_exists($outputFile));
+        $this->assertEquals("application/pdf", mime_content_type($outputFile));
+        $this->assertTrue($result);
+    }
+
     public function testClearInputFiles()
     {
         $ghostscript = new Ghostscript();