Merge pull request #10254 from creative-commoners/pulls/4/guzzle-conflict

DEP Require guzzlehttp/psr7 ^2

composer.json

@@ -26,6 +26,7 @@
         "composer/installers": "^1 || ^2",
         "composer/semver": "^1 || ^3",
         "embed/embed": "^3",
+        "guzzlehttp/psr7": "^2",
         "league/csv": "^8 || ^9",
         "m1/env": "^2.1",
         "monolog/monolog": "^1.16",

docs/en/04_Changelogs/4.11.0.md

@@ -8,7 +8,7 @@
   - [Preview any DataObject in any admin section](#cms-preview)
   - [Other features](#other-features)
 - [Bugfixes](#bugfixes)
-- [Internal API changes](#internal-api-changes)
+- [Dependency and internal API changes](#dependency-internal-api-changes)
 
 
 ## Regression test and Security audit{#audit}
@@ -41,9 +41,11 @@ The [Preview Documentation](https://docs.silverstripe.org/en/4/developer_guides/
 
 This release includes a number of bug fixes to improve a broad range of areas. Check the change logs for full details of these fixes split by module. Thank you to the community members that helped contribute these fixes as part of the release!
 
-## Internal API changes {#internal-api-changes}
+## Dependency and internal API changes {#dependency-internal-api-changes}
 
- - Fixed typo in `SilverStripe\Core\CoreKernel` protected variable `$enviroment`, now `$environment`.  
+- If `guzzlehttp/guzzle` is required, it must now be at least `7.3.0`. This was done to ensure that v2 of `guzzlehttp/psr7` is installed, which is used by `embed/embed` v4
+- `embed/embed` has been upgraded from v3 to v4. The internal implementation of the internal `Embeddable` interface has been changed from `EmbedResource` to `EmbedContainer`
+- Fixed typo in `SilverStripe\Core\CoreKernel` protected variable `$enviroment`, now `$environment`.  
    If you've extended CoreKernel and not using the appropriate getter/setter methods, please update your code.
 
 <!--- Changes below this line will be automatically regenerated -->