Mark Baker
709e2ae5ca
Merge pull request #2748 from PHPOffice/Resolve-Issue-with-Boolean-in-Branch-Pruning
...
Resolve issue with boolean in branch pruning when array is expected
2022-04-13 20:27:19 +02:00
MarkBaker
abaa102919
Resolve issue with boolean in branch pruning when array is expected
2022-04-13 20:18:21 +02:00
MarkBaker
19988626d4
Fix change log typo
2022-04-13 18:17:29 +02:00
Mark Baker
d4585ed0c6
Merge pull request #2746 from PHPOffice/Issue-2730_Combined-Ranges
...
Support for "chained" range operators in the Calculation Engine
2022-04-13 18:16:14 +02:00
Mark Baker
8b83e8ac4c
Merge branch 'master' into Issue-2730_Combined-Ranges
2022-04-13 18:04:00 +02:00
MarkBaker
40730c6023
Handle defined names with the range operator.
...
It gets awkward when the defined name is for an actual range rather than for an individual named cell; because we need to manipulate the stack when that happens.
The code is ugly, and this is a rather simplistic approach, but it works as long as the named range is a cell, a cell range, or even a "chained" range - it won't work if we have union or intersection operators in the defined range - but it does provide formula support that never existed before.
2022-04-13 17:55:51 +02:00
Mark Baker
4856376024
Merge pull request #2739 from mjan4175/fix-external-sheet-column-styles
...
Fix invalid styles in empty columns and rows of added external sheet.
2022-04-13 12:39:40 +02:00
MarkBaker
8c84ce4399
Support for chained range operators in the Calculation Engine (e.g. `A3:B1:C2` which gives an effective combined range of `A1:C3` or `A5:C10:C20:F1` which gives an effective combined range of `A1:F20`).
...
Next step will be allowing Named Cells/Ranges to be chained in the same way.
2022-04-13 12:29:59 +02:00
Mark Baker
2f52cd8644
Merge branch 'master' into fix-external-sheet-column-styles
2022-04-13 12:25:32 +02:00
mjan4175
c214a199d6
FIX: Coding style
2022-04-12 19:53:21 +02:00
mjan4175
5f317250b3
CHANGELOG.md contribution
2022-04-12 19:43:42 +02:00
mjan4175
e41fdf4909
FIX: Invalid styles in rowDimensions of added external sheet.
2022-04-12 13:38:19 +02:00
Mark Baker
a6cb80fd4c
Merge pull request #2718 from PHPOffice/CellAddress-object
...
Initial work on deprecating `ByColumnAndRow` methods in Worksheet
2022-04-12 08:46:55 +02:00
MarkBaker
f672734258
Typo
2022-04-12 08:35:40 +02:00
Mark Baker
3becd5696a
Merge branch 'master' into CellAddress-object
2022-04-12 08:30:33 +02:00
mjan4175
5719b21341
FIX: Changelog revert unwanted changes
2022-04-11 09:39:53 +02:00
mjan4175
43e0e64cd4
CHANGELOG.md contribution
2022-04-11 09:31:07 +02:00
mjan4175
31ca617570
FIX: Data types in tests
2022-04-11 09:06:38 +02:00
mjan4175
bb4a22d5e9
FIX: Coding style in tests
2022-04-11 08:56:42 +02:00
mjan4175
812c14a6ad
Fix invalid styles in empty columns of added external sheet.
2022-04-11 08:50:28 +02:00
dependabot[bot]
c6858885c0
Bump phpstan/phpstan-phpunit from 1.0.0 to 1.1.0 ( #2720 )
...
Bumps [phpstan/phpstan-phpunit](https://github.com/phpstan/phpstan-phpunit ) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/phpstan/phpstan-phpunit/releases )
- [Commits](https://github.com/phpstan/phpstan-phpunit/compare/1.0.0...1.1.0 )
---
updated-dependencies:
- dependency-name: phpstan/phpstan-phpunit
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: oleibman <10341515+oleibman@users.noreply.github.com>
2022-04-10 18:03:04 -07:00
oleibman
2370a88c96
Trivial Change to Unblock Phpstan Update ( #2737 )
...
I cannot duplicate the problem blocking #2720 , but this trivial change should work anyhow.
2022-04-10 17:31:53 -07:00
dependabot[bot]
b03788c902
Bump phpstan/phpstan from 1.4.6 to 1.5.3 ( #2719 )
...
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan ) from 1.4.6 to 1.5.3.
- [Release notes](https://github.com/phpstan/phpstan/releases )
- [Changelog](https://github.com/phpstan/phpstan/blob/1.6.x/CHANGELOG.md )
- [Commits](https://github.com/phpstan/phpstan/compare/1.4.6...1.5.3 )
---
updated-dependencies:
- dependency-name: phpstan/phpstan
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: oleibman <10341515+oleibman@users.noreply.github.com>
2022-04-10 08:25:24 -07:00
oleibman
64e61d8dec
Prep Work for Phpstan Upgrade ( #2728 )
...
Dependabot submitted PRs #2719 and #2720 to upgrade Phpstan. As with most Phpstan upgrades, there are new error messages; this PR is an attempt to fix all 58 of the new problems in order to allow the upgrade to proceed.
Most of these fixes involve the addition of doc-block type annotations, often involving the assignment of the 'objectionable' portion of the statement to a new variable. Some use explicit casting when I am sure that's safe. Some (Reader/Ods) involve defeating result caching by Phpstan.
2022-04-10 08:14:05 -07:00
MarkBaker
83aaf32161
Handle selected cells
2022-04-06 20:37:13 +02:00
dependabot[bot]
28bb2cd7c7
Bump phpunit/phpunit from 9.5.16 to 9.5.20 ( #2726 )
...
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit ) from 9.5.16 to 9.5.20.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases )
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md )
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.16...9.5.20 )
---
updated-dependencies:
- dependency-name: phpunit/phpunit
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-03 05:13:55 -07:00
dependabot[bot]
1ae8ef9651
Bump dompdf/dompdf from 1.2.0 to 1.2.1 ( #2721 )
...
Bumps [dompdf/dompdf](https://github.com/dompdf/dompdf ) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/dompdf/dompdf/releases )
- [Commits](https://github.com/dompdf/dompdf/compare/v1.2.0...v1.2.1 )
---
updated-dependencies:
- dependency-name: dompdf/dompdf
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-03 04:56:17 -07:00
MarkBaker
3ae5a3fae3
Additional unit tests for BColumnAndRow methods, to verify that they still work as expected
2022-04-02 21:37:05 +02:00
MarkBaker
6b4ffda5ae
Add functionality to adjust CellRange by "modifying" the from/to CellAddress Value objects
2022-04-01 15:41:55 +02:00
MarkBaker
1849737abc
Add functionality to shift RowRange and ColumnRange
2022-04-01 11:26:47 +02:00
MarkBaker
62238bc011
Initial work on deprecating `ByColumnAndRow` methods; and providing functionality to use the basic cellAddress methods to be used with a string cell address (e.g. `C5`); an array of columnId and rowId (e.g. `[3, 5]`) or a new CellAddress object.
...
Current implementation for all methods that take a single cell reference argument:
- `setCellValue()`
- `setCellValueExplicit()`
- `getCell()`
- `cellExists()`
- `setBreak()`
- `freezePane()`
- `getComment()`
Also introducing a CellRange object to work with similar cases for methods that accept a cell range rather than simply a cell address; and RowRange/ColumnRange objects for those cases.
Still need to apply to methods that accept a cell range or single cell:
- `mergeCells()`
- `unmergeCells()`
- `protectCells()`
- `unprotectCells()`
- `setAutoFilter()`
Then there's a few special cases that accept row and column ranges, not simply cell ranges; or a series of cell ranges.
2022-03-31 23:22:48 +02:00
Mark Baker
8885c4eeef
Merge pull request #2713 from PHPOffice/Filter-return-result-array-indexes
...
Bugfix to returned column indexes for FILTER() by row
2022-03-24 22:24:39 +01:00
MarkBaker
2ab582a707
Bugfix to returned column indexes for FILTER() by row
2022-03-24 22:12:08 +01:00
Mark Baker
11edcc9f96
Merge pull request #2711 from PHPOffice/LookupRef-Sort-Functions
...
Implementation of the SORT() and SORTBY() Lookup/Reference functions
2022-03-24 18:30:41 +01:00
MarkBaker
9019523efc
Additional unit testing
...
And a quick bugfix for cell ranges applied to both sort functions and to FILTER()
2022-03-24 17:51:06 +01:00
MarkBaker
7f00049fe8
Initial work on the SORT() and SORTBY() Lookup/Reference functions
...
The code could stil do with some cleaning up, and better optimisation for memory usage; but all tests are passing... that's for full multi-level sorting (including direction), and allowing for correct sorting of sting/numeric datatypes.
2022-03-24 12:21:27 +01:00
oleibman
6a349ccf5a
Scrutinizer Faulty Analysis ( #2704 )
...
Despite typehint, Scrutinizer assigns union type to a variable, resulting in subsequent faulty analysis of a method call invoked on that variable. Adding a bogus routine that will never actually be called to one module eliminates 8 Scrutinizer errors.
2022-03-21 14:29:57 -07:00
oleibman
c112802023
Eliminate Most Scrutinizer Problems in Test Suite ( #2699 )
...
* Eliminate Most Scrutinizer Problems in Test Suite
Mostly minor code changes, with some annotations.
* Missed 2 php-cs-fixer Problems
They should be fixed now.
2022-03-21 13:58:42 -07:00
oleibman
2482203c3e
Resolve Scrutinizer Reports for Samples ( #2691 )
...
These are handled about 50-50 between code changes when reasonable, and annotations when not. No source code is changed.
2022-03-21 13:17:25 -07:00
Mark Baker
0ce56b1655
Merge pull request #2707 from PHPOffice/LookupRef-Filter-Function
...
Initial work implementing the FILTER() Lookup/Reference function
Tighten up on vector formats; and provide a couple of helper methods for testing row/column vectors
2022-03-20 18:18:15 +01:00
MarkBaker
f3bb61f3e4
Initial work implementing the FILTER() Lookup/Reference function
...
Tighten up on vector formats; and provide a couple of helper methods for testing row/column vectors
2022-03-20 18:01:30 +01:00
Mark Baker
1642ee4eb1
Merge pull request #2702 from PHPOffice/Xls-Reader-CF-Styling
...
Support fill style and color for reading CF Formats
2022-03-19 19:57:52 +01:00
MarkBaker
0a9d15407f
Suport fill style and color for reading CF Formats
2022-03-19 19:47:14 +01:00
Mark Baker
be734cf922
Merge pull request #2696 from PHPOffice/Xls-Reader-Conditional-Formatting
...
Xls Reader: initial work on reading conditional formatting
Currently the ranges and CF Rules are read, but only the most basic style information for the font (size, weight and colour)
This will be expanded with future PRs
2022-03-19 16:37:42 +01:00
Mark Baker
23e2d702ff
Merge branch 'master' into Xls-Reader-Conditional-Formatting
2022-03-19 16:21:14 +01:00
MarkBaker
be8c444951
More minor tweaks
2022-03-19 16:15:48 +01:00
MarkBaker
aea156ff76
Minor tweaks
2022-03-19 16:03:17 +01:00
MarkBaker
3803658897
Some basic reading of font style information for CF Styles
2022-03-19 15:43:07 +01:00
MarkBaker
3767917ee5
Stubs for reading style information for Conditional Formatting
2022-03-19 14:48:50 +01:00
Mark Baker
1bd5369295
Merge pull request #2667 from kbond/simple-cache-2
...
Allow `psr/simple-cache` 2.x
2022-03-19 12:43:42 +01:00