From 6fe653179fa7d94a80a08e351d0252a1d8afdb53 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Wed, 11 Nov 2020 02:02:04 -0800
Subject: [PATCH] Make DefinedNames Samples Consistent With Other Samples
 (#1707)

All other Samples write to temporary directory. DefinedNames samples
write to main directory, which (a) means they aren't stored with others,
and (b) they aren't ignored by git so look like changed files.
The tests are also simplified by requiring Header rather than Bootstrap,
making use of Helper.
---
 samples/DefinedNames/AbsoluteNamedRange.php     | 17 ++++-------------
 .../DefinedNames/CrossWorksheetNamedFormula.php | 15 +++------------
 samples/DefinedNames/NamedFormulaeAndRanges.php | 17 ++++-------------
 samples/DefinedNames/RelativeNamedRange.php     | 17 ++++-------------
 samples/DefinedNames/RelativeNamedRange2.php    | 17 ++++-------------
 .../RelativeNamedRangeAsFunction.php            | 17 ++++-------------
 samples/DefinedNames/ScopedNamedRange.php       | 17 ++++-------------
 samples/DefinedNames/ScopedNamedRange2.php      | 17 ++++-------------
 samples/DefinedNames/SimpleNamedFormula.php     | 17 ++++-------------
 samples/DefinedNames/SimpleNamedRange.php       | 17 ++++-------------
 10 files changed, 39 insertions(+), 129 deletions(-)

diff --git a/samples/DefinedNames/AbsoluteNamedRange.php b/samples/DefinedNames/AbsoluteNamedRange.php
index 450de66760..30afc00d65 100644
--- a/samples/DefinedNames/AbsoluteNamedRange.php
+++ b/samples/DefinedNames/AbsoluteNamedRange.php
@@ -1,16 +1,9 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -51,13 +44,11 @@
     ->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
     ->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
 
-echo sprintf(
+$helper->log(sprintf(
     'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
     $worksheet->getCell("B{$row}")->getCalculatedValue(),
     $worksheet->getCell('B1')->getValue(),
     $worksheet->getCell("C{$row}")->getCalculatedValue()
-), PHP_EOL;
+));
 
-$outputFileName = 'AbsoluteNamedRange.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/CrossWorksheetNamedFormula.php b/samples/DefinedNames/CrossWorksheetNamedFormula.php
index b441e0f7da..5ce7651628 100644
--- a/samples/DefinedNames/CrossWorksheetNamedFormula.php
+++ b/samples/DefinedNames/CrossWorksheetNamedFormula.php
@@ -1,18 +1,11 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedFormula;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 
@@ -91,9 +84,7 @@ function setYearlyData(Worksheet $worksheet, string $year, $yearlyData, ?string
     $growth = $worksheet->getCell("B{$row}")->getFormattedValue();
     $profitGrowth = $worksheet->getCell("C{$row}")->getFormattedValue();
 
-    echo "Growth for {$month} is {$growth}, with a Profit Growth of {$profitGrowth}", PHP_EOL;
+    $helper->log("Growth for {$month} is {$growth}, with a Profit Growth of {$profitGrowth}");
 }
 
-$outputFileName = 'CrossWorksheetNamedFormula.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/NamedFormulaeAndRanges.php b/samples/DefinedNames/NamedFormulaeAndRanges.php
index b3f94efcaf..a5ca80e706 100644
--- a/samples/DefinedNames/NamedFormulaeAndRanges.php
+++ b/samples/DefinedNames/NamedFormulaeAndRanges.php
@@ -1,17 +1,10 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedFormula;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -62,13 +55,11 @@
     ->setCellValue("B{$row}", '=COLUMN_TOTALS')
     ->setCellValue("C{$row}", '=COLUMN_TOTALS');
 
-echo sprintf(
+$helper->log(sprintf(
     'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
     $worksheet->getCell("B{$row}")->getCalculatedValue(),
     $worksheet->getCell('B1')->getValue(),
     $worksheet->getCell("C{$row}")->getCalculatedValue()
-), PHP_EOL;
+));
 
-$outputFileName = 'NamedFormulaeAndRanges.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/RelativeNamedRange.php b/samples/DefinedNames/RelativeNamedRange.php
index 1f712017af..fac75a4715 100644
--- a/samples/DefinedNames/RelativeNamedRange.php
+++ b/samples/DefinedNames/RelativeNamedRange.php
@@ -1,16 +1,9 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -54,13 +47,11 @@
     ->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
     ->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
 
-echo sprintf(
+$helper->log(sprintf(
     'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
     $worksheet->getCell("B{$row}")->getCalculatedValue(),
     $worksheet->getCell('B1')->getValue(),
     $worksheet->getCell("C{$row}")->getCalculatedValue()
-), PHP_EOL;
+));
 
-$outputFileName = 'RelativeNamedRange.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/RelativeNamedRange2.php b/samples/DefinedNames/RelativeNamedRange2.php
index b6a6f8d1c5..b3e957fd2e 100644
--- a/samples/DefinedNames/RelativeNamedRange2.php
+++ b/samples/DefinedNames/RelativeNamedRange2.php
@@ -1,16 +1,9 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -57,13 +50,11 @@
     ->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
     ->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
 
-echo sprintf(
+$helper->log(sprintf(
     'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
     $worksheet->getCell("B{$row}")->getCalculatedValue(),
     $worksheet->getCell('B1')->getValue(),
     $worksheet->getCell("C{$row}")->getCalculatedValue()
-), PHP_EOL;
+));
 
-$outputFileName = 'RelativeNamedRange2.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/RelativeNamedRangeAsFunction.php b/samples/DefinedNames/RelativeNamedRangeAsFunction.php
index 527cd43b58..333d01ab0b 100644
--- a/samples/DefinedNames/RelativeNamedRangeAsFunction.php
+++ b/samples/DefinedNames/RelativeNamedRangeAsFunction.php
@@ -1,17 +1,10 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedFormula;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -60,13 +53,11 @@
     ->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
     ->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
 
-echo sprintf(
+$helper->log(sprintf(
     'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
     $worksheet->getCell("B{$row}")->getCalculatedValue(),
     $worksheet->getCell('B1')->getValue(),
     $worksheet->getCell("C{$row}")->getCalculatedValue()
-), PHP_EOL;
+));
 
-$outputFileName = 'RelativeNamedRangeAsFunction.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/ScopedNamedRange.php b/samples/DefinedNames/ScopedNamedRange.php
index 5ea7e48ab9..aa71454df0 100644
--- a/samples/DefinedNames/ScopedNamedRange.php
+++ b/samples/DefinedNames/ScopedNamedRange.php
@@ -1,16 +1,9 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -67,15 +60,13 @@
     ->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
     ->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
 
-echo sprintf(
+$helper->log(sprintf(
     'Worked %.2f hours at a rate of %s - Charge to the client is %.2f',
     $worksheet->getCell("B{$row}")->getCalculatedValue(),
     $chargeRateCellValue = $spreadsheet
         ->getSheetByName($spreadsheet->getNamedRange('CHARGE_RATE')->getWorksheet()->getTitle())
         ->getCell($spreadsheet->getNamedRange('CHARGE_RATE')->getCellsInRange()[0])->getValue(),
     $worksheet->getCell("C{$row}")->getCalculatedValue()
-), PHP_EOL;
+));
 
-$outputFileName = 'ScopedNamedRange.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/ScopedNamedRange2.php b/samples/DefinedNames/ScopedNamedRange2.php
index 8e6104189a..5f0898c91e 100644
--- a/samples/DefinedNames/ScopedNamedRange2.php
+++ b/samples/DefinedNames/ScopedNamedRange2.php
@@ -1,16 +1,9 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -83,16 +76,14 @@
     ->setCellValue('B1', 4.5);
 
 foreach ($spreadsheet->getAllSheets() as $worksheet) {
-    echo sprintf(
+    $helper->log(sprintf(
         'Worked %.2f hours for "%s" at a rate of %.2f - Charge to the client is %.2f',
         $worksheet->getCell("B{$row}")->getCalculatedValue(),
         $worksheet->getTitle(),
         $worksheet->getCell('B1')->getValue(),
         $worksheet->getCell("C{$row}")->getCalculatedValue()
-    ), PHP_EOL;
+    ));
 }
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
 
-$outputFileName = 'ScopedNamedRange2.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/SimpleNamedFormula.php b/samples/DefinedNames/SimpleNamedFormula.php
index 8e0fc972ce..ea1f802da1 100644
--- a/samples/DefinedNames/SimpleNamedFormula.php
+++ b/samples/DefinedNames/SimpleNamedFormula.php
@@ -1,17 +1,10 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedFormula;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -39,14 +32,12 @@
     ->setCellValue('B4', '=TAX')
     ->setCellValue('B5', '=PRICE+TAX');
 
-echo sprintf(
+$helper->log(sprintf(
     'With a Tax Rate of %.2f and a net price of %.2f, Tax is %.2f and the gross price is %.2f',
     $worksheet->getCell('B1')->getCalculatedValue(),
     $worksheet->getCell('B3')->getValue(),
     $worksheet->getCell('B4')->getCalculatedValue(),
     $worksheet->getCell('B5')->getCalculatedValue()
-), PHP_EOL;
+));
 
-$outputFileName = 'SimpleNamedFormula.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);
diff --git a/samples/DefinedNames/SimpleNamedRange.php b/samples/DefinedNames/SimpleNamedRange.php
index ee05c68f46..7a7cdc94a1 100644
--- a/samples/DefinedNames/SimpleNamedRange.php
+++ b/samples/DefinedNames/SimpleNamedRange.php
@@ -1,16 +1,9 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../Bootstrap.php';
+require_once __DIR__ . '/../Header.php';
 
 $spreadsheet = new Spreadsheet();
 $worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -33,14 +26,12 @@
     ->setCellValue('B4', '=PRICE*TAX_RATE')
     ->setCellValue('B5', '=PRICE*(1+TAX_RATE)');
 
-echo sprintf(
+$helper->log(sprintf(
     'With a Tax Rate of %.2f and a net price of %.2f, Tax is %.2f and the gross price is %.2f',
     $worksheet->getCell('B1')->getCalculatedValue(),
     $worksheet->getCell('B3')->getValue(),
     $worksheet->getCell('B4')->getCalculatedValue(),
     $worksheet->getCell('B5')->getCalculatedValue()
-), PHP_EOL;
+));
 
-$outputFileName = 'SimpleNamedRange.xlsx';
-$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-$writer->save($outputFileName);
+$helper->write($spreadsheet, __FILE__, ['Xlsx']);