2013-04-25 16:53:29 +00:00
|
|
|
<?php
|
|
|
|
|
2016-08-31 17:18:12 +00:00
|
|
|
namespace PhpOffice\PhpSpreadsheetTests;
|
2016-08-14 04:08:43 +00:00
|
|
|
|
2016-08-31 17:18:12 +00:00
|
|
|
use PhpOffice\PhpSpreadsheet\ReferenceHelper;
|
2017-11-08 15:48:01 +00:00
|
|
|
use PHPUnit\Framework\TestCase;
|
2015-05-29 20:35:35 +00:00
|
|
|
|
2017-11-08 15:48:01 +00:00
|
|
|
class ReferenceHelperTest extends TestCase
|
2013-04-25 16:53:29 +00:00
|
|
|
{
|
2020-04-27 10:28:36 +00:00
|
|
|
protected function setUp(): void
|
2013-04-25 16:53:29 +00:00
|
|
|
{
|
2015-05-17 13:00:02 +00:00
|
|
|
}
|
2013-04-25 16:53:29 +00:00
|
|
|
|
2020-05-18 04:49:57 +00:00
|
|
|
public function testColumnSort(): void
|
2015-05-17 13:00:02 +00:00
|
|
|
{
|
2015-05-29 20:35:35 +00:00
|
|
|
$columnBase = $columnExpectedResult = [
|
2016-08-16 15:33:57 +00:00
|
|
|
'A', 'B', 'Z',
|
|
|
|
'AA', 'AB', 'AZ',
|
|
|
|
'BA', 'BB', 'BZ',
|
|
|
|
'ZA', 'ZB', 'ZZ',
|
|
|
|
'AAA', 'AAB', 'AAZ',
|
|
|
|
'ABA', 'ABB', 'ABZ',
|
|
|
|
'AZA', 'AZB', 'AZZ',
|
|
|
|
'BAA', 'BAB', 'BAZ',
|
|
|
|
'BBA', 'BBB', 'BBZ',
|
|
|
|
'BZA', 'BZB', 'BZZ',
|
2015-05-29 20:35:35 +00:00
|
|
|
];
|
2015-05-17 13:00:02 +00:00
|
|
|
shuffle($columnBase);
|
2016-08-16 15:33:57 +00:00
|
|
|
usort($columnBase, [ReferenceHelper::class, 'columnSort']);
|
2015-05-17 13:00:02 +00:00
|
|
|
foreach ($columnBase as $key => $value) {
|
2017-09-20 05:55:42 +00:00
|
|
|
self::assertEquals($columnExpectedResult[$key], $value);
|
2015-05-17 13:00:02 +00:00
|
|
|
}
|
|
|
|
}
|
2013-04-25 16:53:29 +00:00
|
|
|
|
2020-05-18 04:49:57 +00:00
|
|
|
public function testColumnReverseSort(): void
|
2015-05-17 13:00:02 +00:00
|
|
|
{
|
2015-05-29 20:35:35 +00:00
|
|
|
$columnBase = $columnExpectedResult = [
|
2016-08-16 15:33:57 +00:00
|
|
|
'A', 'B', 'Z',
|
|
|
|
'AA', 'AB', 'AZ',
|
|
|
|
'BA', 'BB', 'BZ',
|
|
|
|
'ZA', 'ZB', 'ZZ',
|
|
|
|
'AAA', 'AAB', 'AAZ',
|
|
|
|
'ABA', 'ABB', 'ABZ',
|
|
|
|
'AZA', 'AZB', 'AZZ',
|
|
|
|
'BAA', 'BAB', 'BAZ',
|
|
|
|
'BBA', 'BBB', 'BBZ',
|
|
|
|
'BZA', 'BZB', 'BZZ',
|
2015-05-29 20:35:35 +00:00
|
|
|
];
|
2015-05-17 13:00:02 +00:00
|
|
|
shuffle($columnBase);
|
|
|
|
$columnExpectedResult = array_reverse($columnExpectedResult);
|
2016-08-16 15:33:57 +00:00
|
|
|
usort($columnBase, [ReferenceHelper::class, 'columnReverseSort']);
|
2015-05-17 13:00:02 +00:00
|
|
|
foreach ($columnBase as $key => $value) {
|
2017-09-20 05:55:42 +00:00
|
|
|
self::assertEquals($columnExpectedResult[$key], $value);
|
2015-05-17 13:00:02 +00:00
|
|
|
}
|
|
|
|
}
|
2019-10-02 18:08:36 +00:00
|
|
|
|
2020-05-18 04:49:57 +00:00
|
|
|
public function testCellSort(): void
|
2019-10-02 18:08:36 +00:00
|
|
|
{
|
|
|
|
$cellBase = $columnExpectedResult = [
|
|
|
|
'A1', 'B1', 'AZB1',
|
|
|
|
'BBB1', 'BB2', 'BAB2',
|
|
|
|
'BZA2', 'Z3', 'AZA3',
|
|
|
|
'BZB3', 'AB5', 'AZ6',
|
|
|
|
'ABZ7', 'BA9', 'BZ9',
|
|
|
|
'AAA9', 'AAZ9', 'BA10',
|
|
|
|
'BZZ10', 'ZA11', 'AAB11',
|
|
|
|
'BBZ29', 'BAA32', 'ZZ43',
|
|
|
|
'AZZ43', 'BAZ67', 'ZB78',
|
|
|
|
'ABA121', 'ABB289', 'BBA544',
|
|
|
|
];
|
|
|
|
shuffle($cellBase);
|
|
|
|
usort($cellBase, [ReferenceHelper::class, 'cellSort']);
|
|
|
|
foreach ($cellBase as $key => $value) {
|
|
|
|
self::assertEquals($columnExpectedResult[$key], $value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-18 04:49:57 +00:00
|
|
|
public function testCellReverseSort(): void
|
2019-10-02 18:08:36 +00:00
|
|
|
{
|
|
|
|
$cellBase = $columnExpectedResult = [
|
|
|
|
'BBA544', 'ABB289', 'ABA121',
|
|
|
|
'ZB78', 'BAZ67', 'AZZ43',
|
|
|
|
'ZZ43', 'BAA32', 'BBZ29',
|
|
|
|
'AAB11', 'ZA11', 'BZZ10',
|
|
|
|
'BA10', 'AAZ9', 'AAA9',
|
|
|
|
'BZ9', 'BA9', 'ABZ7',
|
|
|
|
'AZ6', 'AB5', 'BZB3',
|
|
|
|
'AZA3', 'Z3', 'BZA2',
|
|
|
|
'BAB2', 'BB2', 'BBB1',
|
|
|
|
'AZB1', 'B1', 'A1',
|
|
|
|
];
|
|
|
|
shuffle($cellBase);
|
|
|
|
usort($cellBase, [ReferenceHelper::class, 'cellReverseSort']);
|
|
|
|
foreach ($cellBase as $key => $value) {
|
|
|
|
self::assertEquals($columnExpectedResult[$key], $value);
|
|
|
|
}
|
|
|
|
}
|
2020-07-14 08:58:50 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @dataProvider providerFormulaUpdates
|
|
|
|
*/
|
|
|
|
public function testUpdateFormula(string $formula, int $insertRows, int $insertColumns, string $worksheet, string $expectedResult): void
|
|
|
|
{
|
|
|
|
$referenceHelper = ReferenceHelper::getInstance();
|
|
|
|
|
|
|
|
$result = $referenceHelper->updateFormulaReferences($formula, 'A1', $insertRows, $insertColumns, $worksheet);
|
|
|
|
|
|
|
|
self::assertSame($expectedResult, $result);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function providerFormulaUpdates(): array
|
|
|
|
{
|
|
|
|
return require 'tests/data/ReferenceHelperFormulaUpdates.php';
|
|
|
|
}
|
Named formula implementation, and improved handling of Defined Names generally (#1535)
* Initial work modifying the way named ranges are stored, and handled by the calculation engine
This should provide better support for:
- both union and intersection operators in composite named range values
- MS Excel implementation of the union operator duplicating values
- named formulae
- named ranges and formulae that reference other named ranges and formulae
- ranges and formulae that reference multiple ranges across multiple worksheets
* Initial work on handling defined names (named ranges and named formulae) correctly
- UTF-8 names (already extracted as a separate PR and merged)
- distinction between named ranges and named formulae
- correct handling of union and intersection operators in named ranges
- correct evaluation of named range operators in calculations
- calculation support for named formulae
- support for nested ranges and formulae (named ranges and formulae that reference other named ranges/formulae) in calculations
* Minor tweaks before resolving merge conflicts
* Fix extractSheetTitle() method to work on the last ! in a cell reference rather than the first
* Throw exception if a the reference to a defined name in a formula doesn't exist as a defined name
* Properly assess scope for defined names in calculation engine
* Elimination of some redundant code
* Minor tweaks to simplify entries o the stack where we need to check type
* Ensure correct scoping rules are applied when evaluating named ranges and formulae
* Adjustments to Gnumeric Reader for new defined names structure
* Initial work modifying the Ods Reader to handle named ranges, they weren't actually supported previously... this is still ongoing work
* Handle Ranges formatted as 3-d ranges, as long as the references are both to the same worksheet
* Additional testing for Named Ranges formatted as 3-d ranges, as long as the references are both to the same worksheet
* Skip composite named range tests for the moment
* Clean handling for `undefined name` exception when thrown in the calculation engine. Catch and replace with `#NAME?`
* Adjust method we use to determine whether a defined name is a range or a formula
* PHPCS Recommendations
* PHP doesn't support `mixed` yet, at least not at the minium version that we're working with
* More phpcs fixes
* More phpcs appeasements
* Final phpcs fixes for the moment
Still have a lot of echo and var_dump() statements in the code that scrutinizer will hate, but they stay for the moment while this is still WIP
* Please let this be the last of the phpcs fixes
* Unit tests to determine whether a defined name value is a range value or a formula
* phpcs appeasement
* Named tests from provider
* Initial steps for named ranges and formulae in the Ods Reader
* Reading pseudo-3d range addresses in Ods; treat second sheet reference as being identical to the first, which is the majority of cases where this will occur
* Initial work on Gnumeric reader for named ranges and formulae
* Suppress debug logging again
* Remove more debugging displays
* Last minor tweaks before phase two
* Minor refinements
* And all for the want of a space
* A little tidying up
* More tidying up
* phpcs fix
* Modify defined names in rebindParent()
* Renaming variables
* Resolve an issue with locally scoped defined names that don't contain any worksheet reference
* Keep phpcs happy
* Fix quote handling in regexp
* Fix a couple of scrutinizer issues
* Fix a couple of scrutinizer issues
* Update Xlsx Writer to work with the new defined name internal definition
Additional validation checks
* When adding new defined names through the readers, worksheet may not exist if we're only loading selected sheets rather than the full spreadsheet
* If the only thing that phpcs can pickup on is strings in double quotes instead of single quotes, then I know I'm getting close to ready
* Refactor Defined Names logic for Xlsx Writer into its own class
* phpcs keeping me on my toes
* Restore a couple of files that I managed to change without intending to
* Initial work on Ods Write to provide support for saving named ranges and formulae
* Resolve commas to semi-colons s argument separator when writing named formulae for Ods
* Extract Named Expression Writer for Ods into its own class
* Keep phpcs happy
* Refactoring of formula conversion when reading SpreadsheetML; preparation for reading named ranges because they will also need to use the same conversion method
* First pass at reading Named Ranges/Formulae from SpreadsheetML format xml files
* Remove unused namespace reference
* Defined names being written correctly for Xls; but not yet writing cell formulae that reference those defined names... that's the next big step
And I anticipate that defined names that reference other defined names will also be a problem
* Just to keep phpcs happy
... and yes, I know that there are still diagnostic echo statements in the code
* I had to miss some of the phpcs issues didn't I
* Work on the Xls Writer's Parser Tree to identify named range tokens in a formula, and to distinguish them from function tokens
* Still working on packing that d*** defined name reference in the writer
* Throw an exception in the Parser for saving Xls output if we encounter a defined name in a formula... writer will simply write the calculated cell value, and not the formula as at present
Strip out diagnostic output
* Some phpcs appeasement
* Fix a couple of Scrutinizer issues
* Additional verifications to differentiate a formula from a range value
Add explicit getters/setters for named ranges, named formulae and defined names
Additional unit tests
* Styling for closures
* Remove redundant docblocks
* Spaces
* Gah! Namespace use complaints
* Consistency of making calls to DefinedName rather than NamedRange; NamedRange should now be used only for Named Ranges, and should exclude Named Formulae
* Styling
* spurious newline
* No need to test for variable === null when we're typing it in the function argument definition
* Additional unit tests for local/global scoped named ranges and formulae; and a fix to getNamedFormula()
* Fix silly typo that led to breaking test
* Void return signature for unit tests
* Why weren't these picked up in the last pass?
* Refactoring of getNamedRange()/getNamedFormula()
* Eliminate unused constants, and defaults for private method parameters when always called with a value
* Use strict comparisons when comparing object hash codes
* Initial update to documentation for working with named formulae
* Fix for calculation of relative cell references in named ranges/formulae
* Fix current named range tests, because we should be using absolute references; tests for relative named ranges to be added later
* Fix for calculation of relative cell references in named ranges/formulae
* Updates to changelog and documentation for handling of absolute/relative references in named ranges
* Fix last remaining unit test with a named range reference
* Refactor formula conversion for Ods into a separate class; I hadn't realised that it previously wrote formulae as the MS Excel syntax without any conversion to Ods format
* Fix Ods Writer test xml to reflect Ods-native format for formula
* Docblocks
* Drop dollar prefix from Ods formulae and ranges unless it's necessary
* Set the formula convertor in the content writer constructor
* Documentation update
* Minor updates
* Remove var_dumps from file
* Fix the spurious single quote that was breaking named expressions in the Ods Writer... big sigh of relief that I finally spotted it
* Starting work on documentation for Defined Names, and some examples of using Named Ranges and Formulae
* Starting work on documentation for Defined Names, and some examples of using Named Ranges and Formulae
* Example of a relative named range for the documentation
* Mustn't have phpcs problems in sample code either
* More updates to the documentation
* That should conclude the documentation for Named Ranges, now time to move on to documenting Named Formulae
* That should conclude the documentation for Named Ranges, now time to move on to documenting Named Formulae
* PHPCS appeasement in sample code
* Initial documentation on Named Formulae
* PHPCS appeasements
* Additional comments in the documentation, and modify the named range name validation to support a \ as the first character in a name
* Fix breaking build
* Make defined names case-insensitive
* Fix case-insensitivity
* Improved documentation, and additional unit tests
* Additional unit tests, and a fix for removing a globally scoped defined name even if a worksheet is specified in the method call
* Fix unit test for removing named formulae
* Use assertCount instead of assertSame
* Forgotten voids
* Fix arguments for assertCount
* Unit tests for removing defined names, and a fix for removing locally scoped names
* Unit tests for absolute and relative named ranges in calculation engine, and fix an issue with worksheet name in the offset adjustments for relative references
* PHPCS Appeasement
* Additional unit tests, more documentation, and a fix to the calculation engine when no worksheet reference is provided with a named formula
* PHPCS appeasements
* Additional documentation and examples of using Named Formulae
* Additional examples to go with documentation
* A few minor phpcs appeasements
* Minor refactor of updateFormulaReferencesAnyWorksheet() method
* Discard an unused method argument
* Additional unit tests
* Additional unit tests
* Remove unused argument
* Stricter typing
* Fix return typehinting from remove named range/formula; should return the Spreadsheet object
* Use return typehint of self rather than explicit object type
* Redundant code just to keep scrutinizer happy
* Minor change to handle merge conflict
* phpcs fixes after merge
* Namespace usage ordering
* Please let this be the last phpcs fix needed
Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
2020-07-26 10:00:06 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @dataProvider providerMultipleWorksheetFormulaUpdates
|
|
|
|
*/
|
|
|
|
public function testUpdateFormulaForMultipleWorksheets(string $formula, int $insertRows, int $insertColumns, string $expectedResult): void
|
|
|
|
{
|
|
|
|
$referenceHelper = ReferenceHelper::getInstance();
|
|
|
|
|
|
|
|
$result = $referenceHelper->updateFormulaReferencesAnyWorksheet($formula, $insertRows, $insertColumns);
|
|
|
|
|
|
|
|
self::assertSame($expectedResult, $result);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function providerMultipleWorksheetFormulaUpdates(): array
|
|
|
|
{
|
|
|
|
return require 'tests/data/ReferenceHelperFormulaUpdatesMultipleSheet.php';
|
|
|
|
}
|
2013-04-25 16:53:29 +00:00
|
|
|
}
|