alex/PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
MarkBaker 2020-07-05 18:25:39 +02:00
parent 586b36b440
commit 6cbb622a9e
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/PhpSpreadsheet/Reader/Xml/PageSettings.php
View File

@ -64,9 +64,7 @@ class PageSettings
$pageSetupAttributes = $pageSetupValue->attributes($namespaces['x']); $pageSetupAttributes = $pageSetupValue->attributes($namespaces['x']);
switch ($pageSetupKey) { switch ($pageSetupKey) {
case 'Layout': case 'Layout':
$printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT; $this->setLayout($printDefaults, $pageSetupAttributes);
$printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
$printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
break; break;
case 'Header': case 'Header':
@ -78,10 +76,7 @@ class PageSettings
break; break;
case 'PageMargins': case 'PageMargins':
$printDefaults->leftMargin = (float) $pageSetupAttributes->Left ?: 1.0; $this->setMargins($printDefaults, $pageSetupAttributes);
$printDefaults->rightMargin = (float) $pageSetupAttributes->Right ?: 1.0;
$printDefaults->topMargin = (float) $pageSetupAttributes->Top ?: 1.0;
$printDefaults->bottomMargin = (float) $pageSetupAttributes->Bottom ?: 1.0;
break; break;
} }
@ -117,4 +112,19 @@ class PageSettings
return $printDefaults; return $printDefaults;
} }
private function setLayout(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
{
$printDefaults->orientation = (string)strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
$printDefaults->horizontalCentered = (bool)$pageSetupAttributes->CenterHorizontal ?: false;
$printDefaults->verticalCentered = (bool)$pageSetupAttributes->CenterVertical ?: false;
}
private function setMargins(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
{
$printDefaults->leftMargin = (float)$pageSetupAttributes->Left ?: 1.0;
$printDefaults->rightMargin = (float)$pageSetupAttributes->Right ?: 1.0;
$printDefaults->topMargin = (float)$pageSetupAttributes->Top ?: 1.0;
$printDefaults->bottomMargin = (float)$pageSetupAttributes->Bottom ?: 1.0;
}
} }

2
tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
View File

@ -11,7 +11,7 @@ class PageSetupTest extends TestCase
{ {
private const MARGIN_PRECISION = 0.00000001; private const MARGIN_PRECISION = 0.00000001;
private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
/** /**
* @var Spreadsheet * @var Spreadsheet

2
tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
View File

@ -11,7 +11,7 @@ class PageSetupTest extends TestCase
{ {
private const MARGIN_PRECISION = 0.00000001; private const MARGIN_PRECISION = 0.00000001;
private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
/** /**
* @var Spreadsheet * @var Spreadsheet

2
tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
View File

@ -11,7 +11,7 @@ class PageSetupTest extends TestCase
{ {
private const MARGIN_PRECISION = 0.00000001; private const MARGIN_PRECISION = 0.00000001;
private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
/** /**
* @var Spreadsheet * @var Spreadsheet

2
tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
View File

@ -11,7 +11,7 @@ class PageSetupTest extends TestCase
{ {
private const MARGIN_PRECISION = 0.000001; private const MARGIN_PRECISION = 0.000001;
private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
/** /**
* @var Spreadsheet * @var Spreadsheet