Skip to content

Commit 6fe6531

Browse files
oleibmanoleibman
authored
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.
1 parent 0bf3986 commit 6fe6531

10 files changed

+39
-129
lines changed

‎samples/DefinedNames/AbsoluteNamedRange.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedRange;
54
use PhpOffice\PhpSpreadsheet\Spreadsheet;
65

7-
error_reporting(E_ALL);
8-
set_time_limit(0);
9-
10-
date_default_timezone_set('UTC');
11-
12-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
13-
require_once __DIR__ . '/../Bootstrap.php';
6+
require __DIR__ . '/../Header.php';
147

158
$spreadsheet = new Spreadsheet();
169
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -51,13 +44,11 @@
5144
->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
5245
->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
5346

54-
echo sprintf(
47+
$helper->log(sprintf(
5548
'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
5649
$worksheet->getCell("B{$row}")->getCalculatedValue(),
5750
$worksheet->getCell('B1')->getValue(),
5851
$worksheet->getCell("C{$row}")->getCalculatedValue()
59-
), PHP_EOL;
52+
));
6053

61-
$outputFileName = 'AbsoluteNamedRange.xlsx';
62-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
63-
$writer->save($outputFileName);
54+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/CrossWorksheetNamedFormula.php‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedFormula;
54
use PhpOffice\PhpSpreadsheet\Shared\Date;
65
use PhpOffice\PhpSpreadsheet\Spreadsheet;
76
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
87

9-
error_reporting(E_ALL);
10-
set_time_limit(0);
11-
12-
date_default_timezone_set('UTC');
13-
14-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
15-
require_once __DIR__ . '/../Bootstrap.php';
8+
require_once __DIR__ . '/../Header.php';
169

1710
$spreadsheet = new Spreadsheet();
1811

@@ -91,9 +84,7 @@ function setYearlyData(Worksheet $worksheet, string $year, $yearlyData, ?string
9184
$growth = $worksheet->getCell("B{$row}")->getFormattedValue();
9285
$profitGrowth = $worksheet->getCell("C{$row}")->getFormattedValue();
9386

94-
echo "Growth for {$month} is {$growth}, with a Profit Growth of {$profitGrowth}", PHP_EOL;
87+
$helper->log("Growth for {$month} is {$growth}, with a Profit Growth of {$profitGrowth}");
9588
}
9689

97-
$outputFileName = 'CrossWorksheetNamedFormula.xlsx';
98-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
99-
$writer->save($outputFileName);
90+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/NamedFormulaeAndRanges.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedFormula;
54
use PhpOffice\PhpSpreadsheet\NamedRange;
65
use PhpOffice\PhpSpreadsheet\Spreadsheet;
76

8-
error_reporting(E_ALL);
9-
set_time_limit(0);
10-
11-
date_default_timezone_set('UTC');
12-
13-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
14-
require_once __DIR__ . '/../Bootstrap.php';
7+
require_once __DIR__ . '/../Header.php';
158

169
$spreadsheet = new Spreadsheet();
1710
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -62,13 +55,11 @@
6255
->setCellValue("B{$row}", '=COLUMN_TOTALS')
6356
->setCellValue("C{$row}", '=COLUMN_TOTALS');
6457

65-
echo sprintf(
58+
$helper->log(sprintf(
6659
'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
6760
$worksheet->getCell("B{$row}")->getCalculatedValue(),
6861
$worksheet->getCell('B1')->getValue(),
6962
$worksheet->getCell("C{$row}")->getCalculatedValue()
70-
), PHP_EOL;
63+
));
7164

72-
$outputFileName = 'NamedFormulaeAndRanges.xlsx';
73-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
74-
$writer->save($outputFileName);
65+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/RelativeNamedRange.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedRange;
54
use PhpOffice\PhpSpreadsheet\Spreadsheet;
65

7-
error_reporting(E_ALL);
8-
set_time_limit(0);
9-
10-
date_default_timezone_set('UTC');
11-
12-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
13-
require_once __DIR__ . '/../Bootstrap.php';
6+
require_once __DIR__ . '/../Header.php';
147

