Merge pull request #52 from php-http/issue-41-psr-18

Support PSR-17

Author: dbu

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Change Log
 
-## Unreleased
+## 2.0.0 - Unreleased
 
+- Client expects PSR-17 ResponseFactoryInterface and StreamFactoryInterface rather than Httplug factories.
 - Allow cURL options to overwrite our default spec-compliant default configuration
 
 ## 1.7.1 - 2018-03-36

composer.json

@@ -1,8 +1,12 @@
 {
     "name": "php-http/curl-client",
-    "description": "cURL client for PHP-HTTP",
+    "description": "PSR-18 and HTTPlug Async client with cURL",
     "license": "MIT",
-    "keywords": ["http", "curl"],
+    "keywords": [
+        "curl",
+        "http",
+        "psr-18"
+    ],
     "homepage": "http://php-http.org",
     "authors": [
         {
@@ -12,23 +16,21 @@
     ],
     "prefer-stable": true,
     "minimum-stability": "dev",
-    "config": {
-        "bin-dir": "vendor/bin"
-    },
     "require": {
         "php": "^7.1",
         "ext-curl": "*",
+        "php-http/discovery": "^1.6",
         "php-http/httplug": "^2.0",
-        "php-http/message-factory": "^1.0.2",
         "php-http/message": "^1.2",
-        "php-http/discovery": "^1.0",
+        "psr/http-client": "^1.0",
+        "psr/http-factory": "^1.0",
         "symfony/options-resolver": "^3.4 || ^4.0"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
         "php-http/client-integration-tests": "dev-master",
         "phpunit/phpunit": "^7.5",
-        "zendframework/zend-diactoros": "^1.0"
+        "zendframework/zend-diactoros": "^2.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,16 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="tests/bootstrap.php">
+
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+>
+    <php>
+        <server name="TEST_SERVER" value="http://127.0.0.1:10000/server.php"/>
+    </php>
+
     <testsuites>
-        <testsuite name="Curl Client Test Suite">
-            <directory>tests/</directory>
+
+        <testsuite name="All">
+            <directory>tests</directory>
+            <!-- Exclude till https://github.com/php-http/message/issues/105 resolved. -->
+            <exclude>tests/Functional/HttpAsyncClientGuzzleTest.php</exclude>
+            <exclude>tests/Functional/HttpClientGuzzleTest.php</exclude>
+        </testsuite>
+
+        <testsuite name="Unit">
+            <directory>tests/Unit</directory>
         </testsuite>
+
+        <testsuite name="Functional">
+            <directory>tests/Functional</directory>
+            <!-- Exclude till https://github.com/php-http/message/issues/105 resolved. -->
+            <exclude>tests/Functional/HttpAsyncClientGuzzleTest.php</exclude>
+            <exclude>tests/Functional/HttpClientGuzzleTest.php</exclude>
+        </testsuite>
+
     </testsuites>
-    <php>
-        <server name="TEST_SERVER" value="http://127.0.0.1:10000/server.php" />
-    </php>
+
     <filter>
         <whitelist>
-            <directory suffix=".php">src/</directory>
+            <directory>src</directory>
         </whitelist>
     </filter>
+
 </phpunit>