Skip to content

Commit 4e92e31

Browse files
committed
Merge branch 'v2-updates'
2 parents a5a57c5 + 98b2591 commit 4e92e31

3 files changed

Lines changed: 19 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Change Log
22

3+
## [2.0.0](https://github.com/schmittjoh/serializer/tree/2.0.0) (2018-11-09)
4+
**Implemented enhancements:**
5+
6+
- Move serialization info to the serialization context class [\#1006](https://github.com/schmittjoh/serializer/pull/1006) ([goetas](https://github.com/goetas))
7+
- Upgrade to Doctrine CS 5.0 [\#1002](https://github.com/schmittjoh/serializer/pull/1002) ([Majkl578](https://github.com/Majkl578))
8+
- Add travis build for docs [\#997](https://github.com/schmittjoh/serializer/pull/997) ([kunicmarko20](https://github.com/kunicmarko20))
9+
10+
**Merged pull requests:**
11+
12+
- Added missing comma in 'Overriding Groups' example [\#1001](https://github.com/schmittjoh/serializer/pull/1001) ([skuhnow](https://github.com/skuhnow))
13+
314
## [2.0.0-RC1](https://github.com/schmittjoh/serializer/tree/2.0.0-RC1) (2018-10-17)
415

516
**Merged pull requests:**

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@ Learn more about the serializer in its [documentation](http://jmsyst.com/libs/se
2828

2929
## Notes
3030

31-
You are browsing the code of upcoming 2.0 release, if you are interested in the 1.x series, check the [1.x][1.x] branch.
32-
33-
Differences between the 1.x and 2.x series can be found in the [CHANGELOG][CHANGELOG].
31+
You are browsing the code for the 2.x version, if you are interested in the 1.x version,
32+
check the [1.x][1.x] branch.
3433

34+
Differences between the 1.x and 2.x can be found in the [CHANGELOG][CHANGELOG].
3535
Upgrading from 1.x to 2.x should be almost transparent for most of the userland code, in the
3636
case you have heavily used internal-api or you are relaying on some of the removed features,
37-
the [UPGRADING][UPGRADING] document is a short guide on how to upgrade.
37+
the [UPGRADING][UPGRADING] document is a short guide on how to upgrade.
3838

39-
If you are submitting a pull request, until the 2.0 is not released submit it targeting the 1.x branch.
40-
Accepted pull request will be ported to the 2.0 release when possible.
39+
Pull requests for new features are accepted only on the master branch.
40+
Bug fixes are accepted for both master and 1.x branches.
41+
Bug fixes sent on the 1.x branch, will be ported to the master branch when possible.
4142

4243
[CHANGELOG]: https://github.com/schmittjoh/serializer/blob/master/CHANGELOG.md
4344
[UPGRADING]: https://github.com/schmittjoh/serializer/blob/master/UPGRADING.md

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": "^7.2",
20-
"jms/metadata": "^2.0@RC",
20+
"jms/metadata": "^2.0",
2121
"doctrine/annotations": "^1.0",
2222
"doctrine/instantiator": "^1.0.3",
2323
"hoa/compiler": "^3.17.08.08"

0 commit comments

Comments
 (0)