Skip to content

Commit 12ec2f1

Browse files
committed
Merge remote-tracking branch 'origin/master' into reflection-2x
# Conflicts: # composer.json # src/TypeAdapter/Exception/UnexpectedPolymorphicTypeException.php # src/TypeAdapter/Primitive/Polymorphic/ClassPolymorphicTypeAdapterFactory.php # tests/Integration/JsonSerializationTest.php # tests/Stubs/Polymorphic/Change.php
2 parents ae19f1d + 8ad5db6 commit 12ec2f1

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [1.2.0](https://github.com/good-php/serialization/compare/v1.1.1...v1.2.0) (2025-05-28)
2+
3+
4+
### Features
5+
6+
* Polymorphic adapter ([#10](https://github.com/good-php/serialization/issues/10)) ([145e802](https://github.com/good-php/serialization/commit/145e802ac60f171e722e96a649af6eb1c90aca3d))
7+
8+
## [1.1.1](https://github.com/good-php/serialization/compare/v1.1.0...v1.1.1) (2025-05-28)
9+
10+
11+
### Reverts
12+
13+
* Revert "Merge pull request #8 from good-php/polymorphic-adapter" (#9) ([aae982b](https://github.com/good-php/serialization/commit/aae982b9f0fb0ec599f7a5acdf3ad53b336f615d)), closes [#8](https://github.com/good-php/serialization/issues/8) [#9](https://github.com/good-php/serialization/issues/9)
14+
115
# [1.1.0](https://github.com/good-php/serialization/compare/v1.0.0...v1.1.0) (2025-03-10)
216

317

0 commit comments

Comments
 (0)