Skip to content

Commit 14d1dce

Browse files
committed
🔥 evict PSR-7 and PSR-15 to separate libraries so that i don't have to look at them any longer
1 parent 4bbfbe0 commit 14d1dce

34 files changed

+10
-4969
lines changed

composer.json

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"type": "library",
66
"keywords": [
7-
"http", "message", "client", "factory", "handler", "psr-7", "psr-15", "psr-17", "psr-18"
7+
"http", "request", "response", "message", "client", "factory", "psr-7", "psr-17", "psr-18"
88
],
99
"authors": [
1010
{
@@ -20,9 +20,7 @@
2020
"provide": {
2121
"psr/http-client-implementation": "1.0",
2222
"psr/http-factory-implementation": "1.0",
23-
"psr/http-message-implementation": "1.0",
24-
"psr/http-server-handler-implementation": "1.0",
25-
"psr/http-server-middleware-implementation": "1.0"
23+
"psr/http-message-implementation": "1.0"
2624
},
2725
"minimum-stability": "stable",
2826
"prefer-stable": true,
@@ -35,16 +33,13 @@
3533
"ext-zlib": "*",
3634
"chillerlan/php-http-message-utils": "^2.1",
3735
"chillerlan/php-settings-container": "^3.1.1",
38-
"fig/http-message-util": "^1.1.5",
36+
"chillerlan/psr-7": "^1.0",
3937
"psr/http-client": "^1.0",
40-
"psr/http-message": "^1.1",
38+
"psr/http-message": "^1.1 || ^2.0",
4139
"psr/http-factory": "^1.0",
42-
"psr/http-server-handler": "^1.0",
43-
"psr/http-server-middleware": "^1.0",
4440
"psr/log": "^1.1 || ^2.0 || ^3.0"
4541
},
4642
"require-dev": {
47-
"http-interop/http-factory-tests": "^2.1",
4843
"phan/phan": "^5.4",
4944
"phpmd/phpmd": "^2.15",
5045
"phpunit/phpunit": "^10.5",

phpunit.xml.dist

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
<testsuite name="php-httpinterface test suite">
1010
<directory>tests</directory>
1111
</testsuite>
12-
<!--
13-
<testsuite name="http-interop integration tests">
14-
<directory>./vendor/http-interop/http-factory-tests/test</directory>
15-
</testsuite>
16-
-->
1712
</testsuites>
1813
<source>
1914
<include>
@@ -33,11 +28,11 @@
3328
</groups>
3429
<php>
3530
<const name="TEST_IS_CI" value="true"/>
36-
<const name="REQUEST_FACTORY" value="chillerlan\HTTP\Common\HTTPFactory"/>
37-
<const name="RESPONSE_FACTORY" value="chillerlan\HTTP\Common\HTTPFactory"/>
38-
<const name="SERVER_REQUEST_FACTORY" value="chillerlan\HTTP\Common\HTTPFactory"/>
39-
<const name="STREAM_FACTORY" value="chillerlan\HTTP\Common\HTTPFactory"/>
40-
<const name="UPLOADED_FILE_FACTORY" value="chillerlan\HTTP\Common\HTTPFactory"/>
41-
<const name="URI_FACTORY" value="chillerlan\HTTP\Common\HTTPFactory"/>
31+
<const name="REQUEST_FACTORY" value="chillerlan\HTTP\Psr7\HTTPFactory"/>
32+
<const name="RESPONSE_FACTORY" value="chillerlan\HTTP\Psr7\HTTPFactory"/>
33+
<const name="SERVER_REQUEST_FACTORY" value="chillerlan\HTTP\Psr7\HTTPFactory"/>
34+
<const name="STREAM_FACTORY" value="chillerlan\HTTP\Psr7\HTTPFactory"/>
35+
<const name="UPLOADED_FILE_FACTORY" value="chillerlan\HTTP\Psr7\HTTPFactory"/>
36+
<const name="URI_FACTORY" value="chillerlan\HTTP\Psr7\HTTPFactory"/>
4237
</php>
4338
</phpunit>

src/Common/FactoryUtils.php

Lines changed: 0 additions & 91 deletions
This file was deleted.

src/Common/HTTPFactory.php

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)