Merge branch '3.x'

dvdoug · Feb 4, 2023 · b2402d1 · b2402d1
2 parents 4508fa0 + 0f93e47
commit b2402d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,15 +21,19 @@
  `->getBox()` and `->getItems()`
  - `NoBoxesAvailableException` now has a `getAffectedItems()` method instead of `getItem()`. This should allow
  improved handling of the exception inside calling applications when multiple items cannot be packed
- - Calling `json_encode()` on a `PackedBox` or `PackedItem` now additionally serialises the entire underlying
- `Box`/`Item` where those objects also implement `JsonSerializable`. Previously the serialisation only included the
- key values from the `Box`/`Item` interfaces themselves.
 ### Removed
  - Removed deprecated `ConstrainedItem`. You should use `ConstrainedPlacementItem` as a replacement
  - Removed `getKeepFlat()` from the `Item` interface
  - Removed `InfalliblePacker`. You can now get the same behaviour by calling `->throwOnUnpackableItem(false)` and
  `->getUnpackedItems()` on the main `Packer` class
 
+
+## [3.11.0] - 2023-02-04
+### Changed
+- Calling `json_encode()` on a `PackedBox` or `PackedItem` now additionally serialises the entire underlying
+ `Box`/`Item` where those objects also implement `JsonSerializable`. Previously the serialisation only included the
+ key values from the `Box`/`Item` interfaces themselves.
+
 ## [3.10.0] - 2022-09-10
 ### Added
 - Added `ItemSorter`, `BoxSorter` and `PackedBoxSorter` to allow calling applications to have better control over
@@ -517,6 +521,7 @@ Initial release
 
 [4.x - Unreleased]: https://github.com/dvdoug/BoxPacker/compare/3.x...master
 
+[3.11.0]: https://github.com/dvdoug/BoxPacker/compare/3.10.0...3.11.0
 [3.10.0]: https://github.com/dvdoug/BoxPacker/compare/3.9.4...3.10.0
 [3.9.4]: https://github.com/dvdoug/BoxPacker/compare/3.9.3...3.9.4
 [3.9.3]: https://github.com/dvdoug/BoxPacker/compare/3.9.2...3.9.3

diff --git a/docs/conf.py b/docs/conf.py
@@ -46,7 +46,7 @@
 
 # General information about the project.
 project = u'BoxPacker'
-copyright = u'2012-2022, Doug Wright'
+copyright = u'2012-2023, Doug Wright'
 author = u'Doug Wright'
 
 # The version info for the project you're documenting, acts as replacement for

diff --git a/license.txt b/license.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2012-2022 Doug Wright
+Copyright (C) 2012-2023 Doug Wright
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal