Skip to content

Commit 0ff2079

Browse files
authored
Removed setters for AbstractHttpProvider (#728)
* Removed setters for AbstractHttpProvider * Fixed broken tests
1 parent fa69505 commit 0ff2079

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5-
## 4.0.0
5+
## 4.0.0-beta2
6+
7+
- Removed `AbstractHttpProvider::setMessageFactory`.
8+
- Removed `AbstractHttpProvider::getHttpClient`.
9+
- Make sure we have a `MessageFactory` in the constructor of `AbstractHttpProvider`.
10+
11+
## 4.0.0-beta1
612

713
First release of this library.

Provider/AbstractHttpProvider.php

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ abstract class AbstractHttpProvider extends AbstractProvider
4343
public function __construct(HttpClient $client, MessageFactory $factory = null)
4444
{
4545
$this->client = $client;
46-
$this->messageFactory = $factory;
46+
$this->messageFactory = $factory ?: MessageFactoryDiscovery::find();
4747
}
4848

4949
/**
@@ -92,26 +92,6 @@ protected function getHttpClient(): HttpClient
9292
*/
9393
protected function getMessageFactory(): MessageFactory
9494
{
95-
if ($this->messageFactory === null) {
96-
$this->messageFactory = MessageFactoryDiscovery::find();
97-
}
98-
9995
return $this->messageFactory;
10096
}
101-
102-
/**
103-
* @param HttpClient $client
104-
*/
105-
public function setClient(HttpClient $client)
106-
{
107-
$this->client = $client;
108-
}
109-
110-
/**
111-
* @param MessageFactory $messageFactory
112-
*/
113-
public function setMessageFactory(MessageFactory $messageFactory)
114-
{
115-
$this->messageFactory = $messageFactory;
116-
}
11797
}

Tests/Provider/AbstractHttpProviderTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,17 @@
1818
use Geocoder\Query\GeocodeQuery;
1919
use Geocoder\Query\ReverseQuery;
2020
use Http\Client\HttpClient;
21+
use Http\Discovery\ClassDiscovery;
2122
use Http\Mock\Client;
2223
use PHPUnit\Framework\TestCase;
2324

2425
class AbstractHttpProviderTest extends TestCase
2526
{
27+
public static function setUpBeforeClass()
28+
{
29+
ClassDiscovery::prependStrategy('\Nyholm\Psr7\Httplug\DiscoveryStrategy');
30+
}
31+
2632
public function testHttpClientGetter()
2733
{
2834
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();

0 commit comments

Comments
 (0)