Skip to content

Commit 11522af

Browse files
author
MarkBaker
committed
Merge branch 'master' into PHP8-Sane-Property-Names
# Conflicts: # CHANGELOG.md # src/PhpSpreadsheet/Shared/Drawing.php # src/PhpSpreadsheet/Spreadsheet.php # src/PhpSpreadsheet/Style/Conditional.php
2 parents 02e8897 + a6240b0 commit 11522af

Some content is hidden

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

68 files changed

+1508
-709
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
/.php_cs.dist export-ignore
66
/.sami.php export-ignore
77
/.scrutinizer.yml export-ignore
8-
/.travis.yml export-ignore
98
/CHANGELOG.PHPExcel.md export-ignore
109
/bin export-ignore
1110
/composer.lock export-ignore

.github/workflows/main.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: main
22
on: [ push, pull_request ]
33
jobs:
44
test:
@@ -10,6 +10,7 @@ jobs:
1010
- '7.3'
1111
- '7.4'
1212
- '8.0'
13+
- '8.1'
1314

1415
name: PHP ${{ matrix.php-version }}
1516

@@ -37,7 +38,7 @@ jobs:
3738

3839
- name: Delete composer lock file
3940
id: composer-lock
40-
if: ${{ matrix.php-version == '8.0' }}
41+
if: ${{ matrix.php-version == '8.0' || matrix.php-version == '8.1' }}
4142
run: |
4243
rm composer.lock
4344
echo "::set-output name=flags::--ignore-platform-reqs"
@@ -148,3 +149,25 @@ jobs:
148149
./vendor/bin/phpunit --coverage-clover coverage-clover.xml
149150
curl -LO https://scrutinizer-ci.com/ocular.phar
150151
php ocular.phar code-coverage:upload --format=php-clover coverage-clover.xml
152+
153+
release:
154+
runs-on: ubuntu-latest
155+
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
156+
steps:
157+
- uses: actions/checkout@v2
158+
with:
159+
ref: ${{ github.ref }} # Otherwise our annotated tag is not fetched and we cannot get correct version
160+
161+
# Create release
162+
- name: Get release info
163+
id: release-info
164+
run: |
165+
echo "::set-output name=subject::$(git tag --format '%(contents:subject)' --points-at)"
166+
git tag --format '%(contents:body)' --points-at > release-body.txt
167+
- uses: actions/create-release@v1
168+
env:
169+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
170+
with:
171+
tag_name: ${{ github.ref }}
172+
release_name: ${{ steps.release-info.outputs.subject }}
173+
body_path: release-body.txt

.travis.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
99

1010
### Added
1111

12+
- CSV Reader - Best Guess for Encoding, and Handle Null-string Escape [#1647](https://github.com/PHPOffice/PhpSpreadsheet/issues/1647)
1213
- Provided a Size Helper class to validate size values (pt, px, em)
1314

1415
### Changed
@@ -25,8 +26,17 @@ and this project adheres to [Semantic Versioning](https://semver.org).
2526

2627
### Fixed
2728

29+
- Fix for Xls Reader when SST has a bad length [#1592](https://github.com/PHPOffice/PhpSpreadsheet/issues/1592)
30+
- Resolve Xlsx loader issue whe hyperlinks don't have a destination
31+
- Resolve issues when printer settings resources IDs clash with drawing IDs
32+
- Resolve issue with SLK long filenames [#1612](https://github.com/PHPOffice/PhpSpreadsheet/issues/1612)
33+
- ROUNDUP and ROUNDDOWN return incorrect results for values of 0 [#1627](https://github.com/phpoffice/phpspreadsheet/pull/1627)
34+
- Apply Column and Row Styles to Existing Cells [#1712](https://github.com/PHPOffice/PhpSpreadsheet/issues/1712) [PR #1721](https://github.com/PHPOffice/PhpSpreadsheet/pull/1721)
35+
- Resolve issues with defined names where worksheet doesn't exist (#1686)[https://github.com/PHPOffice/PhpSpreadsheet/issues/1686] and [#1723](https://github.com/PHPOffice/PhpSpreadsheet/issues/1723) - [PR #1742](https://github.com/PHPOffice/PhpSpreadsheet/pull/1742)
36+
- Fix for issue [#1735](https://github.com/PHPOffice/PhpSpreadsheet/issues/1735) Incorrect activeSheetIndex after RemoveSheetByIndex - [PR #1743](https://github.com/PHPOffice/PhpSpreadsheet/pull/1743)
2837
- Ensure that the list of shared formulae is maintained when an xlsx file is chunked with readFilter[Issue #169](https://github.com/PHPOffice/PhpSpreadsheet/issues/1669).
2938
- Fix for notice during accessing "cached magnification factor" offset [#1354](https://github.com/PHPOffice/PhpSpreadsheet/pull/1354)
39+
- Fix compatibility with ext-gd on php 8
3040

3141
### Security Fix (CVE-2020-7776)
3242

@@ -78,7 +88,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
7888

7989
### Fixed
8090

81-
- PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544)
91+
- PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544)
8292
- Calculation/DateTime Failure With PHP8 [#1661](https://github.com/phpoffice/phpspreadsheet/pull/1661)
8393
- Reader/Gnumeric Failure with PHP8 [#1662](https://github.com/phpoffice/phpspreadsheet/pull/1662)
8494
- ReverseSort bug, exposed but not caused by PHP8 [#1660](https://github.com/phpoffice/phpspreadsheet/pull/1660)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PhpSpreadsheet
22

3-
[![Build Status](https://travis-ci.org/PHPOffice/PhpSpreadsheet.svg?branch=master)](https://travis-ci.org/PHPOffice/PhpSpreadsheet)
3+
[![Build Status](https://github.com/PHPOffice/PhpSpreadsheet/workflows/main/badge.svg)](https://github.com/PHPOffice/PhpSpreadsheet/actions)
44
[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
55
[![Code Coverage](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
66
[![Total Downloads](https://img.shields.io/packagist/dt/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"psr/simple-cache": "^1.0",
6060
"psr/http-client": "^1.0",
6161
"psr/http-factory": "^1.0",
62-
"voku/anti-xss": "^4.1"
62+
"ezyang/htmlpurifier": "^4.13"
6363
},
6464
"require-dev": {
6565
"dompdf/dompdf": "^0.8.5",

0 commit comments

Comments
 (0)