Readded pageBreakTrigger property, fixed page orientation

Author: JanSlabon

src/Modules/Document.php

@@ -367,12 +367,7 @@ public function addPage($orientation, $size, $rotation)
 
         $widthPt = $this->manager->getConverter()->toPt($size[0]);
         $heightPt = $this->manager->getConverter()->toPt($size[1]);
-        $sizePt = [
-            0 => $widthPt,
-            1 => $heightPt,
-            'width' => $widthPt,
-            'height' => $heightPt
-        ];
+        $sizePt = [$widthPt, $heightPt];
 
         $this->document->getCatalog()->getPages()->create($sizePt, $orientation);
         $this->rotation = $rotation;

src/SetaFpdf.php

@@ -24,6 +24,7 @@
  * @property float|int $tMargin
  * @property float|int $rMargin
  * @property float|int $bMargin
+ * @property float|int $pageBreakTrigger
  */
 class SetaFpdf
 {
@@ -979,6 +980,10 @@ public function __get($name)
                 return $this->manager->getMargin()->getRight();
             case 'bMargin':
                 return $this->manager->getMargin()->getBottom();
+            case 'pageBreakTrigger':
+            case 'PageBreakTrigger': // allow both upper- and lower case
+                $manager = $this->manager;
+                return ($manager->getConverter()->fromPt($manager->getHeight()) - $manager->getMargin()->getBottom());
 
             default:
                 throw new \InvalidArgumentException(sprintf('Property "%s" cannot be accessed.', $name));

tests/functional/SetaFpdf/FpdfProperties.php

@@ -27,6 +27,9 @@ public function __get($name)
                 return $this->rMargin;
             case 'bMargin':
                 return $this->bMargin;
+            case 'pageBreakTrigger':
+            case 'PageBreakTrigger':
+                return $this->PageBreakTrigger;
 
             default:
                 throw new \InvalidArgumentException(sprintf('Property "%s" cannot be accessed.', $name));

tests/functional/SetaFpdf/PageValuesTest.php

@@ -65,4 +65,15 @@ public function testPageHeight($orientation = 'P', $unit = 'mm', $size = 'A4')
         // asserts are done in the proxy
         $this->assertSame($height, $proxy->h);
     }
+
+    public function testDifferentOrienatations()
+    {
+        $proxy = $this->getProxy('P', 'pt', [100, 200]);
+        $this->assertSame(100, $proxy->GetPageWidth());
+        $this->assertSame(200, $proxy->GetPageHeight());
+
+        $proxy->AddPage('L');
+        $this->assertSame(200, $proxy->GetPageWidth());
+        $this->assertSame(100, $proxy->GetPageHeight());
+    }
 }

tests/functional/SetaFpdf/PropertiesTest.php

@@ -89,4 +89,23 @@ public function testPageMargin()
         $proxy->SetAutoPageBreak(true, $bottom);
         $this->assertSame($bottom, $proxy->bMargin);
     }
+
+    public function testPageBreakTrigger()
+    {
+        $proxy = $this->getProxy('P', 'mm', [100, 200]);
+        $proxy->SetAutoPageBreak(true, 10);
+
+        $this->assertSame(190., $proxy->pageBreakTrigger);
+
+        $proxy = $this->getProxy('P', 'pt', [100, 200]);
+        $proxy->SetAutoPageBreak(true, 10);
+        $this->assertSame(190, $proxy->pageBreakTrigger);
+
+        $proxy = $this->getProxy('P', 'cm', [100, 200]);
+        $proxy->SetAutoPageBreak(true, 10);
+        $this->assertSame(190., $proxy->pageBreakTrigger);
+
+        $proxy->AddPage('L');
+        $this->assertSame(90., $proxy->pageBreakTrigger);
+    }
 }

tests/visual/SetaFpdf/Single/PageTest.php

@@ -35,15 +35,15 @@ public function testAutoPageBreakSimple()
         $proxy->AddPage();
         $f();
 
-        $this->assertProxySame($proxy);
+        $this->assertProxySame($proxy, VisualTestCase::TOLERANCE, 72);
     }
 
     public function testAddPagesWithDefault()
     {
         $proxy = $this->getProxy('L', 'cm', 'A3');
         $proxy->AddPage();
         $proxy->AddPage();
-        $this->assertProxySame($proxy);
+        $this->assertProxySame($proxy, VisualTestCase::TOLERANCE, 72);
     }
 
     public function testAddPagesWithOwnValueAndFallback()
@@ -52,7 +52,7 @@ public function testAddPagesWithOwnValueAndFallback()
         $proxy->AddPage();
         $proxy->AddPage('P', 'A5', 180);
         $proxy->AddPage(null, null, 0);
-        $this->assertProxySame($proxy);
+        $this->assertProxySame($proxy, VisualTestCase::TOLERANCE, 72);
     }
 
     public function testAddPagesWithOwnSize()
@@ -63,6 +63,19 @@ public function testAddPagesWithOwnSize()
         $proxy->AddPage(null, null, 0);
         $proxy->AddPage('P', [10, 15], 90);
         $proxy->AddPage(null, [100, 25], 0);
-        $this->assertProxySame($proxy);
+        $this->assertProxySame($proxy, VisualTestCase::TOLERANCE, 72);
+    }
+
+    public function testDifferentOrienatations()
+    {
+        $proxy = $this->getProxy('P', 'pt', [100, 200]);
+        $proxy->AddPage();
+        $proxy->SetDrawColor(255, 0, 0);
+        $proxy->Rect(2, 2, $proxy->GetPageWidth() - 4, $proxy->GetPageHeight() - 4);
+
+        $proxy->AddPage('L');
+        $proxy->SetDrawColor(255, 0, 0);
+        $proxy->Rect(2, 2, $proxy->GetPageWidth() - 4, $proxy->GetPageHeight() - 4);
+        $this->assertProxySame($proxy, VisualTestCase::TOLERANCE, 72);
     }
 }