Skip to content

Commit

Permalink
[BUGFIX] Declare guzzlehttp/psr7 dependency
Browse files Browse the repository at this point in the history
guzzlehttp/psr7 is not only an indirect dependency
from guzzlehttp/guzzle, but also a direct core
dependency since we extend LazyOpenStream in
SelfEmittableLazyOpenStream. Declare that dependency
directly, which also blocks upcoming guzzlehttp/psr7:2.0
which is currently incompatible with our core use.

composer req guzzlehttp/psr7:^1.4.0 --no-update
composer req guzzlehttp/psr7:^1.4.0 -d typo3/sysext/core --no-update
composer update --lock

Change-Id: I4968bc854545262ce0230ea71647463f5a332f54
Resolves: #94422
Releases: master, 10.4, 9.5
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/69667
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
  • Loading branch information
lolli42 committed Jun 30, 2021
1 parent 550c4be commit dc125e4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions composer.json
Expand Up @@ -45,6 +45,7 @@
"doctrine/lexer": "^1.0",
"egulias/email-validator": "^2.1",
"guzzlehttp/guzzle": "^6.3.0",
"guzzlehttp/psr7": "^1.4.0",
"nikic/php-parser": "^4.10.4",
"phpdocumentor/reflection-docblock": "^5.2",
"phpdocumentor/type-resolver": "^1.3",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions typo3/sysext/core/composer.json
Expand Up @@ -33,6 +33,7 @@
"doctrine/lexer": "^1.0",
"egulias/email-validator": "^2.1",
"guzzlehttp/guzzle": "^6.3.0",
"guzzlehttp/psr7": "^1.4.0",
"nikic/php-parser": "^4.10.4",
"psr/container": "^1.0",
"psr/event-dispatcher": "^1.0",
Expand Down

0 comments on commit dc125e4

Please sign in to comment.