Skip to content

Updated to stable versions of Httplug #10

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

Merged
merged 1 commit into from
Mar 2, 2016
Merged

Updated to stable versions of Httplug #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
],
"require": {
"php": ">=5.4",
"php-http/client-common": "^0.1.1",
"php-http/httplug": "^1.0",
Copy link
Member

Choose a reason for hiding this comment

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

I meant, why is this removed? Is this not necessary?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, it is never used.

"react/http-client": "^0.4.8",
"react/dns": "^0.4.1",
"react/stream": "^0.4.3"
},
"require-dev": {
"guzzlehttp/psr7": "^1.0",
"php-http/adapter-integration-tests": "dev-master"
"php-http/adapter-integration-tests": "^0.3.1",
"puli/composer-plugin": "1.0.0-beta9"
},
"autoload": {
"psr-4": {
Expand All @@ -45,5 +46,5 @@
"test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
},
"prefer-stable": true,
"minimum-stability": "dev"
"minimum-stability": "beta"
}
3 changes: 2 additions & 1 deletion src/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Http\Adapter\React;

use Psr\Http\Message\ResponseInterface;
use React\EventLoop\LoopInterface;
use React\Promise\Deferred;
use React\HttpClient\Client as ReactClient;
Expand Down Expand Up @@ -46,8 +47,8 @@ class Client implements HttpClient, HttpAsyncClient
/**
* Initialize the React client.
*
* @param MessageFactory $messageFactory
* @param LoopInterface|null $loop React Event loop
* @param Resolver $resolver React async DNS resolver
* @param ReactClient $client React client to use
*/
public function __construct(
Expand Down
4 changes: 2 additions & 2 deletions src/Promise.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function (Exception $error) {
* @param callable|null $onFulfilled
* @param callable|null $onRejected
*
* @return ReactPromiseAdapter
* @return Promise
*/
public function then(callable $onFulfilled = null, callable $onRejected = null)
{
Expand Down Expand Up @@ -106,7 +106,7 @@ public function getState()
*
* @param LoopInterface $loop
*
* @return ReactPromiseAdapter
* @return Promise
*/
public function setLoop(LoopInterface $loop)
{
Expand Down
2 changes: 1 addition & 1 deletion src/ReactFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static function buildDnsResolver(
* Build a React Http Client.
*
* @param LoopInterface $loop
* @param Resolver $dns
* @param DnsResolver $dns
*
* @return HttpClient
*/
Expand Down
1 change: 1 addition & 0 deletions tests/AsyncClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Http\Adapter\React\Tests;

use Http\Client\HttpClient;
use Http\Discovery\MessageFactoryDiscovery;
use Http\Client\Tests\HttpAsyncClientTest;
use Http\Adapter\React\Client;
Expand Down
3 changes: 2 additions & 1 deletion tests/ClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

namespace Http\Adapter\React\Tests;

use Http\Discovery\MessageFactoryDiscovery;
use Http\Client\HttpClient;
use Http\Client\Tests\HttpClientTest;
use Http\Adapter\React\Client;
use Http\Discovery\MessageFactoryDiscovery;

/**
* @author Stéphane Hulard <stephane@hlrd.me>
Expand Down