Commit Graph

6104 Commits

Author SHA1 Message Date
oleibman 83513c2cd5 Update Changelog 2026-01-06 20:17:28 -08:00
oleibman c96f9a7612 Coverage Tweak 2026-01-06 13:53:06 -08:00
oleibman 002f618416 More Tests and a Sample 2026-01-06 11:50:31 -08:00
Thomas Lallement 059a75880e Merge branch 'master' into drawing-in-cell 2026-01-06 09:38:09 +01:00
Thomas Lallement 9e639408ae CS Fixes 2026-01-06 09:15:49 +01:00
oleibman ccb5f05b9f Merge pull request #4771 from oleibman/hyperlinkcell
Fix Some Hyperlink Problems
2026-01-06 01:52:29 +00:00
oleibman 29908b95a7 Merge branch 'master' into hyperlinkcell 2026-01-05 17:42:12 -08:00
oleibman 2e51d0755e Update CHANGELOG.md 2026-01-05 17:41:16 -08:00
oleibman e698017d11 Merge pull request #4770 from oleibman/axisshadows
Chart Shadow `kx` and `ky`
2026-01-06 01:31:51 +00:00
oleibman ed51a473e2 Update CHANGELOG.md 2026-01-05 17:29:02 -08:00
Thomas Lallement 064f084580 Add coverage for BaseDrawing::isInCell method 2026-01-05 10:53:23 +01:00
Thomas Lallement 4d7c060897 Fix path of fixture images 2026-01-05 10:51:51 +01:00
Thomas Lallement 2e0fb13300 Fix Metadata and add test coverage 2026-01-05 10:39:48 +01:00
oleibman e33834b4ea Merge pull request #4769 from oleibman/issue918
Xls Writer and Empty RichText
2026-01-04 02:58:58 +00:00
oleibman 33007a361f Merge branch 'master' into issue918 2026-01-03 18:56:06 -08:00
oleibman 653a036510 Update CHANGELOG.md 2026-01-03 18:55:31 -08:00
oleibman 0a214f8d45 Merge pull request #4768 from oleibman/issue4766
Strings That Look Like Huge Floating Point Numbers
2026-01-04 02:24:56 +00:00
oleibman b6524f0640 Merge branch 'master' into issue4766 2026-01-03 18:18:34 -08:00
oleibman a140c3263c Update CHANGELOG.md 2026-01-03 18:17:53 -08:00
oleibman 77b6a96061 Merge pull request #4767 from oleibman/issue1319
Rowspan in Html
2026-01-04 02:02:31 +00:00
oleibman dade50db8d Update CHANGELOG.md 2026-01-03 17:59:34 -08:00
oleibman b89b4d920e Make Tests non-Static 2026-01-03 15:56:38 -08:00
oleibman b60ffd09d6 Fix Some Hyperlink Problems
Fix #3889. Fix #2464. After evaluating HYPERLINK function specifying cell address(es) rather than literal(s), the calculated hyperlink is attached to the wrong cell. I probably should have figured this out sooner - this is just another instance of the common problem of trying to assign a cell to a variable and then using the variable after a delay during which the "current" cell may have changed. The problem is resolved by storing the cell's worksheet and coordinate on entry to HYPERLINK, then restoring those before manipulating the hyperlink before returning to the caller.

An additional problem with hyperlinks is that assigning a new value to a cell has not cleared any hyperlink associated with the cell. This will now happen, if needed, whenever `setValue` or `setValueExplicit` is called.

A third problem is unaddressed. A (fairly unrealistic) formula like:
```php
$sheet->getCell('A4')->setValue('=LEN(HYPERLINK("http://www.example.com", "Example"))');
```
winds up attaching a hyperlink to the cell when its value is calculated, and it probably shouldn't. However, @TobiasBg reports in 2464 that Excel for Mac does the same thing, and I've just confirmed that Excel 365 on Windows does likewise. Furthermore, the hyperlink which Excel creates is not usable ("Cannot open the specified file"), whereas the link that PhpSpreadsheet creates is usable. So we're not doing any worse than Excel, and arguably doing better. I'm satisfied.
2026-01-03 13:25:42 -08:00
Thomas Lallement ca28d561ba Fix count of drawing 2026-01-03 20:28:15 +01:00
oleibman 4549c29c80 Chart Shadow kx and ky
Thank you to @raziel057, who pointed out this problem while doing some research on a PR on which he is working. The code in AxisShadowTest generates a spreadsheet which, if written to disk, will be treated by Excel as corrupt. Since the test doesn't actually generate a spreadsheet, it isn't entirely invalid, but it should do a better job of presenting usable code.

