Skip to content

Commit 0210a94

Browse files
committed
Merge branch 'master' of github.com:php-ds/ds
2 parents 5c1ada9 + 23a1e7a commit 0210a94

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

CHANGELOG.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5-
## [1.0.2] - 2016-07-31
6-
### Added
7-
- Map::putAll
5+
## [1.0.4] - 2016-08-01
6+
### Fixed
7+
- `unserialize` memory leak when failed to unserialize.
8+
- `htable` bucket copy macro didn't copy the bucket's "next"
89

910
## [1.0.3] - 2016-08-01
1011
### Added
11-
- Set::merge
12+
- `Set::merge`
1213

1314
### Fixed
1415
- ds_htable_put_next bucket rehash fix (see docs #4)
16+
-
17+
## [1.0.2] - 2016-07-31
18+
### Added
19+
- `Map::putAll`

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://travis-ci.org/php-ds/extension.svg?branch=master)](https://travis-ci.org/php-ds/extension)
44
[![Build status](https://ci.appveyor.com/api/projects/status/dbcssp6flml2gher?svg=true)](https://ci.appveyor.com/project/rtheunissen/extension)
5-
[![PECL](https://img.shields.io/badge/PECL-1.0.3-blue.svg)](https://pecl.php.net/package/ds)
5+
[![PECL](https://img.shields.io/badge/PECL-1.0.4-blue.svg)](https://pecl.php.net/package/ds)
66

77
## Documentation
88

@@ -76,11 +76,11 @@ It's highly recommended that you include the [polyfill](https://github.com/php-d
7676

7777
Please see [CONTRIBUTING](CONTRIBUTING.md) for more information.
7878

79-
### Credits
79+
## Credits
8080

8181
- [Rudi Theunissen](https://github.com/rtheunissen)
8282
- [Joe Watkins](https://github.com/krakjoe)
8383

84-
### License
84+
## License
8585

8686
The MIT License (MIT). Please see [LICENSE](LICENSE.md) for more information.

0 commit comments

Comments
 (0)