158
$spreadsheet = new Spreadsheet();
169
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -54,13 +47,11 @@
5447
->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
5548
->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
5649

57-
echo sprintf(
50+
$helper->log(sprintf(
5851
'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
5952
$worksheet->getCell("B{$row}")->getCalculatedValue(),
6053
$worksheet->getCell('B1')->getValue(),
6154
$worksheet->getCell("C{$row}")->getCalculatedValue()
62-
), PHP_EOL;
55+
));
6356

64-
$outputFileName = 'RelativeNamedRange.xlsx';
65-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
66-
$writer->save($outputFileName);
57+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/RelativeNamedRange2.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedRange;
54
use PhpOffice\PhpSpreadsheet\Spreadsheet;
65

7-
error_reporting(E_ALL);
8-
set_time_limit(0);
9-
10-
date_default_timezone_set('UTC');
11-
12-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
13-
require_once __DIR__ . '/../Bootstrap.php';
6+
require_once __DIR__ . '/../Header.php';
147

158
$spreadsheet = new Spreadsheet();
169
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -57,13 +50,11 @@
5750
->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
5851
->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
5952

60-
echo sprintf(
53+
$helper->log(sprintf(
6154
'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
6255
$worksheet->getCell("B{$row}")->getCalculatedValue(),
6356
$worksheet->getCell('B1')->getValue(),
6457
$worksheet->getCell("C{$row}")->getCalculatedValue()
65-
), PHP_EOL;
58+
));
6659

67-
$outputFileName = 'RelativeNamedRange2.xlsx';
68-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
69-
$writer->save($outputFileName);
60+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/RelativeNamedRangeAsFunction.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedFormula;
54
use PhpOffice\PhpSpreadsheet\NamedRange;
65
use PhpOffice\PhpSpreadsheet\Spreadsheet;
76

8-
error_reporting(E_ALL);
9-
set_time_limit(0);
10-
11-
date_default_timezone_set('UTC');
12-
13-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
14-
require_once __DIR__ . '/../Bootstrap.php';
7+
require_once __DIR__ . '/../Header.php';
158

169
$spreadsheet = new Spreadsheet();
1710
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -60,13 +53,11 @@
6053
->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
6154
->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
6255

63-
echo sprintf(
56+
$helper->log(sprintf(
6457
'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
6558
$worksheet->getCell("B{$row}")->getCalculatedValue(),
6659
$worksheet->getCell('B1')->getValue(),
6760
$worksheet->getCell("C{$row}")->getCalculatedValue()
68-
), PHP_EOL;
61+
));
6962

70-
$outputFileName = 'RelativeNamedRangeAsFunction.xlsx';
71-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
72-
$writer->save($outputFileName);
63+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/ScopedNamedRange.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedRange;
54
use PhpOffice\PhpSpreadsheet\Spreadsheet;
65

7-
error_reporting(E_ALL);
8-
set_time_limit(0);
9-
10-
date_default_timezone_set('UTC');
11-
12-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
13-
require_once __DIR__ . '/../Bootstrap.php';
6+
require_once __DIR__ . '/../Header.php';
147

158
$spreadsheet = new Spreadsheet();
169
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -67,15 +60,13 @@
6760
->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
6861
->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
6962

70-
echo sprintf(
63+
$helper->log(sprintf(
7164
'Worked %.2f hours at a rate of %s - Charge to the client is %.2f',
7265
$worksheet->getCell("B{$row}")->getCalculatedValue(),
7366
$chargeRateCellValue = $spreadsheet
7467
->getSheetByName($spreadsheet->getNamedRange('CHARGE_RATE')->getWorksheet()->getTitle())
7568
->getCell($spreadsheet->getNamedRange('CHARGE_RATE')->getCellsInRange()[0])->getValue(),
7669
$worksheet->getCell("C{$row}")->getCalculatedValue()
77-
), PHP_EOL;
70+
));
7871

79-
$outputFileName = 'ScopedNamedRange.xlsx';
80-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
81-
$writer->save($outputFileName);
72+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/ScopedNamedRange2.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedRange;
54
use PhpOffice\PhpSpreadsheet\Spreadsheet;
65

