Skip to content

Commit 3c59e8c

Browse files
committed
Replace dependency on "zend_diactoros" for "nyholm/psr7"
1 parent 87b6cbc commit 3c59e8c

File tree

8 files changed

+223
-77
lines changed

8 files changed

+223
-77
lines changed

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"ezyang/htmlpurifier": "^v4.12.0",
1515
"giggsey/libphonenumber-for-php": "^8.11.5",
1616
"messagebird/php-rest-api": "^v1.16.1",
17+
"nyholm/psr7": "^1.2.1",
1718
"ramsey/uuid": "^3.9.3",
1819
"ramsey/uuid-doctrine": "^1.6.0",
1920
"sensio/framework-extra-bundle": "^v5.5.3",
@@ -37,8 +38,7 @@
3738
"symfony/yaml": "^v4.4.5",
3839
"twig/extensions": "^v1.5.4",
3940
"twilio/sdk": "^5.42.2",
40-
"white-october/pagerfanta-bundle": "^v1.3.2",
41-
"zendframework/zend-diactoros": "^1.8.7"
41+
"white-october/pagerfanta-bundle": "^v1.3.2"
4242
},
4343
"require-dev": {
4444
"codeception/codeception": "^2.5.6",

composer.lock

+170-69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/packages/nyholm_psr7.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
services:
2+
_defaults:
3+
public: false
4+
5+
# Register nyholm/psr7 services for autowiring with PSR-17 (HTTP factories)
6+
Psr\Http\Message\RequestFactoryInterface: '@nyholm.psr7.psr17_factory'
7+
Psr\Http\Message\ResponseFactoryInterface: '@nyholm.psr7.psr17_factory'
8+
Psr\Http\Message\ServerRequestFactoryInterface: '@nyholm.psr7.psr17_factory'
9+
Psr\Http\Message\StreamFactoryInterface: '@nyholm.psr7.psr17_factory'
10+
Psr\Http\Message\UploadedFileFactoryInterface: '@nyholm.psr7.psr17_factory'
11+
Psr\Http\Message\UriFactoryInterface: '@nyholm.psr7.psr17_factory'
12+
13+
nyholm.psr7.psr17_factory:
14+
class: Nyholm\Psr7\Factory\Psr17Factory

config/parameters/test.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ parameters:
3636
- 'Acme\App\Presentation\Web\Core\Port\Response\ResponseFactoryInterface'
3737
- 'Acme\App\Test\Framework\Decorator\EmailCollectorEmailerDecorator'
3838
- 'Doctrine\ORM\EntityManagerInterface'
39+
- 'Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface'
3940
- 'session'

config/services/prod.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ services:
4747
libphonenumber\PhoneNumberUtil:
4848
factory: ['libphonenumber\PhoneNumberUtil', getInstance]
4949

50+
Psr\Http\Message\ServerRequestFactoryInterface:
51+
'@nyholm.psr7.psr17_factory'
52+
5053
Psr\Http\Message\ServerRequestInterface:
5154
factory: 'Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface:createRequest'
5255
arguments: ['@=service("request_stack").getMasterRequest()']
@@ -55,4 +58,4 @@ services:
5558
class: Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory
5659

5760
Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface:
58-
class: Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory
61+
class: Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory

symfony.lock

+18-3
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,18 @@
158158
"myclabs/deep-copy": {
159159
"version": "1.7.0"
160160
},
161+
"nyholm/psr7": {
162+
"version": "1.0",
163+
"recipe": {
164+
"repo": "github.com/symfony/recipes",
165+
"branch": "master",
166+
"version": "1.0",
167+
"ref": "5e29a795c9996269c4cea2e87eeb3052c33cf98e"
168+
},
169+
"files": [
170+
"config/packages/nyholm_psr7.yaml"
171+
]
172+
},
161173
"ocramius/package-versions": {
162174
"version": "1.1.3"
163175
},
@@ -182,6 +194,9 @@
182194
"php-cs-fixer/diff": {
183195
"version": "v1.2.0"
184196
},
197+
"php-http/message-factory": {
198+
"version": "v1.0.2"
199+
},
185200
"phpdocumentor/reflection-common": {
186201
"version": "1.0.1"
187202
},
@@ -224,6 +239,9 @@
224239
"psr/container": {
225240
"version": "1.0.0"
226241
},
242+
"psr/http-factory": {
243+
"version": "1.0.0"
244+
},
227245
"psr/http-message": {
228246
"version": "1.0.1"
229247
},
@@ -611,9 +629,6 @@
611629
"zendframework/zend-code": {
612630
"version": "3.3.0"
613631
},
614-
"zendframework/zend-diactoros": {
615-
"version": "1.7.0"
616-
},
617632
"zendframework/zend-eventmanager": {
618633
"version": "3.2.0"
619634
}

0 commit comments

Comments
 (0)