Merge branch 'master' into update-dependencies

Author: jjok

src/packet/Connect.php

@@ -15,9 +15,6 @@
  */
 class Connect extends ControlPacket {
 
-    /** @var bool */
-    protected $useVariableHeader = true;
-
     /** @var null|string */
     protected $clientId = null;
 
@@ -156,4 +153,4 @@ public function getClientId()
         }
         return substr($this->clientId, 0, 23);
     }
-}
+}

src/packet/ConnectionAck.php

@@ -7,24 +7,14 @@
 
 namespace oliverlorenz\reactphpmqtt\packet;
 
-use oliverlorenz\reactphpmqtt\protocol\Version;
-
 /**
  * The CONNACK Packet is the packet sent by the Server in response to
  * a CONNECT Packet received from a Client.
  */
 class ConnectionAck extends ControlPacket {
 
-    protected $useVariableHeader = false;
-
     public static function getControlPacketType()
     {
         return ControlPacketType::CONNACK;
     }
-
-    public function __construct(Version $version, $input)
-    {
-        $this->version = $version;
-        $this->input = $input;
-    }
-}
+}

src/packet/ControlPacket.php

@@ -11,19 +11,11 @@
 
 abstract class ControlPacket {
 
-    protected $command;
-
     /** @var $version Version */
     protected $version;
 
-
-    protected $variableHeader;
-
     protected $payload = '';
 
-    protected $useVariableHeader = false;
-    protected $useFixedHeader = true;
-
     protected $identifier;
 
     public function __construct(Version $version)
@@ -38,9 +30,9 @@ public function __construct(Version $version)
      */
     public static function parse(Version $version, $rawInput)
     {
-        $packet = new static($version);
         static::checkRawInputValidControlPackageType($rawInput);
-        return $packet;
+
+        return new static($version);
     }
 
     protected static function checkRawInputValidControlPackageType($rawInput)
@@ -51,9 +43,9 @@ protected static function checkRawInputValidControlPackageType($rawInput)
         }
     }
 
-    /** @return null */
+    /** @return int */
     public static function getControlPacketType() {
-        throw new \RuntimeException('you should overwrite getControlPacketType()');
+        throw new \RuntimeException('you must overwrite getControlPacketType()');
     }
 
     protected function getPayloadLength()
@@ -91,7 +83,7 @@ protected function getFixedHeader()
      */
     protected function getVariableHeader()
     {
-        return null;
+        return '';
     }
 
     /**
@@ -119,27 +111,15 @@ public function getLengthPrefixField($fieldPayload)
         $return = chr($msb);
         $return .= chr($lsb);
         $return .= $fieldPayload;
+
         return $return;
     }
 
     public function get()
     {
-        $fullMessage = '';
-
-        // add fixed header
-        if ($this->useFixedHeader) {
-            $fullMessage .= $this->getFixedHeader();
-        }
-
-        // add variable header
-        if ($this->useVariableHeader) {
-            $fullMessage .= $this->getVariableHeader();
-        }
-
-        // add payload
-        $fullMessage .= $this->getPayload();
-
-        return $fullMessage;
+        return $this->getFixedHeader() .
+               $this->getVariableHeader() .
+               $this->getPayload();
     }
 
     /**
@@ -161,8 +141,7 @@ protected static function getPayloadLengthPrefixFieldInRawInput($startIndex, $ra
         $headerLength = 2;
         $header = substr($rawInput, $startIndex, $headerLength);
         $lengthOfMessage = ord($header{1});
+
         return substr($rawInput, $startIndex + $headerLength, $lengthOfMessage);
     }
-
-
 }

src/packet/Factory.php

@@ -23,7 +23,7 @@ public static function getByMessage($version, $input)
         $packetControlType = ord($input{0}) >> 4;
         switch ($packetControlType) {
             case ConnectionAck::getControlPacketType():
-                return new ConnectionAck($version, $input);
+                return ConnectionAck::parse($version, $input);
             case PingResponse::getControlPacketType():
                 return new PingResponse($version, $input);
             case SubscribeAck::getControlPacketType():

src/packet/PingRequest.php

@@ -16,10 +16,8 @@
  */
 class PingRequest extends ControlPacket {
 
-    protected $useVariableHeader = true;
-
     public static function getControlPacketType()
     {
         return ControlPacketType::PINGREQ;
     }
-}
+}

src/packet/Publish.php

@@ -25,8 +25,6 @@ class Publish extends ControlPacket {
 
     protected $retain = false;
 
-    protected $useVariableHeader = true;
-
     public static function getControlPacketType()
     {
         return ControlPacketType::PUBLISH;

src/packet/PublishAck.php

@@ -12,10 +12,8 @@
  */
 class PublishAck extends ControlPacket {
 
-    protected $useVariableHeader = true;
-
     public static function getControlPacketType()
     {
         return ControlPacketType::PUBACK;
     }
-}
+}

src/packet/PublishComplete.php

@@ -13,11 +13,8 @@
  */
 class PublishComplete extends ControlPacket {
 
-    protected $useVariableHeader = true;
-
     public static function getControlPacketType()
     {
         return ControlPacketType::PUBCOMP;
     }
-
-}
+}

src/packet/PublishReceived.php

@@ -13,11 +13,8 @@
  */
 class PublishReceived extends ControlPacket {
 
-    protected $useVariableHeader = true;
-
     public static function getControlPacketType()
     {
         return ControlPacketType::PUBREC;
     }
-
-}
+}

src/packet/PublishRelease.php

@@ -13,11 +13,8 @@
  */
 class PublishRelease extends ControlPacket {
 
-    protected $useVariableHeader = true;
-
     public static function getControlPacketType()
     {
         return ControlPacketType::PUBREL;
     }
-
-}
+}