Use strict type comparisons

Misc clean up and formatting

composer.json

@@ -24,5 +24,8 @@
     },
 	"replace": {
 		"voryx/thruway-message": "1.*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.5.4"
     }
 }

src/Common/Utils.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Thruway\Common;
 
 /**
@@ -17,7 +16,7 @@ public static function getUniqueId()
     {
         $filter      = 0x1fffffffffffff; // 53 bits
         $randomBytes = openssl_random_pseudo_bytes(8);
-        list($high, $low) = array_values(unpack("N2", $randomBytes));
+        list($high, $low) = array_values(unpack('N2', $randomBytes));
         return abs(($high << 32 | $low) & $filter);
     }
 
@@ -29,7 +28,7 @@ public static function getUniqueId()
      */
     public static function uriIsValid($uri)
     {
-        return !!preg_match('/^([0-9a-z_]+\.)*([0-9a-z_]+)$/', $uri);
+        return (bool)preg_match('/^([0-9a-z_]+\.)*([0-9a-z_]+)$/', $uri);
     }
 
     /**
@@ -43,7 +42,7 @@ public static function uriIsValid($uri)
      */
     public static function getDerivedKey($key, $salt, $iterations = 1000, $keyLen = 32)
     {
-        if (function_exists("hash_pbkdf2")) {
+        if (function_exists('hash_pbkdf2')) {
             $key = hash_pbkdf2('sha256', $key, $salt, $iterations, $keyLen, true);
         } else {
             // PHP v5.4 compatibility
@@ -72,7 +71,7 @@ public static function getDerivedKey($key, $salt, $iterations = 1000, $keyLen =
     public static function compat_pbkdf2($algo, $password, $salt, $iterations, $length = 0, $rawOutput = false)
     {
         // check for hashing algorithm
-        if (!in_array(strtolower($algo), hash_algos())) {
+        if (!in_array(strtolower($algo), hash_algos(), true)) {
             trigger_error(sprintf(
                 '%s(): Unknown hashing algorithm: %s',
                 __FUNCTION__, $algo
@@ -133,7 +132,7 @@ public static function compat_pbkdf2($algo, $password, $salt, $iterations, $leng
             $block  = $digest;
             for ($j = 1; $j < $iterations; $j++) {
                 $digest = hash_hmac($algo, $digest, $password, true);
-                $block ^= $digest;
+                $block  ^= $digest;
             }
             $derivedKey .= $block;
         }
@@ -152,10 +151,10 @@ public static function compat_pbkdf2($algo, $password, $salt, $iterations, $leng
     /**
      * Changes the Precision for PHP configs that default to less than 16
      */
-    static public function checkPrecision()
+    public static function checkPrecision()
     {
         if (ini_get('precision') < 16) {
             ini_set('precision', 16);
         }
     }
-}
+}

src/Message/AbortMessage.php

@@ -13,7 +13,6 @@
  */
 class AbortMessage extends Message
 {
-
     use DetailsTrait;
 
     /**
@@ -33,18 +32,7 @@ public function __construct($details, $responseURI)
     {
         parent::__construct();
 
-        $this->setDetails($details);
-        $this->setResponseURI($responseURI);
-    }
-
-
-    /**
-     * Set response URI
-     *
-     * @param mixed $responseURI
-     */
-    public function setResponseURI($responseURI)
-    {
+        $this->details     = (object)$details;
         $this->responseURI = $responseURI;
     }
 
@@ -78,5 +66,4 @@ public function getAdditionalMsgFields()
     {
         return [(object)$this->getDetails(), $this->getResponseURI()];
     }
-
 }

src/Message/ActionMessageInterface.php

@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Thruway\Message;
 
-
 /**
  * Interface ActionMessageInterface
  *
@@ -12,7 +10,8 @@
  *
  * @package Thruway\Message
  */
-interface ActionMessageInterface {
+interface ActionMessageInterface
+{
     /**
      * This returns the Uri so that the authorization manager doesn't have to know
      * exactly the type of object to get the Uri
@@ -27,4 +26,4 @@ public function getUri();
      * @return mixed
      */
     public function getActionName();
-} 
+}

src/Message/AuthenticateMessage.php

@@ -11,7 +11,6 @@
  */
 class AuthenticateMessage extends Message
 {
-
     /**
      * @var mixed
      */
@@ -28,8 +27,8 @@ class AuthenticateMessage extends Message
      */
     public function __construct($signature, $extra = null)
     {
-        $this->setSignature($signature);
-        $this->setExtra($extra);
+        $this->signature = $signature;
+        $this->extra     = (object)$extra;
     }
 
     /**

src/Message/CallMessage.php

@@ -6,7 +6,6 @@
 use Thruway\Message\Traits\OptionsTrait;
 use Thruway\Message\Traits\RequestTrait;
 
-
 /**
  * Class CallMessage
  * Call as originally issued by the Caller to the Dealer.
@@ -18,7 +17,6 @@
  */
 class CallMessage extends Message implements ActionMessageInterface
 {
-
     use RequestTrait;
     use OptionsTrait;
     use ArgumentsTrait;
@@ -67,7 +65,6 @@ public function getAdditionalMsgFields()
         $a = [$this->getRequestId(), $this->getOptions(), $this->getProcedureName()];
 
         return array_merge($a, $this->getArgumentsForSerialization());
-
     }
 
     /**
@@ -104,8 +101,6 @@ public function getUri()
      */
     public function getActionName()
     {
-        return "call";
+        return 'call';
     }
-
-
 }

src/Message/CancelMessage.php

@@ -14,7 +14,6 @@
  */
 class CancelMessage extends Message
 {
-
     use RequestTrait;
     use OptionsTrait;
 
@@ -50,5 +49,4 @@ public function getAdditionalMsgFields()
     {
         return [$this->getRequestId(), (object)$this->getOptions()];
     }
-
 }

src/Message/ChallengeMessage.php

@@ -59,13 +59,11 @@ public function getAuthMethod()
         return $this->authMethod;
     }
 
-
     /**
      * @param mixed $authMethod
      */
     public function setAuthMethod($authMethod)
     {
         $this->authMethod = $authMethod;
     }
-
 }

src/Message/ErrorMessage.php

@@ -51,7 +51,6 @@ class ErrorMessage extends Message
      */
     public function __construct($errorMsgCode, $errorRequestId, $details, $errorURI, $arguments = null, $argumentsKw = null)
     {
-
         $this->setErrorRequestId($errorRequestId);
         $this->setErrorMsgCode($errorMsgCode);
         $this->setDetails($details);
@@ -94,10 +93,10 @@ public function getErrorURI()
     public static function createErrorMessageFromMessage(Message $msg, $errorUri = null)
     {
         if ($errorUri === null) {
-            $errorUri = "wamp.error.unknown";
+            $errorUri = 'wamp.error.unknown';
         }
 
-        if (method_exists($msg, "getRequestId")) {
+        if (method_exists($msg, 'getRequestId')) {
             return new ErrorMessage($msg->getMsgCode(), $msg->getRequestId(), new \stdClass, $errorUri);
         }
 
@@ -207,5 +206,4 @@ public function __toString()
     {
         return $this->getErrorURI();
     }
-
 }

src/Message/EventMessage.php

@@ -17,7 +17,6 @@
  */
 class EventMessage extends Message
 {
-
     use DetailsTrait;
     use ArgumentsTrait;
 
@@ -178,4 +177,4 @@ public function setRestoringState($restoringState)
             $details->_thruway_restoring_state = true;
         }
     }
-}
+}

src/Message/GoodbyeMessage.php

@@ -4,7 +4,6 @@
 
 use Thruway\Message\Traits\DetailsTrait;
 
-
 /**
  * Class GoodbyeMessage
  * Sent by a Peer to close a previously opened WAMP session. Must be echo'ed by the receiving Peer.
@@ -14,7 +13,6 @@
  */
 class GoodbyeMessage extends Message
 {
-
     use DetailsTrait;
 
     /**
@@ -34,7 +32,7 @@ public function __construct($details, $reason)
 
     /**
      * Set reason
-     * 
+     *
      * @param string $reason
      */
     public function setReason($reason)
@@ -44,8 +42,8 @@ public function setReason($reason)
 
     /**
      * Get reason
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getReason()
     {
@@ -72,5 +70,4 @@ public function getAdditionalMsgFields()
     {
         return [(object)$this->getDetails(), $this->getReason()];
     }
-
-} 
+}

src/Message/HeartbeatMessage.php

@@ -1,10 +1,9 @@
 <?php
 
-
 namespace Thruway\Message;
 
-
-class HeartbeatMessage extends Message {
+class HeartbeatMessage extends Message
+{
     /**
      * @var int
      */
@@ -23,7 +22,7 @@ class HeartbeatMessage extends Message {
      * @param $incomingSeq
      * @param $outgoingSeq
      */
-    function __construct($incomingSeq, $outgoingSeq, $discard = null)
+    public function __construct($incomingSeq, $outgoingSeq, $discard = null)
     {
         $this->setDiscard($discard);
         $this->setIncomingSeq($incomingSeq);
@@ -51,7 +50,7 @@ public function getAdditionalMsgFields()
         $a = [$this->getIncomingSeq(), $this->getOutgoingSeq()];
 
         if (is_string($this->getDiscard())) {
-            array_push($a, $this->getDiscard());
+            $a[] = $this->getDiscard();
         }
 
         return $a;
@@ -104,6 +103,4 @@ public function setOutgoingSeq($outgoingSeq)
     {
         $this->outgoingSeq = $outgoingSeq;
     }
-
-
-}
+}

src/Message/HelloMessage.php

@@ -49,7 +49,6 @@ public function __construct($realm, $details)
         $this->setAuthMethods($authMethods);
     }
 
-
     /**
      * Get message code
      *
@@ -108,5 +107,4 @@ public function setAuthMethods($authMethods)
     {
         $this->authMethods = $authMethods;
     }
-
 }

src/Message/InterruptMessage.php

@@ -1,23 +1,20 @@
 <?php
 
-
 namespace Thruway\Message;
 
-
 use Thruway\Message\Traits\OptionsTrait;
 use Thruway\Message\Traits\RequestTrait;
 
 class InterruptMessage extends Message
 {
-
     use RequestTrait;
     use OptionsTrait;
 
     /**
      * @param int $requestId
      * @param \stdClass $options
      */
-    function __construct($requestId, $options)
+    public function __construct($requestId, $options)
     {
         $this->setRequestId($requestId);
         $this->setOptions($options);
@@ -43,5 +40,4 @@ public function getAdditionalMsgFields()
     {
         return [$this->getRequestId(), (object)$this->getOptions()];
     }
-
-}
+}