c

Author: dbu

src/Collector/Collector.php

@@ -18,8 +18,6 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
 final class Collector extends DataCollector
 {

src/Collector/Formatter.php

@@ -18,8 +18,6 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
 final class Formatter implements MessageFormatter
 {

src/Collector/ProfileClient.php

@@ -21,10 +21,8 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
-final class ProfileClient implements ClientInterace, HttpAsyncClient
+final class ProfileClient implements ClientInterface, HttpAsyncClient
 {
     use VersionBridgeClient;
 

src/Collector/ProfileClientFactory.php

@@ -16,8 +16,6 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
 final class ProfileClientFactory implements ClientFactory
 {

src/Collector/ProfilePlugin.php

@@ -15,8 +15,6 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
 final class ProfilePlugin implements Plugin
 {

src/Collector/StackPlugin.php

@@ -15,8 +15,6 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
 final class StackPlugin implements Plugin
 {

tests/Unit/Collector/ProfileClientTest.php

@@ -13,6 +13,7 @@
 use Http\HttplugBundle\Collector\ProfileClient;
 use Http\HttplugBundle\Collector\Stack;
 use Http\Message\Formatter as MessageFormatter;
+use Http\Message\Formatter\SimpleFormatter;
 use Http\Promise\FulfilledPromise;
 use Http\Promise\Promise;
 use Http\Promise\RejectedPromise;
@@ -44,27 +45,27 @@ class ProfileClientTest extends TestCase
 
     public function setUp(): void
     {
-        $messageFormatter = $this->createMock(MessageFormatter::class);
+        $messageFormatter = $this->createMock(SimpleFormatter::class);
         $formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
         $this->collector = new Collector();
         $stopwatch = $this->createMock(Stopwatch::class);
 
-        $this->activeStack = new Stack('default', 'FormattedRequest');
-        $this->collector->activateStack($this->activeStack);
+        $activeStack = new Stack('default', 'FormattedRequest');
+        $this->collector->activateStack($activeStack);
 
         $this->client = $this->getMockBuilder(CombinedClientInterface::class)->getMock();
         $uri = new Uri('https://example.com/target');
         $this->request = new Request('GET', $uri);
         $this->stopwatchEvent = $this->createMock(StopwatchEvent::class);
         $this->subject = new ProfileClient($this->client, $this->collector, $formatter, $stopwatch);
         $this->response = new Response();
-        $this->exception = new \Exception();
+        $exception = new \Exception('test');
         $this->fulfilledPromise = new FulfilledPromise($this->response);
-        $this->rejectedPromise = new RejectedPromise($this->exception);
+        $this->rejectedPromise = new RejectedPromise($exception);
 
         $messageFormatter
-            ->method('formatResponse')
-            ->with($this->response)
+            ->method('formatResponseForRequest')
+            ->with($this->response, $this->request)
             ->willReturn('FormattedResponse')
         ;
 
@@ -168,8 +169,10 @@ public function testOnRejected(): void
 
         $this->subject->sendAsyncRequest($this->request);
 
-        $this->assertEquals(42, $this->activeStack->getDuration());
-        $this->assertEquals('FormattedResponse', $this->activeStack->getClientException());
+        $activeStack = $this->collector->getActiveStack();
+        $this->assertInstanceOf(Stack::class, $activeStack);
+        $this->assertEquals(42, $activeStack->getDuration());
+        $this->assertEquals('Unexpected exception of type "Exception": test', $activeStack->getClientException());
     }
 }
 

tests/Unit/Collector/ProfilePluginTest.php

@@ -13,6 +13,7 @@
 use Http\HttplugBundle\Collector\ProfilePlugin;
 use Http\HttplugBundle\Collector\Stack;
 use Http\Message\Formatter as MessageFormatter;
+use Http\Message\Formatter\SimpleFormatter;
 use Http\Promise\FulfilledPromise;
 use Http\Promise\Promise;
 use Http\Promise\RejectedPromise;
@@ -42,10 +43,10 @@ class ProfilePluginTest extends TestCase
     public function setUp(): void
     {
         $this->collector = new Collector();
-        $messageFormatter = $this->createMock(MessageFormatter::class);
-        $this->formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
+        $messageFormatter = $this->createMock(SimpleFormatter::class);
+        $formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
 
-        $this->plugin = $this->getMockBuilder(Plugin::class)->getMock();
+        $this->plugin = $this->createMock(Plugin::class);
         $this->request = new Request('GET', '/');
         $this->response = new Response();
         $this->fulfilledPromise = new FulfilledPromise($this->response);
@@ -74,7 +75,7 @@ public function setUp(): void
         $this->subject = new ProfilePlugin(
             $this->plugin,
             $this->collector,
-            $this->formatter
+            $formatter,
         );
     }
 
@@ -131,8 +132,8 @@ public function testOnRejected(): void
         });
 
         $this->assertEquals($this->exception, $promise->wait());
-        $profile = $this->currentStack->getProfiles()[0];
         $this->expectException(TransferException::class);
+        $profile = $this->currentStack->getProfiles()[0];
         $profile->getResponse();
     }
 }

tests/Unit/Collector/StackPluginTest.php

@@ -11,6 +11,7 @@
 use Http\HttplugBundle\Collector\Formatter;
 use Http\HttplugBundle\Collector\StackPlugin;
 use Http\Message\Formatter as MessageFormatter;
+use Http\Message\Formatter\SimpleFormatter;
 use Http\Promise\FulfilledPromise;
 use Http\Promise\RejectedPromise;
 use PHPUnit\Framework\Error\Warning;
@@ -48,8 +49,8 @@ class StackPluginTest extends TestCase
     public function setUp(): void
     {
         $this->collector = new Collector();
-        $messageFormatter = $this->createMock(MessageFormatter::class);
-        $this->formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
+        $messageFormatter = $this->createMock(SimpleFormatter::class);
+        $formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
         $this->request = new Request('GET', '/');
         $this->response = new Response();
         $this->exception = new HttpException('', $this->request, $this->response);
@@ -66,7 +67,7 @@ public function setUp(): void
             ->willReturn('FormattedResponse')
         ;
 
-        $this->subject = new StackPlugin($this->collector, $this->formatter, 'default');
+        $this->subject = new StackPlugin($this->collector, $formatter, 'default');
     }
 
     public function testStackIsInitialized(): void
@@ -76,9 +77,11 @@ public function testStackIsInitialized(): void
         $this->subject->handleRequest($this->request, $next, function (): void {
         });
 
-        $stack = $this->collector->getActiveStack();
-        $this->assertEquals('default', $stack->getClient());
-        $this->assertEquals('FormattedRequest', $stack->getRequest());
+        $this->assertNull($this->collector->getActiveStack());
+        $stacks = $this->collector->getStacks();
+        $this->assertCount(1, $stacks);
+        $this->assertEquals('default', $stacks[0]->getClient());
+        $this->assertEquals('FormattedRequest', $stacks[0]->getRequest());
     }
 
     public function testOnFulfilled(): void
