Skip to content

Commit 74f312b

Browse files
authored
Merge branch 'master' into atsign
2 parents 61f24ca + e9f03df commit 74f312b

File tree

135 files changed

+2925
-871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+2925
-871
lines changed

.github/workflows/github-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Setup PHP, with composer and extensions
1919
uses: shivammathur/setup-php@v2

.github/workflows/main.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Setup PHP, with composer and extensions
2929
uses: shivammathur/setup-php@v2
@@ -37,7 +37,7 @@ jobs:
3737
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
3838

3939
- name: Cache composer dependencies
40-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4141
with:
4242
path: ${{ steps.composer-cache.outputs.dir }}
4343
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969
steps:
7070
- name: Checkout
71-
uses: actions/checkout@v3
71+
uses: actions/checkout@v4
7272
with:
7373
fetch-depth: 2
7474

@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-latest
8888
steps:
8989
- name: Checkout
90-
uses: actions/checkout@v3
90+
uses: actions/checkout@v4
9191

9292
- name: Setup PHP, with composer and extensions
9393
uses: shivammathur/setup-php@v2
@@ -102,7 +102,7 @@ jobs:
102102
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
103103

104104
- name: Cache composer dependencies
105-
uses: actions/cache@v3
105+
uses: actions/cache@v4
106106
with:
107107
path: ${{ steps.composer-cache.outputs.dir }}
108108
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -118,7 +118,7 @@ jobs:
118118
runs-on: ubuntu-latest
119119
steps:
120120
- name: Checkout
121-
uses: actions/checkout@v3
121+
uses: actions/checkout@v4
122122

123123
- name: Setup PHP, with composer and extensions
124124
uses: shivammathur/setup-php@v2
@@ -133,7 +133,7 @@ jobs:
133133
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
134134

135135
- name: Cache composer dependencies
136-
uses: actions/cache@v3
136+
uses: actions/cache@v4
137137
with:
138138
path: ${{ steps.composer-cache.outputs.dir }}
139139
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -149,7 +149,7 @@ jobs:
149149
runs-on: ubuntu-latest
150150
steps:
151151
- name: Checkout
152-
uses: actions/checkout@v3
152+
uses: actions/checkout@v4
153153

154154
- name: Setup PHP, with composer and extensions
155155
uses: shivammathur/setup-php@v2
@@ -164,7 +164,7 @@ jobs:
164164
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
165165

166166
- name: Cache composer dependencies
167-
uses: actions/cache@v3
167+
uses: actions/cache@v4
168168
with:
169169
path: ${{ steps.composer-cache.outputs.dir }}
170170
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -180,7 +180,7 @@ jobs:
180180
runs-on: ubuntu-latest
181181
steps:
182182
- name: Checkout
183-
uses: actions/checkout@v3
183+
uses: actions/checkout@v4
184184

185185
- name: Setup PHP, with composer and extensions
186186
uses: shivammathur/setup-php@v2
@@ -195,7 +195,7 @@ jobs:
195195
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
196196

197197
- name: Cache composer dependencies
198-
uses: actions/cache@v3
198+
uses: actions/cache@v4
199199
with:
200200
path: ${{ steps.composer-cache.outputs.dir }}
201201
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -227,7 +227,7 @@ jobs:
227227
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
228228

229229
- name: Cache composer dependencies
230-
uses: actions/cache@v3
230+
uses: actions/cache@v4
231231
with:
232232
path: ${{ steps.composer-cache.outputs.dir }}
233233
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -248,7 +248,7 @@ jobs:
248248
runs-on: ubuntu-latest
249249
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
250250
steps:
251-
- uses: actions/checkout@v3
251+
- uses: actions/checkout@v4
252252
with:
253253
ref: ${{ github.ref }} # Otherwise our annotated tag is not fetched and we cannot get correct version
254254

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tools:
2424
timeout: 600
2525

2626
build_failure_conditions:
27-
- 'elements.rating(<= C).new.exists' # No new classes/methods with a rating of C or worse allowed
27+
- 'elements.rating(<= D).new.exists' # No new classes/methods with a rating of D or worse allowed
2828
- 'issues.severity(>= MAJOR).new.exists' # New issues of major or higher severity
2929
- 'project.metric_change("scrutinizer.test_coverage", < 0)' # Code Coverage decreased from previous inspection
3030
- 'patches.label("Unused Use Statements").new.exists' # No new unused imports patches allowed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org).
77

88
## Unreleased - TBD
99

10+
### BREAKING CHANGE
11+
12+
- Writing of cell comments to Html will now sanitize all Html tags within the comment, so the tags will be rendered as plaintext and have no other effects when rendered. Styling can be achieved by using the Font property of of the TextRuns which make up the comment, as is already the cases for Xlsx. [PR #3957](https://github.com/PHPOffice/PhpSpreadsheet/pull/3957)
13+
1014
### Added
1115

1216
- Default Style Alignment Property (workaround for bug in non-Excel spreadsheet apps) [Issue #3918](https://github.com/PHPOffice/PhpSpreadsheet/issues/3918) [PR #3924](https://github.com/PHPOffice/PhpSpreadsheet/pull/3924)
17+
- Additional Support for Date/Time Styles [PR #3939](https://github.com/PHPOffice/PhpSpreadsheet/pull/3939)
1318

1419
### Changed
1520

@@ -33,6 +38,10 @@ and this project adheres to [Semantic Versioning](https://semver.org).
3338
- Incorrect SUMPRODUCT Calculation [Issue #3909](https://github.com/PHPOffice/PhpSpreadsheet/issues/3909) [PR #3916](https://github.com/PHPOffice/PhpSpreadsheet/pull/3916)
3439
- Formula Misidentifying Text as Cell After Insertion/Deletion [Issue #3907](https://github.com/PHPOffice/PhpSpreadsheet/issues/3907) [PR #3915](https://github.com/PHPOffice/PhpSpreadsheet/pull/3915)
3540
- Unexpected Absolute Address in Xlsx Rels [Issue #3730](https://github.com/PHPOffice/PhpSpreadsheet/issues/3730) [PR #3923](https://github.com/PHPOffice/PhpSpreadsheet/pull/3923)
41+
- Unallocated Cells Affected by Column/Row Insert/Delete [Issue #3933](https://github.com/PHPOffice/PhpSpreadsheet/issues/3933) [PR #3940](https://github.com/PHPOffice/PhpSpreadsheet/pull/3940)
42+
- Invalid Builtin Defined Name in Xls Reader [Issue #3935](https://github.com/PHPOffice/PhpSpreadsheet/issues/3935) [PR #3942](https://github.com/PHPOffice/PhpSpreadsheet/pull/3942)
43+
- Hidden Rows and Columns Tcpdf/Mpdf [PR #3945](https://github.com/PHPOffice/PhpSpreadsheet/pull/3945)
44+
- Protect Sheet But Allow Sort [Issue #3951](https://github.com/PHPOffice/PhpSpreadsheet/issues/3951) [PR #3956](https://github.com/PHPOffice/PhpSpreadsheet/pull/3956)
3645

3746
## 2.0.0 - 2024-01-04
3847

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@
8484
"markbaker/matrix": "^3.0",
8585
"psr/http-client": "^1.0",
8686
"psr/http-factory": "^1.0",
87-
"psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
88-
"voku/anti-xss": "^4.1"
87+
"psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
8988
},
9089
"require-dev": {
9190
"dealerdirect/phpcodesniffer-composer-installer": "dev-main",

0 commit comments

Comments
 (0)