Skip to content

Allow laminas/laminas-diactoros v3 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+47 −56
Open

Allow laminas/laminas-diactoros v3 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c88d23a
Update dependencies to allow laminas/laminas-diactoros v3
erickskrauch Oct 21, 2024
0a58b66
Fix an error in Psr7ResponseTrait
erickskrauch Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"minimum-stability": "stable",
"require": {
"yiisoft/yii2": "^2.0.15",
"psr/http-message": "^1.0",
"psr/http-message": "^1.0|^2.0",
"psr/http-server-handler": "^1.0",
"laminas/laminas-diactoros": "^2.3",
"yidas/yii2-bower-asset": "2.0.13.1"
"laminas/laminas-diactoros": "^2.3|^3.0"
},
"require-dev": {
"samdark/yii2-psr-log-target": "^1.0",
"monolog/monolog": "~2.1.0",
"squizlabs/php_codesniffer": "^3.2",
"phpunit/phpunit": "^9.0",
"spiral/roadrunner": "^2.5"
"spiral/roadrunner": "^2.5",
"yidas/yii2-bower-asset": "2.0.13.1"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! This dependency yidas/yii2-bower-asset I don't believe needs to be added. If you can remove it and update the composer.lock file I'd be happy to merge this in. I'd prefer not to lock this and let Yii2 automatically pull it in as needed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was there before me, so I decided that you actually needed it and moved to the dev section. Should I still remove it? I believe without it you wouldn't be able to install the Yii2 framework since it requires some bower assets.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@charlesportwoodii, kind ping :)

Copy link
Contributor

@maximal maximal Dec 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@erickskrauch, @charlesportwoodii, I think, we should use asset-packagist (bower-asset) approach here, as it is currently the main method for Yii2 applications. Otherwise, for now, this bridge will prevent asset-packagist from installing packages to vendor/bower-asset directory and use yidas/yii2-bower-asset/bower directory instead.

See for more information: https://www.yiiframework.com/doc/guide/2.0/en/structure-assets#bower-npm-assets

},
"autoload": {
"psr-4": {
Expand Down
91 changes: 41 additions & 50 deletions composer.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions src/web/traits/Psr7ResponseTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public function getPsr7Response(): ResponseInterface

// Manually set headers to ensure array headers are added.
foreach ($this->getPsr7Headers() as $header => $value) {
if (\is_array($header)) {
foreach ($header as $v) {
if (\is_array($value)) {
foreach ($value as $v) {
$response = $response->withAddedHeader($header, $v);
}
} else {
Expand Down