Removed setters for AbstractHttpProvider (#728)

* Removed setters for AbstractHttpProvider

* Fixed broken tests

Author: Nyholm

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
-## 4.0.0
+## 4.0.0-beta2
+
+- Removed `AbstractHttpProvider::setMessageFactory`.
+- Removed `AbstractHttpProvider::getHttpClient`.
+- Make sure we have a `MessageFactory` in the constructor of `AbstractHttpProvider`. 
+
+## 4.0.0-beta1
 
 First release of this library. 

Provider/AbstractHttpProvider.php

@@ -43,7 +43,7 @@ abstract class AbstractHttpProvider extends AbstractProvider
     public function __construct(HttpClient $client, MessageFactory $factory = null)
     {
         $this->client = $client;
-        $this->messageFactory = $factory;
+        $this->messageFactory = $factory ?: MessageFactoryDiscovery::find();
     }
 
     /**
@@ -92,26 +92,6 @@ protected function getHttpClient(): HttpClient
      */
     protected function getMessageFactory(): MessageFactory
     {
-        if ($this->messageFactory === null) {
-            $this->messageFactory = MessageFactoryDiscovery::find();
-        }
-
         return $this->messageFactory;
     }
-
-    /**
-     * @param HttpClient $client
-     */
-    public function setClient(HttpClient $client)
-    {
-        $this->client = $client;
-    }
-
-    /**
-     * @param MessageFactory $messageFactory
-     */
-    public function setMessageFactory(MessageFactory $messageFactory)
-    {
-        $this->messageFactory = $messageFactory;
-    }
 }

Tests/Provider/AbstractHttpProviderTest.php

@@ -18,11 +18,17 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Http\Client\HttpClient;
+use Http\Discovery\ClassDiscovery;
 use Http\Mock\Client;
 use PHPUnit\Framework\TestCase;
 
 class AbstractHttpProviderTest extends TestCase
 {
+    public static function setUpBeforeClass()
+    {
+        ClassDiscovery::prependStrategy('\Nyholm\Psr7\Httplug\DiscoveryStrategy');
+    }
+
     public function testHttpClientGetter()
     {
         $client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();