Skip to content

Commit 04570a6

Browse files
committed
Update tests.
1 parent 2fc0f8b commit 04570a6

7 files changed

+14
-90
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
"php": ">=5.5",
1515
"ext-curl": "*",
1616
"php-http/httplug": "^1.0",
17-
"php-http/message-factory": "^0.3"
17+
"php-http/message-factory": "^0.4@dev"
1818
},
1919
"require-dev": {
2020
"guzzlehttp/psr7": "^1.0",
2121
"php-http/adapter-integration-tests": "dev-master",
22+
"php-http/discovery": "^0.3",
2223
"phpunit/phpunit": "^4.8@stable",
2324
"zendframework/zend-diactoros": "^1.0"
2425
},

tests/CurlHttpAsyncClientDiactorosTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
use Http\Client\HttpClient;
55
use Http\Curl\CurlHttpClient;
6-
use Http\Curl\Tests\StreamFactory\DiactorosStreamFactory;
7-
use Http\Discovery\MessageFactory\DiactorosFactory;
6+
use Http\Discovery\MessageFactory\DiactorosMessageFactory;
7+
use Http\Discovery\StreamFactory\DiactorosStreamFactory;
88
use Zend\Diactoros\Request;
99
use Zend\Diactoros\Response;
1010

@@ -18,6 +18,6 @@ class CurlHttpAsyncClientDiactorosTest extends CurlHttpAsyncClientTestCase
1818
*/
1919
protected function createHttpAsyncClient()
2020
{
21-
return new CurlHttpClient(new DiactorosFactory(), new DiactorosStreamFactory());
21+
return new CurlHttpClient(new DiactorosMessageFactory(), new DiactorosStreamFactory());
2222
}
2323
}

tests/CurlHttpAsyncClientGuzzleTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
use Http\Client\HttpClient;
55
use Http\Curl\CurlHttpClient;
6-
use Http\Curl\Tests\StreamFactory\GuzzleStreamFactory;
7-
use Http\Discovery\MessageFactory\GuzzleFactory;
6+
use Http\Discovery\MessageFactory\GuzzleMessageFactory;
7+
use Http\Discovery\StreamFactory\GuzzleStreamFactory;
88

99
/**
1010
* Tests for Http\Curl\CurlHttpClient
@@ -16,6 +16,6 @@ class CurlHttpAsyncClientGuzzleTest extends CurlHttpAsyncClientTestCase
1616
*/
1717
protected function createHttpAsyncClient()
1818
{
19-
return new CurlHttpClient(new GuzzleFactory(), new GuzzleStreamFactory());
19+
return new CurlHttpClient(new GuzzleMessageFactory(), new GuzzleStreamFactory());
2020
}
2121
}

tests/CurlHttpClientDiactorosTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
use Http\Client\HttpClient;
55
use Http\Curl\CurlHttpClient;
6-
use Http\Curl\Tests\StreamFactory\DiactorosStreamFactory;
7-
use Http\Discovery\MessageFactory\DiactorosFactory;
6+
use Http\Discovery\MessageFactory\DiactorosMessageFactory;
7+
use Http\Discovery\StreamFactory\DiactorosStreamFactory;
88
use Zend\Diactoros\Request;
99
use Zend\Diactoros\Response;
1010

@@ -18,6 +18,6 @@ class CurlHttpClientDiactorosTest extends CurlHttpClientTestCase
1818
*/
1919
protected function createHttpAdapter()
2020
{
21-
return new CurlHttpClient(new DiactorosFactory(), new DiactorosStreamFactory());
21+
return new CurlHttpClient(new DiactorosMessageFactory(), new DiactorosStreamFactory());
2222
}
2323
}

tests/CurlHttpClientGuzzleTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
use Http\Client\HttpClient;
55
use Http\Curl\CurlHttpClient;
6-
use Http\Curl\Tests\StreamFactory\GuzzleStreamFactory;
7-
use Http\Discovery\MessageFactory\GuzzleFactory;
6+
use Http\Discovery\MessageFactory\GuzzleMessageFactory;
7+
use Http\Discovery\StreamFactory\GuzzleStreamFactory;
88

99
/**
1010
* Tests for Http\Curl\CurlHttpClient
@@ -16,6 +16,6 @@ class CurlHttpClientGuzzleTest extends CurlHttpClientTestCase
1616
*/
1717
protected function createHttpAdapter()
1818
{
19-
return new CurlHttpClient(new GuzzleFactory(), new GuzzleStreamFactory());
19+
return new CurlHttpClient(new GuzzleMessageFactory(), new GuzzleStreamFactory());
2020
}
2121
}

tests/StreamFactory/DiactorosStreamFactory.php

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

tests/StreamFactory/GuzzleStreamFactory.php

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

0 commit comments

Comments
 (0)