Skip to content

Commit

Permalink
8843
Browse files Browse the repository at this point in the history
 + Merged in Upstream master 2.0.0 and preserved existing fixes on fork.
 + updated testUpdateCellReferenceMaxRow to remove call to update cell reference for a range
 + fixed duplicate constant added from upstream that was missed during initial merge
  • Loading branch information
bshain-vtinfo committed Mar 11, 2024
1 parent a949892 commit 56855e0
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com)
and this project adheres to [Semantic Versioning](https://semver.org).

## 2.0.0.1 - 2024-03-11

### Added

- Nothing

### Changed

- Nothing

### Deprecated

- Nothing

### Removed

- custom support for CONDITION_COLORSCALE that is now supported by default

### Fixed

- Test that confirms greater than max row cell address

## 2.0.0 - 2024-01-24

### BREAKING CHANGE
Expand Down
1 change: 0 additions & 1 deletion src/PhpSpreadsheet/Style/Conditional.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class Conditional implements IComparable

// additional condition types not originally supported
const CONDITION_ABOVEAVERAGE = 'aboveAverage';
const CONDITION_COLORSCALE = 'colorScale';
const CONDITION_TOPTEN = 'top10';

private const CONDITION_TYPES = [
Expand Down
6 changes: 1 addition & 5 deletions tests/PhpSpreadsheetTests/CellReferenceHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,10 @@ public function testCellReferenceHelperDeleteColumnAltogether(): void

public function testUpdateCellReferenceMaxRow(): void
{
$expectedResult = 'A' . (AddressRange::MAX_ROW + 1);
$expectedResult = 'A' . AddressRange::MAX_ROW;

$cellRefHelper = new CellReferenceHelper('A1', 0, 1);
$result = $cellRefHelper->updateCellReference('A' . AddressRange::MAX_ROW);
self::assertSame($expectedResult, $result);

$cellRefHelperRange = new CellReferenceHelper('A1', 0, 1);
$result = $cellRefHelperRange->updateCellReference('A1:A' . AddressRange::MAX_ROW);
self::assertSame($expectedResult, $result);
}
}

0 comments on commit 56855e0

Please sign in to comment.