Skip to content

Commit fc3bc29

Browse files
committed
fix default page size
1 parent b6a9f7c commit fc3bc29

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/PhpWord/Style/Section.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ class Section extends Border
3535
*
3636
* @const int|float
3737
*/
38-
const DEFAULT_WIDTH = 11870; // In twips.
39-
const DEFAULT_HEIGHT = 16787; // In twips.
40-
const DEFAULT_MARGIN = 1440; // In twips.
41-
const DEFAULT_GUTTER = 0; // In twips.
42-
const DEFAULT_HEADER_HEIGHT = 720; // In twips.
43-
const DEFAULT_FOOTER_HEIGHT = 720; // In twips.
38+
const DEFAULT_WIDTH = 11905.511811024; // In twips.
39+
const DEFAULT_HEIGHT = 16837.79527559; // In twips.
40+
const DEFAULT_MARGIN = 1440; // In twips.
41+
const DEFAULT_GUTTER = 0; // In twips.
42+
const DEFAULT_HEADER_HEIGHT = 720; // In twips.
43+
const DEFAULT_FOOTER_HEIGHT = 720; // In twips.
4444
const DEFAULT_COLUMN_COUNT = 1;
45-
const DEFAULT_COLUMN_SPACING = 720; // In twips.
45+
const DEFAULT_COLUMN_SPACING = 720; // In twips.
4646

4747
/**
4848
* Page Orientation

tests/PhpWord/Style/SectionTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ public function testSettingValue()
3333
$oSettings = new Section();
3434

3535
$this->assertEquals('portrait', $oSettings->getOrientation());
36-
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
37-
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
36+
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
37+
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
3838
$this->assertEquals('A4', $oSettings->getPaperSize());
3939

4040
$oSettings->setSettingValue('orientation', 'landscape');
4141
$this->assertEquals('landscape', $oSettings->getOrientation());
42-
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW());
43-
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH());
42+
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
43+
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
4444

4545
$iVal = rand(1, 1000);
4646
$oSettings->setSettingValue('borderSize', $iVal);
@@ -110,7 +110,7 @@ public function testPageWidth()
110110
// Section Settings
111111
$oSettings = new Section();
112112

113-
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
113+
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
114114
$iVal = rand(1, 1000);
115115
$oSettings->setSettingValue('pageSizeW', $iVal);
116116
$this->assertEquals($iVal, $oSettings->getPageSizeW());
@@ -124,7 +124,7 @@ public function testPageHeight()
124124
// Section Settings
125125
$oSettings = new Section();
126126

127-
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
127+
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
128128
$iVal = rand(1, 1000);
129129
$oSettings->setSettingValue('pageSizeH', $iVal);
130130
$this->assertEquals($iVal, $oSettings->getPageSizeH());
@@ -140,8 +140,8 @@ public function testOrientationLandscape()
140140

141141
$oSettings->setLandscape();
142142
$this->assertEquals('landscape', $oSettings->getOrientation());
143-
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW());
144-
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH());
143+
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
144+
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
145145
}
146146

147147
/**
@@ -154,8 +154,8 @@ public function testOrientationPortrait()
154154

155155
$oSettings->setPortrait();
156156
$this->assertEquals('portrait', $oSettings->getOrientation());
157-
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
158-
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
157+
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
158+
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
159159
}
160160

161161
/**

0 commit comments

Comments
 (0)