Merge branch 'master' into issue2768
This commit is contained in:
Mark Baker
GitHub
commit
da76f0d977
|
|
@ -26,6 +26,20 @@ $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
|
|||
|
||||
// add code that show the issue here...
|
||||
```
|
||||
If this is an issue with reading a specific spreadsheet file, then it may be appropriate to provide a sample file that demonstrates the problem; but please keep it as small as possible, and sanitize any confidential information before uploading.
|
||||
|
||||
### What features do you think are causing the issue
|
||||
|
||||
- [ ] Reader
|
||||
- [ ] Writer
|
||||
- [ ] Styles
|
||||
- [ ] Data Validations
|
||||
- [ ] Formula Calulations
|
||||
- [ ] Charts
|
||||
- [ ] AutoFilter
|
||||
- [ ] Form Elements
|
||||
|
||||
### Does an issue affect all spreadsheet file formats? If not, which formats are affected?
|
||||
|
||||
|
||||
### Which versions of PhpSpreadsheet and PHP are affected?
|
||||
|
|
|
|||
|
|
@ -3,14 +3,21 @@ This is:
|
|||
```
|
||||
- [ ] a bugfix
|
||||
- [ ] a new feature
|
||||
- [ ] refactoring
|
||||
- [ ] additional unit tests
|
||||
```
|
||||
|
||||
Checklist:
|
||||
|
||||
- [ ] Changes are covered by unit tests
|
||||
- [ ] Changes are covered by existing unit tests
|
||||
- [ ] New unit tests have been added
|
||||
- [ ] Code style is respected
|
||||
- [ ] Commit message explains **why** the change is made (see https://github.com/erlang/otp/wiki/Writing-good-commit-messages)
|
||||
- [ ] CHANGELOG.md contains a short summary of the change
|
||||
- [ ] Documentation is updated as necessary
|
||||
|
||||
### Why this change is needed?
|
||||
|
||||
Provide an explanation of why this change is needed, with links to any Issues (if appropriate).
|
||||
If this is a bugfix or a new feature, and there are no existing Issues, then please also create an issue that will make it easier to track progress with this PR.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ $config
|
|||
'braces' => true,
|
||||
'cast_spaces' => true,
|
||||
'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']], // const are often grouped with other related const
|
||||
'class_definition' => true,
|
||||
'class_definition' => false,
|
||||
'class_keyword_remove' => false, // ::class keyword gives us better support in IDE
|
||||
'combine_consecutive_issets' => true,
|
||||
'combine_consecutive_unsets' => true,
|
||||
|
|
|
|||
47
CHANGELOG.md
47
CHANGELOG.md
|
|
@ -9,19 +9,29 @@ and this project adheres to [Semantic Versioning](https://semver.org).
|
|||
|
||||
### Added
|
||||
|
||||
- Implementation of the FILTER(), SORT(), SORTBY() and UNIQUE() Lookup/Reference (array) functions
|
||||
- Ods Writer support for Freeze Pane [Issue #2013](https://github.com/PHPOffice/PhpSpreadsheet/issues/2013) [PR #2755](https://github.com/PHPOffice/PhpSpreadsheet/pull/2755)
|
||||
- Ods Writer support for setting column width/row height (including the use of AutoSize) [Issue #2346](https://github.com/PHPOffice/PhpSpreadsheet/issues/2346) [PR #2753](https://github.com/PHPOffice/PhpSpreadsheet/pull/2753)
|
||||
- Introduced CellAddress, CellRange, RowRange and ColumnRange value objects that can be used as an alternative to a string value (e.g. `'C5'`, `'B2:D4'`, `'2:2'` or `'B:C'`) in appropriate contexts.
|
||||
- Implementation of the FILTER(), SORT(), SORTBY() and UNIQUE() Lookup/Reference (array) functions.
|
||||
- Implementation of the ISREF() Information function.
|
||||
- Added support for reading "formatted" numeric values from Csv files; although default behaviour of reading these values as strings is preserved.
|
||||
|
||||
(i.e a value of "12,345.67" can be read as numeric `1235.67`, not simply as a string `"12,345.67"`, if the `castFormattedNumberToNumeric()` setting is enabled.
|
||||
(i.e a value of "12,345.67" can be read as numeric `12345.67`, not simply as a string `"12,345.67"`, if the `castFormattedNumberToNumeric()` setting is enabled.
|
||||
|
||||
This functionality is locale-aware, using the server's locale settings to identify the thousands and decimal separators.
|
||||
|
||||
- Support for two cell anchor drawing of images. [#2532](https://github.com/PHPOffice/PhpSpreadsheet/pull/2532)
|
||||
- Support for two cell anchor drawing of images. [#2532](https://github.com/PHPOffice/PhpSpreadsheet/pull/2532) [#2674](https://github.com/PHPOffice/PhpSpreadsheet/pull/2674)
|
||||
- Limited support for Xls Reader to handle Conditional Formatting:
|
||||
|
||||
Ranges and Rules are read, but style is currently limited to font size, weight and color; and to fill style and color.
|
||||
|
||||
- Add ability to suppress Mac line ending check for CSV [#2623](https://github.com/PHPOffice/PhpSpreadsheet/pull/2623)
|
||||
- Initial support for creating and writing Tables (Xlsx Writer only) [PR #2671](https://github.com/PHPOffice/PhpSpreadsheet/pull/2671)
|
||||
|
||||
See `/samples/Table` for examples of use.
|
||||
|
||||
Note that PreCalculateFormulas needs to be disabled when saving spreadsheets containing tables with formulae (totals or column formulae).
|
||||
|
||||
### Changed
|
||||
|
||||
- Gnumeric Reader now loads number formatting for cells.
|
||||
|
|
@ -37,6 +47,27 @@ and this project adheres to [Semantic Versioning](https://semver.org).
|
|||
### Deprecated
|
||||
|
||||
- All Excel Function implementations in `Calculation\Functions` (including the Error functions) have been moved to dedicated classes for groups of related functions. See the docblocks against all the deprecated methods for details of the new methods to call instead. At some point, these old classes will be deleted.
|
||||
- Worksheet methods that reference cells "byColumnandRow". All such methods have an equivalent that references the cell by its address (e.g. '`E3'` rather than `5, 3`).
|
||||
|
||||
These functions now accept either a cell address string (`'E3')` or an array with columnId and rowId (`[5, 3]`) or a new `CellAddress` object as their `cellAddress`/`coordinate` argument.
|
||||
This includes the methods:
|
||||
- `setCellValueByColumnAndRow()` use the equivalent `setCellValue()`
|
||||
- `setCellValueExplicitByColumnAndRow()` use the equivalent `setCellValueExplicit()`
|
||||
- `getCellByColumnAndRow()` use the equivalent `getCell()`
|
||||
- `cellExistsByColumnAndRow()` use the equivalent `cellExists()`
|
||||
- `getStyleByColumnAndRow()` use the equivalent `getStyle()`
|
||||
- `setBreakByColumnAndRow()` use the equivalent `setBreak()`
|
||||
- `mergeCellsByColumnAndRow()` use the equivalent `mergeCells()`
|
||||
- `unmergeCellsByColumnAndRow()` use the equivalent `unmergeCells()`
|
||||
- `protectCellsByColumnAndRow()` use the equivalent `protectCells()`
|
||||
- `unprotectCellsByColumnAndRow()` use the equivalent `unprotectCells()`
|
||||
- `setAutoFilterByColumnAndRow()` use the equivalent `setAutoFilter()`
|
||||
- `freezePaneByColumnAndRow()` use the equivalent `freezePane()`
|
||||
- `getCommentByColumnAndRow()` use the equivalent `getComment()`
|
||||
- `setSelectedCellByColumnAndRow()` use the equivalent `setSelectedCells()`
|
||||
|
||||
This change provides more consistency in the methods (not every "by cell address" method has an equivalent "byColumnAndRow" method);
|
||||
and the "by cell address" methods often provide more flexibility, such as allowing a range of cells, or referencing them by passing the defined name of a named range as the argument.
|
||||
|
||||
### Removed
|
||||
|
||||
|
|
@ -44,19 +75,27 @@ and this project adheres to [Semantic Versioning](https://semver.org).
|
|||
|
||||
### Fixed
|
||||
|
||||
- Make allowance for the AutoFilter dropdown icon in the first row of an Autofilter range when using Autosize columns. [Issue #2413](https://github.com/PHPOffice/PhpSpreadsheet/issues/2413) [PR #2754](https://github.com/PHPOffice/PhpSpreadsheet/pull/2754)
|
||||
- Support for "chained" ranges (e.g. `A5:C10:C20:F1`) in the Calculation Engine; and also support for using named ranges with the Range operator (e.g. `NamedRange1:NamedRange2`) [Issue #2730](https://github.com/PHPOffice/PhpSpreadsheet/issues/2730) [PR #2746](https://github.com/PHPOffice/PhpSpreadsheet/pull/2746)
|
||||
- Update Conditional Formatting ranges and rule conditions when inserting/deleting rows/columns [Issue #2678](https://github.com/PHPOffice/PhpSpreadsheet/issues/2678) [PR #2689](https://github.com/PHPOffice/PhpSpreadsheet/pull/2689)
|
||||
- Allow `INDIRECT()` to accept row/column ranges as well as cell ranges [PR #2687](https://github.com/PHPOffice/PhpSpreadsheet/pull/2687)
|
||||
- Fix bug when deleting cells with hyperlinks, where the hyperlink was then being "inherited" by whatever cell moved to that cell address.
|
||||
- Fix bug in Conditional Formatting in the Xls Writer that resulted in a broken file when there were multiple conditional ranges in a worksheet.
|
||||
- Fix Conditional Formatting in the Xls Writer to work with rules that contain string literals, cell references and formulae.
|
||||
- Fix for setting Active Sheet to the first loaded worksheet when bookViews element isn't defined [Issue #2666](https://github.com/PHPOffice/PhpSpreadsheet/issues/2666) [PR #2669](https://github.com/PHPOffice/PhpSpreadsheet/pull/2669)
|
||||
- Fixed behaviour of XLSX font style vertical align settings.
|
||||
- Fixed behaviour of XLSX font style vertical align settings [PR #2619](https://github.com/PHPOffice/PhpSpreadsheet/pull/2619)
|
||||
- Resolved formula translations to handle separators (row and column) for array functions as well as for function argument separators; and cleanly handle nesting levels.
|
||||
|
||||
Note that this method is used when translating Excel functions between `en_us` and other locale languages, as well as when converting formulae between different spreadsheet formats (e.g. Ods to Excel).
|
||||
|
||||
Nor is this a perfect solution, as there may still be issues when function calls have array arguments that themselves contain function calls; but it's still better than the current logic.
|
||||
- Fix for escaping double quotes within a formula [Issue #1971](https://github.com/PHPOffice/PhpSpreadsheet/issues/1971) [PR #2651](https://github.com/PHPOffice/PhpSpreadsheet/pull/2651)
|
||||
- Change open mode for output from `wb+` to `wb` [Issue #2372](https://github.com/PHPOffice/PhpSpreadsheet/issues/2372) [PR #2657](https://github.com/PHPOffice/PhpSpreadsheet/pull/2657)
|
||||
- Use color palette if supplied [Issue #2499](https://github.com/PHPOffice/PhpSpreadsheet/issues/2499) [PR #2595](https://github.com/PHPOffice/PhpSpreadsheet/pull/2595)
|
||||
- Xls reader treat drawing offsets as int rather than float [PR #2648](https://github.com/PHPOffice/PhpSpreadsheet/pull/2648)
|
||||
- Handle booleans in conditional styles properly [PR #2654](https://github.com/PHPOffice/PhpSpreadsheet/pull/2654)
|
||||
- Fix for reading files in the root directory of a ZipFile, which should not be prefixed by relative paths ("./") as dirname($filename) does by default.
|
||||
- Fix invalid style of cells in empty columns with columnDimensions and rows with rowDimensions in added external sheet. [PR #2739](https://github.com/PHPOffice/PhpSpreadsheet/pull/2739)
|
||||
|
||||
## 1.22.0 - 2022-02-18
|
||||
|
||||
|
|
|
|||
|
|
@ -80,7 +80,8 @@ semi-colon (`;`) are used as separators instead of a comma, although
|
|||
other symbols can be used. Because CSV is a text-only format, it doesn't
|
||||
support any data formatting options.
|
||||
|
||||
"CSV" is not a single, well-defined format (although see RFC 4180 for
|
||||
"CSV" is not a single, well-defined format (although see
|
||||
[RFC 4180](https://www.rfc-editor.org/rfc/rfc4180.html) for
|
||||
one definition that is commonly used). Rather, in practice the term
|
||||
"CSV" refers to any file that:
|
||||
|
||||
|
|
@ -117,5 +118,5 @@ Wide Web Consortium (W3C). However, in 2000, HTML also became an
|
|||
international standard (ISO/IEC 15445:2000). HTML 4.01 was published in
|
||||
late 1999, with further errata published through 2001. In 2004
|
||||
development began on HTML5 in the Web Hypertext Application Technology
|
||||
Working Group (WHATWG), which became a joint deliverable with the W3C in
|
||||
2008.
|
||||
Working Group (WHATWG), which became a joint deliverable with the W3C in 2008.
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,22 @@ practise), it will reject the Xls loader that it would normally use for
|
|||
a .xls file; and test the file using the other loaders until it finds
|
||||
the appropriate loader, and then use that to read the file.
|
||||
|
||||
If you know that this is an `xls` file, but don't know whether it is a
|
||||
genuine BIFF-format Excel or Html markup with an xls extension, you can
|
||||
limit the loader to check only those two possibilities by passing in an
|
||||
array of Readers to test against.
|
||||
|
||||
```php
|
||||
$inputFileName = './sampleData/example1.xls';
|
||||
$testAgainstFormats = [
|
||||
\PhpOffice\PhpSpreadsheet\IOFactory::READER_XLS,
|
||||
\PhpOffice\PhpSpreadsheet\IOFactory::READER_HTML,
|
||||
];
|
||||
|
||||
/** Load $inputFileName to a Spreadsheet Object **/
|
||||
$spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($inputFileName, 0, $testAgainstFormats);
|
||||
```
|
||||
|
||||
While easy to implement in your code, and you don't need to worry about
|
||||
the file type; this isn't the most efficient method to load a file; and
|
||||
it lacks the flexibility to configure the loader in any way before
|
||||
|
|
@ -118,6 +134,34 @@ $spreadsheet = $reader->load($inputFileName);
|
|||
See `samples/Reader/04_Simple_file_reader_using_the_IOFactory_to_identify_a_reader_to_use.php`
|
||||
for a working example of this code.
|
||||
|
||||
As with the IOFactory `load()` method, you can also pass an array of formats
|
||||
for the `identify()` method to check against if you know that it will only
|
||||
be in a subset of the possible formats that PhpSpreadsheet supports.
|
||||
|
||||
```php
|
||||
$inputFileName = './sampleData/example1.xls';
|
||||
$testAgainstFormats = [
|
||||
\PhpOffice\PhpSpreadsheet\IOFactory::READER_XLS,
|
||||
\PhpOffice\PhpSpreadsheet\IOFactory::READER_HTML,
|
||||
];
|
||||
|
||||
/** Identify the type of $inputFileName **/
|
||||
$inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($inputFileName, $testAgainstFormats);
|
||||
```
|
||||
|
||||
You can also use this to confirm that a file is what it claims to be:
|
||||
|
||||
```php
|
||||
$inputFileName = './sampleData/example1.xls';
|
||||
|
||||
try {
|
||||
/** Verify that $inputFileName really is an Xls file **/
|
||||
$inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($inputFileName, [\PhpOffice\PhpSpreadsheet\IOFactory::READER_XLS]);
|
||||
} catch (\PhpOffice\PhpSpreadsheet\Reader\Exception $e) {
|
||||
// File isn't actually an Xls file, even though it has an xls extension
|
||||
}
|
||||
```
|
||||
|
||||
## Spreadsheet Reader Options
|
||||
|
||||
Once you have created a reader object for the workbook that you want to
|
||||
|
|
@ -146,7 +190,7 @@ $spreadsheet = $reader->load($inputFileName);
|
|||
See `samples/Reader/05_Simple_file_reader_using_the_read_data_only_option.php`
|
||||
for a working example of this code.
|
||||
|
||||
It is important to note that Workbooks (and PhpSpreadsheet) store dates
|
||||
It is important to note that most Workbooks (and PhpSpreadsheet) store dates
|
||||
and times as simple numeric values: they can only be distinguished from
|
||||
other numeric values by the format mask that is applied to that cell.
|
||||
When setting read data only to true, PhpSpreadsheet doesn't read the
|
||||
|
|
@ -162,8 +206,8 @@ Reading Only Data from a Spreadsheet File applies to Readers:
|
|||
|
||||
Reader | Y/N |Reader | Y/N |Reader | Y/N |
|
||||
----------|:---:|--------|:---:|--------------|:---:|
|
||||
Xlsx | YES | Xls | YES | Xml | YES |
|
||||
Ods | YES | SYLK | NO | Gnumeric | YES |
|
||||
Xlsx | YES | Xls | YES | Xml | YES |
|
||||
Ods | YES | SYLK | NO | Gnumeric | YES |
|
||||
CSV | NO | HTML | NO
|
||||
|
||||
### Reading Only Named WorkSheets from a File
|
||||
|
|
@ -233,8 +277,8 @@ Reading Only Named WorkSheets from a File applies to Readers:
|
|||
|
||||
Reader | Y/N |Reader | Y/N |Reader | Y/N |
|
||||
----------|:---:|--------|:---:|--------------|:---:|
|
||||
Xlsx | YES | Xls | YES | Xml | YES |
|
||||
Ods | YES | SYLK | NO | Gnumeric | YES |
|
||||
Xlsx | YES | Xls | YES | Xml | YES |
|
||||
Ods | YES | SYLK | NO | Gnumeric | YES |
|
||||
CSV | NO | HTML | NO
|
||||
|
||||
### Reading Only Specific Columns and Rows from a File (Read Filters)
|
||||
|
|
@ -381,7 +425,7 @@ Using Read Filters applies to:
|
|||
|
||||
Reader | Y/N |Reader | Y/N |Reader | Y/N |
|
||||
----------|:---:|--------|:---:|--------------|:---:|
|
||||
Xlsx | YES | Xls | YES | Xml | YES |
|
||||
Xlsx | YES | Xls | YES | Xml | YES |
|
||||
Ods | YES | SYLK | NO | Gnumeric | YES |
|
||||
CSV | YES | HTML | NO | | |
|
||||
|
||||
|
|
@ -439,7 +483,7 @@ Combining Multiple Files into a Single Spreadsheet Object applies to:
|
|||
|
||||
Reader | Y/N |Reader | Y/N |Reader | Y/N |
|
||||
----------|:---:|--------|:---:|--------------|:---:|
|
||||
Xlsx | NO | Xls | NO | Xml | NO |
|
||||
Xlsx | NO | Xls | NO | Xml | NO |
|
||||
Ods | NO | SYLK | YES | Gnumeric | NO |
|
||||
CSV | YES | HTML | NO
|
||||
|
||||
|
|
@ -516,7 +560,7 @@ Splitting a single loaded file across multiple worksheets applies to:
|
|||
|
||||
Reader | Y/N |Reader | Y/N |Reader | Y/N |
|
||||
----------|:---:|--------|:---:|--------------|:---:|
|
||||
Xlsx | NO | Xls | NO | Xml | NO |
|
||||
Xlsx | NO | Xls | NO | Xml | NO |
|
||||
Ods | NO | SYLK | NO | Gnumeric | NO |
|
||||
CSV | YES | HTML | NO
|
||||
|
||||
|
|
@ -556,7 +600,7 @@ Setting CSV delimiter applies to:
|
|||
|
||||
Reader | Y/N |Reader | Y/N |Reader | Y/N |
|
||||
----------|:---:|--------|:---:|--------------|:---:|
|
||||
Xlsx | NO | Xls | NO | Xml | NO |
|
||||
Xlsx | NO | Xls | NO | Xml | NO |
|
||||
Ods | NO | SYLK | NO | Gnumeric | NO |
|
||||
CSV | YES | HTML | NO
|
||||
|
||||
|
|
@ -594,7 +638,7 @@ Applies to:
|
|||
|
||||
Reader | Y/N |Reader | Y/N |Reader | Y/N |
|
||||
----------|:---:|--------|:---:|--------------|:---:|
|
||||
Xlsx | NO | Xls | NO | Xml | NO |
|
||||
Xlsx | NO | Xls | NO | Xml | NO |
|
||||
Ods | NO | SYLK | NO | Gnumeric | NO |
|
||||
CSV | YES | HTML | NO
|
||||
|
||||
|
|
@ -646,7 +690,7 @@ Loading using a Value Binder applies to:
|
|||
|
||||
Reader | Y/N |Reader | Y/N |Reader | Y/N
|
||||
----------|:---:|--------|:---:|--------------|:---:
|
||||
Xlsx | NO | Xls | NO | Xml | NO
|
||||
Xlsx | NO | Xls | NO | Xml | NO
|
||||
Ods | NO | SYLK | NO | Gnumeric | NO
|
||||
CSV | YES | HTML | YES
|
||||
|
||||
|
|
|
|||
|
|
@ -1167,13 +1167,15 @@ that you are setting is measured in.
|
|||
Valid units are `pt` (points), `px` (pixels), `pc` (pica), `in` (inches),
|
||||
`cm` (centimeters) and `mm` (millimeters).
|
||||
|
||||
Setting the column width to `-1` tells MS Excel to display the column using its default width.
|
||||
|
||||
```php
|
||||
$spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(120, 'pt');
|
||||
```
|
||||
|
||||
If you want PhpSpreadsheet to perform an automatic width calculation,
|
||||
use the following code. PhpSpreadsheet will approximate the column with
|
||||
to the width of the widest column value.
|
||||
use the following code. PhpSpreadsheet will approximate the column width
|
||||
to the width of the widest value displayed in that column.
|
||||
|
||||
```php
|
||||
$spreadsheet->getActiveSheet()->getColumnDimension('B')->setAutoSize(true);
|
||||
|
|
@ -1266,6 +1268,18 @@ Valid units are `pt` (points), `px` (pixels), `pc` (pica), `in` (inches),
|
|||
$spreadsheet->getActiveSheet()->getRowDimension('10')->setRowHeight(100, 'pt');
|
||||
```
|
||||
|
||||
Setting the row height to `-1` tells MS Excel to display the column using its default height, which is based on the character font size.
|
||||
|
||||
If you have wrapped text in a cell, then the `-1` default will only set the row height to display a single line of that wrapped text.
|
||||
If you need to calculate the actual height for the row, then count the lines that should be displayed (count the `\n` and add 1); then adjust for the font.
|
||||
The adjustment for Calibri 11 is approximately 14.5; for Calibri 12 15.9, etc.
|
||||
```php
|
||||
$spreadsheet->getActiveSheet()->getRowDimension(1)->setRowHeight(
|
||||
14.5 * (substr_count($sheet->getCell('A1')->getValue(), "\n") + 1)
|
||||
);
|
||||
```
|
||||
|
||||
|
||||
## Show/hide a row
|
||||
|
||||
To set a worksheet''s row visibility, you can use the following code.
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ parameters:
|
|||
|
||||
-
|
||||
message: "#^Offset 'value' does not exist on array\\|null\\.$#"
|
||||
count: 3
|
||||
count: 5
|
||||
path: src/PhpSpreadsheet/Calculation/Calculation.php
|
||||
|
||||
-
|
||||
|
|
@ -1175,11 +1175,6 @@ parameters:
|
|||
count: 1
|
||||
path: src/PhpSpreadsheet/Cell/Coordinate.php
|
||||
|
||||
-
|
||||
message: "#^Cannot use array destructuring on array\\|null\\.$#"
|
||||
count: 1
|
||||
path: src/PhpSpreadsheet/Cell/Coordinate.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#4 \\$currentRow of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:validateRange\\(\\) expects int, string given\\.$#"
|
||||
count: 1
|
||||
|
|
@ -3120,11 +3115,6 @@ parameters:
|
|||
count: 1
|
||||
path: src/PhpSpreadsheet/Reader/Xml/Style.php
|
||||
|
||||
-
|
||||
message: "#^Cannot use array destructuring on array\\|null\\.$#"
|
||||
count: 4
|
||||
path: src/PhpSpreadsheet/ReferenceHelper.php
|
||||
|
||||
-
|
||||
message: "#^Elseif condition is always true\\.$#"
|
||||
count: 1
|
||||
|
|
@ -4295,11 +4285,6 @@ parameters:
|
|||
count: 1
|
||||
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
|
||||
|
||||
-
|
||||
message: "#^Result of && is always true\\.$#"
|
||||
count: 1
|
||||
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
|
||||
|
||||
-
|
||||
message: "#^Right side of && is always true\\.$#"
|
||||
count: 1
|
||||
|
|
@ -4650,11 +4635,6 @@ parameters:
|
|||
count: 1
|
||||
path: src/PhpSpreadsheet/Writer/Ods/Content.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
|
||||
count: 4
|
||||
path: src/PhpSpreadsheet/Writer/Ods/Content.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<2, max\\> given\\.$#"
|
||||
count: 3
|
||||
|
|
@ -4670,11 +4650,6 @@ parameters:
|
|||
count: 1
|
||||
path: src/PhpSpreadsheet/Writer/Ods/Formula.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$content of method XMLWriter\\:\\:text\\(\\) expects string, int given\\.$#"
|
||||
count: 2
|
||||
path: src/PhpSpreadsheet/Writer/Ods/Settings.php
|
||||
|
||||
-
|
||||
message: "#^Cannot call method getHashCode\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
|
||||
count: 1
|
||||
|
|
@ -5177,7 +5152,7 @@ parameters:
|
|||
|
||||
-
|
||||
message: "#^Parameter \\#2 \\$id of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeRelationship\\(\\) expects int, string given\\.$#"
|
||||
count: 4
|
||||
count: 5
|
||||
path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
|
||||
|
||||
-
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
<?php
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
|
||||
|
||||
require __DIR__ . '/../Header.php';
|
||||
|
||||
// Create new Spreadsheet object
|
||||
$helper->log('Create new Spreadsheet object');
|
||||
$spreadsheet = new Spreadsheet();
|
||||
|
||||
// Set document properties
|
||||
$helper->log('Set document properties');
|
||||
$spreadsheet->getProperties()->setCreator('aswinkumar863')
|
||||
->setLastModifiedBy('aswinkumar863')
|
||||
->setTitle('PhpSpreadsheet Table Test Document')
|
||||
->setSubject('PhpSpreadsheet Table Test Document')
|
||||
->setDescription('Test document for PhpSpreadsheet, generated using PHP classes.')
|
||||
->setKeywords('office PhpSpreadsheet php')
|
||||
->setCategory('Table');
|
||||
|
||||
// Create the worksheet
|
||||
$helper->log('Add data');
|
||||
|
||||
$spreadsheet->setActiveSheetIndex(0);
|
||||
$spreadsheet->getActiveSheet()->setCellValue('A1', 'Year')
|
||||
->setCellValue('B1', 'Quarter')
|
||||
->setCellValue('C1', 'Country')
|
||||
->setCellValue('D1', 'Sales');
|
||||
|
||||
$dataArray = [
|
||||
['2010', 'Q1', 'United States', 790],
|
||||
['2010', 'Q2', 'United States', 730],
|
||||
['2010', 'Q3', 'United States', 860],
|
||||
['2010', 'Q4', 'United States', 850],
|
||||
['2011', 'Q1', 'United States', 800],
|
||||
['2011', 'Q2', 'United States', 700],
|
||||
['2011', 'Q3', 'United States', 900],
|
||||
['2011', 'Q4', 'United States', 950],
|
||||
['2010', 'Q1', 'Belgium', 380],
|
||||
['2010', 'Q2', 'Belgium', 390],
|
||||
['2010', 'Q3', 'Belgium', 420],
|
||||
['2010', 'Q4', 'Belgium', 460],
|
||||
['2011', 'Q1', 'Belgium', 400],
|
||||
['2011', 'Q2', 'Belgium', 350],
|
||||
['2011', 'Q3', 'Belgium', 450],
|
||||
['2011', 'Q4', 'Belgium', 500],
|
||||
];
|
||||
|
||||
$spreadsheet->getActiveSheet()->fromArray($dataArray, null, 'A2');
|
||||
|
||||
// Create Table
|
||||
$helper->log('Create Table');
|
||||
$table = new Table('A1:D17', 'Sales_Data');
|
||||
|
||||
// Create Columns
|
||||
$table->getColumn('D')->setShowFilterButton(false);
|
||||
|
||||
// Create Table Style
|
||||
$helper->log('Create Table Style');
|
||||
$tableStyle = new TableStyle();
|
||||
$tableStyle->setTheme(TableStyle::TABLE_STYLE_MEDIUM2);
|
||||
$tableStyle->setShowRowStripes(true);
|
||||
$tableStyle->setShowColumnStripes(true);
|
||||
$tableStyle->setShowFirstColumn(true);
|
||||
$tableStyle->setShowLastColumn(true);
|
||||
$table->setStyle($tableStyle);
|
||||
|
||||
// Add Table to Worksheet
|
||||
$helper->log('Add Table to Worksheet');
|
||||
$spreadsheet->getActiveSheet()->addTable($table);
|
||||
|
||||
// Save
|
||||
$helper->write($spreadsheet, __FILE__, ['Xlsx']);
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
<?php
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\IOFactory;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
|
||||
require __DIR__ . '/../Header.php';
|
||||
|
||||
// Create new Spreadsheet object
|
||||
$helper->log('Create new Spreadsheet object');
|
||||
$spreadsheet = new Spreadsheet();
|
||||
|
||||
// Set document properties
|
||||
$helper->log('Set document properties');
|
||||
$spreadsheet->getProperties()->setCreator('aswinkumar863')
|
||||
->setLastModifiedBy('aswinkumar863')
|
||||
->setTitle('PhpSpreadsheet Table Test Document')
|
||||
->setSubject('PhpSpreadsheet Table Test Document')
|
||||
->setDescription('Test document for PhpSpreadsheet, generated using PHP classes.')
|
||||
->setKeywords('office PhpSpreadsheet php')
|
||||
->setCategory('Table');
|
||||
|
||||
// Create the worksheet
|
||||
$helper->log('Add data');
|
||||
|
||||
$spreadsheet->setActiveSheetIndex(0);
|
||||
$spreadsheet->getActiveSheet()->setCellValue('A1', 'Year')
|
||||
->setCellValue('B1', 'Quarter')
|
||||
->setCellValue('C1', 'Country')
|
||||
->setCellValue('D1', 'Sales');
|
||||
|
||||
$dataArray = [
|
||||
['2010', 'Q1', 'United States', 790],
|
||||
['2010', 'Q2', 'United States', 730],
|
||||
['2010', 'Q3', 'United States', 860],
|
||||
['2010', 'Q4', 'United States', 850],
|
||||
['2011', 'Q1', 'United States', 800],
|
||||
['2011', 'Q2', 'United States', 700],
|
||||
['2011', 'Q3', 'United States', 900],
|
||||
['2011', 'Q4', 'United States', 950],
|
||||
['2010', 'Q1', 'Belgium', 380],
|
||||
['2010', 'Q2', 'Belgium', 390],
|
||||
['2010', 'Q3', 'Belgium', 420],
|
||||
['2010', 'Q4', 'Belgium', 460],
|
||||
['2011', 'Q1', 'Belgium', 400],
|
||||
['2011', 'Q2', 'Belgium', 350],
|
||||
['2011', 'Q3', 'Belgium', 450],
|
||||
['2011', 'Q4', 'Belgium', 500],
|
||||
];
|
||||
|
||||
$spreadsheet->getActiveSheet()->fromArray($dataArray, null, 'A2');
|
||||
|
||||
// Table
|
||||
$helper->log('Create Table');
|
||||
$table = new Table();
|
||||
$table->setName('SalesData');
|
||||
$table->setShowTotalsRow(true);
|
||||
$table->setRange('A1:D18'); // +1 row for totalsRow
|
||||
|
||||
$helper->log('Add Totals Row');
|
||||
// Table column label not implemented yet,
|
||||
$table->getColumn('A')->setTotalsRowLabel('Total');
|
||||
// So set the label directly to the cell
|
||||
$spreadsheet->getActiveSheet()->getCell('A18')->setValue('Total');
|
||||
|
||||
// Table column function not implemented yet,
|
||||
$table->getColumn('D')->setTotalsRowFunction('sum');
|
||||
// So set the formula directly to the cell
|
||||
$spreadsheet->getActiveSheet()->getCell('D18')->setValue('=SUBTOTAL(109,SalesData[Sales])');
|
||||
|
||||
// Add Table to Worksheet
|
||||
$helper->log('Add Table to Worksheet');
|
||||
$spreadsheet->getActiveSheet()->addTable($table);
|
||||
|
||||
// Save
|
||||
$path = $helper->getFilename(__FILE__);
|
||||
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
|
||||
|
||||
// Disable precalculation to add table's total row
|
||||
$writer->setPreCalculateFormulas(false);
|
||||
$callStartTime = microtime(true);
|
||||
$writer->save($path);
|
||||
$helper->logWrite($writer, $path, $callStartTime);
|
||||
$helper->logEndingNotes();
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
<?php
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\IOFactory;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
|
||||
require __DIR__ . '/../Header.php';
|
||||
|
||||
// Create new Spreadsheet object
|
||||
$helper->log('Create new Spreadsheet object');
|
||||
$spreadsheet = new Spreadsheet();
|
||||
|
||||
// Set document properties
|
||||
$helper->log('Set document properties');
|
||||
$spreadsheet->getProperties()->setCreator('aswinkumar863')
|
||||
->setLastModifiedBy('aswinkumar863')
|
||||
->setTitle('PhpSpreadsheet Table Test Document')
|
||||
->setSubject('PhpSpreadsheet Table Test Document')
|
||||
->setDescription('Test document for PhpSpreadsheet, generated using PHP classes.')
|
||||
->setKeywords('office PhpSpreadsheet php')
|
||||
->setCategory('Table');
|
||||
|
||||
// Create the worksheet
|
||||
$helper->log('Add data');
|
||||
|
||||
$spreadsheet->setActiveSheetIndex(0);
|
||||
|
||||
$columnFormula = '=SUM(Sales_Data[[#This Row],[Q1]:[Q4]])';
|
||||
|
||||
$dataArray = [
|
||||
['Year', 'Country', 'Q1', 'Q2', 'Q3', 'Q4', 'Sales'],
|
||||
[2010, 'Belgium', 380, 390, 420, 460, $columnFormula],
|
||||
[2010, 'France', 510, 490, 460, 590, $columnFormula],
|
||||
[2010, 'Germany', 720, 680, 640, 660, $columnFormula],
|
||||
[2010, 'Italy', 440, 410, 420, 450, $columnFormula],
|
||||
[2010, 'Spain', 510, 490, 470, 420, $columnFormula],
|
||||
[2010, 'UK', 690, 610, 620, 600, $columnFormula],
|
||||
[2010, 'United States', 790, 730, 860, 850, $columnFormula],
|
||||
[2011, 'Belgium', 400, 350, 450, 500, $columnFormula],
|
||||
[2011, 'France', 620, 650, 415, 570, $columnFormula],
|
||||
[2011, 'Germany', 680, 620, 710, 690, $columnFormula],
|
||||
[2011, 'Italy', 430, 370, 350, 335, $columnFormula],
|
||||
[2011, 'Spain', 460, 390, 430, 415, $columnFormula],
|
||||
[2011, 'UK', 720, 650, 580, 510, $columnFormula],
|
||||
[2011, 'United States', 800, 700, 900, 950, $columnFormula],
|
||||
];
|
||||
|
||||
$spreadsheet->getActiveSheet()->fromArray($dataArray, null, 'A1');
|
||||
|
||||
// Create Table
|
||||
$helper->log('Create Table');
|
||||
$table = new Table('A1:G15', 'Sales_Data');
|
||||
$table->setRange('A1:G15');
|
||||
|
||||
// Set Column Formula
|
||||
$table->getColumn('G')->setColumnFormula($columnFormula);
|
||||
|
||||
// Add Table to Worksheet
|
||||
$helper->log('Add Table to Worksheet');
|
||||
$spreadsheet->getActiveSheet()->addTable($table);
|
||||
|
||||
// Save
|
||||
$path = $helper->getFilename(__FILE__);
|
||||
$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
|
||||
|
||||
// Disable precalculation to add table's total row
|
||||
$writer->setPreCalculateFormulas(false);
|
||||
$callStartTime = microtime(true);
|
||||
$writer->save($path);
|
||||
$helper->logWrite($writer, $path, $callStartTime);
|
||||
$helper->logEndingNotes();
|
||||
|
|
@ -33,11 +33,11 @@ class Calculation
|
|||
// Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
|
||||
const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?([\p{L}][\p{L}\p{N}\.]*)[\s]*\(';
|
||||
// Cell reference (cell or range of cells, with or without a sheet reference)
|
||||
const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=-]*)|(\'.*?\')|(\".*?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
|
||||
const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=:`-]*)|(\'.*?\')|(\".*?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
|
||||
// Cell reference (with or without a sheet reference) ensuring absolute/relative
|
||||
const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=-]*)|(\'.*?\')|(\".*?\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
|
||||
const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=-]*)|(\'.*?\')|(\".*?\"))!)?(\$?[a-z]{1,3})):(?![.*])';
|
||||
const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=-]*)|(\'.*?\')|(\".*?\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
|
||||
const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'.*?\')|(\".*?\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
|
||||
const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'.*?\')|(\".*?\"))!)?(\$?[a-z]{1,3})):(?![.*])';
|
||||
const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'.*?\')|(\".*?\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
|
||||
// Cell reference (with or without a sheet reference) ensuring absolute/relative
|
||||
// Cell ranges ensuring absolute/relative
|
||||
const CALCULATION_REGEXP_COLUMNRANGE_RELATIVE = '(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
|
||||
|
|
@ -108,7 +108,8 @@ class Calculation
|
|||
'+' => true, '-' => true, '*' => true, '/' => true,
|
||||
'^' => true, '&' => true, '%' => false, '~' => false,
|
||||
'>' => true, '<' => true, '=' => true, '>=' => true,
|
||||
'<=' => true, '<>' => true, '|' => true, ':' => true,
|
||||
'<=' => true, '<>' => true, '∩' => true, '∪' => true,
|
||||
':' => true,
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -120,7 +121,7 @@ class Calculation
|
|||
'+' => true, '-' => true, '*' => true, '/' => true,
|
||||
'^' => true, '&' => true, '>' => true, '<' => true,
|
||||
'=' => true, '>=' => true, '<=' => true, '<>' => true,
|
||||
'|' => true, ':' => true,
|
||||
'∩' => true, '∪' => true, ':' => true,
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -3872,7 +3873,7 @@ class Calculation
|
|||
'*' => 0, '/' => 0, // Multiplication and Division
|
||||
'+' => 0, '-' => 0, // Addition and Subtraction
|
||||
'&' => 0, // Concatenation
|
||||
'|' => 0, ':' => 0, // Intersect and Range
|
||||
'∪' => 0, '∩' => 0, ':' => 0, // Union, Intersect and Range
|
||||
'>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0, // Comparison
|
||||
];
|
||||
|
||||
|
|
@ -3884,8 +3885,9 @@ class Calculation
|
|||
// This list includes all valid operators, whether binary (including boolean) or unary (such as %)
|
||||
// Array key is the operator, the value is its precedence
|
||||
private static $operatorPrecedence = [
|
||||
':' => 8, // Range
|
||||
'|' => 7, // Intersect
|
||||
':' => 9, // Range
|
||||
'∩' => 8, // Intersect
|
||||
'∪' => 7, // Union
|
||||
'~' => 6, // Negation
|
||||
'%' => 5, // Percentage
|
||||
'^' => 4, // Exponentiation
|
||||
|
|
@ -3957,7 +3959,7 @@ class Calculation
|
|||
++$index;
|
||||
} elseif ($opCharacter == '+' && !$expectingOperator) { // Positive (unary plus rather than binary operator plus) can be discarded?
|
||||
++$index; // Drop the redundant plus symbol
|
||||
} elseif ((($opCharacter == '~') || ($opCharacter == '|')) && (!$isOperandOrFunction)) { // We have to explicitly deny a tilde or pipe, because they are legal
|
||||
} elseif ((($opCharacter == '~') || ($opCharacter == '∩') || ($opCharacter == '∪')) && (!$isOperandOrFunction)) { // We have to explicitly deny a tilde, union or intersect because they are legal
|
||||
return $this->raiseFormulaError("Formula Error: Illegal character '~'"); // on the stack but not in the input expression
|
||||
} elseif ((isset(self::$operators[$opCharacter]) || $isOperandOrFunction) && $expectingOperator) { // Are we putting an operator on the stack?
|
||||
while (
|
||||
|
|
@ -4135,17 +4137,25 @@ class Calculation
|
|||
$testPrevOp = $stack->last(1);
|
||||
if ($testPrevOp !== null && $testPrevOp['value'] === ':') {
|
||||
// If we have a worksheet reference, then we're playing with a 3D reference
|
||||
if ($matches[2] == '') {
|
||||
if ($matches[2] === '') {
|
||||
// Otherwise, we 'inherit' the worksheet reference from the start cell reference
|
||||
// The start of the cell range reference should be the last entry in $output
|
||||
$rangeStartCellRef = $output[count($output) - 1]['value'];
|
||||
preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $rangeStartCellRef, $rangeStartMatches);
|
||||
if ($rangeStartCellRef === ':') {
|
||||
// Do we have chained range operators?
|
||||
$rangeStartCellRef = $output[count($output) - 2]['value'];
|
||||
}
|
||||
preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $rangeStartCellRef, $rangeStartMatches);
|
||||
if ($rangeStartMatches[2] > '') {
|
||||
$val = $rangeStartMatches[2] . '!' . $val;
|
||||
}
|
||||
} else {
|
||||
$rangeStartCellRef = $output[count($output) - 1]['value'];
|
||||
preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $rangeStartCellRef, $rangeStartMatches);
|
||||
if ($rangeStartCellRef === ':') {
|
||||
// Do we have chained range operators?
|
||||
$rangeStartCellRef = $output[count($output) - 2]['value'];
|
||||
}
|
||||
preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $rangeStartCellRef, $rangeStartMatches);
|
||||
if ($rangeStartMatches[2] !== $matches[2]) {
|
||||
return $this->raiseFormulaError('3D Range references are not yet supported');
|
||||
}
|
||||
|
|
@ -4159,7 +4169,7 @@ class Calculation
|
|||
$outputItem = $stack->getStackItem('Cell Reference', $val, $val);
|
||||
|
||||
$output[] = $outputItem;
|
||||
} else { // it's a variable, constant, string, number or boolean
|
||||
} else { // it's a variable, constant, string, number or boolean
|
||||
$localeConstant = false;
|
||||
$stackItemType = 'Value';
|
||||
$stackItemReference = null;
|
||||
|
|
@ -4168,39 +4178,65 @@ class Calculation
|
|||
$testPrevOp = $stack->last(1);
|
||||
if ($testPrevOp !== null && $testPrevOp['value'] === ':') {
|
||||
$stackItemType = 'Cell Reference';
|
||||
$startRowColRef = $output[count($output) - 1]['value'];
|
||||
[$rangeWS1, $startRowColRef] = Worksheet::extractSheetTitle($startRowColRef, true);
|
||||
$rangeSheetRef = $rangeWS1;
|
||||
if ($rangeWS1 !== '') {
|
||||
$rangeWS1 .= '!';
|
||||
}
|
||||
$rangeSheetRef = trim($rangeSheetRef, "'");
|
||||
[$rangeWS2, $val] = Worksheet::extractSheetTitle($val, true);
|
||||
if ($rangeWS2 !== '') {
|
||||
$rangeWS2 .= '!';
|
||||
|
||||
if (
|
||||
!is_numeric($val) &&
|
||||
((ctype_alpha($val) === false || strlen($val) > 3)) &&
|
||||
(preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $val) !== false) &&
|
||||
($this->spreadsheet->getNamedRange($val) !== null)
|
||||
) {
|
||||
$namedRange = $this->spreadsheet->getNamedRange($val);
|
||||
if ($namedRange !== null) {
|
||||
$stackItemType = 'Defined Name';
|
||||
$address = str_replace('$', '', $namedRange->getValue());
|
||||
$stackItemReference = $val;
|
||||
if (strpos($address, ':') !== false) {
|
||||
// We'll need to manipulate the stack for an actual named range rather than a named cell
|
||||
$fromTo = explode(':', $address);
|
||||
$to = array_pop($fromTo);
|
||||
foreach ($fromTo as $from) {
|
||||
$output[] = $stack->getStackItem($stackItemType, $from, $stackItemReference);
|
||||
$output[] = $stack->getStackItem('Binary Operator', ':');
|
||||
}
|
||||
$address = $to;
|
||||
}
|
||||
$val = $address;
|
||||
}
|
||||
} else {
|
||||
$rangeWS2 = $rangeWS1;
|
||||
}
|
||||
$startRowColRef = $output[count($output) - 1]['value'];
|
||||
[$rangeWS1, $startRowColRef] = Worksheet::extractSheetTitle($startRowColRef, true);
|
||||
$rangeSheetRef = $rangeWS1;
|
||||
if ($rangeWS1 !== '') {
|
||||
$rangeWS1 .= '!';
|
||||
}
|
||||
$rangeSheetRef = trim($rangeSheetRef, "'");
|
||||
[$rangeWS2, $val] = Worksheet::extractSheetTitle($val, true);
|
||||
if ($rangeWS2 !== '') {
|
||||
$rangeWS2 .= '!';
|
||||
} else {
|
||||
$rangeWS2 = $rangeWS1;
|
||||
}
|
||||
|
||||
$refSheet = $pCellParent;
|
||||
if ($pCellParent !== null && $rangeSheetRef !== '' && $rangeSheetRef !== $pCellParent->getTitle()) {
|
||||
$refSheet = $pCellParent->getParent()->getSheetByName($rangeSheetRef);
|
||||
}
|
||||
$refSheet = $pCellParent;
|
||||
if ($pCellParent !== null && $rangeSheetRef !== '' && $rangeSheetRef !== $pCellParent->getTitle()) {
|
||||
$refSheet = $pCellParent->getParent()->getSheetByName($rangeSheetRef);
|
||||
}
|
||||
|
||||
if (ctype_digit($val) && $val <= 1048576) {
|
||||
// Row range
|
||||
$stackItemType = 'Row Reference';
|
||||
/** @var int $valx */
|
||||
$valx = $val;
|
||||
$endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataColumn($valx) : 'XFD'; // Max 16,384 columns for Excel2007
|
||||
$val = "{$rangeWS2}{$endRowColRef}{$val}";
|
||||
} elseif (ctype_alpha($val) && strlen($val) <= 3) {
|
||||
// Column range
|
||||
$stackItemType = 'Column Reference';
|
||||
$endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataRow($val) : 1048576; // Max 1,048,576 rows for Excel2007
|
||||
$val = "{$rangeWS2}{$val}{$endRowColRef}";
|
||||
if (ctype_digit($val) && $val <= 1048576) {
|
||||
// Row range
|
||||
$stackItemType = 'Row Reference';
|
||||
/** @var int $valx */
|
||||
$valx = $val;
|
||||
$endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataColumn($valx) : 'XFD'; // Max 16,384 columns for Excel2007
|
||||
$val = "{$rangeWS2}{$endRowColRef}{$val}";
|
||||
} elseif (ctype_alpha($val) && strlen($val) <= 3) {
|
||||
// Column range
|
||||
$stackItemType = 'Column Reference';
|
||||
$endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataRow($val) : 1048576; // Max 1,048,576 rows for Excel2007
|
||||
$val = "{$rangeWS2}{$val}{$endRowColRef}";
|
||||
}
|
||||
$stackItemReference = $val;
|
||||
}
|
||||
$stackItemReference = $val;
|
||||
} elseif ($opCharacter == self::FORMULA_STRING_QUOTE) {
|
||||
// UnEscape any quotes within the string
|
||||
$val = self::wrapResult(str_replace('""', self::FORMULA_STRING_QUOTE, self::unwrapResult($val)));
|
||||
|
|
@ -4307,7 +4343,7 @@ class Calculation
|
|||
) {
|
||||
$output[] = $stack->pop(); // Swap operands and higher precedence operators from the stack to the output
|
||||
}
|
||||
$stack->push('Binary Operator', '|'); // Put an Intersect Operator on the stack
|
||||
$stack->push('Binary Operator', '∩'); // Put an Intersect Operator on the stack
|
||||
$expectingOperator = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -4382,7 +4418,7 @@ class Calculation
|
|||
true : (bool) Functions::flattenSingleValue($storeValue);
|
||||
if (is_array($storeValue)) {
|
||||
$wrappedItem = end($storeValue);
|
||||
$storeValue = end($wrappedItem);
|
||||
$storeValue = is_array($wrappedItem) ? end($wrappedItem) : $wrappedItem;
|
||||
}
|
||||
|
||||
if (
|
||||
|
|
@ -4414,7 +4450,7 @@ class Calculation
|
|||
true : (bool) Functions::flattenSingleValue($storeValue);
|
||||
if (is_array($storeValue)) {
|
||||
$wrappedItem = end($storeValue);
|
||||
$storeValue = end($wrappedItem);
|
||||
$storeValue = is_array($wrappedItem) ? end($wrappedItem) : $wrappedItem;
|
||||
}
|
||||
|
||||
if (
|
||||
|
|
@ -4461,21 +4497,29 @@ class Calculation
|
|||
|
||||
// Process the operation in the appropriate manner
|
||||
switch ($token) {
|
||||
// Comparison (Boolean) Operators
|
||||
case '>': // Greater than
|
||||
case '<': // Less than
|
||||
case '>=': // Greater than or Equal to
|
||||
case '<=': // Less than or Equal to
|
||||
case '=': // Equality
|
||||
case '<>': // Inequality
|
||||
// Comparison (Boolean) Operators
|
||||
case '>': // Greater than
|
||||
case '<': // Less than
|
||||
case '>=': // Greater than or Equal to
|
||||
case '<=': // Less than or Equal to
|
||||
case '=': // Equality
|
||||
case '<>': // Inequality
|
||||
$result = $this->executeBinaryComparisonOperation($operand1, $operand2, (string) $token, $stack);
|
||||
if (isset($storeKey)) {
|
||||
$branchStore[$storeKey] = $result;
|
||||
}
|
||||
|
||||
break;
|
||||
// Binary Operators
|
||||
case ':': // Range
|
||||
// Binary Operators
|
||||
case ':': // Range
|
||||
if ($operand1Data['type'] === 'Defined Name') {
|
||||
if (preg_match('/$' . self::CALCULATION_REGEXP_DEFINEDNAME . '^/mui', $operand1Data['reference']) !== false) {
|
||||
$definedName = $this->spreadsheet->getNamedRange($operand1Data['reference']);
|
||||
if ($definedName !== null) {
|
||||
$operand1Data['reference'] = $operand1Data['value'] = str_replace('$', '', $definedName->getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
if (strpos($operand1Data['reference'], '!') !== false) {
|
||||
[$sheet1, $operand1Data['reference']] = Worksheet::extractSheetTitle($operand1Data['reference'], true);
|
||||
} else {
|
||||
|
|
@ -4599,7 +4643,7 @@ class Calculation
|
|||
}
|
||||
|
||||
break;
|
||||
case '|': // Intersect
|
||||
case '∩': // Intersect
|
||||
$rowIntersect = array_intersect_key($operand1, $operand2);
|
||||
$cellIntersect = $oCol = $oRow = [];
|
||||
foreach (array_keys($rowIntersect) as $row) {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace PhpOffice\PhpSpreadsheet\Calculation;
|
|||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Cell;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\Date;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
|
||||
class Functions
|
||||
{
|
||||
|
|
@ -686,12 +685,13 @@ class Functions
|
|||
// Uppercase coordinate
|
||||
$pCoordinatex = strtoupper($coordinate);
|
||||
// Eliminate leading equal sign
|
||||
$pCoordinatex = Worksheet::pregReplace('/^=/', '', $pCoordinatex);
|
||||
$pCoordinatex = (string) preg_replace('/^=/', '', $pCoordinatex);
|
||||
$defined = $spreadsheet->getDefinedName($pCoordinatex, $worksheet);
|
||||
if ($defined !== null) {
|
||||
$worksheet2 = $defined->getWorkSheet();
|
||||
if (!$defined->isFormula() && $worksheet2 !== null) {
|
||||
$coordinate = "'" . $worksheet2->getTitle() . "'!" . Worksheet::pregReplace('/^=/', '', $defined->getValue());
|
||||
$coordinate = "'" . $worksheet2->getTitle() . "'!" .
|
||||
(string) preg_replace('/^=/', '', $defined->getValue());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -700,7 +700,7 @@ class Functions
|
|||
|
||||
public static function trimTrailingRange(string $coordinate): string
|
||||
{
|
||||
return Worksheet::pregReplace('/:[\\w\$]+$/', '', $coordinate);
|
||||
return (string) preg_replace('/:[\\w\$]+$/', '', $coordinate);
|
||||
}
|
||||
|
||||
public static function trimSheetFromCellReference(string $coordinate): string
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Cell;
|
||||
|
||||
interface AddressRange
|
||||
{
|
||||
public const MAX_ROW = 1048576;
|
||||
|
||||
public const MAX_COLUMN = 'XFD';
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
public function from();
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
public function to();
|
||||
|
||||
public function __toString(): string;
|
||||
}
|
||||
|
|
@ -0,0 +1,174 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Exception;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
|
||||
class CellAddress
|
||||
{
|
||||
/**
|
||||
* @var ?Worksheet
|
||||
*/
|
||||
protected $worksheet;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $cellAddress;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $columnName;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $columnId;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $rowId;
|
||||
|
||||
public function __construct(string $cellAddress, ?Worksheet $worksheet = null)
|
||||
{
|
||||
$this->cellAddress = str_replace('$', '', $cellAddress);
|
||||
[$this->columnName, $rowId] = Coordinate::coordinateFromString($cellAddress);
|
||||
$this->rowId = (int) $rowId;
|
||||
$this->columnId = Coordinate::columnIndexFromString($this->columnName);
|
||||
$this->worksheet = $worksheet;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param mixed $columnId
|
||||
* @param mixed $rowId
|
||||
*/
|
||||
private static function validateColumnAndRow($columnId, $rowId): void
|
||||
{
|
||||
$array = [$columnId, $rowId];
|
||||
array_walk(
|
||||
$array,
|
||||
function ($value): void {
|
||||
if (!is_numeric($value) || $value <= 0) {
|
||||
throw new Exception('Row and Column Ids must be positive integer values');
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param mixed $columnId
|
||||
* @param mixed $rowId
|
||||
*/
|
||||
public static function fromColumnAndRow($columnId, $rowId, ?Worksheet $worksheet = null): self
|
||||
{
|
||||
self::validateColumnAndRow($columnId, $rowId);
|
||||
|
||||
/** @phpstan-ignore-next-line */
|
||||
return new static(Coordinate::stringFromColumnIndex($columnId) . ((string) $rowId), $worksheet);
|
||||
}
|
||||
|
||||
public static function fromColumnRowArray(array $array, ?Worksheet $worksheet = null): self
|
||||
{
|
||||
[$columnId, $rowId] = $array;
|
||||
|
||||
return static::fromColumnAndRow($columnId, $rowId, $worksheet);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param mixed $cellAddress
|
||||
*/
|
||||
public static function fromCellAddress($cellAddress, ?Worksheet $worksheet = null): self
|
||||
{
|
||||
/** @phpstan-ignore-next-line */
|
||||
return new static($cellAddress, $worksheet);
|
||||
}
|
||||
|
||||
/**
|
||||
* The returned address string will contain the worksheet name as well, if available,
|
||||
* (ie. if a Worksheet was provided to the constructor).
|
||||
* e.g. "'Mark''s Worksheet'!C5".
|
||||
*/
|
||||
public function fullCellAddress(): string
|
||||
{
|
||||
if ($this->worksheet !== null) {
|
||||
$title = str_replace("'", "''", $this->worksheet->getTitle());
|
||||
|
||||
return "'{$title}'!{$this->cellAddress}";
|
||||
}
|
||||
|
||||
return $this->cellAddress;
|
||||
}
|
||||
|
||||
public function worksheet(): ?Worksheet
|
||||
{
|
||||
return $this->worksheet;
|
||||
}
|
||||
|
||||
/**
|
||||
* The returned address string will contain just the column/row address,
|
||||
* (even if a Worksheet was provided to the constructor).
|
||||
* e.g. "C5".
|
||||
*/
|
||||
public function cellAddress(): string
|
||||
{
|
||||
return $this->cellAddress;
|
||||
}
|
||||
|
||||
public function rowId(): int
|
||||
{
|
||||
return $this->rowId;
|
||||
}
|
||||
|
||||
public function columnId(): int
|
||||
{
|
||||
return $this->columnId;
|
||||
}
|
||||
|
||||
public function columnName(): string
|
||||
{
|
||||
return $this->columnName;
|
||||
}
|
||||
|
||||
public function nextRow(int $offset = 1): self
|
||||
{
|
||||
$newRowId = $this->rowId + $offset;
|
||||
if ($newRowId < 1) {
|
||||
$newRowId = 1;
|
||||
}
|
||||
|
||||
return static::fromColumnAndRow($this->columnId, $newRowId);
|
||||
}
|
||||
|
||||
public function previousRow(int $offset = 1): self
|
||||
{
|
||||
return $this->nextRow(0 - $offset);
|
||||
}
|
||||
|
||||
public function nextColumn(int $offset = 1): self
|
||||
{
|
||||
$newColumnId = $this->columnId + $offset;
|
||||
if ($newColumnId < 1) {
|
||||
$newColumnId = 1;
|
||||
}
|
||||
|
||||
return static::fromColumnAndRow($newColumnId, $this->rowId);
|
||||
}
|
||||
|
||||
public function previousColumn(int $offset = 1): self
|
||||
{
|
||||
return $this->nextColumn(0 - $offset);
|
||||
}
|
||||
|
||||
/**
|
||||
* The returned address string will contain the worksheet name as well, if available,
|
||||
* (ie. if a Worksheet was provided to the constructor).
|
||||
* e.g. "'Mark''s Worksheet'!C5".
|
||||
*/
|
||||
public function __toString()
|
||||
{
|
||||
return $this->fullCellAddress();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Exception;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
|
||||
class CellRange implements AddressRange
|
||||
{
|
||||
/**
|
||||
* @var CellAddress
|
||||
*/
|
||||
protected $from;
|
||||
|
||||
/**
|
||||
* @var CellAddress
|
||||
*/
|
||||
protected $to;
|
||||
|
||||
public function __construct(CellAddress $from, CellAddress $to)
|
||||
{
|
||||
$this->validateFromTo($from, $to);
|
||||
}
|
||||
|
||||
private function validateFromTo(CellAddress $from, CellAddress $to): void
|
||||
{
|
||||
// Identify actual top-left and bottom-right values (in case we've been given top-right and bottom-left)
|
||||
$firstColumn = min($from->columnId(), $to->columnId());
|
||||
$firstRow = min($from->rowId(), $to->rowId());
|
||||
$lastColumn = max($from->columnId(), $to->columnId());
|
||||
$lastRow = max($from->rowId(), $to->rowId());
|
||||
|
||||
$fromWorksheet = $from->worksheet();
|
||||
$toWorksheet = $to->worksheet();
|
||||
$this->validateWorksheets($fromWorksheet, $toWorksheet);
|
||||
|
||||
$this->from = $this->cellAddressWrapper($firstColumn, $firstRow, $fromWorksheet);
|
||||
$this->to = $this->cellAddressWrapper($lastColumn, $lastRow, $toWorksheet);
|
||||
}
|
||||
|
||||
private function validateWorksheets(?Worksheet $fromWorksheet, ?Worksheet $toWorksheet): void
|
||||
{
|
||||
if ($fromWorksheet !== null && $toWorksheet !== null) {
|
||||
// We could simply compare worksheets rather than worksheet titles; but at some point we may introduce
|
||||
// support for 3d ranges; and at that point we drop this check and let the validation fall through
|
||||
// to the check for same workbook; but unless we check on titles, this test will also detect if the
|
||||
// worksheets are in different spreadsheets, and the next check will never execute or throw its
|
||||
// own exception.
|
||||
if ($fromWorksheet->getTitle() !== $toWorksheet->getTitle()) {
|
||||
throw new Exception('3d Cell Ranges are not supported');
|
||||
} elseif ($fromWorksheet->getParent() !== $toWorksheet->getParent()) {
|
||||
throw new Exception('Worksheets must be in the same spreadsheet');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function cellAddressWrapper(int $column, int $row, ?Worksheet $worksheet = null): CellAddress
|
||||
{
|
||||
$cellAddress = Coordinate::stringFromColumnIndex($column) . (string) $row;
|
||||
|
||||
return new class ($cellAddress, $worksheet) extends CellAddress {
|
||||
public function nextRow(int $offset = 1): CellAddress
|
||||
{
|
||||
/** @var CellAddress $result */
|
||||
$result = parent::nextRow($offset);
|
||||
$this->rowId = $result->rowId;
|
||||
$this->cellAddress = $result->cellAddress;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function previousRow(int $offset = 1): CellAddress
|
||||
{
|
||||
/** @var CellAddress $result */
|
||||
$result = parent::previousRow($offset);
|
||||
$this->rowId = $result->rowId;
|
||||
$this->cellAddress = $result->cellAddress;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function nextColumn(int $offset = 1): CellAddress
|
||||
{
|
||||
/** @var CellAddress $result */
|
||||
$result = parent::nextColumn($offset);
|
||||
$this->columnId = $result->columnId;
|
||||
$this->columnName = $result->columnName;
|
||||
$this->cellAddress = $result->cellAddress;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function previousColumn(int $offset = 1): CellAddress
|
||||
{
|
||||
/** @var CellAddress $result */
|
||||
$result = parent::previousColumn($offset);
|
||||
$this->columnId = $result->columnId;
|
||||
$this->columnName = $result->columnName;
|
||||
$this->cellAddress = $result->cellAddress;
|
||||
|
||||
return $this;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public function from(): CellAddress
|
||||
{
|
||||
// Re-order from/to in case the cell addresses have been modified
|
||||
$this->validateFromTo($this->from, $this->to);
|
||||
|
||||
return $this->from;
|
||||
}
|
||||
|
||||
public function to(): CellAddress
|
||||
{
|
||||
// Re-order from/to in case the cell addresses have been modified
|
||||
$this->validateFromTo($this->from, $this->to);
|
||||
|
||||
return $this->to;
|
||||
}
|
||||
|
||||
public function __toString(): string
|
||||
{
|
||||
// Re-order from/to in case the cell addresses have been modified
|
||||
$this->validateFromTo($this->from, $this->to);
|
||||
|
||||
if ($this->from->cellAddress() === $this->to->cellAddress()) {
|
||||
return "{$this->from->fullCellAddress()}";
|
||||
}
|
||||
|
||||
$fromAddress = $this->from->fullCellAddress();
|
||||
$toAddress = $this->to->cellAddress();
|
||||
|
||||
return "{$fromAddress}:{$toAddress}";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,125 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
|
||||
class ColumnRange implements AddressRange
|
||||
{
|
||||
/**
|
||||
* @var ?Worksheet
|
||||
*/
|
||||
protected $worksheet;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $from;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $to;
|
||||
|
||||
public function __construct(string $from, ?string $to = null, ?Worksheet $worksheet = null)
|
||||
{
|
||||
$this->validateFromTo(
|
||||
Coordinate::columnIndexFromString($from),
|
||||
Coordinate::columnIndexFromString($to ?? $from)
|
||||
);
|
||||
$this->worksheet = $worksheet;
|
||||
}
|
||||
|
||||
public static function fromColumnIndexes(int $from, int $to, ?Worksheet $worksheet = null): self
|
||||
{
|
||||
return new self(Coordinate::stringFromColumnIndex($from), Coordinate::stringFromColumnIndex($to), $worksheet);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int|string> $array
|
||||
*/
|
||||
public static function fromArray(array $array, ?Worksheet $worksheet = null): self
|
||||
{
|
||||
array_walk(
|
||||
$array,
|
||||
function (&$column): void {
|
||||
$column = is_numeric($column) ? Coordinate::stringFromColumnIndex((int) $column) : $column;
|
||||
}
|
||||
);
|
||||
/** @var string $from */
|
||||
/** @var string $to */
|
||||
[$from, $to] = $array;
|
||||
|
||||
return new self($from, $to, $worksheet);
|
||||
}
|
||||
|
||||
private function validateFromTo(int $from, int $to): void
|
||||
{
|
||||
// Identify actual top and bottom values (in case we've been given bottom and top)
|
||||
$this->from = min($from, $to);
|
||||
$this->to = max($from, $to);
|
||||
}
|
||||
|
||||
public function columnCount(): int
|
||||
{
|
||||
return $this->to - $this->from + 1;
|
||||
}
|
||||
|
||||
public function shiftDown(int $offset = 1): self
|
||||
{
|
||||
$newFrom = $this->from + $offset;
|
||||
$newFrom = ($newFrom < 1) ? 1 : $newFrom;
|
||||
|
||||
$newTo = $this->to + $offset;
|
||||
$newTo = ($newTo < 1) ? 1 : $newTo;
|
||||
|
||||
return self::fromColumnIndexes($newFrom, $newTo, $this->worksheet);
|
||||
}
|
||||
|
||||
public function shiftUp(int $offset = 1): self
|
||||
{
|
||||
return $this->shiftDown(0 - $offset);
|
||||
}
|
||||
|
||||
public function from(): string
|
||||
{
|
||||
return Coordinate::stringFromColumnIndex($this->from);
|
||||
}
|
||||
|
||||
public function to(): string
|
||||
{
|
||||
return Coordinate::stringFromColumnIndex($this->to);
|
||||
}
|
||||
|
||||
public function fromIndex(): int
|
||||
{
|
||||
return $this->from;
|
||||
}
|
||||
|
||||
public function toIndex(): int
|
||||
{
|
||||
return $this->to;
|
||||
}
|
||||
|
||||
public function toCellRange(): CellRange
|
||||
{
|
||||
return new CellRange(
|
||||
CellAddress::fromColumnAndRow($this->from, 1, $this->worksheet),
|
||||
CellAddress::fromColumnAndRow($this->to, AddressRange::MAX_ROW)
|
||||
);
|
||||
}
|
||||
|
||||
public function __toString(): string
|
||||
{
|
||||
$from = $this->from();
|
||||
$to = $this->to();
|
||||
|
||||
if ($this->worksheet !== null) {
|
||||
$title = str_replace("'", "''", $this->worksheet->getTitle());
|
||||
|
||||
return "'{$title}'!{$from}:{$to}";
|
||||
}
|
||||
|
||||
return "{$from}:{$to}";
|
||||
}
|
||||
}
|
||||
|
|
@ -383,7 +383,7 @@ abstract class Coordinate
|
|||
// Sort the result by column and row
|
||||
$sortKeys = [];
|
||||
foreach ($cellList as $coord) {
|
||||
[$column, $row] = sscanf($coord, '%[A-Z]%d');
|
||||
sscanf($coord, '%[A-Z]%d', $column, $row);
|
||||
$sortKeys[sprintf('%3s%09d', $column, $row)] = $coord;
|
||||
}
|
||||
ksort($sortKeys);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,93 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
|
||||
class RowRange implements AddressRange
|
||||
{
|
||||
/**
|
||||
* @var ?Worksheet
|
||||
*/
|
||||
protected $worksheet;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $from;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $to;
|
||||
|
||||
public function __construct(int $from, ?int $to = null, ?Worksheet $worksheet = null)
|
||||
{
|
||||
$this->validateFromTo($from, $to ?? $from);
|
||||
$this->worksheet = $worksheet;
|
||||
}
|
||||
|
||||
public static function fromArray(array $array, ?Worksheet $worksheet = null): self
|
||||
{
|
||||
[$from, $to] = $array;
|
||||
|
||||
return new self($from, $to, $worksheet);
|
||||
}
|
||||
|
||||
private function validateFromTo(int $from, int $to): void
|
||||
{
|
||||
// Identify actual top and bottom values (in case we've been given bottom and top)
|
||||
$this->from = min($from, $to);
|
||||
$this->to = max($from, $to);
|
||||
}
|
||||
|
||||
public function from(): int
|
||||
{
|
||||
return $this->from;
|
||||
}
|
||||
|
||||
public function to(): int
|
||||
{
|
||||
return $this->to;
|
||||
}
|
||||
|
||||
public function rowCount(): int
|
||||
{
|
||||
return $this->to - $this->from + 1;
|
||||
}
|
||||
|
||||
public function shiftRight(int $offset = 1): self
|
||||
{
|
||||
$newFrom = $this->from + $offset;
|
||||
$newFrom = ($newFrom < 1) ? 1 : $newFrom;
|
||||
|
||||
$newTo = $this->to + $offset;
|
||||
$newTo = ($newTo < 1) ? 1 : $newTo;
|
||||
|
||||
return new self($newFrom, $newTo, $this->worksheet);
|
||||
}
|
||||
|
||||
public function shiftLeft(int $offset = 1): self
|
||||
{
|
||||
return $this->shiftRight(0 - $offset);
|
||||
}
|
||||
|
||||
public function toCellRange(): CellRange
|
||||
{
|
||||
return new CellRange(
|
||||
CellAddress::fromColumnAndRow(Coordinate::columnIndexFromString('A'), $this->from, $this->worksheet),
|
||||
CellAddress::fromColumnAndRow(Coordinate::columnIndexFromString(AddressRange::MAX_COLUMN), $this->to)
|
||||
);
|
||||
}
|
||||
|
||||
public function __toString(): string
|
||||
{
|
||||
if ($this->worksheet !== null) {
|
||||
$title = str_replace("'", "''", $this->worksheet->getTitle());
|
||||
|
||||
return "'{$title}'!{$this->from}:{$this->to}";
|
||||
}
|
||||
|
||||
return "{$this->from}:{$this->to}";
|
||||
}
|
||||
}
|
||||
|
|
@ -4,8 +4,8 @@ namespace PhpOffice\PhpSpreadsheet\Collection;
|
|||
|
||||
use Generator;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Cell;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
|
||||
use PhpOffice\PhpSpreadsheet\Settings;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
use Psr\SimpleCache\CacheInterface;
|
||||
|
||||
|
|
@ -151,8 +151,6 @@ class Cells
|
|||
{
|
||||
$sortKeys = [];
|
||||
foreach ($this->getCoordinates() as $coord) {
|
||||
$column = '';
|
||||
$row = 0;
|
||||
sscanf($coord, '%[A-Z]%d', $column, $row);
|
||||
$sortKeys[sprintf('%09d%3s', $row, $column)] = $coord;
|
||||
}
|
||||
|
|
@ -172,8 +170,6 @@ class Cells
|
|||
$col = ['A' => '1A'];
|
||||
$row = [1];
|
||||
foreach ($this->getCoordinates() as $coord) {
|
||||
$c = '';
|
||||
$r = 0;
|
||||
sscanf($coord, '%[A-Z]%d', $c, $r);
|
||||
$row[$r] = $r;
|
||||
$col[$c] = strlen($c) . $c;
|
||||
|
|
@ -206,9 +202,6 @@ class Cells
|
|||
*/
|
||||
public function getCurrentColumn()
|
||||
{
|
||||
$column = '';
|
||||
$row = 0;
|
||||
|
||||
sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
|
||||
|
||||
return $column;
|
||||
|
|
@ -221,9 +214,6 @@ class Cells
|
|||
*/
|
||||
public function getCurrentRow()
|
||||
{
|
||||
$column = '';
|
||||
$row = 0;
|
||||
|
||||
sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
|
||||
|
||||
return (int) $row;
|
||||
|
|
@ -240,24 +230,19 @@ class Cells
|
|||
public function getHighestColumn($row = null)
|
||||
{
|
||||
if ($row === null) {
|
||||
$colRow = $this->getHighestRowAndColumn();
|
||||
|
||||
return $colRow['column'];
|
||||
return $this->getHighestRowAndColumn()['column'];
|
||||
}
|
||||
|
||||
$columnList = [1];
|
||||
$maxColumn = '1A';
|
||||
foreach ($this->getCoordinates() as $coord) {
|
||||
$c = '';
|
||||
$r = 0;
|
||||
|
||||
sscanf($coord, '%[A-Z]%d', $c, $r);
|
||||
if ($r != $row) {
|
||||
continue;
|
||||
}
|
||||
$columnList[] = Coordinate::columnIndexFromString($c);
|
||||
$maxColumn = max($maxColumn, strlen($c) . $c);
|
||||
}
|
||||
|
||||
return Coordinate::stringFromColumnIndex((int) @max($columnList));
|
||||
return substr($maxColumn, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -271,24 +256,19 @@ class Cells
|
|||
public function getHighestRow($column = null)
|
||||
{
|
||||
if ($column === null) {
|
||||
$colRow = $this->getHighestRowAndColumn();
|
||||
|
||||
return $colRow['row'];
|
||||
return $this->getHighestRowAndColumn()['row'];
|
||||
}
|
||||
|
||||
$rowList = [0];
|
||||
$maxRow = 1;
|
||||
foreach ($this->getCoordinates() as $coord) {
|
||||
$c = '';
|
||||
$r = 0;
|
||||
|
||||
sscanf($coord, '%[A-Z]%d', $c, $r);
|
||||
if ($c != $column) {
|
||||
continue;
|
||||
}
|
||||
$rowList[] = $r;
|
||||
$maxRow = max($maxRow, $r);
|
||||
}
|
||||
|
||||
return max($rowList);
|
||||
return $maxRow;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -298,7 +278,9 @@ class Cells
|
|||
*/
|
||||
private function getUniqueID()
|
||||
{
|
||||
return uniqid('phpspreadsheet.', true) . '.';
|
||||
return Settings::getCache() instanceof Memory
|
||||
? random_bytes(7) . ':'
|
||||
: uniqid('phpspreadsheet.', true) . '.';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -345,9 +327,6 @@ class Cells
|
|||
public function removeRow($row): void
|
||||
{
|
||||
foreach ($this->getCoordinates() as $coord) {
|
||||
$c = '';
|
||||
$r = 0;
|
||||
|
||||
sscanf($coord, '%[A-Z]%d', $c, $r);
|
||||
if ($r == $row) {
|
||||
$this->delete($coord);
|
||||
|
|
@ -363,9 +342,6 @@ class Cells
|
|||
public function removeColumn($column): void
|
||||
{
|
||||
foreach ($this->getCoordinates() as $coord) {
|
||||
$c = '';
|
||||
$r = 0;
|
||||
|
||||
sscanf($coord, '%[A-Z]%d', $c, $r);
|
||||
if ($c == $column) {
|
||||
$this->delete($coord);
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class Properties
|
|||
// Initialise values
|
||||
$this->lastModifiedBy = $this->creator;
|
||||
$this->created = self::intOrFloatTimestamp(null);
|
||||
$this->modified = self::intOrFloatTimestamp(null);
|
||||
$this->modified = $this->created;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -14,23 +14,39 @@ use PhpOffice\PhpSpreadsheet\Writer\IWriter;
|
|||
*/
|
||||
abstract class IOFactory
|
||||
{
|
||||
public const READER_XLSX = 'Xlsx';
|
||||
public const READER_XLS = 'Xls';
|
||||
public const READER_XML = 'Xml';
|
||||
public const READER_ODS = 'Ods';
|
||||
public const READER_SYLK = 'Slk';
|
||||
public const READER_SLK = 'Slk';
|
||||
public const READER_GNUMERIC = 'Gnumeric';
|
||||
public const READER_HTML = 'Html';
|
||||
public const READER_CSV = 'Csv';
|
||||
|
||||
public const WRITER_XLSX = 'Xlsx';
|
||||
public const WRITER_XLS = 'Xls';
|
||||
public const WRITER_ODS = 'Ods';
|
||||
public const WRITER_CSV = 'Csv';
|
||||
public const WRITER_HTML = 'Html';
|
||||
|
||||
private static $readers = [
|
||||
'Xlsx' => Reader\Xlsx::class,
|
||||
'Xls' => Reader\Xls::class,
|
||||
'Xml' => Reader\Xml::class,
|
||||
'Ods' => Reader\Ods::class,
|
||||
'Slk' => Reader\Slk::class,
|
||||
'Gnumeric' => Reader\Gnumeric::class,
|
||||
'Html' => Reader\Html::class,
|
||||
'Csv' => Reader\Csv::class,
|
||||
self::READER_XLSX => Reader\Xlsx::class,
|
||||
self::READER_XLS => Reader\Xls::class,
|
||||
self::READER_XML => Reader\Xml::class,
|
||||
self::READER_ODS => Reader\Ods::class,
|
||||
self::READER_SLK => Reader\Slk::class,
|
||||
self::READER_GNUMERIC => Reader\Gnumeric::class,
|
||||
self::READER_HTML => Reader\Html::class,
|
||||
self::READER_CSV => Reader\Csv::class,
|
||||
];
|
||||
|
||||
private static $writers = [
|
||||
'Xls' => Writer\Xls::class,
|
||||
'Xlsx' => Writer\Xlsx::class,
|
||||
'Ods' => Writer\Ods::class,
|
||||
'Csv' => Writer\Csv::class,
|
||||
'Html' => Writer\Html::class,
|
||||
self::WRITER_XLS => Writer\Xls::class,
|
||||
self::WRITER_XLSX => Writer\Xlsx::class,
|
||||
self::WRITER_ODS => Writer\Ods::class,
|
||||
self::WRITER_CSV => Writer\Csv::class,
|
||||
self::WRITER_HTML => Writer\Html::class,
|
||||
'Tcpdf' => Writer\Pdf\Tcpdf::class,
|
||||
'Dompdf' => Writer\Pdf\Dompdf::class,
|
||||
'Mpdf' => Writer\Pdf\Mpdf::class,
|
||||
|
|
@ -70,10 +86,18 @@ abstract class IOFactory
|
|||
* Loads Spreadsheet from file using automatic Reader\IReader resolution.
|
||||
*
|
||||
* @param string $filename The name of the spreadsheet file
|
||||
* @param int $flags the optional second parameter flags may be used to identify specific elements
|
||||
* that should be loaded, but which won't be loaded by default, using these values:
|
||||
* IReader::LOAD_WITH_CHARTS - Include any charts that are defined in the loaded file
|
||||
* @param string[] $readers An array of Readers to use to identify the file type. By default, load() will try
|
||||
* all possible Readers until it finds a match; but this allows you to pass in a
|
||||
* list of Readers so it will only try the subset that you specify here.
|
||||
* Values in this list can be any of the constant values defined in the set
|
||||
* IOFactory::READER_*.
|
||||
*/
|
||||
public static function load(string $filename, int $flags = 0): Spreadsheet
|
||||
public static function load(string $filename, int $flags = 0, ?array $readers = null): Spreadsheet
|
||||
{
|
||||
$reader = self::createReaderForFile($filename);
|
||||
$reader = self::createReaderForFile($filename, $readers);
|
||||
|
||||
return $reader->load($filename, $flags);
|
||||
}
|
||||
|
|
@ -81,9 +105,9 @@ abstract class IOFactory
|
|||
/**
|
||||
* Identify file type using automatic IReader resolution.
|
||||
*/
|
||||
public static function identify(string $filename): string
|
||||
public static function identify(string $filename, ?array $readers = null): string
|
||||
{
|
||||
$reader = self::createReaderForFile($filename);
|
||||
$reader = self::createReaderForFile($filename, $readers);
|
||||
$className = get_class($reader);
|
||||
$classType = explode('\\', $className);
|
||||
unset($reader);
|
||||
|
|
@ -93,14 +117,32 @@ abstract class IOFactory
|
|||
|
||||
/**
|
||||
* Create Reader\IReader for file using automatic IReader resolution.
|
||||
*
|
||||
* @param string[] $readers An array of Readers to use to identify the file type. By default, load() will try
|
||||
* all possible Readers until it finds a match; but this allows you to pass in a
|
||||
* list of Readers so it will only try the subset that you specify here.
|
||||
* Values in this list can be any of the constant values defined in the set
|
||||
* IOFactory::READER_*.
|
||||
*/
|
||||
public static function createReaderForFile(string $filename): IReader
|
||||
public static function createReaderForFile(string $filename, ?array $readers = null): IReader
|
||||
{
|
||||
File::assertFile($filename);
|
||||
|
||||
$testReaders = self::$readers;
|
||||
if ($readers !== null) {
|
||||
$readers = array_map('strtoupper', $readers);
|
||||
$testReaders = array_filter(
|
||||
self::$readers,
|
||||
function (string $readerType) use ($readers) {
|
||||
return in_array(strtoupper($readerType), $readers, true);
|
||||
},
|
||||
ARRAY_FILTER_USE_KEY
|
||||
);
|
||||
}
|
||||
|
||||
// First, lucky guess by inspecting file extension
|
||||
$guessedReader = self::getReaderTypeFromExtension($filename);
|
||||
if ($guessedReader !== null) {
|
||||
if (($guessedReader !== null) && array_key_exists($guessedReader, $testReaders)) {
|
||||
$reader = self::createReader($guessedReader);
|
||||
|
||||
// Let's see if we are lucky
|
||||
|
|
@ -110,11 +152,11 @@ abstract class IOFactory
|
|||
}
|
||||
|
||||
// If we reach here then "lucky guess" didn't give any result
|
||||
// Try walking through all the options in self::$autoResolveClasses
|
||||
foreach (self::$readers as $type => $class) {
|
||||
// Try walking through all the options in self::$readers (or the selected subset)
|
||||
foreach ($testReaders as $readerType => $class) {
|
||||
// Ignore our original guess, we know that won't work
|
||||
if ($type !== $guessedReader) {
|
||||
$reader = self::createReader($type);
|
||||
if ($readerType !== $guessedReader) {
|
||||
$reader = self::createReader($readerType);
|
||||
if ($reader->canRead($filename)) {
|
||||
return $reader;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -153,6 +153,10 @@ abstract class BaseReader implements IReader
|
|||
|
||||
/**
|
||||
* Loads Spreadsheet from file.
|
||||
*
|
||||
* @param int $flags the optional second parameter flags may be used to identify specific elements
|
||||
* that should be loaded, but which won't be loaded by default, using these values:
|
||||
* IReader::LOAD_WITH_CHARTS - Include any charts that are defined in the loaded file
|
||||
*/
|
||||
public function load(string $filename, int $flags = 0): Spreadsheet
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3759,8 +3759,13 @@ class Xls extends BaseReader
|
|||
} else {
|
||||
$textRun = $richText->createTextRun($text);
|
||||
if (isset($fmtRuns[$i - 1])) {
|
||||
$fontIndex = $fmtRuns[$i - 1]['fontIndex'];
|
||||
|
||||
if ($fmtRuns[$i - 1]['fontIndex'] < 4) {
|
||||
$fontIndex = $fmtRuns[$i - 1]['fontIndex'];
|
||||
} else {
|
||||
// this has to do with that index 4 is omitted in all BIFF versions for some stra nge reason
|
||||
// check the OpenOffice documentation of the FONT record
|
||||
$fontIndex = $fmtRuns[$i - 1]['fontIndex'] - 1;
|
||||
}
|
||||
if (array_key_exists($fontIndex, $this->objFonts) === false) {
|
||||
$fontIndex = count($this->objFonts) - 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -368,6 +368,9 @@ class Xlsx extends BaseReader
|
|||
if (strpos($fileName, '//') !== false) {
|
||||
$fileName = substr($fileName, strpos($fileName, '//') + 1);
|
||||
}
|
||||
// Relative paths generated by dirname($filename) when $filename
|
||||
// has no path (i.e.files in root of the zip archive)
|
||||
$fileName = (string) preg_replace('/^\.\//', '', $fileName);
|
||||
$fileName = File::realpath($fileName);
|
||||
|
||||
// Sadly, some 3rd party xlsx generators don't use consistent case for filenaming
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
|||
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Conditional;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
|
||||
class ReferenceHelper
|
||||
|
|
@ -90,8 +91,8 @@ class ReferenceHelper
|
|||
*/
|
||||
public static function cellSort($a, $b)
|
||||
{
|
||||
[$ac, $ar] = sscanf($a, '%[A-Z]%d');
|
||||
[$bc, $br] = sscanf($b, '%[A-Z]%d');
|
||||
sscanf($a, '%[A-Z]%d', $ac, $ar);
|
||||
sscanf($b, '%[A-Z]%d', $bc, $br);
|
||||
|
||||
if ($ar === $br) {
|
||||
return strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
|
||||
|
|
@ -111,8 +112,8 @@ class ReferenceHelper
|
|||
*/
|
||||
public static function cellReverseSort($a, $b)
|
||||
{
|
||||
[$ac, $ar] = sscanf($a, '%[A-Z]%d');
|
||||
[$bc, $br] = sscanf($b, '%[A-Z]%d');
|
||||
sscanf($a, '%[A-Z]%d', $ac, $ar);
|
||||
sscanf($b, '%[A-Z]%d', $bc, $br);
|
||||
|
||||
if ($ar === $br) {
|
||||
return -strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
|
||||
|
|
@ -497,6 +498,9 @@ class ReferenceHelper
|
|||
// Update worksheet: autofilter
|
||||
$this->adjustAutoFilter($worksheet, $beforeCellAddress, $numberOfColumns);
|
||||
|
||||
// Update worksheet: table
|
||||
$this->adjustTable($worksheet, $beforeCellAddress, $numberOfColumns);
|
||||
|
||||
// Update worksheet: freeze pane
|
||||
if ($worksheet->getFreezePane()) {
|
||||
$splitCell = $worksheet->getFreezePane() ?? '';
|
||||
|
|
@ -1026,6 +1030,85 @@ class ReferenceHelper
|
|||
} while ($startColID !== $endColID);
|
||||
}
|
||||
|
||||
private function adjustTable(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns): void
|
||||
{
|
||||
$tableCollection = $worksheet->getTableCollection();
|
||||
|
||||
foreach ($tableCollection as $table) {
|
||||
$tableRange = $table->getRange();
|
||||
if (!empty($tableRange)) {
|
||||
if ($numberOfColumns !== 0) {
|
||||
$tableColumns = $table->getColumns();
|
||||
if (count($tableColumns) > 0) {
|
||||
$column = '';
|
||||
$row = 0;
|
||||
sscanf($beforeCellAddress, '%[A-Z]%d', $column, $row);
|
||||
$columnIndex = Coordinate::columnIndexFromString($column);
|
||||
[$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($tableRange);
|
||||
if ($columnIndex <= $rangeEnd[0]) {
|
||||
if ($numberOfColumns < 0) {
|
||||
$this->adjustTableDeleteRules($columnIndex, $numberOfColumns, $tableColumns, $table);
|
||||
}
|
||||
$startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
|
||||
|
||||
// Shuffle columns in table range
|
||||
if ($numberOfColumns > 0) {
|
||||
$this->adjustTableInsert($startCol, $numberOfColumns, $rangeEnd[0], $table);
|
||||
} else {
|
||||
$this->adjustTableDelete($startCol, $numberOfColumns, $rangeEnd[0], $table);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$table->setRange($this->updateCellReference($tableRange));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function adjustTableDeleteRules(int $columnIndex, int $numberOfColumns, array $tableColumns, Table $table): void
|
||||
{
|
||||
// If we're actually deleting any columns that fall within the table range,
|
||||
// then we delete any rules for those columns
|
||||
$deleteColumn = $columnIndex + $numberOfColumns - 1;
|
||||
$deleteCount = abs($numberOfColumns);
|
||||
|
||||
for ($i = 1; $i <= $deleteCount; ++$i) {
|
||||
$columnName = Coordinate::stringFromColumnIndex($deleteColumn + 1);
|
||||
if (isset($tableColumns[$columnName])) {
|
||||
$table->clearColumn($columnName);
|
||||
}
|
||||
++$deleteColumn;
|
||||
}
|
||||
}
|
||||
|
||||
private function adjustTableInsert(int $startCol, int $numberOfColumns, int $rangeEnd, Table $table): void
|
||||
{
|
||||
$startColRef = $startCol;
|
||||
$endColRef = $rangeEnd;
|
||||
$toColRef = $rangeEnd + $numberOfColumns;
|
||||
|
||||
do {
|
||||
$table->shiftColumn(Coordinate::stringFromColumnIndex($endColRef), Coordinate::stringFromColumnIndex($toColRef));
|
||||
--$endColRef;
|
||||
--$toColRef;
|
||||
} while ($startColRef <= $endColRef);
|
||||
}
|
||||
|
||||
private function adjustTableDelete(int $startCol, int $numberOfColumns, int $rangeEnd, Table $table): void
|
||||
{
|
||||
// For delete, we shuffle from beginning to end to avoid overwriting
|
||||
$startColID = Coordinate::stringFromColumnIndex($startCol);
|
||||
$toColID = Coordinate::stringFromColumnIndex($startCol + $numberOfColumns);
|
||||
$endColID = Coordinate::stringFromColumnIndex($rangeEnd + 1);
|
||||
|
||||
do {
|
||||
$table->shiftColumn($startColID, $toColID);
|
||||
++$startColID;
|
||||
++$toColID;
|
||||
} while ($startColID !== $endColID);
|
||||
}
|
||||
|
||||
private function duplicateStylesByColumn(Worksheet $worksheet, int $beforeColumn, int $beforeRow, int $highestRow, int $numberOfColumns): void
|
||||
{
|
||||
$beforeColumnName = Coordinate::stringFromColumnIndex($beforeColumn - 1);
|
||||
|
|
|
|||
|
|
@ -222,11 +222,15 @@ class Font
|
|||
* @param RichText|string $cellText Text to calculate width
|
||||
* @param int $rotation Rotation angle
|
||||
* @param null|FontStyle $defaultFont Font object
|
||||
*
|
||||
* @return int Column width
|
||||
* @param bool $filterAdjustment Add space for Autofilter or Table dropdown
|
||||
*/
|
||||
public static function calculateColumnWidth(FontStyle $font, $cellText = '', $rotation = 0, ?FontStyle $defaultFont = null)
|
||||
{
|
||||
public static function calculateColumnWidth(
|
||||
FontStyle $font,
|
||||
$cellText = '',
|
||||
$rotation = 0,
|
||||
?FontStyle $defaultFont = null,
|
||||
bool $filterAdjustment = false
|
||||
): int {
|
||||
// If it is rich text, use plain text
|
||||
if ($cellText instanceof RichText) {
|
||||
$cellText = $cellText->getPlainText();
|
||||
|
|
@ -237,7 +241,7 @@ class Font
|
|||
$lineTexts = explode("\n", $cellText);
|
||||
$lineWidths = [];
|
||||
foreach ($lineTexts as $lineText) {
|
||||
$lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont);
|
||||
$lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont, $filterAdjustment);
|
||||
}
|
||||
|
||||
return max($lineWidths); // width of longest line in cell
|
||||
|
|
@ -247,7 +251,13 @@ class Font
|
|||
$approximate = self::$autoSizeMethod == self::AUTOSIZE_METHOD_APPROX;
|
||||
$columnWidth = 0;
|
||||
if (!$approximate) {
|
||||
$columnWidthAdjust = ceil(self::getTextWidthPixelsExact('n', $font, 0) * 1.07);
|
||||
$columnWidthAdjust = ceil(
|
||||
self::getTextWidthPixelsExact(
|
||||
str_repeat('n', 1 * ($filterAdjustment ? 3 : 1)),
|
||||
$font,
|
||||
0
|
||||
) * 1.07
|
||||
);
|
||||
|
||||
try {
|
||||
// Width of text in pixels excl. padding
|
||||
|
|
@ -259,7 +269,11 @@ class Font
|
|||
}
|
||||
|
||||
if ($approximate) {
|
||||
$columnWidthAdjust = self::getTextWidthPixelsApprox('n', $font, 0);
|
||||
$columnWidthAdjust = self::getTextWidthPixelsApprox(
|
||||
str_repeat('n', 1 * ($filterAdjustment ? 3 : 1)),
|
||||
$font,
|
||||
0
|
||||
);
|
||||
// Width of text in pixels excl. padding, approximation
|
||||
// and addition because Excel adds some padding, just use approx width of 'n' glyph
|
||||
$columnWidth = self::getTextWidthPixelsApprox($cellText, $font, $rotation) + $columnWidthAdjust;
|
||||
|
|
|
|||
|
|
@ -869,6 +869,19 @@ class Spreadsheet
|
|||
$cell->setXfIndex($cell->getXfIndex() + $countCellXfs);
|
||||
}
|
||||
|
||||
// update the column dimensions Xfs
|
||||
foreach ($worksheet->getColumnDimensions() as $columnDimension) {
|
||||
$columnDimension->setXfIndex($columnDimension->getXfIndex() + $countCellXfs);
|
||||
}
|
||||
|
||||
// update the row dimensions Xfs
|
||||
foreach ($worksheet->getRowDimensions() as $rowDimension) {
|
||||
$xfIndex = $rowDimension->getXfIndex();
|
||||
if ($xfIndex !== null) {
|
||||
$rowDimension->setXfIndex($xfIndex + $countCellXfs);
|
||||
}
|
||||
}
|
||||
|
||||
return $this->addSheet($worksheet, $sheetIndex);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ use DateTimeZone;
|
|||
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
|
||||
use PhpOffice\PhpSpreadsheet\Calculation\Functions;
|
||||
use PhpOffice\PhpSpreadsheet\Calculation\Internal\WildcardMatch;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\Date;
|
||||
|
|
@ -50,9 +51,18 @@ class AutoFilter
|
|||
|
||||
/**
|
||||
* Create a new AutoFilter.
|
||||
*
|
||||
* @param AddressRange|array<int>|string $range
|
||||
* A simple string containing a Cell range like 'A1:E10' is permitted
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
*/
|
||||
public function __construct(string $range = '', ?Worksheet $worksheet = null)
|
||||
public function __construct($range = '', ?Worksheet $worksheet = null)
|
||||
{
|
||||
if ($range !== '') {
|
||||
[, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
|
||||
}
|
||||
|
||||
$this->range = $range;
|
||||
$this->workSheet = $worksheet;
|
||||
}
|
||||
|
|
@ -92,12 +102,19 @@ class AutoFilter
|
|||
|
||||
/**
|
||||
* Set AutoFilter Cell Range.
|
||||
*
|
||||
* @param AddressRange|array<int>|string $range
|
||||
* A simple string containing a Cell range like 'A1:E10' is permitted
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
*/
|
||||
public function setRange(string $range): self
|
||||
public function setRange($range = ''): self
|
||||
{
|
||||
$this->evaluated = false;
|
||||
// extract coordinate
|
||||
[$worksheet, $range] = Worksheet::extractSheetTitle($range, true);
|
||||
if ($range !== '') {
|
||||
[, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
|
||||
}
|
||||
if (empty($range)) {
|
||||
// Discard all column rules
|
||||
$this->columns = [];
|
||||
|
|
|
|||
|
|
@ -83,9 +83,10 @@ class ColumnDimension extends Dimension
|
|||
/**
|
||||
* Get Width.
|
||||
*
|
||||
* Each unit of column width is equal to the width of one character in the default font size.
|
||||
* By default, this will be the return value; but this method also accepts a unit of measure argument and will
|
||||
* return the value converted to the specified UoM using an approximation method.
|
||||
* Each unit of column width is equal to the width of one character in the default font size. A value of -1
|
||||
* tells Excel to display this column in its default width.
|
||||
* By default, this will be the return value; but this method also accepts an optional unit of measure argument
|
||||
* and will convert the returned value to the specified UoM..
|
||||
*/
|
||||
public function getWidth(?string $unitOfMeasure = null): float
|
||||
{
|
||||
|
|
@ -97,9 +98,11 @@ class ColumnDimension extends Dimension
|
|||
/**
|
||||
* Set Width.
|
||||
*
|
||||
* Each unit of column width is equal to the width of one character in the default font size.
|
||||
* By default, this will be the unit of measure for the passed value; but this method accepts a unit of measure
|
||||
* argument, and will convert the value from the specified UoM using an approximation method.
|
||||
* Each unit of column width is equal to the width of one character in the default font size. A value of -1
|
||||
* tells Excel to display this column in its default width.
|
||||
* By default, this will be the unit of measure for the passed value; but this method also accepts an
|
||||
* optional unit of measure argument, and will convert the value from the specified UoM using an
|
||||
* approximation method.
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -65,8 +65,9 @@ class RowDimension extends Dimension
|
|||
|
||||
/**
|
||||
* Get Row Height.
|
||||
* By default, this will be in points; but this method accepts a unit of measure
|
||||
* argument, and will convert the value to the specified UoM.
|
||||
* By default, this will be in points; but this method also accepts an optional unit of measure
|
||||
* argument, and will convert the value from points to the specified UoM.
|
||||
* A value of -1 tells Excel to display this column in its default height.
|
||||
*
|
||||
* @return float
|
||||
*/
|
||||
|
|
@ -80,8 +81,8 @@ class RowDimension extends Dimension
|
|||
/**
|
||||
* Set Row Height.
|
||||
*
|
||||
* @param float $height in points
|
||||
* By default, this will be the passed argument value; but this method accepts a unit of measure
|
||||
* @param float $height in points. A value of -1 tells Excel to display this column in its default height.
|
||||
* By default, this will be the passed argument value; but this method also accepts an optional unit of measure
|
||||
* argument, and will convert the passed argument value to points from the specified UoM
|
||||
*
|
||||
* @return $this
|
||||
|
|
|
|||
|
|
@ -0,0 +1,454 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Worksheet;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
|
||||
|
||||
class Table
|
||||
{
|
||||
/**
|
||||
* Table Name.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $name = '';
|
||||
|
||||
/**
|
||||
* Show Header Row.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $showHeaderRow = true;
|
||||
|
||||
/**
|
||||
* Show Totals Row.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $showTotalsRow = false;
|
||||
|
||||
/**
|
||||
* Table Range.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $range = '';
|
||||
|
||||
/**
|
||||
* Table Worksheet.
|
||||
*
|
||||
* @var null|Worksheet
|
||||
*/
|
||||
private $workSheet;
|
||||
|
||||
/**
|
||||
* Table Column.
|
||||
*
|
||||
* @var Table\Column[]
|
||||
*/
|
||||
private $columns = [];
|
||||
|
||||
/**
|
||||
* Table Style.
|
||||
*
|
||||
* @var TableStyle
|
||||
*/
|
||||
private $style;
|
||||
|
||||
/**
|
||||
* Create a new Table.
|
||||
*
|
||||
* @param AddressRange|array<int>|string $range
|
||||
* A simple string containing a Cell range like 'A1:E10' is permitted
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
* @param string $name (e.g. Table1)
|
||||
*/
|
||||
public function __construct($range = '', string $name = '')
|
||||
{
|
||||
$this->setRange($range);
|
||||
$this->setName($name);
|
||||
$this->style = new TableStyle();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Table name.
|
||||
*/
|
||||
public function getName(): string
|
||||
{
|
||||
return $this->name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Table name.
|
||||
*/
|
||||
public function setName(string $name): self
|
||||
{
|
||||
$name = trim($name);
|
||||
|
||||
if (!empty($name)) {
|
||||
if (strlen($name) === 1 && in_array($name, ['C', 'c', 'R', 'r'])) {
|
||||
throw new PhpSpreadsheetException('The table name is invalid');
|
||||
}
|
||||
if (strlen($name) > 255) {
|
||||
throw new PhpSpreadsheetException('The table name cannot be longer than 255 characters');
|
||||
}
|
||||
// Check for A1 or R1C1 cell reference notation
|
||||
if (
|
||||
preg_match(Coordinate::A1_COORDINATE_REGEX, $name) ||
|
||||
preg_match('/^R\[?\-?[0-9]*\]?C\[?\-?[0-9]*\]?$/i', $name)
|
||||
) {
|
||||
throw new PhpSpreadsheetException('The table name can\'t be the same as a cell reference');
|
||||
}
|
||||
if (!preg_match('/^[\p{L}_\\\\]/iu', $name)) {
|
||||
throw new PhpSpreadsheetException('The table name must begin a name with a letter, an underscore character (_), or a backslash (\)');
|
||||
}
|
||||
if (!preg_match('/^[\p{L}_\\\\][\p{L}\p{M}0-9\._]+$/iu', $name)) {
|
||||
throw new PhpSpreadsheetException('The table name contains invalid characters');
|
||||
}
|
||||
}
|
||||
|
||||
$this->name = $name;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get show Header Row.
|
||||
*/
|
||||
public function getShowHeaderRow(): bool
|
||||
{
|
||||
return $this->showHeaderRow;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set show Header Row.
|
||||
*/
|
||||
public function setShowHeaderRow(bool $showHeaderRow): self
|
||||
{
|
||||
$this->showHeaderRow = $showHeaderRow;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get show Totals Row.
|
||||
*/
|
||||
public function getShowTotalsRow(): bool
|
||||
{
|
||||
return $this->showTotalsRow;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set show Totals Row.
|
||||
*/
|
||||
public function setShowTotalsRow(bool $showTotalsRow): self
|
||||
{
|
||||
$this->showTotalsRow = $showTotalsRow;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Table Range.
|
||||
*/
|
||||
public function getRange(): string
|
||||
{
|
||||
return $this->range;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Table Cell Range.
|
||||
*
|
||||
* @param AddressRange|array<int>|string $range
|
||||
* A simple string containing a Cell range like 'A1:E10' is permitted
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
*/
|
||||
public function setRange($range = ''): self
|
||||
{
|
||||
// extract coordinate
|
||||
if ($range !== '') {
|
||||
[, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
|
||||
}
|
||||
if (empty($range)) {
|
||||
// Discard all column rules
|
||||
$this->columns = [];
|
||||
$this->range = '';
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
if (strpos($range, ':') === false) {
|
||||
throw new PhpSpreadsheetException('Table must be set on a range of cells.');
|
||||
}
|
||||
|
||||
[$width, $height] = Coordinate::rangeDimension($range);
|
||||
if ($width < 1 || $height < 2) {
|
||||
throw new PhpSpreadsheetException('The table range must be at least 1 column and 2 rows');
|
||||
}
|
||||
|
||||
$this->range = $range;
|
||||
// Discard any column ruless that are no longer valid within this range
|
||||
[$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
|
||||
foreach ($this->columns as $key => $value) {
|
||||
$colIndex = Coordinate::columnIndexFromString($key);
|
||||
if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
|
||||
unset($this->columns[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Table Cell Range to max row.
|
||||
*/
|
||||
public function setRangeToMaxRow(): self
|
||||
{
|
||||
if ($this->workSheet !== null) {
|
||||
$thisrange = $this->range;
|
||||
$range = preg_replace('/\\d+$/', (string) $this->workSheet->getHighestRow(), $thisrange) ?? '';
|
||||
if ($range !== $thisrange) {
|
||||
$this->setRange($range);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Table's Worksheet.
|
||||
*/
|
||||
public function getWorksheet(): ?Worksheet
|
||||
{
|
||||
return $this->workSheet;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Table's Worksheet.
|
||||
*/
|
||||
public function setWorksheet(?Worksheet $worksheet = null): self
|
||||
{
|
||||
if ($this->name !== '' && $worksheet !== null) {
|
||||
$spreadsheet = $worksheet->getParent();
|
||||
$tableName = StringHelper::strToUpper($this->name);
|
||||
|
||||
foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
|
||||
foreach ($sheet->getTableCollection() as $table) {
|
||||
if (StringHelper::strToUpper($table->getName()) === $tableName) {
|
||||
throw new PhpSpreadsheetException("Workbook already contains a table named '{$this->name}'");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->workSheet = $worksheet;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all Table Columns.
|
||||
*
|
||||
* @return Table\Column[]
|
||||
*/
|
||||
public function getColumns(): array
|
||||
{
|
||||
return $this->columns;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate that the specified column is in the Table range.
|
||||
*
|
||||
* @param string $column Column name (e.g. A)
|
||||
*
|
||||
* @return int The column offset within the table range
|
||||
*/
|
||||
public function isColumnInRange(string $column): int
|
||||
{
|
||||
if (empty($this->range)) {
|
||||
throw new PhpSpreadsheetException('No table range is defined.');
|
||||
}
|
||||
|
||||
$columnIndex = Coordinate::columnIndexFromString($column);
|
||||
[$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
|
||||
if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
|
||||
throw new PhpSpreadsheetException('Column is outside of current table range.');
|
||||
}
|
||||
|
||||
return $columnIndex - $rangeStart[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a specified Table Column Offset within the defined Table range.
|
||||
*
|
||||
* @param string $column Column name (e.g. A)
|
||||
*
|
||||
* @return int The offset of the specified column within the table range
|
||||
*/
|
||||
public function getColumnOffset($column): int
|
||||
{
|
||||
return $this->isColumnInRange($column);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a specified Table Column.
|
||||
*
|
||||
* @param string $column Column name (e.g. A)
|
||||
*/
|
||||
public function getColumn($column): Table\Column
|
||||
{
|
||||
$this->isColumnInRange($column);
|
||||
|
||||
if (!isset($this->columns[$column])) {
|
||||
$this->columns[$column] = new Table\Column($column, $this);
|
||||
}
|
||||
|
||||
return $this->columns[$column];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a specified Table Column by it's offset.
|
||||
*
|
||||
* @param int $columnOffset Column offset within range (starting from 0)
|
||||
*/
|
||||
public function getColumnByOffset($columnOffset): Table\Column
|
||||
{
|
||||
[$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
|
||||
$pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $columnOffset);
|
||||
|
||||
return $this->getColumn($pColumn);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Table.
|
||||
*
|
||||
* @param string|Table\Column $columnObjectOrString
|
||||
* A simple string containing a Column ID like 'A' is permitted
|
||||
*/
|
||||
public function setColumn($columnObjectOrString): self
|
||||
{
|
||||
if ((is_string($columnObjectOrString)) && (!empty($columnObjectOrString))) {
|
||||
$column = $columnObjectOrString;
|
||||
} elseif (is_object($columnObjectOrString) && ($columnObjectOrString instanceof Table\Column)) {
|
||||
$column = $columnObjectOrString->getColumnIndex();
|
||||
} else {
|
||||
throw new PhpSpreadsheetException('Column is not within the table range.');
|
||||
}
|
||||
$this->isColumnInRange($column);
|
||||
|
||||
if (is_string($columnObjectOrString)) {
|
||||
$this->columns[$columnObjectOrString] = new Table\Column($columnObjectOrString, $this);
|
||||
} else {
|
||||
$columnObjectOrString->setTable($this);
|
||||
$this->columns[$column] = $columnObjectOrString;
|
||||
}
|
||||
ksort($this->columns);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear a specified Table Column.
|
||||
*
|
||||
* @param string $column Column name (e.g. A)
|
||||
*/
|
||||
public function clearColumn($column): self
|
||||
{
|
||||
$this->isColumnInRange($column);
|
||||
|
||||
if (isset($this->columns[$column])) {
|
||||
unset($this->columns[$column]);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Shift an Table Column Rule to a different column.
|
||||
*
|
||||
* Note: This method bypasses validation of the destination column to ensure it is within this Table range.
|
||||
* Nor does it verify whether any column rule already exists at $toColumn, but will simply override any existing value.
|
||||
* Use with caution.
|
||||
*
|
||||
* @param string $fromColumn Column name (e.g. A)
|
||||
* @param string $toColumn Column name (e.g. B)
|
||||
*/
|
||||
public function shiftColumn($fromColumn, $toColumn): self
|
||||
{
|
||||
$fromColumn = strtoupper($fromColumn);
|
||||
$toColumn = strtoupper($toColumn);
|
||||
|
||||
if (($fromColumn !== null) && (isset($this->columns[$fromColumn])) && ($toColumn !== null)) {
|
||||
$this->columns[$fromColumn]->setTable();
|
||||
$this->columns[$fromColumn]->setColumnIndex($toColumn);
|
||||
$this->columns[$toColumn] = $this->columns[$fromColumn];
|
||||
$this->columns[$toColumn]->setTable($this);
|
||||
unset($this->columns[$fromColumn]);
|
||||
|
||||
ksort($this->columns);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get table Style.
|
||||
*/
|
||||
public function getStyle(): Table\TableStyle
|
||||
{
|
||||
return $this->style;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set table Style.
|
||||
*/
|
||||
public function setStyle(TableStyle $style): self
|
||||
{
|
||||
$this->style = $style;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implement PHP __clone to create a deep clone, not just a shallow copy.
|
||||
*/
|
||||
public function __clone()
|
||||
{
|
||||
$vars = get_object_vars($this);
|
||||
foreach ($vars as $key => $value) {
|
||||
if (is_object($value)) {
|
||||
if ($key === 'workSheet') {
|
||||
// Detach from worksheet
|
||||
$this->{$key} = null;
|
||||
} else {
|
||||
$this->{$key} = clone $value;
|
||||
}
|
||||
} elseif ((is_array($value)) && ($key === 'columns')) {
|
||||
// The columns array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table objects
|
||||
$this->{$key} = [];
|
||||
foreach ($value as $k => $v) {
|
||||
$this->{$key}[$k] = clone $v;
|
||||
// attach the new cloned Column to this new cloned Table object
|
||||
$this->{$key}[$k]->setTable($this);
|
||||
}
|
||||
} else {
|
||||
$this->{$key} = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* toString method replicates previous behavior by returning the range if object is
|
||||
* referenced as a property of its worksheet.
|
||||
*/
|
||||
public function __toString()
|
||||
{
|
||||
return (string) $this->range;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,203 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
|
||||
class Column
|
||||
{
|
||||
/**
|
||||
* Table Column Index.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $columnIndex = '';
|
||||
|
||||
/**
|
||||
* Show Filter Button.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $showFilterButton = true;
|
||||
|
||||
/**
|
||||
* Total Row Label.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $totalsRowLabel;
|
||||
|
||||
/**
|
||||
* Total Row Function.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $totalsRowFunction;
|
||||
|
||||
/**
|
||||
* Total Row Formula.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $totalsRowFormula;
|
||||
|
||||
/**
|
||||
* Column Formula.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $columnFormula;
|
||||
|
||||
/**
|
||||
* Table.
|
||||
*
|
||||
* @var null|Table
|
||||
*/
|
||||
private $table;
|
||||
|
||||
/**
|
||||
* Create a new Column.
|
||||
*
|
||||
* @param string $column Column (e.g. A)
|
||||
* @param Table $table Table for this column
|
||||
*/
|
||||
public function __construct($column, ?Table $table = null)
|
||||
{
|
||||
$this->columnIndex = $column;
|
||||
$this->table = $table;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Table column index as string eg: 'A'.
|
||||
*/
|
||||
public function getColumnIndex(): string
|
||||
{
|
||||
return $this->columnIndex;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Table column index as string eg: 'A'.
|
||||
*
|
||||
* @param string $column Column (e.g. A)
|
||||
*/
|
||||
public function setColumnIndex($column): self
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$column = strtoupper($column);
|
||||
if ($this->table !== null) {
|
||||
$this->table->isColumnInRange($column);
|
||||
}
|
||||
|
||||
$this->columnIndex = $column;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get show Filter Button.
|
||||
*/
|
||||
public function getShowFilterButton(): bool
|
||||
{
|
||||
return $this->showFilterButton;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set show Filter Button.
|
||||
*/
|
||||
public function setShowFilterButton(bool $showFilterButton): self
|
||||
{
|
||||
$this->showFilterButton = $showFilterButton;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total Row Label.
|
||||
*/
|
||||
public function getTotalsRowLabel(): ?string
|
||||
{
|
||||
return $this->totalsRowLabel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set total Row Label.
|
||||
*/
|
||||
public function setTotalsRowLabel(string $totalsRowLabel): self
|
||||
{
|
||||
$this->totalsRowLabel = $totalsRowLabel;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total Row Function.
|
||||
*/
|
||||
public function getTotalsRowFunction(): ?string
|
||||
{
|
||||
return $this->totalsRowFunction;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set total Row Function.
|
||||
*/
|
||||
public function setTotalsRowFunction(string $totalsRowFunction): self
|
||||
{
|
||||
$this->totalsRowFunction = $totalsRowFunction;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total Row Formula.
|
||||
*/
|
||||
public function getTotalsRowFormula(): ?string
|
||||
{
|
||||
return $this->totalsRowFormula;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set total Row Formula.
|
||||
*/
|
||||
public function setTotalsRowFormula(string $totalsRowFormula): self
|
||||
{
|
||||
$this->totalsRowFormula = $totalsRowFormula;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get column Formula.
|
||||
*/
|
||||
public function getColumnFormula(): ?string
|
||||
{
|
||||
return $this->columnFormula;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set column Formula.
|
||||
*/
|
||||
public function setColumnFormula(string $columnFormula): self
|
||||
{
|
||||
$this->columnFormula = $columnFormula;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get this Column's Table.
|
||||
*/
|
||||
public function getTable(): ?Table
|
||||
{
|
||||
return $this->table;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set this Column's Table.
|
||||
*/
|
||||
public function setTable(?Table $table = null): self
|
||||
{
|
||||
$this->table = $table;
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,230 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
|
||||
class TableStyle
|
||||
{
|
||||
const TABLE_STYLE_NONE = '';
|
||||
const TABLE_STYLE_LIGHT1 = 'TableStyleLight1';
|
||||
const TABLE_STYLE_LIGHT2 = 'TableStyleLight2';
|
||||
const TABLE_STYLE_LIGHT3 = 'TableStyleLight3';
|
||||
const TABLE_STYLE_LIGHT4 = 'TableStyleLight4';
|
||||
const TABLE_STYLE_LIGHT5 = 'TableStyleLight5';
|
||||
const TABLE_STYLE_LIGHT6 = 'TableStyleLight6';
|
||||
const TABLE_STYLE_LIGHT7 = 'TableStyleLight7';
|
||||
const TABLE_STYLE_LIGHT8 = 'TableStyleLight8';
|
||||
const TABLE_STYLE_LIGHT9 = 'TableStyleLight9';
|
||||
const TABLE_STYLE_LIGHT10 = 'TableStyleLight10';
|
||||
const TABLE_STYLE_LIGHT11 = 'TableStyleLight11';
|
||||
const TABLE_STYLE_LIGHT12 = 'TableStyleLight12';
|
||||
const TABLE_STYLE_LIGHT13 = 'TableStyleLight13';
|
||||
const TABLE_STYLE_LIGHT14 = 'TableStyleLight14';
|
||||
const TABLE_STYLE_LIGHT15 = 'TableStyleLight15';
|
||||
const TABLE_STYLE_LIGHT16 = 'TableStyleLight16';
|
||||
const TABLE_STYLE_LIGHT17 = 'TableStyleLight17';
|
||||
const TABLE_STYLE_LIGHT18 = 'TableStyleLight18';
|
||||
const TABLE_STYLE_LIGHT19 = 'TableStyleLight19';
|
||||
const TABLE_STYLE_LIGHT20 = 'TableStyleLight20';
|
||||
const TABLE_STYLE_LIGHT21 = 'TableStyleLight21';
|
||||
const TABLE_STYLE_MEDIUM1 = 'TableStyleMedium1';
|
||||
const TABLE_STYLE_MEDIUM2 = 'TableStyleMedium2';
|
||||
const TABLE_STYLE_MEDIUM3 = 'TableStyleMedium3';
|
||||
const TABLE_STYLE_MEDIUM4 = 'TableStyleMedium4';
|
||||
const TABLE_STYLE_MEDIUM5 = 'TableStyleMedium5';
|
||||
const TABLE_STYLE_MEDIUM6 = 'TableStyleMedium6';
|
||||
const TABLE_STYLE_MEDIUM7 = 'TableStyleMedium7';
|
||||
const TABLE_STYLE_MEDIUM8 = 'TableStyleMedium8';
|
||||
const TABLE_STYLE_MEDIUM9 = 'TableStyleMedium9';
|
||||
const TABLE_STYLE_MEDIUM10 = 'TableStyleMedium10';
|
||||
const TABLE_STYLE_MEDIUM11 = 'TableStyleMedium11';
|
||||
const TABLE_STYLE_MEDIUM12 = 'TableStyleMedium12';
|
||||
const TABLE_STYLE_MEDIUM13 = 'TableStyleMedium13';
|
||||
const TABLE_STYLE_MEDIUM14 = 'TableStyleMedium14';
|
||||
const TABLE_STYLE_MEDIUM15 = 'TableStyleMedium15';
|
||||
const TABLE_STYLE_MEDIUM16 = 'TableStyleMedium16';
|
||||
const TABLE_STYLE_MEDIUM17 = 'TableStyleMedium17';
|
||||
const TABLE_STYLE_MEDIUM18 = 'TableStyleMedium18';
|
||||
const TABLE_STYLE_MEDIUM19 = 'TableStyleMedium19';
|
||||
const TABLE_STYLE_MEDIUM20 = 'TableStyleMedium20';
|
||||
const TABLE_STYLE_MEDIUM21 = 'TableStyleMedium21';
|
||||
const TABLE_STYLE_MEDIUM22 = 'TableStyleMedium22';
|
||||
const TABLE_STYLE_MEDIUM23 = 'TableStyleMedium23';
|
||||
const TABLE_STYLE_MEDIUM24 = 'TableStyleMedium24';
|
||||
const TABLE_STYLE_MEDIUM25 = 'TableStyleMedium25';
|
||||
const TABLE_STYLE_MEDIUM26 = 'TableStyleMedium26';
|
||||
const TABLE_STYLE_MEDIUM27 = 'TableStyleMedium27';
|
||||
const TABLE_STYLE_MEDIUM28 = 'TableStyleMedium28';
|
||||
const TABLE_STYLE_DARK1 = 'TableStyleDark1';
|
||||
const TABLE_STYLE_DARK2 = 'TableStyleDark2';
|
||||
const TABLE_STYLE_DARK3 = 'TableStyleDark3';
|
||||
const TABLE_STYLE_DARK4 = 'TableStyleDark4';
|
||||
const TABLE_STYLE_DARK5 = 'TableStyleDark5';
|
||||
const TABLE_STYLE_DARK6 = 'TableStyleDark6';
|
||||
const TABLE_STYLE_DARK7 = 'TableStyleDark7';
|
||||
const TABLE_STYLE_DARK8 = 'TableStyleDark8';
|
||||
const TABLE_STYLE_DARK9 = 'TableStyleDark9';
|
||||
const TABLE_STYLE_DARK10 = 'TableStyleDark10';
|
||||
const TABLE_STYLE_DARK11 = 'TableStyleDark11';
|
||||
|
||||
/**
|
||||
* Theme.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $theme;
|
||||
|
||||
/**
|
||||
* Show First Column.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $showFirstColumn = false;
|
||||
|
||||
/**
|
||||
* Show Last Column.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $showLastColumn = false;
|
||||
|
||||
/**
|
||||
* Show Row Stripes.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $showRowStripes = false;
|
||||
|
||||
/**
|
||||
* Show Column Stripes.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $showColumnStripes = false;
|
||||
|
||||
/**
|
||||
* Table.
|
||||
*
|
||||
* @var null|Table
|
||||
*/
|
||||
private $table;
|
||||
|
||||
/**
|
||||
* Create a new Table Style.
|
||||
*
|
||||
* @param string $theme (e.g. TableStyle::TABLE_STYLE_MEDIUM2)
|
||||
*/
|
||||
public function __construct(string $theme = self::TABLE_STYLE_MEDIUM2)
|
||||
{
|
||||
$this->theme = $theme;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get theme.
|
||||
*/
|
||||
public function getTheme(): string
|
||||
{
|
||||
return $this->theme;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set theme.
|
||||
*/
|
||||
public function setTheme(string $theme): self
|
||||
{
|
||||
$this->theme = $theme;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get show First Column.
|
||||
*/
|
||||
public function getShowFirstColumn(): bool
|
||||
{
|
||||
return $this->showFirstColumn;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set show First Column.
|
||||
*/
|
||||
public function setShowFirstColumn(bool $showFirstColumn): self
|
||||
{
|
||||
$this->showFirstColumn = $showFirstColumn;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get show Last Column.
|
||||
*/
|
||||
public function getShowLastColumn(): bool
|
||||
{
|
||||
return $this->showLastColumn;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set show Last Column.
|
||||
*/
|
||||
public function setShowLastColumn(bool $showLastColumn): self
|
||||
{
|
||||
$this->showLastColumn = $showLastColumn;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get show Row Stripes.
|
||||
*/
|
||||
public function getShowRowStripes(): bool
|
||||
{
|
||||
return $this->showRowStripes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set show Row Stripes.
|
||||
*/
|
||||
public function setShowRowStripes(bool $showRowStripes): self
|
||||
{
|
||||
$this->showRowStripes = $showRowStripes;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get show Column Stripes.
|
||||
*/
|
||||
public function getShowColumnStripes(): bool
|
||||
{
|
||||
return $this->showColumnStripes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set show Column Stripes.
|
||||
*/
|
||||
public function setShowColumnStripes(bool $showColumnStripes): self
|
||||
{
|
||||
$this->showColumnStripes = $showColumnStripes;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get this Style's Table.
|
||||
*/
|
||||
public function getTable(): ?Table
|
||||
{
|
||||
return $this->table;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set this Style's Table.
|
||||
*/
|
||||
public function setTable(?Table $table = null): self
|
||||
{
|
||||
$this->table = $table;
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Worksheet;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellRange;
|
||||
|
||||
class Validations
|
||||
{
|
||||
/**
|
||||
* Validate a cell address.
|
||||
*
|
||||
* @param null|array<int>|CellAddress|string $cellAddress Coordinate of the cell as a string, eg: 'C5';
|
||||
* or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*/
|
||||
public static function validateCellAddress($cellAddress): string
|
||||
{
|
||||
if (is_string($cellAddress)) {
|
||||
[$worksheet, $address] = Worksheet::extractSheetTitle($cellAddress, true);
|
||||
// if (!empty($worksheet) && $worksheet !== $this->getTitle()) {
|
||||
// throw new Exception('Reference is not for this worksheet');
|
||||
// }
|
||||
|
||||
return empty($worksheet) ? strtoupper($address) : $worksheet . '!' . strtoupper($address);
|
||||
}
|
||||
|
||||
if (is_array($cellAddress)) {
|
||||
$cellAddress = CellAddress::fromColumnRowArray($cellAddress);
|
||||
}
|
||||
|
||||
return (string) $cellAddress;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate a cell address or cell range.
|
||||
*
|
||||
* @param AddressRange|array<int>|CellAddress|int|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12';
|
||||
* or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
|
||||
* or as a CellAddress or AddressRange object.
|
||||
*/
|
||||
public static function validateCellOrCellRange($cellRange): string
|
||||
{
|
||||
if (is_string($cellRange) || is_numeric($cellRange)) {
|
||||
$cellRange = (string) $cellRange;
|
||||
// Convert a single column reference like 'A' to 'A:A'
|
||||
$cellRange = (string) preg_replace('/^([A-Z]+)$/', '${1}:${1}', $cellRange);
|
||||
// Convert a single row reference like '1' to '1:1'
|
||||
$cellRange = (string) preg_replace('/^(\d+)$/', '${1}:${1}', $cellRange);
|
||||
} elseif (is_object($cellRange) && $cellRange instanceof CellAddress) {
|
||||
$cellRange = new CellRange($cellRange, $cellRange);
|
||||
}
|
||||
|
||||
return self::validateCellRange($cellRange);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate a cell range.
|
||||
*
|
||||
* @param AddressRange|array<int>|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12';
|
||||
* or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
|
||||
* or as an AddressRange object.
|
||||
*/
|
||||
public static function validateCellRange($cellRange): string
|
||||
{
|
||||
if (is_string($cellRange)) {
|
||||
[$worksheet, $addressRange] = Worksheet::extractSheetTitle($cellRange, true);
|
||||
|
||||
// Convert Column ranges like 'A:C' to 'A1:C1048576'
|
||||
$addressRange = (string) preg_replace('/^([A-Z]+):([A-Z]+)$/', '${1}1:${2}1048576', $addressRange);
|
||||
// Convert Row ranges like '1:3' to 'A1:XFD3'
|
||||
$addressRange = (string) preg_replace('/^(\\d+):(\\d+)$/', 'A${1}:XFD${2}', $addressRange);
|
||||
|
||||
return empty($worksheet) ? strtoupper($addressRange) : $worksheet . '!' . strtoupper($addressRange);
|
||||
}
|
||||
|
||||
if (is_array($cellRange)) {
|
||||
[$from, $to] = array_chunk($cellRange, 2);
|
||||
$cellRange = new CellRange(CellAddress::fromColumnRowArray($from), CellAddress::fromColumnRowArray($to));
|
||||
}
|
||||
|
||||
return (string) $cellRange;
|
||||
}
|
||||
|
||||
public static function definedNameToCoordinate(string $coordinate, Worksheet $worksheet): string
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$testCoordinate = strtoupper($coordinate);
|
||||
// Eliminate leading equal sign
|
||||
$testCoordinate = (string) preg_replace('/^=/', '', $coordinate);
|
||||
$defined = $worksheet->getParent()->getDefinedName($testCoordinate, $worksheet);
|
||||
if ($defined !== null) {
|
||||
if ($defined->getWorksheet() === $worksheet && !$defined->isFormula()) {
|
||||
$coordinate = (string) preg_replace('/^=/', '', $defined->getValue());
|
||||
}
|
||||
}
|
||||
|
||||
return $coordinate;
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,11 @@ namespace PhpOffice\PhpSpreadsheet\Worksheet;
|
|||
|
||||
use ArrayObject;
|
||||
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
|
||||
use PhpOffice\PhpSpreadsheet\Calculation\Functions;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Cell;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellRange;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
|
||||
|
|
@ -107,6 +111,13 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
private $chartCollection;
|
||||
|
||||
/**
|
||||
* Collection of Table objects.
|
||||
*
|
||||
* @var ArrayObject<int, Table>
|
||||
*/
|
||||
private $tableCollection;
|
||||
|
||||
/**
|
||||
* Worksheet title.
|
||||
*
|
||||
|
|
@ -371,7 +382,10 @@ class Worksheet implements IComparable
|
|||
$this->defaultRowDimension = new RowDimension(null);
|
||||
// Default column dimension
|
||||
$this->defaultColumnDimension = new ColumnDimension(null);
|
||||
// AutoFilter
|
||||
$this->autoFilter = new AutoFilter('', $this);
|
||||
// Table collection
|
||||
$this->tableCollection = new ArrayObject();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -729,9 +743,19 @@ class Worksheet implements IComparable
|
|||
}
|
||||
}
|
||||
|
||||
$autoFilterRange = $autoFilterFirstRowRange = $this->autoFilter->getRange();
|
||||
if (!empty($autoFilterRange)) {
|
||||
$autoFilterRangeBoundaries = Coordinate::rangeBoundaries($autoFilterRange);
|
||||
$autoFilterFirstRowRange = (string) new CellRange(
|
||||
CellAddress::fromColumnAndRow($autoFilterRangeBoundaries[0][0], $autoFilterRangeBoundaries[0][1]),
|
||||
CellAddress::fromColumnAndRow($autoFilterRangeBoundaries[1][0], $autoFilterRangeBoundaries[0][1])
|
||||
);
|
||||
}
|
||||
|
||||
// loop through all cells in the worksheet
|
||||
foreach ($this->getCoordinates(false) as $coordinate) {
|
||||
$cell = $this->getCellOrNull($coordinate);
|
||||
|
||||
if ($cell !== null && isset($autoSizes[$this->cellCollection->getCurrentColumn()])) {
|
||||
//Determine if cell is in merge range
|
||||
$isMerged = isset($isMergeCell[$this->cellCollection->getCurrentCoordinate()]);
|
||||
|
|
@ -748,13 +772,21 @@ class Worksheet implements IComparable
|
|||
}
|
||||
}
|
||||
|
||||
// Determine width if cell does not participate in a merge or does and is a value cell of 1-column wide range
|
||||
// Determine width if cell is not part of a merge or does and is a value cell of 1-column wide range
|
||||
if (!$isMerged || $isMergedButProceed) {
|
||||
// Determine if we need to make an adjustment for the first row in an AutoFilter range that
|
||||
// has a column filter dropdown
|
||||
$filterAdjustment = false;
|
||||
if (!empty($autoFilterRange) && $cell->isInRange($autoFilterFirstRowRange)) {
|
||||
$filterAdjustment = true;
|
||||
}
|
||||
|
||||
// Calculated value
|
||||
// To formatted string
|
||||
$cellValue = NumberFormat::toFormattedString(
|
||||
$cell->getCalculatedValue(),
|
||||
$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode()
|
||||
$this->getParent()->getCellXfByIndex($cell->getXfIndex())
|
||||
->getNumberFormat()->getFormatCode()
|
||||
);
|
||||
|
||||
if ($cellValue !== null && $cellValue !== '') {
|
||||
|
|
@ -763,8 +795,10 @@ class Worksheet implements IComparable
|
|||
(float) Shared\Font::calculateColumnWidth(
|
||||
$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont(),
|
||||
$cellValue,
|
||||
$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getAlignment()->getTextRotation(),
|
||||
$this->getParent()->getDefaultStyle()->getFont()
|
||||
$this->getParent()->getCellXfByIndex($cell->getXfIndex())
|
||||
->getAlignment()->getTextRotation(),
|
||||
$this->getParent()->getDefaultStyle()->getFont(),
|
||||
$filterAdjustment
|
||||
)
|
||||
);
|
||||
}
|
||||
|
|
@ -1043,7 +1077,7 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function getHighestColumn($row = null)
|
||||
{
|
||||
if (empty($row)) {
|
||||
if ($row === null) {
|
||||
return Coordinate::stringFromColumnIndex($this->cachedHighestColumn);
|
||||
}
|
||||
|
||||
|
|
@ -1073,7 +1107,7 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function getHighestRow($column = null)
|
||||
{
|
||||
if ($column == null) {
|
||||
if ($column === null) {
|
||||
return $this->cachedHighestRow;
|
||||
}
|
||||
|
||||
|
|
@ -1106,14 +1140,16 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set a cell value.
|
||||
*
|
||||
* @param string $coordinate Coordinate of the cell, eg: 'A1'
|
||||
* @param mixed $value Value of the cell
|
||||
* @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
|
||||
* or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
* @param mixed $value Value for the cell
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setCellValue($coordinate, $value)
|
||||
{
|
||||
$this->getCell($coordinate)->setValue($value);
|
||||
$cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
|
||||
$this->getCell($cellAddress)->setValue($value);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -1121,6 +1157,10 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set a cell value by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the setCellValue() method with a cell address such as 'C5' instead;,
|
||||
* or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @param int $columnIndex Numeric column coordinate of the cell
|
||||
* @param int $row Numeric row coordinate of the cell
|
||||
* @param mixed $value Value of the cell
|
||||
|
|
@ -1129,7 +1169,7 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function setCellValueByColumnAndRow($columnIndex, $row, $value)
|
||||
{
|
||||
$this->getCellByColumnAndRow($columnIndex, $row)->setValue($value);
|
||||
$this->getCell(Coordinate::stringFromColumnIndex($columnIndex) . $row)->setValue($value);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -1137,7 +1177,8 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set a cell value.
|
||||
*
|
||||
* @param string $coordinate Coordinate of the cell, eg: 'A1'
|
||||
* @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
|
||||
* or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
* @param mixed $value Value of the cell
|
||||
* @param string $dataType Explicit data type, see DataType::TYPE_*
|
||||
*
|
||||
|
|
@ -1145,8 +1186,8 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function setCellValueExplicit($coordinate, $value, $dataType)
|
||||
{
|
||||
// Set value
|
||||
$this->getCell($coordinate)->setValueExplicit($value, $dataType);
|
||||
$cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
|
||||
$this->getCell($cellAddress)->setValueExplicit($value, $dataType);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -1154,6 +1195,10 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set a cell value by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the setCellValueExplicit() method with a cell address such as 'C5' instead;,
|
||||
* or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @param int $columnIndex Numeric column coordinate of the cell
|
||||
* @param int $row Numeric row coordinate of the cell
|
||||
* @param mixed $value Value of the cell
|
||||
|
|
@ -1163,7 +1208,7 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function setCellValueExplicitByColumnAndRow($columnIndex, $row, $value, $dataType)
|
||||
{
|
||||
$this->getCellByColumnAndRow($columnIndex, $row)->setValueExplicit($value, $dataType);
|
||||
$this->getCell(Coordinate::stringFromColumnIndex($columnIndex) . $row)->setValueExplicit($value, $dataType);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
|
@ -1171,22 +1216,25 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Get cell at a specific coordinate.
|
||||
*
|
||||
* @param string $coordinate Coordinate of the cell, eg: 'A1'
|
||||
* @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
|
||||
* or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @return Cell Cell that was found or created
|
||||
*/
|
||||
public function getCell(string $coordinate): Cell
|
||||
public function getCell($coordinate): Cell
|
||||
{
|
||||
$cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
|
||||
|
||||
// Shortcut for increased performance for the vast majority of simple cases
|
||||
if ($this->cellCollection->has($coordinate)) {
|
||||
if ($this->cellCollection->has($cellAddress)) {
|
||||
/** @var Cell $cell */
|
||||
$cell = $this->cellCollection->get($coordinate);
|
||||
$cell = $this->cellCollection->get($cellAddress);
|
||||
|
||||
return $cell;
|
||||
}
|
||||
|
||||
/** @var Worksheet $sheet */
|
||||
[$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($coordinate);
|
||||
[$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
|
||||
$cell = $sheet->cellCollection->get($finalCoordinate);
|
||||
|
||||
return $cell ?? $sheet->createNewCell($finalCoordinate);
|
||||
|
|
@ -1210,7 +1258,7 @@ class Worksheet implements IComparable
|
|||
$sheet = $this->parent->getSheetByName($worksheetReference[0]);
|
||||
$finalCoordinate = strtoupper($worksheetReference[1]);
|
||||
|
||||
if (!$sheet) {
|
||||
if ($sheet === null) {
|
||||
throw new Exception('Sheet not found for name: ' . $worksheetReference[0]);
|
||||
}
|
||||
} elseif (
|
||||
|
|
@ -1221,7 +1269,7 @@ class Worksheet implements IComparable
|
|||
$namedRange = $this->validateNamedRange($coordinate, true);
|
||||
if ($namedRange !== null) {
|
||||
$sheet = $namedRange->getWorksheet();
|
||||
if (!$sheet) {
|
||||
if ($sheet === null) {
|
||||
throw new Exception('Sheet not found for named range: ' . $namedRange->getName());
|
||||
}
|
||||
|
||||
|
|
@ -1231,7 +1279,7 @@ class Worksheet implements IComparable
|
|||
}
|
||||
}
|
||||
|
||||
if (!$sheet || !$finalCoordinate) {
|
||||
if ($sheet === null || $finalCoordinate === null) {
|
||||
$sheet = $this;
|
||||
$finalCoordinate = strtoupper($coordinate);
|
||||
}
|
||||
|
|
@ -1265,6 +1313,10 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Get cell at a specific coordinate by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the getCell() method with a cell address such as 'C5' instead;,
|
||||
* or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @param int $columnIndex Numeric column coordinate of the cell
|
||||
* @param int $row Numeric row coordinate of the cell
|
||||
*
|
||||
|
|
@ -1272,18 +1324,7 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function getCellByColumnAndRow($columnIndex, $row): Cell
|
||||
{
|
||||
$columnLetter = Coordinate::stringFromColumnIndex($columnIndex);
|
||||
$coordinate = $columnLetter . $row;
|
||||
|
||||
if ($this->cellCollection->has($coordinate)) {
|
||||
/** @var Cell $cell */
|
||||
$cell = $this->cellCollection->get($coordinate);
|
||||
|
||||
return $cell;
|
||||
}
|
||||
|
||||
// Create new cell object, if required
|
||||
return $this->createNewCell($coordinate);
|
||||
return $this->getCell(Coordinate::stringFromColumnIndex($columnIndex) . $row);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1328,14 +1369,14 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Does the cell at a specific coordinate exist?
|
||||
*
|
||||
* @param string $coordinate Coordinate of the cell eg: 'A1'
|
||||
*
|
||||
* @return bool
|
||||
* @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
|
||||
* or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*/
|
||||
public function cellExists($coordinate)
|
||||
public function cellExists($coordinate): bool
|
||||
{
|
||||
$cellAddress = Validations::validateCellAddress($coordinate);
|
||||
/** @var Worksheet $sheet */
|
||||
[$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($coordinate);
|
||||
[$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
|
||||
|
||||
return $sheet->cellCollection->has($finalCoordinate);
|
||||
}
|
||||
|
|
@ -1343,12 +1384,14 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Cell at a specific coordinate by using numeric cell coordinates exists?
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the cellExists() method with a cell address such as 'C5' instead;,
|
||||
* or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @param int $columnIndex Numeric column coordinate of the cell
|
||||
* @param int $row Numeric row coordinate of the cell
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function cellExistsByColumnAndRow($columnIndex, $row)
|
||||
public function cellExistsByColumnAndRow($columnIndex, $row): bool
|
||||
{
|
||||
return $this->cellExists(Coordinate::stringFromColumnIndex($columnIndex) . $row);
|
||||
}
|
||||
|
|
@ -1416,10 +1459,15 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Get style for cell.
|
||||
*
|
||||
* @param string $cellCoordinate Cell coordinate (or range) to get style for, eg: 'A1'
|
||||
* @param AddressRange|array<int>|CellAddress|int|string $cellCoordinate
|
||||
* A simple string containing a cell address like 'A1' or a cell range like 'A1:E10'
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or a CellAddress or AddressRange object.
|
||||
*/
|
||||
public function getStyle($cellCoordinate): Style
|
||||
{
|
||||
$cellCoordinate = Validations::validateCellOrCellRange($cellCoordinate);
|
||||
|
||||
// set this sheet as active
|
||||
$this->parent->setActiveSheetIndex($this->parent->getIndex($this));
|
||||
|
||||
|
|
@ -1429,6 +1477,35 @@ class Worksheet implements IComparable
|
|||
return $this->parent->getCellXfSupervisor();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get style for cell by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the getStyle() method with a cell address range such as 'C5:F8' instead;,
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
*
|
||||
* @param int $columnIndex1 Numeric column coordinate of the cell
|
||||
* @param int $row1 Numeric row coordinate of the cell
|
||||
* @param null|int $columnIndex2 Numeric column coordinate of the range cell
|
||||
* @param null|int $row2 Numeric row coordinate of the range cell
|
||||
*
|
||||
* @return Style
|
||||
*/
|
||||
public function getStyleByColumnAndRow($columnIndex1, $row1, $columnIndex2 = null, $row2 = null)
|
||||
{
|
||||
if ($columnIndex2 !== null && $row2 !== null) {
|
||||
$cellRange = new CellRange(
|
||||
CellAddress::fromColumnAndRow($columnIndex1, $row1),
|
||||
CellAddress::fromColumnAndRow($columnIndex2, $row2)
|
||||
);
|
||||
|
||||
return $this->getStyle($cellRange);
|
||||
}
|
||||
|
||||
return $this->getStyle(CellAddress::fromColumnAndRow($columnIndex1, $row1));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get conditional styles for a cell.
|
||||
*
|
||||
|
|
@ -1483,7 +1560,7 @@ class Worksheet implements IComparable
|
|||
{
|
||||
$coordinate = strtoupper($coordinate);
|
||||
if (strpos($coordinate, ':') !== false) {
|
||||
return isset($this->conditionalStylesCollection[strtoupper($coordinate)]);
|
||||
return isset($this->conditionalStylesCollection[$coordinate]);
|
||||
}
|
||||
|
||||
$cell = $this->getCell($coordinate);
|
||||
|
|
@ -1535,27 +1612,6 @@ class Worksheet implements IComparable
|
|||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get style for cell by using numeric cell coordinates.
|
||||
*
|
||||
* @param int $columnIndex1 Numeric column coordinate of the cell
|
||||
* @param int $row1 Numeric row coordinate of the cell
|
||||
* @param null|int $columnIndex2 Numeric column coordinate of the range cell
|
||||
* @param null|int $row2 Numeric row coordinate of the range cell
|
||||
*
|
||||
* @return Style
|
||||
*/
|
||||
public function getStyleByColumnAndRow($columnIndex1, $row1, $columnIndex2 = null, $row2 = null)
|
||||
{
|
||||
if ($columnIndex2 !== null && $row2 !== null) {
|
||||
$cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
|
||||
|
||||
return $this->getStyle($cellRange);
|
||||
}
|
||||
|
||||
return $this->getStyle(Coordinate::stringFromColumnIndex($columnIndex1) . $row1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Duplicate cell style to a range of cells.
|
||||
*
|
||||
|
|
@ -1640,26 +1696,22 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set break on a cell.
|
||||
*
|
||||
* @param string $coordinate Cell coordinate (e.g. A1)
|
||||
* @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
|
||||
* or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
* @param int $break Break type (type of Worksheet::BREAK_*)
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setBreak($coordinate, $break)
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$coordinate = strtoupper($coordinate);
|
||||
$cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
|
||||
|
||||
if ($coordinate != '') {
|
||||
if ($break == self::BREAK_NONE) {
|
||||
if (isset($this->breaks[$coordinate])) {
|
||||
unset($this->breaks[$coordinate]);
|
||||
}
|
||||
} else {
|
||||
$this->breaks[$coordinate] = $break;
|
||||
if ($break === self::BREAK_NONE) {
|
||||
if (isset($this->breaks[$cellAddress])) {
|
||||
unset($this->breaks[$cellAddress]);
|
||||
}
|
||||
} else {
|
||||
throw new Exception('No cell coordinate specified.');
|
||||
$this->breaks[$cellAddress] = $break;
|
||||
}
|
||||
|
||||
return $this;
|
||||
|
|
@ -1668,6 +1720,10 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set break on a cell by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the setBreak() method with a cell address such as 'C5' instead;,
|
||||
* or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @param int $columnIndex Numeric column coordinate of the cell
|
||||
* @param int $row Numeric row coordinate of the cell
|
||||
* @param int $break Break type (type of Worksheet::BREAK_*)
|
||||
|
|
@ -1692,18 +1748,15 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set merge on a cell range.
|
||||
*
|
||||
* @param string $range Cell range (e.g. A1:E1)
|
||||
* @param AddressRange|array<int>|string $range A simple string containing a Cell range like 'A1:E10'
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange.
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function mergeCells($range)
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$range = strtoupper($range);
|
||||
// Convert 'A:C' to 'A1:C1048576'
|
||||
$range = self::pregReplace('/^([A-Z]+):([A-Z]+)$/', '${1}1:${2}1048576', $range);
|
||||
// Convert '1:3' to 'A1:XFD3'
|
||||
$range = self::pregReplace('/^(\\d+):(\\d+)$/', 'A${1}:XFD${2}', $range);
|
||||
$range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
|
||||
|
||||
if (preg_match('/^([A-Z]+)(\\d+):([A-Z]+)(\\d+)$/', $range, $matches) === 1) {
|
||||
$this->mergeCells[$range] = $range;
|
||||
|
|
@ -1717,7 +1770,7 @@ class Worksheet implements IComparable
|
|||
$numberColumns = $lastColumnIndex - $firstColumnIndex;
|
||||
|
||||
// create upper left cell if it does not already exist
|
||||
$upperLeft = "$firstColumn$firstRow";
|
||||
$upperLeft = "{$firstColumn}{$firstRow}";
|
||||
if (!$this->cellExists($upperLeft)) {
|
||||
$this->getCell($upperLeft)->setValueExplicit(null, DataType::TYPE_NULL);
|
||||
}
|
||||
|
|
@ -1779,6 +1832,11 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set merge on a cell range by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the mergeCells() method with a cell address range such as 'C5:F8' instead;,
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
*
|
||||
* @param int $columnIndex1 Numeric column coordinate of the first cell
|
||||
* @param int $row1 Numeric row coordinate of the first cell
|
||||
* @param int $columnIndex2 Numeric column coordinate of the last cell
|
||||
|
|
@ -1788,7 +1846,10 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function mergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
|
||||
{
|
||||
$cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
|
||||
$cellRange = new CellRange(
|
||||
CellAddress::fromColumnAndRow($columnIndex1, $row1),
|
||||
CellAddress::fromColumnAndRow($columnIndex2, $row2)
|
||||
);
|
||||
|
||||
return $this->mergeCells($cellRange);
|
||||
}
|
||||
|
|
@ -1796,14 +1857,15 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Remove merge on a cell range.
|
||||
*
|
||||
* @param string $range Cell range (e.g. A1:E1)
|
||||
* @param AddressRange|array<int>|string $range A simple string containing a Cell range like 'A1:E10'
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange.
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function unmergeCells($range)
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$range = strtoupper($range);
|
||||
$range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
|
||||
|
||||
if (strpos($range, ':') !== false) {
|
||||
if (isset($this->mergeCells[$range])) {
|
||||
|
|
@ -1821,6 +1883,11 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Remove merge on a cell range by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the unmergeCells() method with a cell address range such as 'C5:F8' instead;,
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
*
|
||||
* @param int $columnIndex1 Numeric column coordinate of the first cell
|
||||
* @param int $row1 Numeric row coordinate of the first cell
|
||||
* @param int $columnIndex2 Numeric column coordinate of the last cell
|
||||
|
|
@ -1830,7 +1897,10 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function unmergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
|
||||
{
|
||||
$cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
|
||||
$cellRange = new CellRange(
|
||||
CellAddress::fromColumnAndRow($columnIndex1, $row1),
|
||||
CellAddress::fromColumnAndRow($columnIndex2, $row2)
|
||||
);
|
||||
|
||||
return $this->unmergeCells($cellRange);
|
||||
}
|
||||
|
|
@ -1861,9 +1931,11 @@ class Worksheet implements IComparable
|
|||
}
|
||||
|
||||
/**
|
||||
* Set protection on a cell range.
|
||||
* Set protection on a cell or cell range.
|
||||
*
|
||||
* @param string $range Cell (e.g. A1) or cell range (e.g. A1:E1)
|
||||
* @param AddressRange|array<int>|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10'
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or a CellAddress or AddressRange object.
|
||||
* @param string $password Password to unlock the protection
|
||||
* @param bool $alreadyHashed If the password has already been hashed, set this to true
|
||||
*
|
||||
|
|
@ -1871,8 +1943,7 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function protectCells($range, $password, $alreadyHashed = false)
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$range = strtoupper($range);
|
||||
$range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
|
||||
|
||||
if (!$alreadyHashed) {
|
||||
$password = Shared\PasswordHasher::hashPassword($password);
|
||||
|
|
@ -1885,6 +1956,11 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set protection on a cell range by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the protectCells() method with a cell address range such as 'C5:F8' instead;,
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
*
|
||||
* @param int $columnIndex1 Numeric column coordinate of the first cell
|
||||
* @param int $row1 Numeric row coordinate of the first cell
|
||||
* @param int $columnIndex2 Numeric column coordinate of the last cell
|
||||
|
|
@ -1896,22 +1972,26 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function protectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2, $password, $alreadyHashed = false)
|
||||
{
|
||||
$cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
|
||||
$cellRange = new CellRange(
|
||||
CellAddress::fromColumnAndRow($columnIndex1, $row1),
|
||||
CellAddress::fromColumnAndRow($columnIndex2, $row2)
|
||||
);
|
||||
|
||||
return $this->protectCells($cellRange, $password, $alreadyHashed);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove protection on a cell range.
|
||||
* Remove protection on a cell or cell range.
|
||||
*
|
||||
* @param string $range Cell (e.g. A1) or cell range (e.g. A1:E1)
|
||||
* @param AddressRange|array<int>|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10'
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or a CellAddress or AddressRange object.
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function unprotectCells($range)
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$range = strtoupper($range);
|
||||
$range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
|
||||
|
||||
if (isset($this->protectedCells[$range])) {
|
||||
unset($this->protectedCells[$range]);
|
||||
|
|
@ -1925,6 +2005,11 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Remove protection on a cell range by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the protectCells() method with a cell address range such as 'C5:F8' instead;,
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object.
|
||||
*
|
||||
* @param int $columnIndex1 Numeric column coordinate of the first cell
|
||||
* @param int $row1 Numeric row coordinate of the first cell
|
||||
* @param int $columnIndex2 Numeric column coordinate of the last cell
|
||||
|
|
@ -1934,7 +2019,10 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function unprotectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
|
||||
{
|
||||
$cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
|
||||
$cellRange = new CellRange(
|
||||
CellAddress::fromColumnAndRow($columnIndex1, $row1),
|
||||
CellAddress::fromColumnAndRow($columnIndex2, $row2)
|
||||
);
|
||||
|
||||
return $this->unprotectCells($cellRange);
|
||||
}
|
||||
|
|
@ -1962,17 +2050,21 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set AutoFilter.
|
||||
*
|
||||
* @param AutoFilter|string $autoFilterOrRange
|
||||
* @param AddressRange|array<int>|AutoFilter|string $autoFilterOrRange
|
||||
* A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange.
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setAutoFilter($autoFilterOrRange)
|
||||
{
|
||||
if (is_string($autoFilterOrRange)) {
|
||||
$this->autoFilter->setRange($autoFilterOrRange);
|
||||
} elseif (is_object($autoFilterOrRange) && ($autoFilterOrRange instanceof AutoFilter)) {
|
||||
if (is_object($autoFilterOrRange) && ($autoFilterOrRange instanceof AutoFilter)) {
|
||||
$this->autoFilter = $autoFilterOrRange;
|
||||
} else {
|
||||
$cellRange = Functions::trimSheetFromCellReference(Validations::validateCellRange($autoFilterOrRange));
|
||||
|
||||
$this->autoFilter->setRange($cellRange);
|
||||
}
|
||||
|
||||
return $this;
|
||||
|
|
@ -1981,6 +2073,11 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Set Autofilter Range by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the setAutoFilter() method with a cell address range such as 'C5:F8' instead;,
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or an AddressRange object or AutoFilter object.
|
||||
*
|
||||
* @param int $columnIndex1 Numeric column coordinate of the first cell
|
||||
* @param int $row1 Numeric row coordinate of the first cell
|
||||
* @param int $columnIndex2 Numeric column coordinate of the second cell
|
||||
|
|
@ -1990,11 +2087,12 @@ class Worksheet implements IComparable
|
|||
*/
|
||||
public function setAutoFilterByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
|
||||
{
|
||||
return $this->setAutoFilter(
|
||||
Coordinate::stringFromColumnIndex($columnIndex1) . $row1
|
||||
. ':' .
|
||||
Coordinate::stringFromColumnIndex($columnIndex2) . $row2
|
||||
$cellRange = new CellRange(
|
||||
CellAddress::fromColumnAndRow($columnIndex1, $row1),
|
||||
CellAddress::fromColumnAndRow($columnIndex2, $row2)
|
||||
);
|
||||
|
||||
return $this->setAutoFilter($cellRange);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2007,6 +2105,58 @@ class Worksheet implements IComparable
|
|||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get collection of Tables.
|
||||
*
|
||||
* @return ArrayObject<int, Table>
|
||||
*/
|
||||
public function getTableCollection()
|
||||
{
|
||||
return $this->tableCollection;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add Table.
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function addTable(Table $table): self
|
||||
{
|
||||
$table->setWorksheet($this);
|
||||
$this->tableCollection[] = $table;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove Table by name.
|
||||
*
|
||||
* @param string $name Table name
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function removeTableByName(string $name): self
|
||||
{
|
||||
$name = Shared\StringHelper::strToUpper($name);
|
||||
foreach ($this->tableCollection as $key => $table) {
|
||||
if (Shared\StringHelper::strToUpper($table->getName()) === $name) {
|
||||
unset($this->tableCollection[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove collection of Tables.
|
||||
*/
|
||||
public function removeTableCollection(): self
|
||||
{
|
||||
$this->tableCollection = new ArrayObject();
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Freeze Pane.
|
||||
*
|
||||
|
|
@ -2026,23 +2176,33 @@ class Worksheet implements IComparable
|
|||
* - B1 will freeze the columns to the left of cell B1 (i.e column A)
|
||||
* - B2 will freeze the rows above and to the left of cell B2 (i.e row 1 and column A)
|
||||
*
|
||||
* @param null|string $cell Position of the split
|
||||
* @param null|string $topLeftCell default position of the right bottom pane
|
||||
* @param null|array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
|
||||
* or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
* Passing a null value for this argument will clear any existing freeze pane for this worksheet.
|
||||
* @param null|array<int>|CellAddress|string $topLeftCell default position of the right bottom pane
|
||||
* Coordinate of the cell as a string, eg: 'C5'; or as an array of [$columnIndex, $row] (e.g. [3, 5]),
|
||||
* or a CellAddress object.
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function freezePane($cell, $topLeftCell = null)
|
||||
public function freezePane($coordinate, $topLeftCell = null)
|
||||
{
|
||||
if (is_string($cell) && Coordinate::coordinateIsRange($cell)) {
|
||||
$cellAddress = ($coordinate !== null)
|
||||
? Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate))
|
||||
: null;
|
||||
if ($cellAddress !== null && Coordinate::coordinateIsRange($cellAddress)) {
|
||||
throw new Exception('Freeze pane can not be set on a range of cells.');
|
||||
}
|
||||
$topLeftCell = ($topLeftCell !== null)
|
||||
? Functions::trimSheetFromCellReference(Validations::validateCellAddress($topLeftCell))
|
||||
: null;
|
||||
|
||||
if ($cell !== null && $topLeftCell === null) {
|
||||
$coordinate = Coordinate::coordinateFromString($cell);
|
||||
if ($cellAddress !== null && $topLeftCell === null) {
|
||||
$coordinate = Coordinate::coordinateFromString($cellAddress);
|
||||
$topLeftCell = $coordinate[0] . $coordinate[1];
|
||||
}
|
||||
|
||||
$this->freezePane = $cell;
|
||||
$this->freezePane = $cellAddress;
|
||||
$this->topLeftCell = $topLeftCell;
|
||||
|
||||
return $this;
|
||||
|
|
@ -2058,6 +2218,10 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Freeze Pane by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the freezePane() method with a cell address such as 'C5' instead;,
|
||||
* or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @param int $columnIndex Numeric column coordinate of the cell
|
||||
* @param int $row Numeric row coordinate of the cell
|
||||
*
|
||||
|
|
@ -2427,31 +2591,31 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Get comment for cell.
|
||||
*
|
||||
* @param string $cellCoordinate Cell coordinate to get comment for, eg: 'A1'
|
||||
* @param array<int>|CellAddress|string $cellCoordinate Coordinate of the cell as a string, eg: 'C5';
|
||||
* or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @return Comment
|
||||
*/
|
||||
public function getComment($cellCoordinate)
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$cellCoordinate = strtoupper($cellCoordinate);
|
||||
$cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
|
||||
|
||||
if (Coordinate::coordinateIsRange($cellCoordinate)) {
|
||||
if (Coordinate::coordinateIsRange($cellAddress)) {
|
||||
throw new Exception('Cell coordinate string can not be a range of cells.');
|
||||
} elseif (strpos($cellCoordinate, '$') !== false) {
|
||||
} elseif (strpos($cellAddress, '$') !== false) {
|
||||
throw new Exception('Cell coordinate string must not be absolute.');
|
||||
} elseif ($cellCoordinate == '') {
|
||||
} elseif ($cellAddress == '') {
|
||||
throw new Exception('Cell coordinate can not be zero-length string.');
|
||||
}
|
||||
|
||||
// Check if we already have a comment for this cell.
|
||||
if (isset($this->comments[$cellCoordinate])) {
|
||||
return $this->comments[$cellCoordinate];
|
||||
if (isset($this->comments[$cellAddress])) {
|
||||
return $this->comments[$cellAddress];
|
||||
}
|
||||
|
||||
// If not, create a new comment.
|
||||
$newComment = new Comment();
|
||||
$this->comments[$cellCoordinate] = $newComment;
|
||||
$this->comments[$cellAddress] = $newComment;
|
||||
|
||||
return $newComment;
|
||||
}
|
||||
|
|
@ -2459,6 +2623,10 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Get comment for cell by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the getComment() method with a cell address such as 'C5' instead;,
|
||||
* or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @param int $columnIndex Numeric column coordinate of the cell
|
||||
* @param int $row Numeric row coordinate of the cell
|
||||
*
|
||||
|
|
@ -2501,64 +2669,21 @@ class Worksheet implements IComparable
|
|||
return $this->setSelectedCells($coordinate);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sigh - Phpstan thinks, correctly, that preg_replace can return null.
|
||||
* But Scrutinizer doesn't. Try to satisfy both.
|
||||
*
|
||||
* @param mixed $str
|
||||
*/
|
||||
private static function ensureString($str): string
|
||||
{
|
||||
return is_string($str) ? $str : '';
|
||||
}
|
||||
|
||||
public static function pregReplace(string $pattern, string $replacement, string $subject): string
|
||||
{
|
||||
return self::ensureString(preg_replace($pattern, $replacement, $subject));
|
||||
}
|
||||
|
||||
private function tryDefinedName(string $coordinate): string
|
||||
{
|
||||
// Uppercase coordinate
|
||||
$coordinate = strtoupper($coordinate);
|
||||
// Eliminate leading equal sign
|
||||
$coordinate = self::pregReplace('/^=/', '', $coordinate);
|
||||
$defined = $this->parent->getDefinedName($coordinate, $this);
|
||||
if ($defined !== null) {
|
||||
if ($defined->getWorksheet() === $this && !$defined->isFormula()) {
|
||||
$coordinate = self::pregReplace('/^=/', '', $defined->getValue());
|
||||
}
|
||||
}
|
||||
|
||||
return $coordinate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Select a range of cells.
|
||||
*
|
||||
* @param string $coordinate Cell range, examples: 'A1', 'B2:G5', 'A:C', '3:6'
|
||||
* @param AddressRange|array<int>|CellAddress|int|string $coordinate A simple string containing a Cell range like 'A1:E10'
|
||||
* or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
|
||||
* or a CellAddress or AddressRange object.
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setSelectedCells($coordinate)
|
||||
{
|
||||
$originalCoordinate = $coordinate;
|
||||
$coordinate = $this->tryDefinedName($coordinate);
|
||||
|
||||
// Convert 'A' to 'A:A'
|
||||
$coordinate = self::pregReplace('/^([A-Z]+)$/', '${1}:${1}', $coordinate);
|
||||
|
||||
// Convert '1' to '1:1'
|
||||
$coordinate = self::pregReplace('/^(\d+)$/', '${1}:${1}', $coordinate);
|
||||
|
||||
// Convert 'A:C' to 'A1:C1048576'
|
||||
$coordinate = self::pregReplace('/^([A-Z]+):([A-Z]+)$/', '${1}1:${2}1048576', $coordinate);
|
||||
|
||||
// Convert '1:3' to 'A1:XFD3'
|
||||
$coordinate = self::pregReplace('/^(\d+):(\d+)$/', 'A${1}:XFD${2}', $coordinate);
|
||||
if (preg_match('/^\\$?[A-Z]{1,3}\\$?\d{1,7}(:\\$?[A-Z]{1,3}\\$?\d{1,7})?$/', $coordinate) !== 1) {
|
||||
throw new Exception("Invalid setSelectedCells $originalCoordinate $coordinate");
|
||||
if (is_string($coordinate)) {
|
||||
$coordinate = Validations::definedNameToCoordinate($coordinate, $this);
|
||||
}
|
||||
$coordinate = Validations::validateCellOrCellRange($coordinate);
|
||||
|
||||
if (Coordinate::coordinateIsRange($coordinate)) {
|
||||
[$first] = Coordinate::splitRange($coordinate);
|
||||
|
|
@ -2574,6 +2699,10 @@ class Worksheet implements IComparable
|
|||
/**
|
||||
* Selected cell by using numeric cell coordinates.
|
||||
*
|
||||
* @Deprecated 1.23.0
|
||||
* Use the setSelectedCells() method with a cell address such as 'C5' instead;,
|
||||
* or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
|
||||
*
|
||||
* @param int $columnIndex Numeric column coordinate of the cell
|
||||
* @param int $row Numeric row coordinate of the cell
|
||||
*
|
||||
|
|
|
|||
|
|
@ -132,10 +132,11 @@ class Ods extends BaseWriter
|
|||
|
||||
$zip->addFile('META-INF/manifest.xml', $this->getWriterPartMetaInf()->write());
|
||||
$zip->addFile('Thumbnails/thumbnail.png', $this->getWriterPartthumbnails()->write());
|
||||
// Settings always need to be written before Content; Styles after Content
|
||||
$zip->addFile('settings.xml', $this->getWriterPartsettings()->write());
|
||||
$zip->addFile('content.xml', $this->getWriterPartcontent()->write());
|
||||
$zip->addFile('meta.xml', $this->getWriterPartmeta()->write());
|
||||
$zip->addFile('mimetype', $this->getWriterPartmimetype()->write());
|
||||
$zip->addFile('settings.xml', $this->getWriterPartsettings()->write());
|
||||
$zip->addFile('styles.xml', $this->getWriterPartstyles()->write());
|
||||
|
||||
// Close file
|
||||
|
|
|
|||
|
|
@ -2,15 +2,20 @@
|
|||
|
||||
namespace PhpOffice\PhpSpreadsheet\Writer\Ods\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Helper\Dimension;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Alignment;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Fill;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Font;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Style as CellStyle;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\ColumnDimension;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\RowDimension;
|
||||
|
||||
class Style
|
||||
{
|
||||
public const CELL_STYLE_PREFIX = 'ce';
|
||||
public const COLUMN_STYLE_PREFIX = 'co';
|
||||
public const ROW_STYLE_PREFIX = 'ro';
|
||||
|
||||
private $writer;
|
||||
|
||||
|
|
@ -159,6 +164,63 @@ class Style
|
|||
$this->writer->endElement(); // Close style:text-properties
|
||||
}
|
||||
|
||||
protected function writeColumnProperties(ColumnDimension $columnDimension): void
|
||||
{
|
||||
$this->writer->startElement('style:table-column-properties');
|
||||
$this->writer->writeAttribute(
|
||||
'style:column-width',
|
||||
round($columnDimension->getWidth(Dimension::UOM_CENTIMETERS), 3) . 'cm'
|
||||
);
|
||||
$this->writer->writeAttribute('fo:break-before', 'auto');
|
||||
|
||||
// End
|
||||
$this->writer->endElement(); // Close style:table-column-properties
|
||||
}
|
||||
|
||||
public function writeColumnStyles(ColumnDimension $columnDimension, int $sheetId): void
|
||||
{
|
||||
$this->writer->startElement('style:style');
|
||||
$this->writer->writeAttribute('style:family', 'table-column');
|
||||
$this->writer->writeAttribute(
|
||||
'style:name',
|
||||
sprintf('%s_%d_%d', self::COLUMN_STYLE_PREFIX, $sheetId, $columnDimension->getColumnNumeric())
|
||||
);
|
||||
|
||||
$this->writeColumnProperties($columnDimension);
|
||||
|
||||
// End
|
||||
$this->writer->endElement(); // Close style:style
|
||||
}
|
||||
|
||||
protected function writeRowProperties(RowDimension $rowDimension): void
|
||||
{
|
||||
$this->writer->startElement('style:table-row-properties');
|
||||
$this->writer->writeAttribute(
|
||||
'style:row-height',
|
||||
round($rowDimension->getRowHeight(Dimension::UOM_CENTIMETERS), 3) . 'cm'
|
||||
);
|
||||
$this->writer->writeAttribute('style:use-optimal-row-height', 'true');
|
||||
$this->writer->writeAttribute('fo:break-before', 'auto');
|
||||
|
||||
// End
|
||||
$this->writer->endElement(); // Close style:table-row-properties
|
||||
}
|
||||
|
||||
public function writeRowStyles(RowDimension $rowDimension, int $sheetId): void
|
||||
{
|
||||
$this->writer->startElement('style:style');
|
||||
$this->writer->writeAttribute('style:family', 'table-row');
|
||||
$this->writer->writeAttribute(
|
||||
'style:name',
|
||||
sprintf('%s_%d_%d', self::ROW_STYLE_PREFIX, $sheetId, $rowDimension->getRowIndex())
|
||||
);
|
||||
|
||||
$this->writeRowProperties($rowDimension);
|
||||
|
||||
// End
|
||||
$this->writer->endElement(); // Close style:style
|
||||
}
|
||||
|
||||
public function write(CellStyle $style): void
|
||||
{
|
||||
$this->writer->startElement('style:style');
|
||||
|
|
|
|||
|
|
@ -119,14 +119,21 @@ class Content extends WriterPart
|
|||
{
|
||||
$spreadsheet = $this->getParentWriter()->getSpreadsheet(); /** @var Spreadsheet $spreadsheet */
|
||||
$sheetCount = $spreadsheet->getSheetCount();
|
||||
for ($i = 0; $i < $sheetCount; ++$i) {
|
||||
for ($sheetIndex = 0; $sheetIndex < $sheetCount; ++$sheetIndex) {
|
||||
$objWriter->startElement('table:table');
|
||||
$objWriter->writeAttribute('table:name', $spreadsheet->getSheet($i)->getTitle());
|
||||
$objWriter->writeAttribute('table:name', $spreadsheet->getSheet($sheetIndex)->getTitle());
|
||||
$objWriter->writeElement('office:forms');
|
||||
$objWriter->startElement('table:table-column');
|
||||
$objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
|
||||
$objWriter->endElement();
|
||||
$this->writeRows($objWriter, $spreadsheet->getSheet($i));
|
||||
foreach ($spreadsheet->getSheet($sheetIndex)->getColumnDimensions() as $columnDimension) {
|
||||
$objWriter->startElement('table:table-column');
|
||||
$objWriter->writeAttribute(
|
||||
'table:style-name',
|
||||
sprintf('%s_%d_%d', Style::COLUMN_STYLE_PREFIX, $sheetIndex, $columnDimension->getColumnNumeric())
|
||||
);
|
||||
$objWriter->writeAttribute('table:default-cell-style-name', 'ce0');
|
||||
// $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
|
||||
$objWriter->endElement();
|
||||
}
|
||||
$this->writeRows($objWriter, $spreadsheet->getSheet($sheetIndex), $sheetIndex);
|
||||
$objWriter->endElement();
|
||||
}
|
||||
}
|
||||
|
|
@ -134,7 +141,7 @@ class Content extends WriterPart
|
|||
/**
|
||||
* Write rows of the specified sheet.
|
||||
*/
|
||||
private function writeRows(XMLWriter $objWriter, Worksheet $sheet): void
|
||||
private function writeRows(XMLWriter $objWriter, Worksheet $sheet, int $sheetIndex): void
|
||||
{
|
||||
$numberRowsRepeated = self::NUMBER_ROWS_REPEATED_MAX;
|
||||
$span_row = 0;
|
||||
|
|
@ -148,8 +155,14 @@ class Content extends WriterPart
|
|||
if ($span_row > 1) {
|
||||
$objWriter->writeAttribute('table:number-rows-repeated', $span_row);
|
||||
}
|
||||
if ($sheet->getRowDimension($row->getRowIndex())->getRowHeight() > 0) {
|
||||
$objWriter->writeAttribute(
|
||||
'table:style_name',
|
||||
sprintf('%s_%d_%d', Style::ROW_STYLE_PREFIX, $sheetIndex, $row->getRowIndex())
|
||||
);
|
||||
}
|
||||
$objWriter->startElement('table:table-cell');
|
||||
$objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
|
||||
$objWriter->writeAttribute('table:number-columns-repeated', (string) self::NUMBER_COLS_REPEATED_MAX);
|
||||
$objWriter->endElement();
|
||||
$objWriter->endElement();
|
||||
$span_row = 0;
|
||||
|
|
@ -275,6 +288,26 @@ class Content extends WriterPart
|
|||
private function writeXfStyles(XMLWriter $writer, Spreadsheet $spreadsheet): void
|
||||
{
|
||||
$styleWriter = new Style($writer);
|
||||
|
||||
$sheetCount = $spreadsheet->getSheetCount();
|
||||
for ($i = 0; $i < $sheetCount; ++$i) {
|
||||
$worksheet = $spreadsheet->getSheet($i);
|
||||
$worksheet->calculateColumnWidths();
|
||||
foreach ($worksheet->getColumnDimensions() as $columnDimension) {
|
||||
if ($columnDimension->getWidth() !== -1.0) {
|
||||
$styleWriter->writeColumnStyles($columnDimension, $i);
|
||||
}
|
||||
}
|
||||
}
|
||||
for ($i = 0; $i < $sheetCount; ++$i) {
|
||||
$worksheet = $spreadsheet->getSheet($i);
|
||||
foreach ($worksheet->getRowDimensions() as $rowDimension) {
|
||||
if ($rowDimension->getRowHeight() > 0.0) {
|
||||
$styleWriter->writeRowStyles($rowDimension, $i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($spreadsheet->getCellXfCollection() as $style) {
|
||||
$styleWriter->write($style);
|
||||
}
|
||||
|
|
@ -296,7 +329,7 @@ class Content extends WriterPart
|
|||
$columnSpan = Coordinate::columnIndexFromString($end[0]) - Coordinate::columnIndexFromString($start[0]) + 1;
|
||||
$rowSpan = ((int) $end[1]) - ((int) $start[1]) + 1;
|
||||
|
||||
$objWriter->writeAttribute('table:number-columns-spanned', $columnSpan);
|
||||
$objWriter->writeAttribute('table:number-rows-spanned', $rowSpan);
|
||||
$objWriter->writeAttribute('table:number-columns-spanned', (string) $columnSpan);
|
||||
$objWriter->writeAttribute('table:number-rows-spanned', (string) $rowSpan);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,11 @@
|
|||
|
||||
namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
|
||||
class Settings extends WriterPart
|
||||
{
|
||||
|
|
@ -45,28 +48,9 @@ class Settings extends WriterPart
|
|||
$objWriter->text('view1');
|
||||
$objWriter->endElement(); // ViewId
|
||||
$objWriter->startElement('config:config-item-map-named');
|
||||
$objWriter->writeAttribute('config:name', 'Tables');
|
||||
foreach ($spreadsheet->getWorksheetIterator() as $ws) {
|
||||
$objWriter->startElement('config:config-item-map-entry');
|
||||
$objWriter->writeAttribute('config:name', $ws->getTitle());
|
||||
$selected = $ws->getSelectedCells();
|
||||
if (preg_match('/^([a-z]+)([0-9]+)/i', $selected, $matches) === 1) {
|
||||
$colSel = Coordinate::columnIndexFromString($matches[1]) - 1;
|
||||
$rowSel = (int) $matches[2] - 1;
|
||||
$objWriter->startElement('config:config-item');
|
||||
$objWriter->writeAttribute('config:name', 'CursorPositionX');
|
||||
$objWriter->writeAttribute('config:type', 'int');
|
||||
$objWriter->text($colSel);
|
||||
$objWriter->endElement();
|
||||
$objWriter->startElement('config:config-item');
|
||||
$objWriter->writeAttribute('config:name', 'CursorPositionY');
|
||||
$objWriter->writeAttribute('config:type', 'int');
|
||||
$objWriter->text($rowSel);
|
||||
$objWriter->endElement();
|
||||
}
|
||||
$objWriter->endElement(); // config:config-item-map-entry
|
||||
}
|
||||
$objWriter->endElement(); // config:config-item-map-named
|
||||
|
||||
$this->writeAllWorksheetSettings($objWriter, $spreadsheet);
|
||||
|
||||
$wstitle = $spreadsheet->getActiveSheet()->getTitle();
|
||||
$objWriter->startElement('config:config-item');
|
||||
$objWriter->writeAttribute('config:name', 'ActiveTable');
|
||||
|
|
@ -85,4 +69,84 @@ class Settings extends WriterPart
|
|||
|
||||
return $objWriter->getData();
|
||||
}
|
||||
|
||||
private function writeAllWorksheetSettings(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
|
||||
{
|
||||
$objWriter->writeAttribute('config:name', 'Tables');
|
||||
|
||||
foreach ($spreadsheet->getWorksheetIterator() as $worksheet) {
|
||||
$this->writeWorksheetSettings($objWriter, $worksheet);
|
||||
}
|
||||
|
||||
$objWriter->endElement(); // config:config-item-map-entry Tables
|
||||
}
|
||||
|
||||
private function writeWorksheetSettings(XMLWriter $objWriter, Worksheet $worksheet): void
|
||||
{
|
||||
$objWriter->startElement('config:config-item-map-entry');
|
||||
$objWriter->writeAttribute('config:name', $worksheet->getTitle());
|
||||
|
||||
$this->writeSelectedCells($objWriter, $worksheet);
|
||||
if ($worksheet->getFreezePane() !== null) {
|
||||
$this->writeFreezePane($objWriter, $worksheet);
|
||||
}
|
||||
|
||||
$objWriter->endElement(); // config:config-item-map-entry Worksheet
|
||||
}
|
||||
|
||||
private function writeSelectedCells(XMLWriter $objWriter, Worksheet $worksheet): void
|
||||
{
|
||||
$selected = $worksheet->getSelectedCells();
|
||||
if (preg_match('/^([a-z]+)([0-9]+)/i', $selected, $matches) === 1) {
|
||||
$colSel = Coordinate::columnIndexFromString($matches[1]) - 1;
|
||||
$rowSel = (int) $matches[2] - 1;
|
||||
$objWriter->startElement('config:config-item');
|
||||
$objWriter->writeAttribute('config:name', 'CursorPositionX');
|
||||
$objWriter->writeAttribute('config:type', 'int');
|
||||
$objWriter->text((string) $colSel);
|
||||
$objWriter->endElement();
|
||||
$objWriter->startElement('config:config-item');
|
||||
$objWriter->writeAttribute('config:name', 'CursorPositionY');
|
||||
$objWriter->writeAttribute('config:type', 'int');
|
||||
$objWriter->text((string) $rowSel);
|
||||
$objWriter->endElement();
|
||||
}
|
||||
}
|
||||
|
||||
private function writeSplitValue(XMLWriter $objWriter, string $splitMode, string $type, string $value): void
|
||||
{
|
||||
$objWriter->startElement('config:config-item');
|
||||
$objWriter->writeAttribute('config:name', $splitMode);
|
||||
$objWriter->writeAttribute('config:type', $type);
|
||||
$objWriter->text($value);
|
||||
$objWriter->endElement();
|
||||
}
|
||||
|
||||
private function writeFreezePane(XMLWriter $objWriter, Worksheet $worksheet): void
|
||||
{
|
||||
$freezePane = CellAddress::fromCellAddress($worksheet->getFreezePane());
|
||||
if ($freezePane->cellAddress() === 'A1') {
|
||||
return;
|
||||
}
|
||||
|
||||
$columnId = $freezePane->columnId();
|
||||
$columnName = $freezePane->columnName();
|
||||
$row = $freezePane->rowId();
|
||||
|
||||
$this->writeSplitValue($objWriter, 'HorizontalSplitMode', 'short', '2');
|
||||
$this->writeSplitValue($objWriter, 'HorizontalSplitPosition', 'int', (string) ($columnId - 1));
|
||||
$this->writeSplitValue($objWriter, 'PositionLeft', 'short', '0');
|
||||
$this->writeSplitValue($objWriter, 'PositionRight', 'short', (string) ($columnId - 1));
|
||||
|
||||
for ($column = 'A'; $column !== $columnName; ++$column) {
|
||||
$worksheet->getColumnDimension($column)->setAutoSize(true);
|
||||
}
|
||||
|
||||
$this->writeSplitValue($objWriter, 'VerticalSplitMode', 'short', '2');
|
||||
$this->writeSplitValue($objWriter, 'VerticalSplitPosition', 'int', (string) ($row - 1));
|
||||
$this->writeSplitValue($objWriter, 'PositionTop', 'short', '0');
|
||||
$this->writeSplitValue($objWriter, 'PositionBottom', 'short', (string) ($row - 1));
|
||||
|
||||
$this->writeSplitValue($objWriter, 'ActiveSplitRange', 'short', '3');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx\RelsRibbon;
|
|||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx\RelsVBA;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx\StringTable;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Style;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Table;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Theme;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Workbook;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet;
|
||||
|
|
@ -167,6 +168,11 @@ class Xlsx extends BaseWriter
|
|||
*/
|
||||
private $writerPartTheme;
|
||||
|
||||
/**
|
||||
* @var Table
|
||||
*/
|
||||
private $writerPartTable;
|
||||
|
||||
/**
|
||||
* @var Workbook
|
||||
*/
|
||||
|
|
@ -196,6 +202,7 @@ class Xlsx extends BaseWriter
|
|||
$this->writerPartStringTable = new StringTable($this);
|
||||
$this->writerPartStyle = new Style($this);
|
||||
$this->writerPartTheme = new Theme($this);
|
||||
$this->writerPartTable = new Table($this);
|
||||
$this->writerPartWorkbook = new Workbook($this);
|
||||
$this->writerPartWorksheet = new Worksheet($this);
|
||||
|
||||
|
|
@ -271,6 +278,11 @@ class Xlsx extends BaseWriter
|
|||
return $this->writerPartTheme;
|
||||
}
|
||||
|
||||
public function getWriterPartTable(): Table
|
||||
{
|
||||
return $this->writerPartTable;
|
||||
}
|
||||
|
||||
public function getWriterPartWorkbook(): Workbook
|
||||
{
|
||||
return $this->writerPartWorkbook;
|
||||
|
|
@ -389,10 +401,11 @@ class Xlsx extends BaseWriter
|
|||
}
|
||||
|
||||
$chartRef1 = 0;
|
||||
$tableRef1 = 1;
|
||||
// Add worksheet relationships (drawings, ...)
|
||||
for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
|
||||
// Add relationships
|
||||
$zipContent['xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels'] = $this->getWriterPartRels()->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts);
|
||||
$zipContent['xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels'] = $this->getWriterPartRels()->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts, $tableRef1);
|
||||
|
||||
// Add unparsedLoadedData
|
||||
$sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName();
|
||||
|
|
@ -478,6 +491,12 @@ class Xlsx extends BaseWriter
|
|||
$zipContent['xl/media/' . $image->getIndexedFilename()] = file_get_contents($image->getPath());
|
||||
}
|
||||
}
|
||||
|
||||
// Add Table parts
|
||||
$tables = $this->spreadSheet->getSheet($i)->getTableCollection();
|
||||
foreach ($tables as $table) {
|
||||
$zipContent['xl/tables/table' . $tableRef1 . '.xml'] = $this->getWriterPartTable()->writeTable($table, $tableRef1++);
|
||||
}
|
||||
}
|
||||
|
||||
// Add media
|
||||
|
|
|
|||
|
|
@ -85,6 +85,16 @@ class ContentTypes extends WriterPart
|
|||
// Shared strings
|
||||
$this->writeOverrideContentType($objWriter, '/xl/sharedStrings.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml');
|
||||
|
||||
// Table
|
||||
$table = 1;
|
||||
for ($i = 0; $i < $sheetCount; ++$i) {
|
||||
$tableCount = $spreadsheet->getSheet($i)->getTableCollection()->count();
|
||||
|
||||
for ($t = 1; $t <= $tableCount; ++$t) {
|
||||
$this->writeOverrideContentType($objWriter, '/xl/tables/table' . $table++ . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml');
|
||||
}
|
||||
}
|
||||
|
||||
// Add worksheet relationship content types
|
||||
$unparsedLoadedData = $spreadsheet->getUnparsedLoadedData();
|
||||
$chart = 1;
|
||||
|
|
|
|||
|
|
@ -163,10 +163,11 @@ class Rels extends WriterPart
|
|||
*
|
||||
* @param int $worksheetId
|
||||
* @param bool $includeCharts Flag indicating if we should write charts
|
||||
* @param int $tableRef Table ID
|
||||
*
|
||||
* @return string XML Output
|
||||
*/
|
||||
public function writeWorksheetRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, $worksheetId = 1, $includeCharts = false)
|
||||
public function writeWorksheetRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, $worksheetId = 1, $includeCharts = false, $tableRef = 1)
|
||||
{
|
||||
// Create XML writer
|
||||
$objWriter = null;
|
||||
|
|
@ -252,6 +253,17 @@ class Rels extends WriterPart
|
|||
);
|
||||
}
|
||||
|
||||
// Write Table
|
||||
$tableCount = $worksheet->getTableCollection()->count();
|
||||
for ($i = 1; $i <= $tableCount; ++$i) {
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
'_table_' . $i,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table',
|
||||
'../tables/table' . $tableRef++ . '.xml'
|
||||
);
|
||||
}
|
||||
|
||||
// Write header/footer relationship?
|
||||
$i = 1;
|
||||
if (count($worksheet->getHeaderFooter()->getImages()) > 0) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,111 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table as WorksheetTable;
|
||||
|
||||
class Table extends WriterPart
|
||||
{
|
||||
/**
|
||||
* Write Table to XML format.
|
||||
*
|
||||
* @param int $tableRef Table ID
|
||||
*
|
||||
* @return string XML Output
|
||||
*/
|
||||
public function writeTable(WorksheetTable $table, $tableRef): string
|
||||
{
|
||||
// Create XML writer
|
||||
$objWriter = null;
|
||||
if ($this->getParentWriter()->getUseDiskCaching()) {
|
||||
$objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
|
||||
} else {
|
||||
$objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
|
||||
}
|
||||
|
||||
// XML header
|
||||
$objWriter->startDocument('1.0', 'UTF-8', 'yes');
|
||||
|
||||
// Table
|
||||
$name = 'Table' . $tableRef;
|
||||
$range = $table->getRange();
|
||||
|
||||
$objWriter->startElement('table');
|
||||
$objWriter->writeAttribute('xml:space', 'preserve');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('id', (string) $tableRef);
|
||||
$objWriter->writeAttribute('name', $name);
|
||||
$objWriter->writeAttribute('displayName', $table->getName() ?: $name);
|
||||
$objWriter->writeAttribute('ref', $range);
|
||||
$objWriter->writeAttribute('headerRowCount', $table->getShowHeaderRow() ? '1' : '0');
|
||||
$objWriter->writeAttribute('totalsRowCount', $table->getShowTotalsRow() ? '1' : '0');
|
||||
|
||||
// Table Boundaries
|
||||
[$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($table->getRange());
|
||||
|
||||
// Table Auto Filter
|
||||
if ($table->getShowHeaderRow()) {
|
||||
$objWriter->startElement('autoFilter');
|
||||
$objWriter->writeAttribute('ref', $range);
|
||||
foreach (range($rangeStart[0], $rangeEnd[0]) as $offset => $columnIndex) {
|
||||
$column = $table->getColumnByOffset($offset);
|
||||
|
||||
if (!$column->getShowFilterButton()) {
|
||||
$objWriter->startElement('filterColumn');
|
||||
$objWriter->writeAttribute('colId', (string) $offset);
|
||||
$objWriter->writeAttribute('hiddenButton', '1');
|
||||
$objWriter->endElement();
|
||||
}
|
||||
}
|
||||
$objWriter->endElement();
|
||||
}
|
||||
|
||||
// Table Columns
|
||||
$objWriter->startElement('tableColumns');
|
||||
$objWriter->writeAttribute('count', (string) ($rangeEnd[0] - $rangeStart[0] + 1));
|
||||
foreach (range($rangeStart[0], $rangeEnd[0]) as $offset => $columnIndex) {
|
||||
$worksheet = $table->getWorksheet();
|
||||
if (!$worksheet) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$column = $table->getColumnByOffset($offset);
|
||||
$cell = $worksheet->getCellByColumnAndRow($columnIndex, $rangeStart[1]);
|
||||
|
||||
$objWriter->startElement('tableColumn');
|
||||
$objWriter->writeAttribute('id', (string) ($offset + 1));
|
||||
$objWriter->writeAttribute('name', $table->getShowHeaderRow() ? $cell->getValue() : 'Column' . ($offset + 1));
|
||||
|
||||
if ($table->getShowTotalsRow()) {
|
||||
if ($column->getTotalsRowLabel()) {
|
||||
$objWriter->writeAttribute('totalsRowLabel', $column->getTotalsRowLabel());
|
||||
}
|
||||
if ($column->getTotalsRowFunction()) {
|
||||
$objWriter->writeAttribute('totalsRowFunction', $column->getTotalsRowFunction());
|
||||
}
|
||||
}
|
||||
if ($column->getColumnFormula()) {
|
||||
$objWriter->writeElement('calculatedColumnFormula', $column->getColumnFormula());
|
||||
}
|
||||
|
||||
$objWriter->endElement();
|
||||
}
|
||||
$objWriter->endElement();
|
||||
|
||||
// Table Styles
|
||||
$objWriter->startElement('tableStyleInfo');
|
||||
$objWriter->writeAttribute('name', $table->getStyle()->getTheme());
|
||||
$objWriter->writeAttribute('showFirstColumn', $table->getStyle()->getShowFirstColumn() ? '1' : '0');
|
||||
$objWriter->writeAttribute('showLastColumn', $table->getStyle()->getShowLastColumn() ? '1' : '0');
|
||||
$objWriter->writeAttribute('showRowStripes', $table->getStyle()->getShowRowStripes() ? '1' : '0');
|
||||
$objWriter->writeAttribute('showColumnStripes', $table->getStyle()->getShowColumnStripes() ? '1' : '0');
|
||||
$objWriter->endElement();
|
||||
|
||||
$objWriter->endElement();
|
||||
|
||||
// Return
|
||||
return $objWriter->getData();
|
||||
}
|
||||
}
|
||||
|
|
@ -120,6 +120,9 @@ class Worksheet extends WriterPart
|
|||
// AlternateContent
|
||||
$this->writeAlternateContent($objWriter, $worksheet);
|
||||
|
||||
// Table
|
||||
$this->writeTable($objWriter, $worksheet);
|
||||
|
||||
// ConditionalFormattingRuleExtensionList
|
||||
// (Must be inserted last. Not insert last, an Excel parse error will occur)
|
||||
$this->writeExtLst($objWriter, $worksheet);
|
||||
|
|
@ -993,6 +996,25 @@ class Worksheet extends WriterPart
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Write Table.
|
||||
*/
|
||||
private function writeTable(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
|
||||
{
|
||||
$tableCount = $worksheet->getTableCollection()->count();
|
||||
|
||||
$objWriter->startElement('tableParts');
|
||||
$objWriter->writeAttribute('count', (string) $tableCount);
|
||||
|
||||
for ($t = 1; $t <= $tableCount; ++$t) {
|
||||
$objWriter->startElement('tablePart');
|
||||
$objWriter->writeAttribute('r:id', 'rId_table_' . $t);
|
||||
$objWriter->endElement();
|
||||
}
|
||||
|
||||
$objWriter->endElement();
|
||||
}
|
||||
|
||||
/**
|
||||
* Write PageSetup.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -21,15 +21,7 @@ class RangeTest extends TestCase
|
|||
{
|
||||
$this->spreadSheet = new Spreadsheet();
|
||||
$this->spreadSheet->getActiveSheet()
|
||||
->setCellValue('A1', 1)
|
||||
->setCellValue('B1', 2)
|
||||
->setCellValue('C1', 3)
|
||||
->setCellValue('A2', 4)
|
||||
->setCellValue('B2', 5)
|
||||
->setCellValue('C2', 6)
|
||||
->setCellValue('A3', 7)
|
||||
->setCellValue('B3', 8)
|
||||
->setCellValue('C3', 9);
|
||||
->fromArray(array_chunk(range(1, 240), 6), null, 'A1', true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -40,33 +32,39 @@ class RangeTest extends TestCase
|
|||
public function testRangeEvaluation(string $formula, $expectedResult): void
|
||||
{
|
||||
$workSheet = $this->spreadSheet->getActiveSheet();
|
||||
$workSheet->setCellValue('E1', $formula);
|
||||
$workSheet->setCellValue('H1', $formula);
|
||||
|
||||
$actualRresult = $workSheet->getCell('E1')->getCalculatedValue();
|
||||
$actualRresult = $workSheet->getCell('H1')->getCalculatedValue();
|
||||
self::assertSame($expectedResult, $actualRresult);
|
||||
}
|
||||
|
||||
public function providerRangeEvaluation(): array
|
||||
{
|
||||
return[
|
||||
['=SUM(A1:B3,A1:C2)', 48],
|
||||
['=COUNT(A1:B3,A1:C2)', 12],
|
||||
['=SUM(A1:B3 A1:C2)', 12],
|
||||
['=COUNT(A1:B3 A1:C2)', 4],
|
||||
['=SUM(A1:A3,C1:C3)', 30],
|
||||
['=COUNT(A1:A3,C1:C3)', 6],
|
||||
['=SUM(A1:A3 C1:C3)', Functions::null()],
|
||||
['=COUNT(A1:A3 C1:C3)', 0],
|
||||
['=SUM(A1:B2,B2:C3)', 40],
|
||||
['=COUNT(A1:B2,B2:C3)', 8],
|
||||
['=SUM(A1:B2 B2:C3)', 5],
|
||||
['=COUNT(A1:B2 B2:C3)', 1],
|
||||
['=SUM(A1:C1,A3:C3,B1:C3)', 63],
|
||||
['=COUNT(A1:C1,A3:C3,B1:C3)', 12],
|
||||
['=SUM(A1:C1,A3:C3 B1:C3)', 23],
|
||||
['=COUNT(A1:C1,A3:C3 B1:C3)', 5],
|
||||
['=SUM(Worksheet!A1:B3,Worksheet!A1:C2)', 48],
|
||||
['=SUM(Worksheet!A1:Worksheet!B3,Worksheet!A1:Worksheet!C2)', 48],
|
||||
'Sum with Simple Range' => ['=SUM(A1:C3)', 72],
|
||||
'Count with Simple Range' => ['=COUNT(A1:C3)', 9],
|
||||
'Sum with UNION #1' => ['=SUM(A1:B3,A1:C2)', 75],
|
||||
'Count with UNION #1' => ['=COUNT(A1:B3,A1:C2)', 12],
|
||||
'Sum with INTERSECTION #1' => ['=SUM(A1:B3 A1:C2)', 18],
|
||||
'Count with INTERSECTION #1' => ['=COUNT(A1:B3 A1:C2)', 4],
|
||||
'Sum with UNION #2' => ['=SUM(A1:A3,C1:C3)', 48],
|
||||
'Count with UNION #2' => ['=COUNT(A1:A3,C1:C3)', 6],
|
||||
'Sum with INTERSECTION #2 - No Intersect' => ['=SUM(A1:A3 C1:C3)', Functions::null()],
|
||||
'Count with INTERSECTION #2 - No Intersect' => ['=COUNT(A1:A3 C1:C3)', 0],
|
||||
'Sum with UNION #3' => ['=SUM(A1:B2,B2:C3)', 64],
|
||||
'Count with UNION #3' => ['=COUNT(A1:B2,B2:C3)', 8],
|
||||
'Sum with INTERSECTION #3 - Single Cell' => ['=SUM(A1:B2 B2:C3)', 8],
|
||||
'Count with INTERSECTION #3 - Single Cell' => ['=COUNT(A1:B2 B2:C3)', 1],
|
||||
'Sum with Triple UNION' => ['=SUM(A1:C1,A3:C3,B1:C3)', 99],
|
||||
'Count with Triple UNION' => ['=COUNT(A1:C1,A3:C3,B1:C3)', 12],
|
||||
'Sum with UNION and INTERSECTION' => ['=SUM(A1:C1,A3:C3 B1:C3)', 35],
|
||||
'Count with UNION and INTERSECTION' => ['=COUNT(A1:C1,A3:C3 B1:C3)', 5],
|
||||
'Sum with UNION with Worksheet Reference' => ['=SUM(Worksheet!A1:B3,Worksheet!A1:C2)', 75],
|
||||
'Sum with UNION with full Worksheet Reference' => ['=SUM(Worksheet!A1:Worksheet!B3,Worksheet!A1:Worksheet!C2)', 75],
|
||||
'Sum with Chained UNION #1' => ['=SUM(A3:B1:C2)', 72],
|
||||
'Count with Chained UNION #1' => ['=COUNT(A3:B1:C2)', 9],
|
||||
'Sum with Chained UNION #2' => ['=SUM(A5:C10:C20:F1)', 7260],
|
||||
'Count with Chained UNION#2' => ['=COUNT(A5:C10:C20:F1)', 120],
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -82,31 +80,35 @@ class RangeTest extends TestCase
|
|||
/**
|
||||
* @dataProvider providerNamedRangeEvaluation
|
||||
*/
|
||||
public function testNamedRangeEvaluation(string $group1, string $group2, string $formula, int $expectedResult): void
|
||||
public function testNamedRangeEvaluation(array $ranges, string $formula, int $expectedResult): void
|
||||
{
|
||||
$workSheet = $this->spreadSheet->getActiveSheet();
|
||||
$this->spreadSheet->addNamedRange(new NamedRange('GROUP1', $workSheet, $group1));
|
||||
$this->spreadSheet->addNamedRange(new NamedRange('GROUP2', $workSheet, $group2));
|
||||
foreach ($ranges as $id => $range) {
|
||||
$this->spreadSheet->addNamedRange(new NamedRange('GROUP' . ++$id, $workSheet, $range));
|
||||
}
|
||||
|
||||
$workSheet->setCellValue('E1', $formula);
|
||||
$workSheet->setCellValue('H1', $formula);
|
||||
|
||||
$sumRresult = $workSheet->getCell('E1')->getCalculatedValue();
|
||||
$sumRresult = $workSheet->getCell('H1')->getCalculatedValue();
|
||||
self::assertSame($expectedResult, $sumRresult);
|
||||
}
|
||||
|
||||
public function providerNamedRangeEvaluation(): array
|
||||
{
|
||||
return[
|
||||
['$A$1:$B$3', '$A$1:$C$2', '=SUM(GROUP1,GROUP2)', 48],
|
||||
['$A$1:$B$3', '$A$1:$C$2', '=COUNT(GROUP1,GROUP2)', 12],
|
||||
['$A$1:$B$3', '$A$1:$C$2', '=SUM(GROUP1 GROUP2)', 12],
|
||||
['$A$1:$B$3', '$A$1:$C$2', '=COUNT(GROUP1 GROUP2)', 4],
|
||||
['$A$1:$B$2', '$B$2:$C$3', '=SUM(GROUP1,GROUP2)', 40],
|
||||
['$A$1:$B$2', '$B$2:$C$3', '=COUNT(GROUP1,GROUP2)', 8],
|
||||
['$A$1:$B$2', '$B$2:$C$3', '=SUM(GROUP1 GROUP2)', 5],
|
||||
['$A$1:$B$2', '$B$2:$C$3', '=COUNT(GROUP1 GROUP2)', 1],
|
||||
['Worksheet!$A$1:$B$2', 'Worksheet!$B$2:$C$3', '=SUM(GROUP1,GROUP2)', 40],
|
||||
['Worksheet!$A$1:Worksheet!$B$2', 'Worksheet!$B$2:Worksheet!$C$3', '=SUM(GROUP1,GROUP2)', 40],
|
||||
[['$A$1:$B$3', '$A$1:$C$2'], '=SUM(GROUP1,GROUP2)', 75],
|
||||
[['$A$1:$B$3', '$A$1:$C$2'], '=COUNT(GROUP1,GROUP2)', 12],
|
||||
[['$A$1:$B$3', '$A$1:$C$2'], '=SUM(GROUP1 GROUP2)', 18],
|
||||
[['$A$1:$B$3', '$A$1:$C$2'], '=COUNT(GROUP1 GROUP2)', 4],
|
||||
[['$A$1:$B$2', '$B$2:$C$3'], '=SUM(GROUP1,GROUP2)', 64],
|
||||
[['$A$1:$B$2', '$B$2:$C$3'], '=COUNT(GROUP1,GROUP2)', 8],
|
||||
[['$A$1:$B$2', '$B$2:$C$3'], '=SUM(GROUP1 GROUP2)', 8],
|
||||
[['$A$1:$B$2', '$B$2:$C$3'], '=COUNT(GROUP1 GROUP2)', 1],
|
||||
[['$A$5', '$C$10:$C$20', '$F$1'], '=SUM(GROUP1:GROUP2:GROUP3)', 7260],
|
||||
[['$A$5:$A$7', '$C$20', '$F$1'], '=SUM(GROUP1:GROUP2:GROUP3)', 7260],
|
||||
[['$A$5:$A$7', '$C$10:$C$20', '$F$1'], '=SUM(GROUP1:GROUP2:GROUP3)', 7260],
|
||||
[['Worksheet!$A$1:$B$2', 'Worksheet!$B$2:$C$3'], '=SUM(GROUP1,GROUP2)', 64],
|
||||
[['Worksheet!$A$1:Worksheet!$B$2', 'Worksheet!$B$2:Worksheet!$C$3'], '=SUM(GROUP1,GROUP2)', 64],
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -132,9 +134,9 @@ class RangeTest extends TestCase
|
|||
public function providerUTF8NamedRangeEvaluation(): array
|
||||
{
|
||||
return[
|
||||
[['Γειά', 'σου', 'Κόσμε'], ['$A$1', '$B$1:$B$2', '$C$1:$C$3'], '=SUM(Γειά,σου,Κόσμε)', 26],
|
||||
[['Γειά', 'σου', 'Κόσμε'], ['$A$1', '$B$1:$B$2', '$C$1:$C$3'], '=SUM(Γειά,σου,Κόσμε)', 38],
|
||||
[['Γειά', 'σου', 'Κόσμε'], ['$A$1', '$B$1:$B$2', '$C$1:$C$3'], '=COUNT(Γειά,σου,Κόσμε)', 6],
|
||||
[['Здравствуй', 'мир'], ['$A$1:$A$3', '$C$1:$C$3'], '=SUM(Здравствуй,мир)', 30],
|
||||
[['Здравствуй', 'мир'], ['$A$1:$A$3', '$C$1:$C$3'], '=SUM(Здравствуй,мир)', 48],
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,229 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Calculation;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
|
||||
use PhpOffice\PhpSpreadsheet\NamedRange;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class ParseFormulaTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @dataProvider providerBinaryOperations
|
||||
*/
|
||||
public function testParseOperations(array $expectedStack, string $formula): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$spreadsheet->addNamedRange(new NamedRange('GROUP1', $spreadsheet->getActiveSheet(), 'B2:D4'));
|
||||
$spreadsheet->addNamedRange(new NamedRange('GROUP2', $spreadsheet->getActiveSheet(), 'D4:F6'));
|
||||
|
||||
$parser = Calculation::getInstance($spreadsheet);
|
||||
$stack = $parser->parseFormula($formula);
|
||||
self::assertSame($expectedStack, $stack);
|
||||
}
|
||||
|
||||
public function providerBinaryOperations(): array
|
||||
{
|
||||
return [
|
||||
'Unary negative with Value' => [
|
||||
[
|
||||
['type' => 'Value', 'value' => 3, 'reference' => null],
|
||||
['type' => 'Unary Operator', 'value' => '~', 'reference' => null],
|
||||
],
|
||||
'=-3',
|
||||
],
|
||||
'Unary negative percentage with Value' => [
|
||||
[
|
||||
['type' => 'Value', 'value' => 3, 'reference' => null],
|
||||
['type' => 'Unary Operator', 'value' => '%', 'reference' => null],
|
||||
['type' => 'Unary Operator', 'value' => '~', 'reference' => null],
|
||||
],
|
||||
'=-3%',
|
||||
],
|
||||
'Binary minus with Values' => [
|
||||
[
|
||||
['type' => 'Value', 'value' => 3, 'reference' => null],
|
||||
['type' => 'Value', 'value' => 4, 'reference' => null],
|
||||
['type' => 'Binary Operator', 'value' => '-', 'reference' => null],
|
||||
],
|
||||
'=3-4',
|
||||
],
|
||||
'Unary negative with Cell Reference' => [
|
||||
[
|
||||
['type' => 'Cell Reference', 'value' => 'A1', 'reference' => 'A1'],
|
||||
['type' => 'Unary Operator', 'value' => '~', 'reference' => null],
|
||||
],
|
||||
'=-A1',
|
||||
],
|
||||
'Unary negative with FQ Cell Reference' => [
|
||||
[
|
||||
['type' => 'Cell Reference', 'value' => "'Sheet 1'!A1", 'reference' => "'Sheet 1'!A1"],
|
||||
['type' => 'Unary Operator', 'value' => '~', 'reference' => null],
|
||||
],
|
||||
"=-'Sheet 1'!A1",
|
||||
],
|
||||
'Unary negative percentage with Cell Reference' => [
|
||||
[
|
||||
['type' => 'Cell Reference', 'value' => 'A1', 'reference' => 'A1'],
|
||||
['type' => 'Unary Operator', 'value' => '%', 'reference' => null],
|
||||
['type' => 'Unary Operator', 'value' => '~', 'reference' => null],
|
||||
],
|
||||
'=-A1%',
|
||||
],
|
||||
'Unary negative with Defined Name' => [
|
||||
[
|
||||
['type' => 'Defined Name', 'value' => 'DEFINED_NAME', 'reference' => 'DEFINED_NAME'],
|
||||
['type' => 'Unary Operator', 'value' => '~', 'reference' => null],
|
||||
],
|
||||
'=-DEFINED_NAME',
|
||||
],
|
||||
'Unary negative percentage with Defined Name' => [
|
||||
[
|
||||
['type' => 'Defined Name', 'value' => 'DEFINED_NAME', 'reference' => 'DEFINED_NAME'],
|
||||
['type' => 'Unary Operator', 'value' => '%', 'reference' => null],
|
||||
['type' => 'Unary Operator', 'value' => '~', 'reference' => null],
|
||||
],
|
||||
'=-DEFINED_NAME%',
|
||||
],
|
||||
'Integer Numbers with Operator' => [
|
||||
[
|
||||
['type' => 'Value', 'value' => 2, 'reference' => null],
|
||||
['type' => 'Value', 'value' => 3, 'reference' => null],
|
||||
['type' => 'Binary Operator', 'value' => '*', 'reference' => null],
|
||||
],
|
||||
'=2*3',
|
||||
],
|
||||
'Float Numbers with Operator' => [
|
||||
[
|
||||
['type' => 'Value', 'value' => 2.5, 'reference' => null],
|
||||
['type' => 'Value', 'value' => 3.5, 'reference' => null],
|
||||
['type' => 'Binary Operator', 'value' => '*', 'reference' => null],
|
||||
],
|
||||
'=2.5*3.5',
|
||||
],
|
||||
'Strings with Operator' => [
|
||||
[
|
||||
['type' => 'Value', 'value' => '"HELLO"', 'reference' => null],
|
||||
['type' => 'Value', 'value' => '"WORLD"', 'reference' => null],
|
||||
['type' => 'Binary Operator', 'value' => '&', 'reference' => null],
|
||||
],
|
||||
'="HELLO"&"WORLD"',
|
||||
],
|
||||
'Error' => [
|
||||
[
|
||||
['type' => 'Value', 'value' => '#DIV0!', 'reference' => null],
|
||||
],
|
||||
'=#DIV0!',
|
||||
],
|
||||
'Cell Range' => [
|
||||
[
|
||||
['type' => 'Cell Reference', 'value' => 'A1', 'reference' => 'A1'],
|
||||
['type' => 'Cell Reference', 'value' => 'C3', 'reference' => 'C3'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
],
|
||||
'=A1:C3',
|
||||
],
|
||||
'Chained Cell Range' => [
|
||||
[
|
||||
['type' => 'Cell Reference', 'value' => 'A1', 'reference' => 'A1'],
|
||||
['type' => 'Cell Reference', 'value' => 'C3', 'reference' => 'C3'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
['type' => 'Cell Reference', 'value' => 'E5', 'reference' => 'E5'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
],
|
||||
'=A1:C3:E5',
|
||||
],
|
||||
'Cell Range Intersection' => [
|
||||
[
|
||||
['type' => 'Cell Reference', 'value' => 'A1', 'reference' => 'A1'],
|
||||
['type' => 'Cell Reference', 'value' => 'C3', 'reference' => 'C3'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
['type' => 'Cell Reference', 'value' => 'B2', 'reference' => 'B2'],
|
||||
['type' => 'Cell Reference', 'value' => 'D4', 'reference' => 'D4'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
['type' => 'Binary Operator', 'value' => '∩', 'reference' => null],
|
||||
],
|
||||
'=A1:C3 B2:D4',
|
||||
],
|
||||
'Row Range' => [
|
||||
[
|
||||
['type' => 'Row Reference', 'value' => 'A2', 'reference' => 'A2'],
|
||||
['type' => 'Row Reference', 'value' => 'XFD3', 'reference' => 'XFD3'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
],
|
||||
'=2:3',
|
||||
],
|
||||
'Column Range' => [
|
||||
[
|
||||
['type' => 'Column Reference', 'value' => 'B1', 'reference' => 'B1'],
|
||||
['type' => 'Column Reference', 'value' => 'C1048576', 'reference' => 'C1048576'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
],
|
||||
'=B:C',
|
||||
],
|
||||
'Range with Defined Names' => [
|
||||
[
|
||||
['type' => 'Defined Name', 'value' => 'GROUP1', 'reference' => 'GROUP1'],
|
||||
['type' => 'Defined Name', 'value' => 'D4', 'reference' => 'GROUP2'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
['type' => 'Defined Name', 'value' => 'F6', 'reference' => 'GROUP2'],
|
||||
['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
],
|
||||
'=GROUP1:GROUP2',
|
||||
],
|
||||
'Named Range with Binary Operator' => [
|
||||
[
|
||||
['type' => 'Defined Name', 'value' => 'DEFINED_NAME_1', 'reference' => 'DEFINED_NAME_1'],
|
||||
['type' => 'Defined Name', 'value' => 'DEFINED_NAME_2', 'reference' => 'DEFINED_NAME_2'],
|
||||
['type' => 'Binary Operator', 'value' => '/', 'reference' => null],
|
||||
],
|
||||
'=DEFINED_NAME_1/DEFINED_NAME_2',
|
||||
],
|
||||
'Named Range Intersection' => [
|
||||
[
|
||||
['type' => 'Defined Name', 'value' => 'DEFINED_NAME_1', 'reference' => 'DEFINED_NAME_1'],
|
||||
['type' => 'Defined Name', 'value' => 'DEFINED_NAME_2', 'reference' => 'DEFINED_NAME_2'],
|
||||
['type' => 'Binary Operator', 'value' => '∩', 'reference' => null],
|
||||
],
|
||||
'=DEFINED_NAME_1 DEFINED_NAME_2',
|
||||
],
|
||||
// 'Structured Reference Arithmetic' => [
|
||||
// [
|
||||
// ['type' => 'Structured Reference', 'value' => '[@Quantity]', 'reference' => null],
|
||||
// ['type' => 'Structured Reference', 'value' => '[@[Unit Price]]', 'reference' => null],
|
||||
// ['type' => 'Binary Operator', 'value' => '*', 'reference' => null],
|
||||
// ],
|
||||
// '=[@Quantity]*[@[Unit Price]]',
|
||||
// ],
|
||||
// 'Structured Reference Intersection' => [
|
||||
// [
|
||||
// ['type' => 'Structured Reference', 'value' => 'DeptSales[[Sales Person]:[Sales Amount]]', 'reference' => null],
|
||||
// ['type' => 'Structured Reference', 'value' => 'DeptSales[[Region]:[% Commission]]', 'reference' => null],
|
||||
// ['type' => 'Binary Operator', 'value' => '∩', 'reference' => null],
|
||||
// ],
|
||||
// '=DeptSales[[Sales Person]:[Sales Amount]] DeptSales[[Region]:[% Commission]]',
|
||||
// ],
|
||||
// 'Cell Range Union' => [
|
||||
// [
|
||||
// ['type' => 'Cell Reference', 'value' => 'A1', 'reference' => 'A1'],
|
||||
// ['type' => 'Cell Reference', 'value' => 'C3', 'reference' => 'C3'],
|
||||
// ['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
// ['type' => 'Cell Reference', 'value' => 'B2', 'reference' => 'B2'],
|
||||
// ['type' => 'Cell Reference', 'value' => 'D4', 'reference' => 'D4'],
|
||||
// ['type' => 'Binary Operator', 'value' => ':', 'reference' => null],
|
||||
// ['type' => 'Binary Operator', 'value' => '∪', 'reference' => null],
|
||||
// ],
|
||||
// '=A1:C3,B2:D4',
|
||||
// ],
|
||||
// 'Named Range Union' => [
|
||||
// [
|
||||
// ['type' => 'Defined Name', 'value' => 'DEFINED_NAME_1', 'reference' => 'DEFINED_NAME_1'],
|
||||
// ['type' => 'Defined Name', 'value' => 'DEFINED_NAME_2', 'reference' => 'DEFINED_NAME_2'],
|
||||
// ['type' => 'Binary Operator', 'value' => '∪', 'reference' => null],
|
||||
// ],
|
||||
// '=DEFINED_NAME_1,DEFINED_NAME_2',
|
||||
// ],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,246 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
|
||||
use PhpOffice\PhpSpreadsheet\Exception;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class CellAddressTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @dataProvider providerCreateFromCellAddress
|
||||
*/
|
||||
public function testCreateFromCellAddress(
|
||||
string $cellAddress,
|
||||
string $expectedColumnName,
|
||||
int $expectedColumnId,
|
||||
int $expectedRowId
|
||||
): void {
|
||||
$cellAddressObject = CellAddress::fromCellAddress($cellAddress);
|
||||
|
||||
self::assertSame($cellAddress, (string) $cellAddressObject);
|
||||
self::assertSame($cellAddress, $cellAddressObject->cellAddress());
|
||||
self::assertSame($expectedRowId, $cellAddressObject->rowId());
|
||||
self::assertSame($expectedColumnId, $cellAddressObject->columnId());
|
||||
self::assertSame($expectedColumnName, $cellAddressObject->columnName());
|
||||
}
|
||||
|
||||
public function providerCreateFromCellAddress(): array
|
||||
{
|
||||
return [
|
||||
['A1', 'A', 1, 1],
|
||||
['C5', 'C', 3, 5],
|
||||
['IV256', 'IV', 256, 256],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider providerCreateFromCellAddressException
|
||||
*
|
||||
* @param mixed $cellAddress
|
||||
*/
|
||||
public function testCreateFromCellAddressException($cellAddress): void
|
||||
{
|
||||
$this->expectException(Exception::class);
|
||||
$this->expectExceptionMessage(
|
||||
$cellAddress === ''
|
||||
? 'Cell coordinate can not be zero-length string'
|
||||
: "Invalid cell coordinate {$cellAddress}"
|
||||
);
|
||||
|
||||
CellAddress::fromCellAddress($cellAddress);
|
||||
}
|
||||
|
||||
public function providerCreateFromCellAddressException(): array
|
||||
{
|
||||
return [
|
||||
['INVALID'],
|
||||
[''],
|
||||
['IV'],
|
||||
['12'],
|
||||
[123],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider providerCreateFromColumnAndRow
|
||||
*/
|
||||
public function testCreateFromColumnAndRow(
|
||||
int $columnId,
|
||||
int $rowId,
|
||||
string $expectedCellAddress,
|
||||
string $expectedColumnName
|
||||
): void {
|
||||
$cellAddressObject = CellAddress::fromColumnAndRow($columnId, $rowId);
|
||||
|
||||
self::assertSame($expectedCellAddress, (string) $cellAddressObject);
|
||||
self::assertSame($expectedCellAddress, $cellAddressObject->cellAddress());
|
||||
self::assertSame($rowId, $cellAddressObject->rowId());
|
||||
self::assertSame($columnId, $cellAddressObject->columnId());
|
||||
self::assertSame($expectedColumnName, $cellAddressObject->columnName());
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider providerCreateFromColumnRowException
|
||||
*
|
||||
* @param mixed $columnId
|
||||
* @param mixed $rowId
|
||||
*/
|
||||
public function testCreateFromColumnRowException($columnId, $rowId): void
|
||||
{
|
||||
$this->expectException(Exception::class);
|
||||
$this->expectExceptionMessage('Row and Column Ids must be positive integer values');
|
||||
|
||||
CellAddress::fromColumnAndRow($columnId, $rowId);
|
||||
}
|
||||
|
||||
public function providerCreateFromColumnAndRow(): array
|
||||
{
|
||||
return [
|
||||
[1, 1, 'A1', 'A'],
|
||||
[3, 5, 'C5', 'C'],
|
||||
[256, 256, 'IV256', 'IV'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider providerCreateFromColumnRowArray
|
||||
*/
|
||||
public function testCreateFromColumnRowArray(
|
||||
int $columnId,
|
||||
int $rowId,
|
||||
string $expectedCellAddress,
|
||||
string $expectedColumnName
|
||||
): void {
|
||||
$columnRowArray = [$columnId, $rowId];
|
||||
$cellAddressObject = CellAddress::fromColumnRowArray($columnRowArray);
|
||||
|
||||
self::assertSame($expectedCellAddress, (string) $cellAddressObject);
|
||||
self::assertSame($expectedCellAddress, $cellAddressObject->cellAddress());
|
||||
self::assertSame($rowId, $cellAddressObject->rowId());
|
||||
self::assertSame($columnId, $cellAddressObject->columnId());
|
||||
self::assertSame($expectedColumnName, $cellAddressObject->columnName());
|
||||
}
|
||||
|
||||
public function providerCreateFromColumnRowArray(): array
|
||||
{
|
||||
return [
|
||||
[1, 1, 'A1', 'A'],
|
||||
[3, 5, 'C5', 'C'],
|
||||
[256, 256, 'IV256', 'IV'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider providerCreateFromColumnRowException
|
||||
*
|
||||
* @param mixed $columnId
|
||||
* @param mixed $rowId
|
||||
*/
|
||||
public function testCreateFromColumnRowArrayException($columnId, $rowId): void
|
||||
{
|
||||
$this->expectException(Exception::class);
|
||||
$this->expectExceptionMessage('Row and Column Ids must be positive integer values');
|
||||
|
||||
$columnRowArray = [$columnId, $rowId];
|
||||
CellAddress::fromColumnRowArray($columnRowArray);
|
||||
}
|
||||
|
||||
public function providerCreateFromColumnRowException(): array
|
||||
{
|
||||
return [
|
||||
[-1, 1],
|
||||
[3, 'A'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider providerCreateFromCellAddressWithWorksheet
|
||||
*/
|
||||
public function testCreateFromCellAddressWithWorksheet(
|
||||
string $cellAddress,
|
||||
string $expectedCellAddress,
|
||||
string $expectedColumnName,
|
||||
int $expectedColumnId,
|
||||
int $expectedRowId
|
||||
): void {
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$worksheet = $spreadsheet->getActiveSheet();
|
||||
$worksheet->setTitle("Mark's Worksheet");
|
||||
|
||||
$cellAddressObject = CellAddress::fromCellAddress($cellAddress, $worksheet);
|
||||
|
||||
self::assertSame($expectedCellAddress, (string) $cellAddressObject);
|
||||
self::assertSame($cellAddress, $cellAddressObject->cellAddress());
|
||||
self::assertSame($expectedRowId, $cellAddressObject->rowId());
|
||||
self::assertSame($expectedColumnId, $cellAddressObject->columnId());
|
||||
self::assertSame($expectedColumnName, $cellAddressObject->columnName());
|
||||
}
|
||||
|
||||
public function providerCreateFromCellAddressWithWorksheet(): array
|
||||
{
|
||||
return [
|
||||
['A1', "'Mark''s Worksheet'!A1", 'A', 1, 1],
|
||||
['C5', "'Mark''s Worksheet'!C5", 'C', 3, 5],
|
||||
['IV256', "'Mark''s Worksheet'!IV256", 'IV', 256, 256],
|
||||
];
|
||||
}
|
||||
|
||||
public function testNextRow(): void
|
||||
{
|
||||
$cellAddress = CellAddress::fromCellAddress('C5');
|
||||
// default single row
|
||||
$cellAddressC6 = $cellAddress->nextRow();
|
||||
self::assertSame('C6', (string) $cellAddressC6);
|
||||
// multiple rows
|
||||
$cellAddressC9 = $cellAddress->nextRow(4);
|
||||
self::assertSame('C9', (string) $cellAddressC9);
|
||||
// negative rows
|
||||
$cellAddressC3 = $cellAddress->nextRow(-2);
|
||||
self::assertSame('C3', (string) $cellAddressC3);
|
||||
// negative beyond the minimum
|
||||
$cellAddressC1 = $cellAddress->nextRow(-10);
|
||||
self::assertSame('C1', (string) $cellAddressC1);
|
||||
|
||||
// Check that the original object is still unchanged
|
||||
self::assertSame('C5', (string) $cellAddress);
|
||||
}
|
||||
|
||||
public function testPreviousRow(): void
|
||||
{
|
||||
$cellAddress = CellAddress::fromCellAddress('C5');
|
||||
// default single row
|
||||
$cellAddressC4 = $cellAddress->previousRow();
|
||||
self::assertSame('C4', (string) $cellAddressC4);
|
||||
}
|
||||
|
||||
public function testNextColumn(): void
|
||||
{
|
||||
$cellAddress = CellAddress::fromCellAddress('C5');
|
||||
// default single row
|
||||
$cellAddressD5 = $cellAddress->nextColumn();
|
||||
self::assertSame('D5', (string) $cellAddressD5);
|
||||
// multiple rows
|
||||
$cellAddressG5 = $cellAddress->nextColumn(4);
|
||||
self::assertSame('G5', (string) $cellAddressG5);
|
||||
// negative rows
|
||||
$cellAddressB5 = $cellAddress->nextColumn(-1);
|
||||
self::assertSame('B5', (string) $cellAddressB5);
|
||||
// negative beyond the minimum
|
||||
$cellAddressA5 = $cellAddress->nextColumn(-10);
|
||||
self::assertSame('A5', (string) $cellAddressA5);
|
||||
|
||||
// Check that the original object is still unchanged
|
||||
self::assertSame('C5', (string) $cellAddress);
|
||||
}
|
||||
|
||||
public function testPreviousColumn(): void
|
||||
{
|
||||
$cellAddress = CellAddress::fromCellAddress('C5');
|
||||
// default single row
|
||||
$cellAddressC4 = $cellAddress->previousColumn();
|
||||
self::assertSame('B5', (string) $cellAddressC4);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,153 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellRange;
|
||||
use PhpOffice\PhpSpreadsheet\Exception;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class CellRangeTest extends TestCase
|
||||
{
|
||||
public function testCreateCellRange(): void
|
||||
{
|
||||
$from = CellAddress::fromCellAddress('B5');
|
||||
$to = CellAddress::fromCellAddress('E2');
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame('B2:E5', (string) $cellRange);
|
||||
}
|
||||
|
||||
public function testCreateCellRangeWithWorksheet(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$worksheet = $spreadsheet->getActiveSheet();
|
||||
$worksheet->setTitle("Mark's Worksheet");
|
||||
|
||||
$from = CellAddress::fromCellAddress('B5', $worksheet);
|
||||
$to = CellAddress::fromCellAddress('E2');
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame("'Mark''s Worksheet'!B2:E5", (string) $cellRange);
|
||||
}
|
||||
|
||||
public function testCreateCellRangeWithWorksheets(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$worksheet = $spreadsheet->getActiveSheet();
|
||||
$worksheet->setTitle("Mark's Worksheet");
|
||||
|
||||
$from = CellAddress::fromCellAddress('B5', $worksheet);
|
||||
$to = CellAddress::fromCellAddress('E2', $worksheet);
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame("'Mark''s Worksheet'!B2:E5", (string) $cellRange);
|
||||
}
|
||||
|
||||
public function testSingleCellRange(): void
|
||||
{
|
||||
$from = CellAddress::fromCellAddress('C3');
|
||||
$to = CellAddress::fromCellAddress('C3');
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame('C3', (string) $cellRange);
|
||||
}
|
||||
|
||||
public function testSingleCellRangeWithWorksheet(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$worksheet = $spreadsheet->getActiveSheet();
|
||||
$worksheet->setTitle("Mark's Worksheet");
|
||||
|
||||
$from = CellAddress::fromCellAddress('C3', $worksheet);
|
||||
$to = CellAddress::fromCellAddress('C3');
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame("'Mark''s Worksheet'!C3", (string) $cellRange);
|
||||
}
|
||||
|
||||
public function testRangeFrom(): void
|
||||
{
|
||||
$from = CellAddress::fromCellAddress('B5');
|
||||
$to = CellAddress::fromCellAddress('E2');
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame('B2', (string) $cellRange->from());
|
||||
}
|
||||
|
||||
public function testRangeTo(): void
|
||||
{
|
||||
$from = CellAddress::fromCellAddress('B5');
|
||||
$to = CellAddress::fromCellAddress('E2');
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame('E5', (string) $cellRange->to());
|
||||
}
|
||||
|
||||
public function testCreateCellRangeWithMismatchedWorksheets(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$worksheet = $spreadsheet->getActiveSheet();
|
||||
$worksheet->setTitle("Mark's Worksheet");
|
||||
$secondWorksheet = new Worksheet($spreadsheet, 'A Second Worksheet');
|
||||
|
||||
$this->expectException(Exception::class);
|
||||
$this->expectExceptionMessage('3d Cell Ranges are not supported');
|
||||
|
||||
$from = CellAddress::fromCellAddress('B5', $worksheet);
|
||||
$to = CellAddress::fromCellAddress('E2', $secondWorksheet);
|
||||
new CellRange($from, $to);
|
||||
}
|
||||
|
||||
public function testCreateCellRangeWithMismatchedSpreadsheets(): void
|
||||
{
|
||||
$spreadsheet1 = new Spreadsheet();
|
||||
$worksheet1 = $spreadsheet1->getActiveSheet();
|
||||
$worksheet1->setTitle("Mark's Worksheet");
|
||||
$spreadsheet2 = new Spreadsheet();
|
||||
$worksheet2 = $spreadsheet2->getActiveSheet();
|
||||
$worksheet2->setTitle("Mark's Worksheet");
|
||||
|
||||
$this->expectException(Exception::class);
|
||||
$this->expectExceptionMessage('Worksheets must be in the same spreadsheet');
|
||||
|
||||
$from = CellAddress::fromCellAddress('B5', $worksheet1);
|
||||
$to = CellAddress::fromCellAddress('E2', $worksheet2);
|
||||
new CellRange($from, $to);
|
||||
}
|
||||
|
||||
public function testShiftRangeTo(): void
|
||||
{
|
||||
$from = CellAddress::fromCellAddress('B5');
|
||||
$to = CellAddress::fromCellAddress('E2');
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame('B2:E5', (string) $cellRange);
|
||||
|
||||
$cellRange->to()
|
||||
->nextColumn(2)
|
||||
->nextRow(2);
|
||||
|
||||
self::assertSame('B2', (string) $cellRange->from());
|
||||
self::assertSame('G7', (string) $cellRange->to());
|
||||
self::assertSame('B2:G7', (string) $cellRange);
|
||||
|
||||
$cellRange->to()
|
||||
->previousColumn()
|
||||
->previousRow();
|
||||
|
||||
self::assertSame('B2', (string) $cellRange->from());
|
||||
self::assertSame('F6', (string) $cellRange->to());
|
||||
self::assertSame('B2:F6', (string) $cellRange);
|
||||
}
|
||||
|
||||
public function testShiftRangeFrom(): void
|
||||
{
|
||||
$from = CellAddress::fromCellAddress('B5');
|
||||
$to = CellAddress::fromCellAddress('E2');
|
||||
$cellRange = new CellRange($from, $to);
|
||||
self::assertSame('B2:E5', (string) $cellRange);
|
||||
|
||||
$cellRange->from()
|
||||
->nextColumn(5)
|
||||
->nextRow(5);
|
||||
|
||||
self::assertSame('E5', (string) $cellRange->from());
|
||||
self::assertSame('G7', (string) $cellRange->to());
|
||||
self::assertSame('E5:G7', (string) $cellRange);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\ColumnRange;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class ColumnRangeTest extends TestCase
|
||||
{
|
||||
public function testCreateColumnRange(): void
|
||||
{
|
||||
$columnRange = new ColumnRange('C', 'E');
|
||||
self::assertSame('C', $columnRange->from());
|
||||
self::assertSame('E', $columnRange->to());
|
||||
self::assertSame(3, $columnRange->fromIndex());
|
||||
self::assertSame(5, $columnRange->toIndex());
|
||||
self::assertSame('C:E', (string) $columnRange);
|
||||
self::assertSame(3, $columnRange->columnCount());
|
||||
self::assertSame('C1:E1048576', (string) $columnRange->toCellRange());
|
||||
}
|
||||
|
||||
public function testCreateSingleColumnRange(): void
|
||||
{
|
||||
$columnRange = new ColumnRange('E');
|
||||
self::assertSame('E', $columnRange->from());
|
||||
self::assertSame('E', $columnRange->to());
|
||||
self::assertSame('E:E', (string) $columnRange);
|
||||
self::assertSame(1, $columnRange->columnCount());
|
||||
self::assertSame('E1:E1048576', (string) $columnRange->toCellRange());
|
||||
}
|
||||
|
||||
public function testCreateColumnRangeWithWorksheet(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$worksheet = $spreadsheet->getActiveSheet();
|
||||
$worksheet->setTitle("Mark's Worksheet");
|
||||
|
||||
$columnRange = new ColumnRange('C', 'E', $worksheet);
|
||||
self::assertSame('C', $columnRange->from());
|
||||
self::assertSame('E', $columnRange->to());
|
||||
self::assertSame("'Mark''s Worksheet'!C:E", (string) $columnRange);
|
||||
self::assertSame("'Mark''s Worksheet'!C1:E1048576", (string) $columnRange->toCellRange());
|
||||
}
|
||||
|
||||
public function testCreateColumnRangeFromArray(): void
|
||||
{
|
||||
$columnRange = ColumnRange::fromArray(['C', 'E']);
|
||||
self::assertSame('C', $columnRange->from());
|
||||
self::assertSame('E', $columnRange->to());
|
||||
self::assertSame('C:E', (string) $columnRange);
|
||||
self::assertSame(3, $columnRange->columnCount());
|
||||
self::assertSame('C1:E1048576', (string) $columnRange->toCellRange());
|
||||
}
|
||||
|
||||
public function testCreateColumnRangeFromIndexes(): void
|
||||
{
|
||||
$columnRange = ColumnRange::fromColumnIndexes(3, 5);
|
||||
self::assertSame('C', $columnRange->from());
|
||||
self::assertSame('E', $columnRange->to());
|
||||
self::assertSame('C:E', (string) $columnRange);
|
||||
self::assertSame(3, $columnRange->columnCount());
|
||||
self::assertSame('C1:E1048576', (string) $columnRange->toCellRange());
|
||||
}
|
||||
|
||||
public function testColumnRangeNext(): void
|
||||
{
|
||||
$columnRange = new ColumnRange('C', 'E');
|
||||
$columnRangeNext = $columnRange->shiftDown(3);
|
||||
|
||||
self::assertSame('F', $columnRangeNext->from());
|
||||
self::assertSame('H', $columnRangeNext->to());
|
||||
|
||||
// Check that original Column Range isn't changed
|
||||
self::assertSame('C:E', (string) $columnRange);
|
||||
}
|
||||
|
||||
public function testColumnRangePrevious(): void
|
||||
{
|
||||
$columnRange = new ColumnRange('C', 'E');
|
||||
$columnRangeNext = $columnRange->shiftUp();
|
||||
|
||||
self::assertSame('B', $columnRangeNext->from());
|
||||
self::assertSame('D', $columnRangeNext->to());
|
||||
|
||||
// Check that original Column Range isn't changed
|
||||
self::assertSame('C:E', (string) $columnRange);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Cell;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\RowRange;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class RowRangeTest extends TestCase
|
||||
{
|
||||
public function testCreateRowRange(): void
|
||||
{
|
||||
$rowRange = new RowRange(3, 5);
|
||||
self::assertSame(3, $rowRange->from());
|
||||
self::assertSame(5, $rowRange->to());
|
||||
self::assertSame('3:5', (string) $rowRange);
|
||||
self::assertSame(3, $rowRange->rowCount());
|
||||
self::assertSame('A3:XFD5', (string) $rowRange->toCellRange());
|
||||
}
|
||||
|
||||
public function testCreateSingleRowRange(): void
|
||||
{
|
||||
$rowRange = new RowRange(3);
|
||||
self::assertSame(3, $rowRange->from());
|
||||
self::assertSame(3, $rowRange->to());
|
||||
self::assertSame('3:3', (string) $rowRange);
|
||||
self::assertSame(1, $rowRange->rowCount());
|
||||
}
|
||||
|
||||
public function testCreateRowRangeWithWorksheet(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$worksheet = $spreadsheet->getActiveSheet();
|
||||
$worksheet->setTitle("Mark's Worksheet");
|
||||
|
||||
$rowRange = new RowRange(3, 5, $worksheet);
|
||||
self::assertSame(3, $rowRange->from());
|
||||
self::assertSame(5, $rowRange->to());
|
||||
self::assertSame("'Mark''s Worksheet'!3:5", (string) $rowRange);
|
||||
}
|
||||
|
||||
public function testCreateRowRangeFromArray(): void
|
||||
{
|
||||
$rowRange = RowRange::fromArray([3, 5]);
|
||||
self::assertSame(3, $rowRange->from());
|
||||
self::assertSame(5, $rowRange->to());
|
||||
self::assertSame('3:5', (string) $rowRange);
|
||||
self::assertSame(3, $rowRange->rowCount());
|
||||
self::assertSame('A3:XFD5', (string) $rowRange->toCellRange());
|
||||
}
|
||||
|
||||
public function testRowRangeNext(): void
|
||||
{
|
||||
$rowRange = new RowRange(3, 5);
|
||||
$rowRangeNext = $rowRange->shiftRight(3);
|
||||
|
||||
self::assertSame(6, $rowRangeNext->from());
|
||||
self::assertSame(8, $rowRangeNext->to());
|
||||
|
||||
// Check that original Row Range isn't changed
|
||||
self::assertSame('3:5', (string) $rowRange);
|
||||
}
|
||||
|
||||
public function testRowRangePrevious(): void
|
||||
{
|
||||
$rowRange = new RowRange(3, 5);
|
||||
$rowRangeNext = $rowRange->shiftLeft();
|
||||
|
||||
self::assertSame(2, $rowRangeNext->from());
|
||||
self::assertSame(4, $rowRangeNext->to());
|
||||
|
||||
// Check that original Row Range isn't changed
|
||||
self::assertSame('3:5', (string) $rowRange);
|
||||
}
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Document;
|
||||
|
||||
use DateTime;
|
||||
use DateTimeZone;
|
||||
use PhpOffice\PhpSpreadsheet\Document\Properties;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\Date;
|
||||
|
|
@ -14,20 +15,27 @@ class PropertiesTest extends TestCase
|
|||
*/
|
||||
private $properties;
|
||||
|
||||
/** @var float */
|
||||
private $startTime;
|
||||
|
||||
protected function setup(): void
|
||||
{
|
||||
$this->properties = new Properties();
|
||||
do {
|
||||
// loop to avoid rare situation where timestamp changes
|
||||
$this->startTime = (float) (new DateTime())->format('U');
|
||||
$this->properties = new Properties();
|
||||
$endTime = (float) (new DateTime())->format('U');
|
||||
} while ($this->startTime !== $endTime);
|
||||
}
|
||||
|
||||
public function testNewInstance(): void
|
||||
{
|
||||
$createdTime = $modifiedTime = time();
|
||||
self::assertSame('Unknown Creator', $this->properties->getCreator());
|
||||
self::assertSame('Unknown Creator', $this->properties->getLastModifiedBy());
|
||||
self::assertSame('Untitled Spreadsheet', $this->properties->getTitle());
|
||||
self::assertSame('', $this->properties->getCompany());
|
||||
self::assertSame($createdTime, $this->properties->getCreated());
|
||||
self::assertSame($modifiedTime, $this->properties->getModified());
|
||||
self::assertEquals($this->startTime, $this->properties->getCreated());
|
||||
self::assertEquals($this->startTime, $this->properties->getModified());
|
||||
}
|
||||
|
||||
public function testSetCreator(): void
|
||||
|
|
@ -46,10 +54,10 @@ class PropertiesTest extends TestCase
|
|||
*/
|
||||
public function testSetCreated($expectedCreationTime, $created): void
|
||||
{
|
||||
$expectedCreationTime = $expectedCreationTime ?? time();
|
||||
$expectedCreationTime = $expectedCreationTime ?? $this->startTime;
|
||||
|
||||
$this->properties->setCreated($created);
|
||||
self::assertSame($expectedCreationTime, $this->properties->getCreated());
|
||||
self::assertEquals($expectedCreationTime, $this->properties->getCreated());
|
||||
}
|
||||
|
||||
public function providerCreationTime(): array
|
||||
|
|
@ -78,10 +86,10 @@ class PropertiesTest extends TestCase
|
|||
*/
|
||||
public function testSetModified($expectedModifiedTime, $modified): void
|
||||
{
|
||||
$expectedModifiedTime = $expectedModifiedTime ?? time();
|
||||
$expectedModifiedTime = $expectedModifiedTime ?? $this->startTime;
|
||||
|
||||
$this->properties->setModified($modified);
|
||||
self::assertSame($expectedModifiedTime, $this->properties->getModified());
|
||||
self::assertEquals($expectedModifiedTime, $this->properties->getModified());
|
||||
}
|
||||
|
||||
public function providerModifiedTime(): array
|
||||
|
|
|
|||
|
|
@ -108,6 +108,22 @@ class IOFactoryTest extends TestCase
|
|||
];
|
||||
}
|
||||
|
||||
public function testFormatAsExpected(): void
|
||||
{
|
||||
$fileName = 'samples/templates/30template.xls';
|
||||
|
||||
$actual = IOFactory::identify($fileName, [IOFactory::READER_XLS]);
|
||||
self::assertSame('Xls', $actual);
|
||||
}
|
||||
|
||||
public function testFormatNotAsExpectedThrowsException(): void
|
||||
{
|
||||
$fileName = 'samples/templates/30template.xls';
|
||||
|
||||
$this->expectException(ReaderException::class);
|
||||
IOFactory::identify($fileName, [IOFactory::READER_ODS]);
|
||||
}
|
||||
|
||||
public function testIdentifyNonExistingFileThrowException(): void
|
||||
{
|
||||
$this->expectException(ReaderException::class);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Xls;
|
||||
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
|
||||
|
||||
class RichTextSizeTest extends AbstractFunctional
|
||||
{
|
||||
public function testRichTextRunSize(): void
|
||||
{
|
||||
$filename = 'tests/data/Reader/XLS/RichTextFontSize.xls';
|
||||
$reader = new Xls();
|
||||
$spreadsheet = $reader->load($filename);
|
||||
$sheet = $spreadsheet->getSheetByName('橱柜门板');
|
||||
self::assertNotNull($sheet);
|
||||
$text = $sheet->getCell('L15')->getValue();
|
||||
$elements = $text->getRichTextElements();
|
||||
self::assertEquals(10, $elements[2]->getFont()->getSize());
|
||||
$spreadsheet->disconnectWorksheets();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class XlsxRootZipFilesTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
private static $testbook = 'tests/data/Reader/XLSX/rootZipFiles.xlsx';
|
||||
|
||||
public function testXlsxRootZipFiles(): void
|
||||
{
|
||||
$filename = self::$testbook;
|
||||
$reader = new Xlsx();
|
||||
$spreadsheet = $reader->load($filename);
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
$value = $sheet->getCell('A1')->getValue();
|
||||
self::assertSame('TEST CELL', $value->getPlainText());
|
||||
}
|
||||
}
|
||||
|
|
@ -188,4 +188,62 @@ class SpreadsheetTest extends TestCase
|
|||
$sheet->getCell('A1')->getStyle()->getFont()->setBold(true);
|
||||
$this->object->addExternalSheet($sheet);
|
||||
}
|
||||
|
||||
public function testAddExternalColumnDimensionStyles(): void
|
||||
{
|
||||
$spreadsheet1 = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
|
||||
$sheet1 = $spreadsheet1->createSheet()->setTitle('sheetWithColumnDimension');
|
||||
$sheet1->getCell('A1')->setValue(1);
|
||||
$sheet1->getCell('A1')->getStyle()->getFont()->setItalic(true);
|
||||
$sheet1->getColumnDimension('B')->setWidth(10)->setXfIndex($sheet1->getCell('A1')->getXfIndex());
|
||||
$index = $sheet1->getColumnDimension('B')->getXfIndex();
|
||||
self::assertEquals(1, $index);
|
||||
self::assertCount(2, $spreadsheet1->getCellXfCollection());
|
||||
|
||||
$spreadsheet2 = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
|
||||
$sheet2 = $spreadsheet2->createSheet()->setTitle('sheetWithTwoStyles');
|
||||
$sheet2->getCell('A1')->setValue(1);
|
||||
$sheet2->getCell('A1')->getStyle()->getFont()->setBold(true);
|
||||
$sheet2->getCell('B2')->getStyle()->getFont()->setSuperscript(true);
|
||||
$countXfs = count($spreadsheet2->getCellXfCollection());
|
||||
self::assertEquals(3, $countXfs);
|
||||
|
||||
$sheet3 = $spreadsheet2->addExternalSheet($sheet1);
|
||||
self::assertCount(5, $spreadsheet2->getCellXfCollection());
|
||||
self::assertTrue($sheet3->getCell('A1')->getStyle()->getFont()->getItalic());
|
||||
self::assertTrue($sheet3->getCell('B1')->getStyle()->getFont()->getItalic());
|
||||
self::assertFalse($sheet3->getCell('B1')->getStyle()->getFont()->getBold());
|
||||
// Prove Xf index changed although style is same.
|
||||
self::assertEquals($countXfs + $index, $sheet3->getCell('B1')->getXfIndex());
|
||||
self::assertEquals($countXfs + $index, $sheet3->getColumnDimension('B')->getXfIndex());
|
||||
}
|
||||
|
||||
public function testAddExternalRowDimensionStyles(): void
|
||||
{
|
||||
$spreadsheet1 = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
|
||||
$sheet1 = $spreadsheet1->createSheet()->setTitle('sheetWithColumnDimension');
|
||||
$sheet1->getCell('A1')->setValue(1);
|
||||
$sheet1->getCell('A1')->getStyle()->getFont()->setItalic(true);
|
||||
$sheet1->getRowDimension(2)->setXfIndex($sheet1->getCell('A1')->getXfIndex());
|
||||
$index = $sheet1->getRowDimension(2)->getXfIndex();
|
||||
self::assertEquals(1, $index);
|
||||
self::assertCount(2, $spreadsheet1->getCellXfCollection());
|
||||
|
||||
$spreadsheet2 = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
|
||||
$sheet2 = $spreadsheet2->createSheet()->setTitle('sheetWithTwoStyles');
|
||||
$sheet2->getCell('A1')->setValue(1);
|
||||
$sheet2->getCell('A1')->getStyle()->getFont()->setBold(true);
|
||||
$sheet2->getCell('B2')->getStyle()->getFont()->setSuperscript(true);
|
||||
$countXfs = count($spreadsheet2->getCellXfCollection());
|
||||
self::assertEquals(3, $countXfs);
|
||||
|
||||
$sheet3 = $spreadsheet2->addExternalSheet($sheet1);
|
||||
self::assertCount(5, $spreadsheet2->getCellXfCollection());
|
||||
self::assertTrue($sheet3->getCell('A1')->getStyle()->getFont()->getItalic());
|
||||
self::assertTrue($sheet3->getCell('A2')->getStyle()->getFont()->getItalic());
|
||||
self::assertFalse($sheet3->getCell('A2')->getStyle()->getFont()->getBold());
|
||||
// Prove Xf index changed although style is same.
|
||||
self::assertEquals($countXfs + $index, $sheet3->getCell('A2')->getXfIndex());
|
||||
self::assertEquals($countXfs + $index, $sheet3->getRowDimension(2)->getXfIndex());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,188 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
||||
use PhpOffice\PhpSpreadsheet\Comment;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class ByColumnAndRowTest extends TestCase
|
||||
{
|
||||
public function testSetCellValueByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$sheet->setCellValueByColumnAndRow(2, 2, 2);
|
||||
self::assertSame(2, $sheet->getCell('B2')->getValue());
|
||||
}
|
||||
|
||||
public function testSetCellValueExplicitByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$sheet->setCellValueExplicitByColumnAndRow(2, 2, '="PHP Rules"', DataType::TYPE_STRING);
|
||||
self::assertSame('="PHP Rules"', $sheet->getCell('B2')->getValue());
|
||||
self::assertSame(DataType::TYPE_STRING, $sheet->getCell('B2')->getDataType());
|
||||
}
|
||||
|
||||
public function testCellExistsByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$cellExists = $sheet->cellExistsByColumnAndRow(2, 2);
|
||||
self::assertFalse($cellExists);
|
||||
|
||||
$sheet->setCellValue('B2', 2);
|
||||
|
||||
$cellExists = $sheet->cellExistsByColumnAndRow(2, 2);
|
||||
self::assertTrue($cellExists);
|
||||
}
|
||||
|
||||
public function testGetCellByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$sheet->setCellValue('B2', 2);
|
||||
$cell = $sheet->getCellByColumnAndRow(2, 2);
|
||||
self::assertSame('B2', $cell->getCoordinate());
|
||||
self::assertSame(2, $cell->getValue());
|
||||
}
|
||||
|
||||
public function testGetStyleByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$data = [['A', 'B'], ['C', 'D']];
|
||||
$sheet->fromArray($data, null, 'B2', true);
|
||||
$sheet->getStyle('B2:C3')->getFont()->setBold(true);
|
||||
|
||||
$rangeStyle = $sheet->getStyleByColumnAndRow(2, 2, 3, 3);
|
||||
self::assertTrue($rangeStyle->getFont()->getBold());
|
||||
|
||||
$cellStyle = $sheet->getStyleByColumnAndRow(2, 2);
|
||||
self::assertTrue($cellStyle->getFont()->getBold());
|
||||
}
|
||||
|
||||
public function testSetBreakByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$sheet->setCellValue('B2', 2);
|
||||
$sheet->setBreakByColumnAndRow(2, 2, Worksheet::BREAK_COLUMN);
|
||||
|
||||
$breaks = $sheet->getBreaks();
|
||||
self::assertArrayHasKey('B2', $breaks);
|
||||
self::assertSame(Worksheet::BREAK_COLUMN, $breaks['B2']);
|
||||
}
|
||||
|
||||
public function testMergeCellsByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$data = [['A', 'B'], ['C', 'D']];
|
||||
$sheet->fromArray($data, null, 'B2', true);
|
||||
|
||||
$sheet->mergeCellsByColumnAndRow(2, 2, 3, 3);
|
||||
$mergeRanges = $sheet->getMergeCells();
|
||||
self::assertArrayHasKey('B2:C3', $mergeRanges);
|
||||
}
|
||||
|
||||
public function testUnergeCellsByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$data = [['A', 'B'], ['C', 'D']];
|
||||
$sheet->fromArray($data, null, 'B2', true);
|
||||
|
||||
$sheet->mergeCells('B2:C3');
|
||||
$mergeRanges = $sheet->getMergeCells();
|
||||
self::assertArrayHasKey('B2:C3', $mergeRanges);
|
||||
|
||||
$sheet->unmergeCellsByColumnAndRow(2, 2, 3, 3);
|
||||
$mergeRanges = $sheet->getMergeCells();
|
||||
self::assertEmpty($mergeRanges);
|
||||
}
|
||||
|
||||
public function testProtectCellsByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$data = [['A', 'B'], ['C', 'D']];
|
||||
$sheet->fromArray($data, null, 'B2', true);
|
||||
|
||||
$sheet->protectCellsByColumnAndRow(2, 2, 3, 3, 'secret', false);
|
||||
$protectedRanges = $sheet->getProtectedCells();
|
||||
self::assertArrayHasKey('B2:C3', $protectedRanges);
|
||||
}
|
||||
|
||||
public function testUnprotectCellsByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$data = [['A', 'B'], ['C', 'D']];
|
||||
$sheet->fromArray($data, null, 'B2', true);
|
||||
|
||||
$sheet->protectCells('B2:C3', 'secret', false);
|
||||
$protectedRanges = $sheet->getProtectedCells();
|
||||
self::assertArrayHasKey('B2:C3', $protectedRanges);
|
||||
|
||||
$sheet->unprotectCellsByColumnAndRow(2, 2, 3, 3);
|
||||
$protectedRanges = $sheet->getProtectedCells();
|
||||
self::assertEmpty($protectedRanges);
|
||||
}
|
||||
|
||||
public function testSetAutoFilterByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$data = [['A', 'B'], ['C', 'D']];
|
||||
$sheet->fromArray($data, null, 'B2', true);
|
||||
|
||||
$sheet->setAutoFilterByColumnAndRow(2, 2, 3, 3);
|
||||
$autoFilter = $sheet->getAutoFilter();
|
||||
self::assertInstanceOf(AutoFilter::class, $autoFilter);
|
||||
self::assertSame('B2:C3', $autoFilter->getRange());
|
||||
}
|
||||
|
||||
public function testFreezePaneByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$data = [['A', 'B'], ['C', 'D']];
|
||||
$sheet->fromArray($data, null, 'B2', true);
|
||||
|
||||
$sheet->freezePaneByColumnAndRow(2, 2);
|
||||
$freezePane = $sheet->getFreezePane();
|
||||
self::assertSame('B2', $freezePane);
|
||||
}
|
||||
|
||||
public function testGetCommentByColumnAndRow(): void
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
|
||||
$sheet->setCellValue('B2', 2);
|
||||
$spreadsheet->getActiveSheet()
|
||||
->getComment('B2')
|
||||
->getText()->createTextRun('My Test Comment');
|
||||
|
||||
$comment = $sheet->getCommentByColumnAndRow(2, 2);
|
||||
self::assertInstanceOf(Comment::class, $comment);
|
||||
self::assertSame('My Test Comment', $comment->getText()->getPlainText());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Worksheet\Table;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table\Column;
|
||||
|
||||
class ColumnTest extends SetupTeardown
|
||||
{
|
||||
protected function initTable(): Table
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
$sheet->getCell('G1')->setValue('Heading');
|
||||
$sheet->getCell('G2')->setValue(2);
|
||||
$sheet->getCell('G3')->setValue(3);
|
||||
$sheet->getCell('G4')->setValue(4);
|
||||
$sheet->getCell('H1')->setValue('Heading2');
|
||||
$sheet->getCell('H2')->setValue(1);
|
||||
$sheet->getCell('H3')->setValue(2);
|
||||
$sheet->getCell('H4')->setValue(3);
|
||||
$this->maxRow = $maxRow = 4;
|
||||
$table = new Table();
|
||||
$table->setRange("G1:H$maxRow");
|
||||
|
||||
return $table;
|
||||
}
|
||||
|
||||
public function testVariousGets(): void
|
||||
{
|
||||
$table = $this->initTable();
|
||||
$column = $table->getColumn('H');
|
||||
$result = $column->getColumnIndex();
|
||||
self::assertEquals('H', $result);
|
||||
}
|
||||
|
||||
public function testGetBadColumnIndex(): void
|
||||
{
|
||||
$this->expectException(PhpSpreadsheetException::class);
|
||||
$this->expectExceptionMessage('Column is outside of current table range.');
|
||||
$table = $this->initTable();
|
||||
$table->getColumn('B');
|
||||
}
|
||||
|
||||
public function testSetColumnIndex(): void
|
||||
{
|
||||
$table = $this->initTable();
|
||||
$column = $table->getColumn('H');
|
||||
$column->setShowFilterButton(false);
|
||||
$expectedResult = 'G';
|
||||
|
||||
$result = $column->setColumnIndex($expectedResult);
|
||||
self::assertInstanceOf(Column::class, $result);
|
||||
|
||||
$result = $result->getColumnIndex();
|
||||
self::assertEquals($expectedResult, $result);
|
||||
}
|
||||
|
||||
public function testVariousSets(): void
|
||||
{
|
||||
$table = $this->initTable();
|
||||
$column = $table->getColumn('H');
|
||||
|
||||
$result = $column->setShowFilterButton(false);
|
||||
self::assertInstanceOf(Column::class, $result);
|
||||
self::assertFalse($column->getShowFilterButton());
|
||||
|
||||
$label = 'Total';
|
||||
$result = $column->setTotalsRowLabel($label);
|
||||
self::assertInstanceOf(Column::class, $result);
|
||||
self::assertEquals($label, $column->getTotalsRowLabel());
|
||||
|
||||
$function = 'sum';
|
||||
$result = $column->setTotalsRowFunction($function);
|
||||
self::assertInstanceOf(Column::class, $result);
|
||||
self::assertEquals($function, $column->getTotalsRowFunction());
|
||||
|
||||
$formula = '=SUM(Sales_Data[[#This Row],[Q1]:[Q4]])';
|
||||
$result = $column->setColumnFormula($formula);
|
||||
self::assertInstanceOf(Column::class, $result);
|
||||
self::assertEquals($formula, $column->getColumnFormula());
|
||||
}
|
||||
|
||||
public function testTable(): void
|
||||
{
|
||||
$table = $this->initTable();
|
||||
$column = new Column('H');
|
||||
$column->setTable($table);
|
||||
self::assertEquals($table, $column->getTable());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Worksheet\Table;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
|
||||
class RemoveTableTest extends SetupTeardown
|
||||
{
|
||||
private const INITIAL_RANGE = 'H2:O256';
|
||||
|
||||
public function testRemoveTable(): void
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$table->setName('Table1');
|
||||
$sheet->addTable($table);
|
||||
|
||||
self::assertEquals(1, $sheet->getTableCollection()->count());
|
||||
|
||||
$sheet->removeTableByName('table1'); // case insensitive
|
||||
self::assertEquals(0, $sheet->getTableCollection()->count());
|
||||
}
|
||||
|
||||
public function testRemoveCollection(): void
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$table->setName('Table1');
|
||||
$sheet->addTable($table);
|
||||
|
||||
self::assertEquals(1, $sheet->getTableCollection()->count());
|
||||
|
||||
$sheet->removeTableCollection();
|
||||
self::assertEquals(0, $sheet->getTableCollection()->count());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Worksheet\Table;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
class SetupTeardown extends TestCase
|
||||
{
|
||||
/**
|
||||
* @var ?Spreadsheet
|
||||
*/
|
||||
private $spreadsheet;
|
||||
|
||||
/**
|
||||
* @var ?Worksheet
|
||||
*/
|
||||
private $sheet;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $maxRow = 4;
|
||||
|
||||
protected function tearDown(): void
|
||||
{
|
||||
$this->sheet = null;
|
||||
if ($this->spreadsheet !== null) {
|
||||
$this->spreadsheet->disconnectWorksheets();
|
||||
$this->spreadsheet = null;
|
||||
}
|
||||
}
|
||||
|
||||
protected function getSpreadsheet(): Spreadsheet
|
||||
{
|
||||
if ($this->spreadsheet !== null) {
|
||||
return $this->spreadsheet;
|
||||
}
|
||||
$this->spreadsheet = new Spreadsheet();
|
||||
|
||||
return $this->spreadsheet;
|
||||
}
|
||||
|
||||
protected function getSheet(): Worksheet
|
||||
{
|
||||
if ($this->sheet !== null) {
|
||||
return $this->sheet;
|
||||
}
|
||||
$this->sheet = $this->getSpreadsheet()->getActiveSheet();
|
||||
|
||||
return $this->sheet;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Worksheet\Table;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
|
||||
|
||||
class TableStyleTest extends SetupTeardown
|
||||
{
|
||||
private const INITIAL_RANGE = 'H2:O256';
|
||||
|
||||
public function testVariousSets(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$style = $table->getStyle();
|
||||
|
||||
$result = $style->setTheme(TableStyle::TABLE_STYLE_DARK1);
|
||||
self::assertInstanceOf(TableStyle::class, $result);
|
||||
self::assertEquals(TableStyle::TABLE_STYLE_DARK1, $style->getTheme());
|
||||
|
||||
$result = $style->setShowFirstColumn(true);
|
||||
self::assertInstanceOf(TableStyle::class, $result);
|
||||
self::assertTrue($style->getShowFirstColumn());
|
||||
|
||||
$result = $style->setShowLastColumn(true);
|
||||
self::assertInstanceOf(TableStyle::class, $result);
|
||||
self::assertTrue($style->getShowLastColumn());
|
||||
|
||||
$result = $style->setShowRowStripes(true);
|
||||
self::assertInstanceOf(TableStyle::class, $result);
|
||||
self::assertTrue($style->getShowRowStripes());
|
||||
|
||||
$result = $style->setShowColumnStripes(true);
|
||||
self::assertInstanceOf(TableStyle::class, $result);
|
||||
self::assertTrue($style->getShowColumnStripes());
|
||||
}
|
||||
|
||||
public function testTable(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$style = new TableStyle();
|
||||
$style->setTable($table);
|
||||
self::assertEquals($table, $style->getTable());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,558 @@
|
|||
<?php
|
||||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Worksheet\Table;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\CellRange;
|
||||
use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Table\Column;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
|
||||
class TableTest extends SetupTeardown
|
||||
{
|
||||
private const INITIAL_RANGE = 'H2:O256';
|
||||
|
||||
public function testToString(): void
|
||||
{
|
||||
$expectedResult = self::INITIAL_RANGE;
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
// magic __toString should return the active table range
|
||||
$result = (string) $table;
|
||||
self::assertEquals($expectedResult, $result);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider validTableNamesProvider
|
||||
*/
|
||||
public function testValidTableNames(string $name, string $expected): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
$result = $table->setName($name);
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
self::assertEquals($expected, $table->getName());
|
||||
}
|
||||
|
||||
public function validTableNamesProvider(): array
|
||||
{
|
||||
return [
|
||||
['', ''],
|
||||
['Table_1', 'Table_1'],
|
||||
['_table_2', '_table_2'],
|
||||
['\table_3', '\table_3'],
|
||||
[" Table_4 \n", 'Table_4'],
|
||||
['table.5', 'table.5'],
|
||||
['தமிழ்', 'தமிழ்'], // UTF-8 letters with combined character
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider invalidTableNamesProvider
|
||||
*/
|
||||
public function testInvalidTableNames(string $name): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
$this->expectException(PhpSpreadsheetException::class);
|
||||
|
||||
$table->setName($name);
|
||||
}
|
||||
|
||||
public function invalidTableNamesProvider(): array
|
||||
{
|
||||
return [
|
||||
['C'],
|
||||
['c'],
|
||||
['R'],
|
||||
['r'],
|
||||
['Z100'],
|
||||
['Z$100'],
|
||||
['R1C1'],
|
||||
['R1C'],
|
||||
['R11C11'],
|
||||
['123'],
|
||||
['=Table'],
|
||||
['ிக'], // starting with UTF-8 combined character
|
||||
[bin2hex(random_bytes(255))], // random string with length greater than 255
|
||||
];
|
||||
}
|
||||
|
||||
public function testUniqueTableName(): void
|
||||
{
|
||||
$this->expectException(PhpSpreadsheetException::class);
|
||||
$sheet = $this->getSheet();
|
||||
|
||||
$table1 = new Table();
|
||||
$table1->setName('Table_1');
|
||||
$sheet->addTable($table1);
|
||||
|
||||
$table2 = new Table();
|
||||
$table2->setName('table_1'); // case insensitive
|
||||
$sheet->addTable($table2);
|
||||
}
|
||||
|
||||
public function testVariousSets(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
$result = $table->setShowHeaderRow(false);
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
self::assertFalse($table->getShowHeaderRow());
|
||||
|
||||
$result = $table->setShowTotalsRow(true);
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
self::assertTrue($table->getShowTotalsRow());
|
||||
}
|
||||
|
||||
public function testGetWorksheet(): void
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$sheet->addTable($table);
|
||||
$result = $table->getWorksheet();
|
||||
self::assertSame($sheet, $result);
|
||||
}
|
||||
|
||||
public function testSetWorksheet(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$spreadsheet = $this->getSpreadsheet();
|
||||
$sheet2 = $spreadsheet->createSheet();
|
||||
// Setters return the instance to implement the fluent interface
|
||||
$result = $table->setWorksheet($sheet2);
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
}
|
||||
|
||||
public function testGetRange(): void
|
||||
{
|
||||
$expectedResult = self::INITIAL_RANGE;
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
// Result should be the active table range
|
||||
$result = $table->getRange();
|
||||
self::assertEquals($expectedResult, $result);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider validTableRangeProvider
|
||||
*
|
||||
* @param AddressRange|array<int>|string $fullRange
|
||||
* @param string $fullRange
|
||||
*/
|
||||
public function testSetRangeValidRange($fullRange, string $actualRange): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
$result = $table->setRange($fullRange);
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
self::assertEquals($actualRange, $table->getRange());
|
||||
}
|
||||
|
||||
public function validTableRangeProvider(): array
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
$title = $sheet->getTitle();
|
||||
|
||||
return [
|
||||
["$title!G1:J512", 'G1:J512'],
|
||||
['K1:N20', 'K1:N20'],
|
||||
[[3, 5, 6, 8], 'C5:F8'],
|
||||
[new CellRange(new CellAddress('C5', $sheet), new CellAddress('F8', $sheet)), 'C5:F8'],
|
||||
];
|
||||
}
|
||||
|
||||
public function testClearRange(): void
|
||||
{
|
||||
$expectedResult = '';
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
// Setters return the instance to implement the fluent interface
|
||||
$result = $table->setRange('');
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
|
||||
// Result should be a clear range
|
||||
$result = $table->getRange();
|
||||
self::assertEquals($expectedResult, $result);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider invalidTableRangeProvider
|
||||
*/
|
||||
public function testSetRangeInvalidRange(string $range): void
|
||||
{
|
||||
$this->expectException(PhpSpreadsheetException::class);
|
||||
|
||||
new Table($range);
|
||||
}
|
||||
|
||||
public function invalidTableRangeProvider(): array
|
||||
{
|
||||
return [
|
||||
['A1'],
|
||||
['A1:A1'],
|
||||
['B1:A4'],
|
||||
['A1:D1'],
|
||||
['D1:A1'],
|
||||
];
|
||||
}
|
||||
|
||||
public function testGetColumnsEmpty(): void
|
||||
{
|
||||
// There should be no columns yet defined
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$result = $table->getColumns();
|
||||
self::assertIsArray($result);
|
||||
self::assertCount(0, $result);
|
||||
}
|
||||
|
||||
public function testGetColumnOffset(): void
|
||||
{
|
||||
$columnIndexes = [
|
||||
'H' => 0,
|
||||
'K' => 3,
|
||||
'M' => 5,
|
||||
];
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
// If we request a specific column by its column ID, we should get an
|
||||
// integer returned representing the column offset within the range
|
||||
foreach ($columnIndexes as $columnIndex => $columnOffset) {
|
||||
$result = $table->getColumnOffset($columnIndex);
|
||||
self::assertEquals($columnOffset, $result);
|
||||
}
|
||||
}
|
||||
|
||||
public function testRemoveColumns(): void
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
$sheet->fromArray(range('H', 'O'), null, 'H2');
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$table->getColumn('L')->setShowFilterButton(false);
|
||||
$sheet->addTable($table);
|
||||
|
||||
$sheet->removeColumn('K', 2);
|
||||
$result = $table->getRange();
|
||||
self::assertEquals('H2:M256', $result);
|
||||
|
||||
// Check that the prop that was set for column L is no longer set
|
||||
self::assertTrue($table->getColumn('L')->getShowFilterButton());
|
||||
}
|
||||
|
||||
public function testRemoveRows(): void
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
$sheet->fromArray(range('H', 'O'), null, 'H2');
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$sheet->addTable($table);
|
||||
|
||||
$sheet->removeRow(42, 128);
|
||||
$result = $table->getRange();
|
||||
self::assertEquals('H2:O128', $result);
|
||||
}
|
||||
|
||||
public function testInsertColumns(): void
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
$sheet->fromArray(range('H', 'O'), null, 'H2');
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$table->getColumn('N')->setShowFilterButton(false);
|
||||
$sheet->addTable($table);
|
||||
|
||||
$sheet->insertNewColumnBefore('N', 3);
|
||||
$result = $table->getRange();
|
||||
self::assertEquals('H2:R256', $result);
|
||||
|
||||
// Check that column N no longer has a prop
|
||||
self::assertTrue($table->getColumn('N')->getShowFilterButton());
|
||||
// Check that the prop originally set in column N has been moved to column Q
|
||||
self::assertFalse($table->getColumn('Q')->getShowFilterButton());
|
||||
}
|
||||
|
||||
public function testInsertRows(): void
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
$sheet->fromArray(range('H', 'O'), null, 'H2');
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$sheet->addTable($table);
|
||||
|
||||
$sheet->insertNewRowBefore(3, 4);
|
||||
$result = $table->getRange();
|
||||
self::assertEquals('H2:O260', $result);
|
||||
}
|
||||
|
||||
public function testGetInvalidColumnOffset(): void
|
||||
{
|
||||
$this->expectException(PhpSpreadsheetException::class);
|
||||
|
||||
$invalidColumn = 'G';
|
||||
$sheet = $this->getSheet();
|
||||
$table = new Table();
|
||||
$table->setWorksheet($sheet);
|
||||
|
||||
$table->getColumnOffset($invalidColumn);
|
||||
}
|
||||
|
||||
public function testSetColumnWithString(): void
|
||||
{
|
||||
$expectedResult = 'L';
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
// Setters return the instance to implement the fluent interface
|
||||
$result = $table->setColumn($expectedResult);
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
|
||||
$result = $table->getColumns();
|
||||
// Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table\Column
|
||||
// objects for each column we set indexed by the column ID
|
||||
self::assertIsArray($result);
|
||||
self::assertCount(1, $result);
|
||||
self::assertArrayHasKey($expectedResult, $result);
|
||||
self::assertInstanceOf(Column::class, $result[$expectedResult]);
|
||||
}
|
||||
|
||||
public function testSetInvalidColumnWithString(): void
|
||||
{
|
||||
$this->expectException(PhpSpreadsheetException::class);
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
$invalidColumn = 'A';
|
||||
$table->setColumn($invalidColumn);
|
||||
}
|
||||
|
||||
public function testSetColumnWithColumnObject(): void
|
||||
{
|
||||
$expectedResult = 'M';
|
||||
$columnObject = new Column($expectedResult);
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
// Setters return the instance to implement the fluent interface
|
||||
$result = $table->setColumn($columnObject);
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
|
||||
$result = $table->getColumns();
|
||||
// Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table\Column
|
||||
// objects for each column we set indexed by the column ID
|
||||
self::assertIsArray($result);
|
||||
self::assertCount(1, $result);
|
||||
self::assertArrayHasKey($expectedResult, $result);
|
||||
self::assertInstanceOf(Column::class, $result[$expectedResult]);
|
||||
}
|
||||
|
||||
public function testSetInvalidColumnWithObject(): void
|
||||
{
|
||||
$this->expectException(PhpSpreadsheetException::class);
|
||||
|
||||
$invalidColumn = 'E';
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$table->setColumn($invalidColumn);
|
||||
}
|
||||
|
||||
public function testSetColumnWithInvalidDataType(): void
|
||||
{
|
||||
$this->expectException(PhpSpreadsheetException::class);
|
||||
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$invalidColumn = 123.456;
|
||||
// @phpstan-ignore-next-line
|
||||
$table->setColumn($invalidColumn);
|
||||
}
|
||||
|
||||
public function testGetColumns(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
$columnIndexes = ['L', 'M'];
|
||||
|
||||
foreach ($columnIndexes as $columnIndex) {
|
||||
$table->setColumn($columnIndex);
|
||||
}
|
||||
|
||||
$result = $table->getColumns();
|
||||
// Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table\Column
|
||||
// objects for each column we set indexed by the column ID
|
||||
self::assertIsArray($result);
|
||||
self::assertCount(count($columnIndexes), $result);
|
||||
foreach ($columnIndexes as $columnIndex) {
|
||||
self::assertArrayHasKey($columnIndex, $result);
|
||||
self::assertInstanceOf(Column::class, $result[$columnIndex]);
|
||||
}
|
||||
|
||||
$table->setRange('');
|
||||
self::assertCount(0, $table->getColumns());
|
||||
self::assertSame('', $table->getRange());
|
||||
}
|
||||
|
||||
public function testGetColumn(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
$columnIndexes = ['L', 'M'];
|
||||
|
||||
foreach ($columnIndexes as $columnIndex) {
|
||||
$table->setColumn($columnIndex);
|
||||
}
|
||||
|
||||
// If we request a specific column by its column ID, we should
|
||||
// get a \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table\Column object returned
|
||||
foreach ($columnIndexes as $columnIndex) {
|
||||
$result = $table->getColumn($columnIndex);
|
||||
self::assertInstanceOf(Column::class, $result);
|
||||
}
|
||||
}
|
||||
|
||||
public function testGetColumnByOffset(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
$columnIndexes = [
|
||||
0 => 'H',
|
||||
3 => 'K',
|
||||
5 => 'M',
|
||||
];
|
||||
|
||||
// If we request a specific column by its offset, we should
|
||||
// get a \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table\Column object returned
|
||||
foreach ($columnIndexes as $columnIndex => $columnID) {
|
||||
$result = $table->getColumnByOffset($columnIndex);
|
||||
self::assertInstanceOf(Column::class, $result);
|
||||
self::assertEquals($result->getColumnIndex(), $columnID);
|
||||
}
|
||||
}
|
||||
|
||||
public function testGetColumnIfNotSet(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
// If we request a specific column by its column ID, we should
|
||||
// get a \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table\Column object returned
|
||||
$result = $table->getColumn('K');
|
||||
self::assertInstanceOf(Column::class, $result);
|
||||
}
|
||||
|
||||
public function testGetColumnWithoutRangeSet(): void
|
||||
{
|
||||
$this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
|
||||
// Clear the range
|
||||
$table->setRange('');
|
||||
$table->getColumn('A');
|
||||
}
|
||||
|
||||
public function testClearRangeWithExistingColumns(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$expectedResult = '';
|
||||
|
||||
$columnIndexes = ['L', 'M', 'N'];
|
||||
foreach ($columnIndexes as $columnIndex) {
|
||||
$table->setColumn($columnIndex);
|
||||
}
|
||||
|
||||
// Setters return the instance to implement the fluent interface
|
||||
$result = $table->setRange('');
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
|
||||
// Range should be cleared
|
||||
$result = $table->getRange();
|
||||
self::assertEquals($expectedResult, $result);
|
||||
|
||||
// Column array should be cleared
|
||||
$result = $table->getColumns();
|
||||
self::assertIsArray($result);
|
||||
self::assertCount(0, $result);
|
||||
}
|
||||
|
||||
public function testSetRangeWithExistingColumns(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$expectedResult = 'G1:J512';
|
||||
|
||||
// These columns should be retained
|
||||
$columnIndexes1 = ['I', 'J'];
|
||||
foreach ($columnIndexes1 as $columnIndex) {
|
||||
$table->setColumn($columnIndex);
|
||||
}
|
||||
// These columns should be discarded
|
||||
$columnIndexes2 = ['K', 'L', 'M'];
|
||||
foreach ($columnIndexes2 as $columnIndex) {
|
||||
$table->setColumn($columnIndex);
|
||||
}
|
||||
|
||||
// Setters return the instance to implement the fluent interface
|
||||
$result = $table->setRange($expectedResult);
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
|
||||
// Range should be correctly set
|
||||
$result = $table->getRange();
|
||||
self::assertEquals($expectedResult, $result);
|
||||
|
||||
// Only columns that existed in the original range and that
|
||||
// still fall within the new range should be retained
|
||||
$result = $table->getColumns();
|
||||
self::assertIsArray($result);
|
||||
self::assertCount(count($columnIndexes1), $result);
|
||||
}
|
||||
|
||||
public function testClone(): void
|
||||
{
|
||||
$sheet = $this->getSheet();
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$sheet->addTable($table);
|
||||
$columnIndexes = ['L', 'M'];
|
||||
|
||||
foreach ($columnIndexes as $columnIndex) {
|
||||
$table->setColumn($columnIndex);
|
||||
}
|
||||
|
||||
$result = clone $table;
|
||||
self::assertInstanceOf(Table::class, $result);
|
||||
self::assertSame($table->getRange(), $result->getRange());
|
||||
self::assertNull($result->getWorksheet());
|
||||
self::assertNotNull($table->getWorksheet());
|
||||
self::assertInstanceOf(Worksheet::class, $table->getWorksheet());
|
||||
$tableColumns = $table->getColumns();
|
||||
$resultColumns = $result->getColumns();
|
||||
self::assertIsArray($tableColumns);
|
||||
self::assertIsArray($resultColumns);
|
||||
self::assertCount(2, $tableColumns);
|
||||
self::assertCount(2, $resultColumns);
|
||||
self::assertArrayHasKey('L', $tableColumns);
|
||||
self::assertArrayHasKey('L', $resultColumns);
|
||||
self::assertArrayHasKey('M', $tableColumns);
|
||||
self::assertArrayHasKey('M', $resultColumns);
|
||||
self::assertInstanceOf(Column::class, $tableColumns['L']);
|
||||
self::assertInstanceOf(Column::class, $resultColumns['L']);
|
||||
self::assertInstanceOf(Column::class, $tableColumns['M']);
|
||||
self::assertInstanceOf(Column::class, $resultColumns['M']);
|
||||
}
|
||||
|
||||
public function testNoWorksheet(): void
|
||||
{
|
||||
$table = new Table();
|
||||
self::assertNull($table->getWorksheet());
|
||||
}
|
||||
|
||||
public function testClearColumn(): void
|
||||
{
|
||||
$table = new Table(self::INITIAL_RANGE);
|
||||
$columnIndexes = ['J', 'K', 'L', 'M'];
|
||||
|
||||
foreach ($columnIndexes as $columnIndex) {
|
||||
$table->setColumn($columnIndex);
|
||||
}
|
||||
$columns = $table->getColumns();
|
||||
self::assertCount(4, $columns);
|
||||
self::assertArrayHasKey('J', $columns);
|
||||
self::assertArrayHasKey('K', $columns);
|
||||
self::assertArrayHasKey('L', $columns);
|
||||
self::assertArrayHasKey('M', $columns);
|
||||
$table->clearColumn('K');
|
||||
$columns = $table->getColumns();
|
||||
self::assertCount(3, $columns);
|
||||
self::assertArrayHasKey('J', $columns);
|
||||
self::assertArrayHasKey('L', $columns);
|
||||
self::assertArrayHasKey('M', $columns);
|
||||
}
|
||||
}
|
||||
|
|
@ -64,7 +64,7 @@ class PreCalcTest extends AbstractFunctional
|
|||
}
|
||||
}
|
||||
|
||||
private const AUTOSIZE_TYPES = ['Xlsx', 'Xls', 'Html'];
|
||||
private const AUTOSIZE_TYPES = ['Xlsx', 'Xls', 'Html', 'Ods'];
|
||||
|
||||
private static function verifyA3B2(Calculation $calculation, string $title, ?bool $preCalc, string $type): void
|
||||
{
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -14,7 +14,6 @@
|
|||
<table:calculation-settings />
|
||||
<table:table table:name="Worksheet">
|
||||
<office:forms />
|
||||
<table:table-column table:number-columns-repeated="1024" />
|
||||
<table:table-row>
|
||||
<table:table-cell table:style-name="ce0" />
|
||||
<table:table-cell table:number-columns-repeated="1023" />
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@
|
|||
<table:calculation-settings/>
|
||||
<table:table table:name="Worksheet">
|
||||
<office:forms/>
|
||||
<table:table-column table:number-columns-repeated="1024"/>
|
||||
<table:table-row>
|
||||
<table:table-cell office:value="1" office:value-type="float" table:style-name="ce2">
|
||||
<text:p>1</text:p>
|
||||
|
|
@ -110,7 +109,6 @@
|
|||
</table:table>
|
||||
<table:table table:name="New Worksheet">
|
||||
<office:forms/>
|
||||
<table:table-column table:number-columns-repeated="1024"/>
|
||||
<table:table-row>
|
||||
<table:table-cell office:value="2" office:value-type="float" table:style-name="ce0">
|
||||
<text:p>2</text:p>
|
||||
|
|
|
|||
Loading…
Reference in New Issue