bugfix(ack) Make sure acks without a frame follow stomp > 1.1 rules

Author: Trey Hyde

src/CentralDesktop/Stomp/Connection.php

@@ -64,8 +64,8 @@ class Connection implements LoggerAwareInterface {
 
     protected $_brokerUri = null;
     protected $_socket = null;
-    protected $_params = array();
-    protected $_subscriptions = array();
+    protected $_params = [];
+    protected $_subscriptions = [];
     protected $_defaultPort = 61613;
     protected $_attempts = 10;
     protected $_username = '';
@@ -173,7 +173,7 @@ function connect($username = '', $password = '', $version = '1.0,1.1,1.2') {
         if ($password != '') {
             $this->_password = $password;
         }
-        $headers = array('login' => $this->_username, 'passcode' => $this->_password);
+        $headers = ['login' => $this->_username, 'passcode' => $this->_password];
         if ($this->clientId != null) {
             $headers["client-id"] = $this->clientId;
         }
@@ -234,7 +234,7 @@ function getSessionId() {
      * @return boolean
      */
     public
-    function send($destination, $msg, $properties = array(), $sync = null) {
+    function send($destination, $msg, $properties = [], $sync = null) {
         $this->logger->debug("Sending message to $destination");
 
         if ($msg instanceof Frame) {
@@ -328,10 +328,10 @@ function _waitForReceipt(Frame $frame, $sync) {
      */
     public
     function subscribe($destination, $properties = null, $sync = null) {
-        $headers = array(
+        $headers = [
             'ack' => 'client-individual',
             'id'  => 0,
-        );
+        ];
 
         $headers['activemq.prefetchSize'] = $this->prefetchSize;
         if ($this->clientId != null) {
@@ -368,7 +368,7 @@ function subscribe($destination, $properties = null, $sync = null) {
      */
     public
     function unsubscribe($destination, $properties = null, $sync = null) {
-        $headers = array();
+        $headers = [];
         if (isset($properties)) {
             foreach ($properties as $name => $value) {
                 $headers[$name] = $value;
@@ -399,7 +399,7 @@ function unsubscribe($destination, $properties = null, $sync = null) {
      */
     public
     function begin($transactionId = null, $sync = null) {
-        $headers = array();
+        $headers = [];
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
@@ -421,7 +421,7 @@ function begin($transactionId = null, $sync = null) {
      */
     public
     function commit($transactionId = null, $sync = null) {
-        $headers = array();
+        $headers = [];
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
@@ -440,7 +440,7 @@ function commit($transactionId = null, $sync = null) {
      */
     public
     function abort($transactionId = null, $sync = null) {
-        $headers = array();
+        $headers = [];
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
@@ -463,42 +463,35 @@ function abort($transactionId = null, $sync = null) {
      */
     private
     function abstract_ack($command, $message, $transactionId = null) {
+        $headers = [];
+
         if ($message instanceof Frame) {
             $headers = $message->headers;
 
-            $ack_headers = array(
+            $headers = [
                 'subscription' => $headers['subscription'],
                 'message-id'   => $headers['message-id']
-            );
-
-            if ($this->_version > 1.1) {
-                $ack_headers['id'] = $headers['ack'];
-            }
+            ];
 
-            if (isset($transactionId)) {
-                $ack_headers['transaction'] = $transactionId;
-            }
+        } else {
+            $headers['message-id'] = $message;
+        }
 
-            $this->logger->info("ACK Frame for -> ", $ack_headers);
-            $frame = new Frame($command, $ack_headers);
-            $this->_writeFrame($frame);
+        if ($this->_version > 1.1) {
+            $headers['id'] = $headers['message-id'];
+        }
 
-            return true;
+        if (isset($transactionId)) {
+            $ack_headers['transaction'] = $transactionId;
         }
-        else {
-            $headers = array();
-            if (isset($transactionId)) {
-                $headers['transaction'] = $transactionId;
-            }
 
-            $headers['message-id'] = $message;
-            $this->logger->info("ACK ID -> ", $headers);
+        $this->logger->info($command, $headers);
+
+        $frame = new Frame($command, $headers);
+        $this->_writeFrame($frame);
 
-            $frame = new Frame($command, $headers);
-            $this->_writeFrame($frame);
+        return true;
 
-            return true;
-        }
     }
 
     public
@@ -527,7 +520,7 @@ function nack($message, $transactionId = null) {
      */
     public
     function disconnect() {
-        $headers = array();
+        $headers = [];
 
         if ($this->clientId != null) {
             $headers["client-id"] = $this->clientId;
@@ -539,7 +532,7 @@ function disconnect() {
         }
         $this->_socket        = null;
         $this->_sessionId     = null;
-        $this->_subscriptions = array();
+        $this->_subscriptions = [];
         $this->_username      = '';
         $this->_password      = '';
     }
@@ -630,12 +623,12 @@ function readFrame() {
             $len = mb_strlen($data, '8bit');
         } while ($len < 2 || $end == false);
 
-        $this->logger->debug("Read frame", array('frame' => $data));
+        $this->logger->debug("Read frame", ['frame' => $data]);
 
 
         list ($header, $body) = explode("\n\n", $data, 2);
         $header  = explode("\n", $header);
-        $headers = array();
+        $headers = [];
         $command = null;
         foreach ($header as $v) {
 
@@ -757,7 +750,7 @@ function _extractNextMessage() {
      */
     public
     function hasFrameToRead() {
-        $read   = array($this->_socket);
+        $read   = [$this->_socket];
         $write  = null;
         $except = null;
 

test/src/CentralDesktop/Stomp/Test/BufferTest.php

@@ -40,7 +40,6 @@ function testProtoHandling() {
 
         $frame = new Stomp\Message\Bytes($body,$headers);
         $s_frame = $frame->__toString();
-        error_log("Frame: {$s_frame}");
 
         $stomp = $this->stomp;