Skip to content

Commit 10bf569

Browse files
author
MarkBaker
committed
Merge branch 'master' into NORM-S-DIST-with-second-argument
# Conflicts: # CHANGELOG.md
2 parents 38392e7 + a79c736 commit 10bf569

File tree

10 files changed

+279
-323
lines changed

10 files changed

+279
-323
lines changed

CHANGELOG.md

+49-26
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,44 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com)
66
and this project adheres to [Semantic Versioning](https://semver.org).
77

8-
## [Unreleased]
8+
## Unreleased - TBD
99

1010
### Added
1111

1212
- Implementation of the Excel `NORM.S.DIST()`, `GAMMA()` and `GAUSS()` functions. [#1588](https://github.com/PHPOffice/PhpSpreadsheet/pull/1588)
1313

14+
### Changed
15+
16+
- Nothing.
17+
18+
### Deprecated
19+
20+
- Nothing.
21+
22+
### Removed
23+
24+
- Nothing.
25+
1426
### Fixed
1527

28+
- Nothing.
29+
30+
## 1.14.1 - 2020-07-19
31+
32+
### Added
33+
1634
- nothing
1735

36+
### Fixed
37+
38+
- WEBSERVICE is HTTP client agnostic and must be configured via `Settings::setHttpClient()` [#1562](https://github.com/PHPOffice/PhpSpreadsheet/issues/1562)
39+
- Borders were not complete on rowspanned columns using HTML reader [#1473](https://github.com/PHPOffice/PhpSpreadsheet/pull/1473)
40+
1841
### Changed
1942

2043
- nothing
2144

22-
## [1.14.0] - 2020-06-29
45+
## 1.14.0 - 2020-06-29
2346

2447
### Added
2548

@@ -43,7 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
4366
- Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
4467
- Don't ouput row and columns without any cells in HTML writer [#1235](https://github.com/PHPOffice/PhpSpreadsheet/issues/1235)
4568

46-
## [1.13.0] - 2020-05-31
69+
## 1.13.0 - 2020-05-31
4770

4871
### Added
4972

@@ -69,7 +92,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
6992
- Drop partial migration tool in favor of complete migration via RectorPHP [#1445](https://github.com/PHPOffice/PhpSpreadsheet/issues/1445)
7093
- Limit composer package to `src/` [#1424](https://github.com/PHPOffice/PhpSpreadsheet/pull/1424)
7194

72-
## [1.12.0] - 2020-04-27
95+
## 1.12.0 - 2020-04-27
7396

7497
### Added
7598

@@ -85,7 +108,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
85108
- MATCH with a static array should return the position of the found value based on the values submitted [#1332](https://github.com/PHPOffice/PhpSpreadsheet/pull/1332)
86109
- Fix Xlsx Reader's handling of undefined fill color [#1353](https://github.com/PHPOffice/PhpSpreadsheet/pull/1353)
87110

88-
## [1.11.0] - 2020-03-02
111+
## 1.11.0 - 2020-03-02
89112

90113
### Added
91114

@@ -104,7 +127,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
104127
- Fix XLSX file loading with autofilter containing '$' [#1326](https://github.com/PHPOffice/PhpSpreadsheet/pull/1326)
105128
- PHPDoc - Use `@return $this` for fluent methods [#1362](https://github.com/PHPOffice/PhpSpreadsheet/pull/1362)
106129

107-
## [1.10.1] - 2019-12-02
130+
## 1.10.1 - 2019-12-02
108131

109132
### Changed
110133

@@ -119,7 +142,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
119142
- ODS writer prevent invalid numeric value if locale decimal separator is comma [#1268](https://github.com/PHPOffice/PhpSpreadsheet/pull/1268)
120143
- Xlsx writer actually writes plotVisOnly and dispBlanksAs from chart properties [#1266](https://github.com/PHPOffice/PhpSpreadsheet/pull/1266)
121144

122-
## [1.10.0] - 2019-11-18
145+
## 1.10.0 - 2019-11-18
123146

124147
### Changed
125148

@@ -144,7 +167,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
144167
- Validate XIRR inputs and return correct error values [#1120](https://github.com/PHPOffice/PhpSpreadsheet/issues/1120)
145168
- Allow to read xlsx files with exotic workbook names like "workbook2.xml" [#1183](https://github.com/PHPOffice/PhpSpreadsheet/pull/1183)
146169

147-
## [1.9.0] - 2019-08-17
170+
## 1.9.0 - 2019-08-17
148171

149172
### Changed
150173

@@ -175,20 +198,20 @@ and this project adheres to [Semantic Versioning](https://semver.org).
175198
- Fix `getCalculatedValue()` error with more than two INDIRECT [#1115](https://github.com/PHPOffice/PhpSpreadsheet/pull/1115)
176199
- Writer\Html did not hide columns [#985](https://github.com/PHPOffice/PhpSpreadsheet/pull/985)
177200

178-
## [1.8.2] - 2019-07-08
201+
## 1.8.2 - 2019-07-08
179202

180203
### Fixed
181204

182205
- Uncaught error when opening ods file and properties aren't defined [#1047](https://github.com/PHPOffice/PhpSpreadsheet/issues/1047)
183206
- Xlsx Reader Cell datavalidations bug [#1052](https://github.com/PHPOffice/PhpSpreadsheet/pull/1052)
184207

185-
## [1.8.1] - 2019-07-02
208+
## 1.8.1 - 2019-07-02
186209

187210
### Fixed
188211

189212
- Allow nullable theme for Xlsx Style Reader class [#1043](https://github.com/PHPOffice/PhpSpreadsheet/issues/1043)
190213

191-
## [1.8.0] - 2019-07-01
214+
## 1.8.0 - 2019-07-01
192215

193216
### Security Fix (CVE-2019-12331)
194217

@@ -211,7 +234,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
211234
- Fix a SUMIF warning with some versions of PHP when having different length of arrays provided as input [#873](https://github.com/PHPOffice/PhpSpreadsheet/pull/873)
212235
- Fix incorrectly handled backslash-escaped space characters in number format
213236

214-
## [1.7.0] - 2019-05-26
237+
## 1.7.0 - 2019-05-26
215238

216239
- Added support for inline styles in Html reader (borders, alignment, width, height)
217240
- QuotedText cells no longer treated as formulae if the content begins with a `=`
@@ -225,7 +248,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
225248
- Fix VLOOKUP
226249
- Fix return type hint
227250

228-
## [1.6.0] - 2019-01-02
251+
## 1.6.0 - 2019-01-02
229252

230253
### Added
231254

@@ -253,13 +276,13 @@ and this project adheres to [Semantic Versioning](https://semver.org).
253276

254277
- `master` is the new default branch, `develop` does not exist anymore
255278

256-
## [1.5.2] - 2018-11-25
279+
## 1.5.2 - 2018-11-25
257280

258281
### Security
259282

260283
- Improvements to the design of the XML Security Scanner [#771](https://github.com/PHPOffice/PhpSpreadsheet/issues/771)
261284

262-
## [1.5.1] - 2018-11-20
285+
## 1.5.1 - 2018-11-20
263286

264287
### Security
265288

@@ -279,7 +302,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
279302
- Mpdf export can exceed pcre.backtrack_limit [#637](https://github.com/PHPOffice/PhpSpreadsheet/issues/637)
280303
- Fix index overflow on data values array [#748](https://github.com/PHPOffice/PhpSpreadsheet/pull/748)
281304

282-
## [1.5.0] - 2018-10-21
305+
## 1.5.0 - 2018-10-21
283306

284307
### Added
285308

@@ -294,7 +317,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
294317
- OFFSET should allow omitted height and width [#561](https://github.com/PHPOffice/PhpSpreadsheet/issues/561)
295318
- Correctly determine delimiter when CSV contains line breaks inside enclosures [#716](https://github.com/PHPOffice/PhpSpreadsheet/issues/716)
296319

297-
## [1.4.1] - 2018-09-30
320+
## 1.4.1 - 2018-09-30
298321

299322
### Fixed
300323

@@ -303,7 +326,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
303326
- Fix warning when reading xlsx without styles [#631](https://github.com/PHPOffice/PhpSpreadsheet/pull/631)
304327
- Fix broken sample links on windows due to $baseDir having backslash [#653](https://github.com/PHPOffice/PhpSpreadsheet/pull/653)
305328

306-
## [1.4.0] - 2018-08-06
329+
## 1.4.0 - 2018-08-06
307330

308331
### Added
309332

@@ -367,13 +390,13 @@ and this project adheres to [Semantic Versioning](https://semver.org).
367390
- Migration tool keep variables containing $PHPExcel untouched [#598](https://github.com/PHPOffice/PhpSpreadsheet/issues/598)
368391
- Rowspans/colspans were incorrect when adding worksheet using loadIntoExisting [#619](https://github.com/PHPOffice/PhpSpreadsheet/issues/619)
369392

370-
## [1.3.1] - 2018-06-12
393+
## 1.3.1 - 2018-06-12
371394

372395
### Fixed
373396

374397
- Ranges across Z and AA columns incorrectly threw an exception [#545](https://github.com/PHPOffice/PhpSpreadsheet/issues/545)
375398

376-
## [1.3.0] - 2018-06-10
399+
## 1.3.0 - 2018-06-10
377400

378401
### Added
379402

@@ -392,13 +415,13 @@ and this project adheres to [Semantic Versioning](https://semver.org).
392415
- Fixed parsing of conditionals in COUNTIF functions [#526](https://github.com/PHPOffice/PhpSpreadsheet/issues/526)
393416
- Corruption errors for saved Xlsx docs with frozen panes [#532](https://github.com/PHPOffice/PhpSpreadsheet/issues/532)
394417

395-
## [1.2.1] - 2018-04-10
418+
## 1.2.1 - 2018-04-10
396419

397420
### Fixed
398421

399422
- Plain text and richtext mixed in same cell can be read [#442](https://github.com/PHPOffice/PhpSpreadsheet/issues/442)
400423

401-
## [1.2.0] - 2018-03-04
424+
## 1.2.0 - 2018-03-04
402425

403426
### Added
404427

@@ -416,7 +439,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
416439
- Select correct cell when calling freezePane [#389](https://github.com/PHPOffice/PhpSpreadsheet/issues/389)
417440
- `setStrikethrough()` did not set the font [#403](https://github.com/PHPOffice/PhpSpreadsheet/issues/403)
418441

419-
## [1.1.0] - 2018-01-28
442+
## 1.1.0 - 2018-01-28
420443

421444
### Added
422445

@@ -434,7 +457,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
434457
- Support XML file without styles [#331](https://github.com/PHPOffice/PhpSpreadsheet/pull/331)
435458
- Cell coordinates which are already a range cause an exception [#319](https://github.com/PHPOffice/PhpSpreadsheet/issues/319)
436459

437-
## [1.0.0] - 2017-12-25
460+
## 1.0.0 - 2017-12-25
438461

439462
### Added
440463

@@ -453,7 +476,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
453476

454477
- Constant `TYPE_DOUGHTNUTCHART` is now `TYPE_DOUGHNUTCHART`.
455478

456-
## [1.0.0-beta2] - 2017-11-26
479+
## 1.0.0-beta2 - 2017-11-26
457480

458481
### Added
459482

@@ -491,7 +514,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
491514
- `PhpSpreadsheet\Style` => `PhpSpreadsheet\Style\Style`
492515
- `PhpSpreadsheet\Worksheet` => `PhpSpreadsheet\Worksheet\Worksheet`
493516

494-
## [1.0.0-beta] - 2017-08-17
517+
## 1.0.0-beta - 2017-08-17
495518

496519
### Added
497520

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
"markbaker/complex": "^1.4",
5858
"markbaker/matrix": "^1.2",
5959
"psr/simple-cache": "^1.0",
60-
"guzzlehttp/guzzle": "^7.0"
60+
"psr/http-client": "^1.0",
61+
"psr/http-factory": "^1.0"
6162
},
6263
"require-dev": {
6364
"dompdf/dompdf": "^0.8.5",

0 commit comments

Comments
 (0)