Commit 12ec2f1
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.php1 file changed
+14
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
1 | 15 | | |
2 | 16 | | |
3 | 17 | | |
| |||
0 commit comments