@@ -89,8 +92,10 @@ public function testOnFulfilled(): void
         });
 
         $this->assertEquals($this->response, $promise->wait());
-        $currentStack = $this->collector->getActiveStack();
-        $this->assertEquals('FormattedResponse', $currentStack->getResponse());
+        $this->assertNull($this->collector->getActiveStack());
+        $stacks = $this->collector->getStacks();
+        $this->assertCount(1, $stacks);
+        $this->assertEquals('FormattedResponse', $stacks[0]->getResponse());
     }
 
     public function testOnRejected(): void
@@ -100,10 +105,14 @@ public function testOnRejected(): void
         $promise = $this->subject->handleRequest($this->request, $next, function (): void {
         });
 
-        $this->assertEquals($this->exception, $promise->wait());
-        $currentStack = $this->collector->getActiveStack();
-        $this->assertEquals('FormattedResponse', $currentStack->getResponse());
-        $this->assertTrue($currentStack->isFailed());
+        $this->assertNull($this->collector->getActiveStack());
+        $stacks = $this->collector->getStacks();
+        $this->assertCount(1, $stacks);
+        $this->assertEquals('FormattedResponse', $stacks[0]->getResponse());
+        $this->assertTrue($stacks[0]->isFailed());
+
+        $this->expectException(\Exception::class);
+        $promise->wait();
     }
 
     public function testOnException(): void