Merge pull request #44 from fcastilloes/fix-meta-calls

Fix meta byte for communicating calls
kusanagi · Jul 10, 2017 · a5f8bb1 · a5f8bb1
2 parents 17c0072 + bad86fa
commit a5f8bb1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+##Upcoming
+## Fixed
+- Fix meta byte for communicating calls
+
 ## [1.1.5] - 2017-07-02
 ## Fixed
 - Fixed url methods return type when a part is not found

diff --git a/src/Mapper/CompactTransportMapper.php b/src/Mapper/CompactTransportMapper.php
@@ -607,30 +607,32 @@ public function merge(Transport $transport, array $mergeData)
         // Merge calls
         foreach ($mergeData['C'] as $service => $sCalls) {
             foreach ($sCalls as $version => $vCalls) {
-                if (isset($vCalls['g'])) {
-                    $call = new RemoteCall(
-                        new ServiceOrigin($service, $version),
-                        $vCalls['C'],
-                        $vCalls['g'],
-                        $vCalls['n'],
-                        new VersionString($vCalls['v']),
-                        $vCalls['a'],
-                        $vCalls['D'] ?? 0,
-                        $vCalls['t'],
-                        isset($vCalls['p'])? array_map([$this, 'getParam'], $vCalls['p']) : []
-                    );
-                } else {
-                    $call = new DeferCall(
-                        new ServiceOrigin($service, $version),
-                        $vCalls['C'],
-                        $vCalls['n'],
-                        new VersionString($vCalls['v']),
-                        $vCalls['a'],
-                        $vCalls['D'] ?? 0,
-                        isset($vCalls['p'])? array_map([$this, 'getParam'], $vCalls['p']) : []
-                    );
+                foreach ($vCalls as $vCall) {
+                    if (isset($vCall['g'])) {
+                        $call = new RemoteCall(
+                            new ServiceOrigin($service, $version),
+                            $vCall['C'],
+                            $vCall['g'],
+                            $vCall['n'],
+                            new VersionString($vCall['v']),
+                            $vCall['a'],
+                            $vCall['D'] ?? 0,
+                            $vCall['t'],
+                            isset($vCall['p']) ? array_map([$this, 'getParam'], $vCall['p']) : []
+                        );
+                    } else {
+                        $call = new DeferCall(
+                            new ServiceOrigin($service, $version),
+                            $vCall['C'],
+                            $vCall['n'],
+                            new VersionString($vCall['v']),
+                            $vCall['a'],
+                            $vCall['D'] ?? 0,
+                            isset($vCall['p']) ? array_map([$this, 'getParam'], $vCall['p']) : []
+                        );
+                    }
+                    $transport->addCall($call);
                 }
-                $transport->addCall($call);
             }
         }
 

diff --git a/src/Messaging/Responder/ZeroMqMultipartResponder.php b/src/Messaging/Responder/ZeroMqMultipartResponder.php
@@ -73,7 +73,8 @@ private function sendActionResponse(ActionApi $action, PayloadWriterInterface $m
         $payload = $this->serializer->serialize($message);
 
         $controlString = '';
-        if ($action->getTransport()->hasCalls()) {
+        $transportCalls = $action->getTransport()->getCalls()->getArray($action->getName());
+        if (isset($transportCalls[$action->getVersion()])) {
             $controlString .= "\x01";
         }