fixup! Replace HTTP Factory class

src/Http/RequestManager.php

@@ -140,7 +140,9 @@ protected function createConfiguredHttpClient(): ClientInterface
 
     protected function createHttpRequestFromMatejRequest(Request $request): RequestInterface
     {
-        $requestBody = $this->getStreamFactory()->createStream(json_encode($request->getData())); // TODO: use \Safe\json_encode
+        $requestBody = $this->getStreamFactory()->createStream(
+            json_encode($request->getData())
+        ); // TODO: use \Safe\json_encode
         $uri = $this->buildBaseUrl() . $request->getPath();
 
         return $this->getMessageFactory()

src/Matej.php

@@ -2,10 +2,10 @@
 
 namespace Lmc\Matej;
 
-use Psr\Http\Client\ClientInterface;
 use Lmc\Matej\Http\RequestManager;
 use Lmc\Matej\Http\ResponseDecoderInterface;
 use Lmc\Matej\RequestBuilder\RequestBuilderFactory;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 

tests/unit/MatejTest.php

@@ -2,7 +2,7 @@
 
 namespace Lmc\Matej;
 
-use Http\Mock\Client;
+use Http\Discovery\Psr18Client;
 use Lmc\Matej\Model\Command\ItemPropertySetup;
 use Lmc\Matej\Model\CommandResponse;
 
@@ -25,8 +25,10 @@ public function shouldExecuteRequestViaBuilder(): void
             __DIR__ . '/Http/Fixtures/response-one-successful-command.json'
         );
 
-        $mockClient = new Client();
-        $mockClient->addResponse($dummyHttpResponse);
+        $mockClient = $this->createMock(Psr18Client::class);
+        $mockClient->expects($this->once())
+            ->method('sendRequest')
+            ->willReturn($dummyHttpResponse);
 
         $matej = new Matej('account-id', 'apiKey');
         $matej->setHttpClient($mockClient);
@@ -36,12 +38,6 @@ public function shouldExecuteRequestViaBuilder(): void
             ->addProperty(ItemPropertySetup::timestamp('valid_from'))
             ->send();
 
-        $this->assertCount(1, $mockClient->getRequests());
-        $this->assertStringStartsWith(
-            'https://account-id.matej.lmc.cz/',
-            $mockClient->getRequests()[0]->getUri()->__toString()
-        );
-
         $this->assertSame(1, $response->getNumberOfCommands());
         $this->assertSame(1, $response->getNumberOfSuccessfulCommands());
         $this->assertSame(0, $response->getNumberOfSkippedCommands());
@@ -50,31 +46,4 @@ public function shouldExecuteRequestViaBuilder(): void
         $this->assertInstanceOf(CommandResponse::class, $response->getCommandResponses()[0]);
         $this->assertSame(CommandResponse::STATUS_OK, $response->getCommandResponses()[0]->getStatus());
     }
-
-    /** @test */
-    public function shouldOverwriteBaseUrl(): void
-    {
-        $dummyHttpResponse = $this->createJsonResponseFromFile(
-            __DIR__ . '/Http/Fixtures/response-one-successful-command.json'
-        );
-
-        $mockClient = new Client();
-        $mockClient->addResponse($dummyHttpResponse);
-
-        $matej = new Matej('account-id', 'apiKey');
-        $matej->setHttpClient($mockClient);
-
-        $matej->setBaseUrl('https://nobody.nowhere.com/%s');
-
-        $matej->request()
-            ->setupItemProperties()
-            ->addProperty(ItemPropertySetup::timestamp('valid_from'))
-            ->send();
-
-        $this->assertCount(1, $mockClient->getRequests());
-        $this->assertStringStartsWith(
-            'https://nobody.nowhere.com/account-id',
-            $mockClient->getRequests()[0]->getUri()->__toString()
-        );
-    }
 }