[TASK] Use psr/http-message:"^1.1 || ^2.0"
We should strive for current dependency versions with upcoming 12.4.0 LTS. psr/http-message has recently been released as 1.1.0 and 2.0.0, which we should support. According to [1], having ^1.1 as lower bound is encouraged to have ^2.0. All our implementations are @internal, dropping 1.0 shouldn't be a huge burden, and other dependencies like guzzle adapted as well already. The patch bumps a couple of psr dependencies to allow ^2.0, raises guzzlehttp/psr7 to a minimum version that supports ^1.1 and ^2.0, and sets psr/http-message to ^1.1 || ^2.0. Our implementations are adapted, allowing us to be much more strict on types. One unfortunate "nullable" Uri is left, but this could be sorted out with a dedicated patch since it has impact on quite a few test cases. [1] https://www.php-fig.org/psr/psr-7/meta/#72-type-additions > composer u psr/http-client \ psr/http-factory \ psr/http-server-handler \ psr/http-server-middleware > composer req guzzlehttp/psr7:^2.5.0 > composer req --no-update guzzlehttp/psr7:"^2.5.0" -d typo3/sysext/core > composer req psr/http-message:"^1.1 || ^2.0" > composer req --no-update psr/http-message:"^1.1 || ^2.0" -d typo3/sysext/adminpanel > composer req --no-update psr/http-message:"^1.1 || ^2.0" -d typo3/sysext/core > composer req --no-update psr/http-message:"^1.1 || ^2.0" -d typo3/sysext/form > composer req --no-update psr/http-message:"^1.1 || ^2.0" -d typo3/sysext/redirects Resolves: #100682 Releases: main Change-Id: I98bb4031a681fe65827e282e0af059af66863873 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78763 Tested-by:Stefan Bürk <stefan@buerk.tech> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
core-ci <typo3@b13.com> Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Benni Mack <benni@typo3.org> Tested-by:
Oliver Klee <typo3-coding@oliverklee.de> Reviewed-by:
Benni Mack <benni@typo3.org> Reviewed-by:
Oliver Klee <typo3-coding@oliverklee.de> Reviewed-by:
Stefan Bürk <stefan@buerk.tech>
Showing
- Build/phpstan/phpstan-baseline.neon 0 additions, 15 deletionsBuild/phpstan/phpstan-baseline.neon
- composer.json 2 additions, 2 deletionscomposer.json
- composer.lock 49 additions, 53 deletionscomposer.lock
- typo3/sysext/adminpanel/composer.json 1 addition, 1 deletiontypo3/sysext/adminpanel/composer.json
- typo3/sysext/core/Classes/Http/FalDumpFileContentsDecoratorStream.php 7 additions, 23 deletions.../core/Classes/Http/FalDumpFileContentsDecoratorStream.php
- typo3/sysext/core/Classes/Http/HtmlResponse.php 3 additions, 1 deletiontypo3/sysext/core/Classes/Http/HtmlResponse.php
- typo3/sysext/core/Classes/Http/Message.php 29 additions, 39 deletionstypo3/sysext/core/Classes/Http/Message.php
- typo3/sysext/core/Classes/Http/RedirectResponse.php 3 additions, 7 deletionstypo3/sysext/core/Classes/Http/RedirectResponse.php
- typo3/sysext/core/Classes/Http/Request.php 12 additions, 13 deletionstypo3/sysext/core/Classes/Http/Request.php
- typo3/sysext/core/Classes/Http/Response.php 11 additions, 13 deletionstypo3/sysext/core/Classes/Http/Response.php
- typo3/sysext/core/Classes/Http/SelfEmittableLazyOpenStream.php 5 additions, 9 deletions.../sysext/core/Classes/Http/SelfEmittableLazyOpenStream.php
- typo3/sysext/core/Classes/Http/ServerRequest.php 24 additions, 47 deletionstypo3/sysext/core/Classes/Http/ServerRequest.php
- typo3/sysext/core/Classes/Http/Stream.php 22 additions, 30 deletionstypo3/sysext/core/Classes/Http/Stream.php
- typo3/sysext/core/Classes/Http/UploadedFile.php 20 additions, 55 deletionstypo3/sysext/core/Classes/Http/UploadedFile.php
- typo3/sysext/core/Classes/Http/Uri.php 39 additions, 106 deletionstypo3/sysext/core/Classes/Http/Uri.php
- typo3/sysext/core/Classes/Security/ContentSecurityPolicy/UriValue.php 1 addition, 1 deletion.../core/Classes/Security/ContentSecurityPolicy/UriValue.php
- typo3/sysext/core/Tests/Unit/Http/RequestTest.php 0 additions, 8 deletionstypo3/sysext/core/Tests/Unit/Http/RequestTest.php
- typo3/sysext/core/Tests/Unit/Http/ResponseTest.php 0 additions, 16 deletionstypo3/sysext/core/Tests/Unit/Http/ResponseTest.php
- typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php 2 additions, 92 deletionstypo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php
- typo3/sysext/core/Tests/Unit/Http/UriTest.php 3 additions, 90 deletionstypo3/sysext/core/Tests/Unit/Http/UriTest.php
Please register or sign in to comment