Merge pull request #12 from MacPaw/develop

Release
MacPaw · Aug 26, 2021 · 6614a3e · 6614a3e
2 parents 001a2e6 + 8cddadb
commit 6614a3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ In the `config/services_test.yaml` file of your project:
 
 ```
     BehatMessengerContext\:
-        resource: '../vendor/macpaw/symfony-behat-context/src/*'
+        resource: '../vendor/macpaw/behat-messenger-context/src/*'
 ```
 
 Step 3: Configure Messenger 
@@ -48,7 +48,7 @@ Go to `behat.yml`
 ```yaml
 ...
   contexts:
-    - SymfonyBehatContext\Context\MessengerContext
+    - BehatMessengerContext\Context\MessengerContext
 ...
 ```
 

diff --git a/src/Context/MessengerContext.php b/src/Context/MessengerContext.php
@@ -10,21 +10,21 @@
 use Exception;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Messenger\Transport\InMemoryTransport;
-use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 
 class MessengerContext implements Context
 {
     use ArraySimilarTrait;
 
     private ContainerInterface $container;
-    private Serializer $serializer;
+    private NormalizableInterface $normalizable;
 
     public function __construct(
         ContainerInterface $container,
-        Serializer $serializer
+        NormalizableInterface $normalizable
     ) {
         $this->container = $container;
-        $this->serializer = $serializer;
+        $this->normalizable = $normalizable;
     }
 
     /**
@@ -65,14 +65,11 @@ public function busShouldContainMessageWithJsonAndVariableFields(
         $expectedMessage = $this->decodeExpectedJson($expectedMessage);
 
         $transport = $this->getMessengerTransportByName($busName);
-        $actualMessageList = [];
         foreach ($transport->get() as $envelope) {
             $actualMessage = $this->convertToArray($envelope->getMessage());
             if ($this->isArraysSimilar($actualMessage, $expectedMessage, $variableFields)) {
                 return;
             }
-
-            $actualMessageList[] = $actualMessage;
         }
 
         throw new Exception(
@@ -167,7 +164,7 @@ private function getPrettyJson(array $message)
      */
     private function convertToArray($object): array
     {
-        return (array) $this->serializer->normalize($object);
+        return (array) $this->normalizable->normalize($object);
     }
 
     /**
@@ -189,7 +186,7 @@ private function getMessengerTransportByName(string $busName): InMemoryTransport
         $hasTransport = $this->container->has($fullName);
 
         if ($hasTransport === false) {
-            throw new Exception('Transport' . $fullName . ' not found');
+            throw new Exception('Transport ' . $fullName . ' not found');
         }
 
         $transport = $this->container->get($fullName);
@@ -199,7 +196,7 @@ private function getMessengerTransportByName(string $busName): InMemoryTransport
         }
 
         throw new Exception(
-            'In memory transport' . $fullName . ' not found'
+            'In memory transport ' . $fullName . ' not found'
         );
     }
 }