Skip to content

Commit ae2920b

Browse files
committed
Merge branch '3.1.x'
Signed-off-by: Maurício Meneghini Fauth <[email protected]>
2 parents 6aab917 + d1b56dd commit ae2920b

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
continue-on-error: ${{ matrix.experimental }}
1212
strategy:
1313
matrix:
14-
php-version: ['8.2', '8.3', '8.4']
14+
php-version: ['8.2', '8.3', '8.4', '8.5']
1515
php-extensions: ['dbase', ':dbase']
1616
os: [ubuntu-latest]
1717
experimental: [false]
1818
composer-options: ['']
1919
include:
20-
- { php-version: '8.5', php-extensions: 'dbase', composer-options: '--ignore-platform-req=php+', experimental: true, os: ubuntu-latest }
21-
- { php-version: '8.5', php-extensions: ':dbase', composer-options: '--ignore-platform-req=php+', experimental: true, os: ubuntu-latest }
20+
- { php-version: '8.6', php-extensions: 'dbase', composer-options: '--ignore-platform-req=php+', experimental: true, os: ubuntu-latest }
21+
- { php-version: '8.6', php-extensions: ':dbase', composer-options: '--ignore-platform-req=php+', experimental: true, os: ubuntu-latest }
2222
steps:
2323
- name: Checkout code
2424
uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
77
### Removed
88
- Drop support for PHP 7.1, PHP 7.2, PHP 7.3, PHP 7.4, PHP 8.0 and PHP 8.1
99

10-
## [3.1.0] - YYYY-MM-DD
10+
## [3.1.0] - 2025-10-29
1111

1212
### Added
1313

14-
- Adds a toggle to allow shape files with no dbf (#41)
14+
- [#41](https://github.com/phpmyadmin/shapefile/pull/41): Adds a toggle to allow shape files with no dbf
15+
- [#44](https://github.com/phpmyadmin/shapefile/pull/44): Support for PHP 8.4 and PHP 8.5
16+
17+
### Removed
18+
19+
- [#39](https://github.com/phpmyadmin/shapefile/pull/39): Drop support for PHP 7.1
1520

1621
## [3.0.2] - 2023-09-11
1722
### Added
@@ -20,7 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
2025

2126
## [3.0.1] - 2021-02-05
2227
### Fixed
23-
- Fix method signature of ShapeFile::getDBFHeader()
28+
- Fix method signature of `ShapeFile::getDBFHeader()`
2429

2530
## [3.0.0] - 2021-02-05
2631
### Added
@@ -29,10 +34,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
2934

3035
### Changed
3136
- Enable strict mode on PHP files
32-
- Rename ShapeFile::$FileName property to ShapeFile::$fileName
33-
- Rename ShapeRecord::$SHPData property to ShapeRecord::$shpData
34-
- Rename ShapeRecord::$DBFData property to ShapeRecord::$dbfData
35-
- ShapeRecord::getContentLength returns `null` when the shape type is not supported instead of `false`.
37+
- Rename `ShapeFile::$FileName` property to `ShapeFile::$fileName`
38+
- Rename `ShapeRecord::$SHPData` property to `ShapeRecord::$shpData`
39+
- Rename `ShapeRecord::$DBFData` property to `ShapeRecord::$dbfData`
40+
- `ShapeRecord::getContentLength` returns `null` when the shape type is not supported instead of `false`.
3641

3742
### Removed
3843
- Drop support for PHP 5.4, PHP 5.5, PHP 5.6, PHP 7.0 and HHVM
@@ -126,8 +131,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
126131
### Added
127132
- Initial release based on bfShapeFiles
128133

129-
[Unreleased]: https://github.com/phpmyadmin/shapefile/compare/3.0.2...HEAD
130-
[3.1.0]: https://github.com/phpmyadmin/shapefile/compare/3.0.2...3.1.x
134+
[Unreleased]: https://github.com/phpmyadmin/shapefile/compare/3.1.0...HEAD
135+
[3.1.0]: https://github.com/phpmyadmin/shapefile/compare/3.0.2...3.1.0
131136
[3.0.2]: https://github.com/phpmyadmin/shapefile/compare/3.0.1...3.0.2
132137
[3.0.1]: https://github.com/phpmyadmin/shapefile/compare/3.0.0...3.0.1
133138
[3.0.0]: https://github.com/phpmyadmin/shapefile/compare/2.1...3.0.0

0 commit comments

Comments
 (0)