Merge branch 'master' into 2.0-Development

Author: MarkBaker

CHANGELOG.md

@@ -28,6 +28,29 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Nothing
 
 
+## 1.25.2 - 2022-09-25
+
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Composer dependency clash with ezyang/htmlpurifier
+
+
 ## 1.25.0 - 2022-09-25
 
 ### Added

composer.json

@@ -69,7 +69,7 @@
         "ext-xmlwriter": "*",
         "ext-zip": "*",
         "ext-zlib": "*",
-        "ezyang/htmlpurifier": "4.15",
+        "ezyang/htmlpurifier": "^4.15",
         "maennchen/zipstream-php": "^2.1",
         "markbaker/complex": "^3.0",
         "markbaker/matrix": "^3.0",