7-
error_reporting(E_ALL);
8-
set_time_limit(0);
9-
10-
date_default_timezone_set('UTC');
11-
12-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
13-
require_once __DIR__ . '/../Bootstrap.php';
6+
require_once __DIR__ . '/../Header.php';
147

158
$spreadsheet = new Spreadsheet();
169
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -83,16 +76,14 @@
8376
->setCellValue('B1', 4.5);
8477

8578
foreach ($spreadsheet->getAllSheets() as $worksheet) {
86-
echo sprintf(
79+
$helper->log(sprintf(
8780
'Worked %.2f hours for "%s" at a rate of %.2f - Charge to the client is %.2f',
8881
$worksheet->getCell("B{$row}")->getCalculatedValue(),
8982
$worksheet->getTitle(),
9083
$worksheet->getCell('B1')->getValue(),
9184
$worksheet->getCell("C{$row}")->getCalculatedValue()
92-
), PHP_EOL;
85+
));
9386
}
9487
$worksheet = $spreadsheet->setActiveSheetIndex(0);
9588

96-
$outputFileName = 'ScopedNamedRange2.xlsx';
97-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
98-
$writer->save($outputFileName);
89+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/SimpleNamedFormula.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedFormula;
54
use PhpOffice\PhpSpreadsheet\NamedRange;
65
use PhpOffice\PhpSpreadsheet\Spreadsheet;
76

8-
error_reporting(E_ALL);
9-
set_time_limit(0);
10-
11-
date_default_timezone_set('UTC');
12-
13-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
14-
require_once __DIR__ . '/../Bootstrap.php';
7+
require_once __DIR__ . '/../Header.php';
158

169
$spreadsheet = new Spreadsheet();
1710
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -39,14 +32,12 @@
3932
->setCellValue('B4', '=TAX')
4033
->setCellValue('B5', '=PRICE+TAX');
4134

42-
echo sprintf(
35+
$helper->log(sprintf(
4336
'With a Tax Rate of %.2f and a net price of %.2f, Tax is %.2f and the gross price is %.2f',
4437
$worksheet->getCell('B1')->getCalculatedValue(),
4538
$worksheet->getCell('B3')->getValue(),
4639
$worksheet->getCell('B4')->getCalculatedValue(),
4740
$worksheet->getCell('B5')->getCalculatedValue()
48-
), PHP_EOL;
41+
));
4942

50-
$outputFileName = 'SimpleNamedFormula.xlsx';
51-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
52-
$writer->save($outputFileName);
43+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

‎samples/DefinedNames/SimpleNamedRange.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?php
22

3-
use PhpOffice\PhpSpreadsheet\IOFactory;
43
use PhpOffice\PhpSpreadsheet\NamedRange;
54
use PhpOffice\PhpSpreadsheet\Spreadsheet;
65

7-
error_reporting(E_ALL);
8-
set_time_limit(0);
9-
10-
date_default_timezone_set('UTC');
11-
12-
// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
13-
require_once __DIR__ . '/../Bootstrap.php';
6+
require_once __DIR__ . '/../Header.php';
147

158
$spreadsheet = new Spreadsheet();
169
$worksheet = $spreadsheet->setActiveSheetIndex(0);
@@ -33,14 +26,12 @@
3326
->setCellValue('B4', '=PRICE*TAX_RATE')
3427
->setCellValue('B5', '=PRICE*(1+TAX_RATE)');
3528

36-
echo sprintf(
29+
$helper->log(sprintf(
3730
'With a Tax Rate of %.2f and a net price of %.2f, Tax is %.2f and the gross price is %.2f',
3831
$worksheet->getCell('B1')->getCalculatedValue(),
3932
$worksheet->getCell('B3')->getValue(),
4033
$worksheet->getCell('B4')->getCalculatedValue(),
4134
$worksheet->getCell('B5')->getCalculatedValue()
42-
), PHP_EOL;
35+
));
4336

44-
$outputFileName = 'SimpleNamedRange.xlsx';
45-
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
46-
$writer->save($outputFileName);
37+
$helper->write($spreadsheet, __FILE__, ['Xlsx']);

0 commit comments

Comments
 (0)