Chart axes have a shadow property, which has many sub-properties. One of these is `size`, which also has sub-properties. Two of those are `kx` and `ky`, representing the skew angle of the shadow. These must be < 90 degrees and > -90 degrees (strangely *not* <= and >=) (see https://ooxml.info/docs/20/20.1/20.1.10/20.1.10.23/). If the supplied value is outside that range, Excel treats the chart as corrupt. That is the main problem with AxisShadowTest - kx was supplied as `-94`. This problem is easily solved in the test by setting it to a valid value instead. And, of course, Chart Writer is changed to not output the value if it is out of range.

Size also has 2 other properties `sx` and `sy`, where a value of 1 indicates 100% of normal size. The test sets `sy` to `254`, a not-particularly sane value. I am fairly certain that `2.54` was intended. I do not believe Excel treats `254` as corrupt, but the test is also changed to supply a sensible value. I imagine that there is a maximum value that Excel will allow, but I don't see it documented anywhere. The UI restricts it to 2 (200%), but larger values are accepted in the xml, so, at least for now, I allow anything.

I have to admit that the Excel UI puzzles me with respect to these properties. There is a single value that can be set for `size` (i.e. no separate property for `sx` and `sy`), and I don't see any way to set the skew angle. There is a settable `angle` property, but that refers to a different shadow property `direction`. At any rate, Excel seems to respond to changes in the xml for all of `sx`, `sy`, `kx`, and `ky`, so we will continue to support them.
2026-01-02 21:58:04 -08:00
oleibman e11a6afb5e Xls Writer and Empty RichText
Fix #918, which went stale in 2019 and is now reopened. Writing out a RichText object with no text to Xls creates a file which Excel considers corrupt. Treating such an object as a null string rather than a RichText object when writing eliminates the problem.
2026-01-02 12:46:24 -08:00
Thomas Lallement 4caf961192 Fix regression due to refactoring 2026-01-02 16:36:55 +01:00
Thomas Lallement 2623a98b5f Fix generation of metadata file for image in cell 2026-01-02 16:00:31 +01:00
oleibman e92b538efa Strings That Look Like Huge Floating Point Numbers
Fix #4776. DefaultValueBinder treats strings that look like scientific notation as floats. However, if Php evaluates them as `INF`, this can cause problems for Excel. A one-line change to DefaultValueBinder avoids this situation. Tests are added for DefaultValueBinder, and also for StringValueBinder and AdvancedValueBinder, although those extend DefaultValueBinder and needed no code changes.
2026-01-01 17:50:36 -08:00
oleibman f0e76a44c2 Test Member Was Misnamed
Caused some tests (and coverage) to be missed. Rename it properly.
2026-01-01 17:26:38 -08:00
oleibman 60a04419cc Rowspan in Html
Fix #1319, which went stale in 2020, and is now reopened. Rowspan is not showing up when saving some spreadsheets as Html. There is some logic concerning property `isSpannedRow` which indicates that this is deliberate, but I have no idea what purpose it serves. It leads directly to this issue, and also adversely affects (in a minor way) some samples (e.g. 17a_Html), where merged cells maintain their text but lose their top and bottom padding. After discarding this logic, the reported problem goes away, the samples look better, and no tests fail. So, whatever its purpose, it wasn't tested for. This PR permanently removes the property, and adds a little additional bulletproofing. A minor accommodation is needed for Tcpdf in one place.

This PR probably deletes more lines from Html Writer than it adds. It would not surprise me if this is one of those unusual cases where Coveralls reports a decrease in coverage despite the fact that all the new code is covered.
2026-01-01 16:34:56 -08:00
oleibman 0544868f90 Merge pull request #4765 from oleibman/issue820
SUBTOTAL and Hidden Rows
2025-12-31 21:18:31 +00:00
oleibman 6af5379b6b Update CHANGELOG.md 2025-12-31 13:15:45 -08:00
oleibman 947cdeeeeb Merge pull request #4764 from oleibman/issue993
Drawing Hyperlink
2025-12-31 20:56:49 +00:00
oleibman 7450f46459 Update CHANGELOG.md 2025-12-31 12:53:53 -08:00
oleibman f17dfc9921 Merge pull request #4763 from oleibman/mergedstyles
Merge Cell Basic, Table, and Conditional Styles
2025-12-31 20:42:22 +00:00
oleibman 2fc7b9be52 Update CHANGELOG.md 2025-12-31 12:39:33 -08:00
oleibman c57be91754 Coverage Tweak 2025-12-31 10:49:33 -08:00
oleibman b24daf8d8a Better Support of Hyperlink Display Attribute
This attribute is written by Xlsx Writer, using the `tooltip` attribute, introduced by PR #904 in 2019. It is ignored by Excel, but may be used by Google Sheets (see issue #807). If it is used by anyone, it should be supported by Xlsx Reader, and exist as its own attribute in the `Hyperlink` class. Writer will continue to use tooltip if the new attribute isn't set.
2025-12-31 09:32:02 -08:00
Thomas Lallement 423a76b737 Fix after merge 2025-12-31 13:51:07 +01:00
Thomas Lallement f5c9026f62 Merge remote-tracking branch 'origin/drawing-in-cell' into drawing-in-cell
# Conflicts:
#	src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
2025-12-31 13:45:42 +01:00
Thomas Lallement c2c3dda45b Fix moving drawing in cell and add more tests 2025-12-31 13:43:58 +01:00
Thomas Lallement 23f5052b96 Remove duplicated fixture file 2025-12-31 13:43:58 +01:00
tlallement 53ee8028c5 Allow writing Drawing in Cell 2025-12-31 13:43:58 +01:00
tlallement 977619791d Remove init offsetX & offsetY 2025-12-31 13:43:58 +01:00
Thomas Lallement 4084efd7c8 Remove unused imports 2025-12-31 13:43:58 +01:00
Thomas Lallement bb99f0a2d9 Fix phpstan, cs & phpdoc 2025-12-31 13:43:58 +01:00
Thomas Lallement 35074f377b Finalize XLSX In-Cell Drawing Writer 2025-12-31 13:07:21 +01:00
Thomas Lallement 58af20bde4 WIP - Write in-cell drawing 2025-12-31 13:01:15 +01:00
Thomas Lallement 67f57394ac Merge branch 'PHPOffice:master' into patch-1 2025-12-31 12:04:31 +01:00