Merge pull request #75 from WarriorXK/hotfix/4.0.1

Hotfix/4.0.1

Author: WarriorXK

VERSION

@@ -1 +1 @@
-4.0.0
+4.0.1

src/PHPWebSockets/AConnection.php

@@ -262,7 +262,7 @@ public function isWriteBufferEmpty() : bool {
      *
      * @return bool
      */
-    public function writeUntilEmpty(float $totalTimeout = NULL, float $lastUpdateTimeout = NULL) : bool {
+    public function writeUntilEmpty(?float $totalTimeout = NULL, ?float $lastUpdateTimeout = NULL) : bool {
 
         $start = microtime(TRUE);
         $lastTimeWritten = $start;
@@ -819,7 +819,7 @@ public function write(string $data, int $opcode = \PHPWebSockets::OPCODE_FRAME_T
      *
      * @return bool
      */
-    public function waitUntilDisconnect(float $timeout = NULL) : bool {
+    public function waitUntilDisconnect(?float $timeout = NULL) : bool {
 
         $start = microtime(TRUE);
         do {
@@ -888,7 +888,7 @@ protected function _checkRSVBits(array $headers) : bool {
      *
      * @return void
      */
-    public function setNewMessageStreamCallback(callable $callable = NULL) : void {
+    public function setNewMessageStreamCallback(?callable $callable = NULL) : void {
         $this->_newMessageStreamCallback = $callable;
     }
 

src/PHPWebSockets/AUpdate.php

@@ -56,7 +56,7 @@ abstract class AUpdate {
      */
     protected $_code = 0;
 
-    public function __construct(int $code, AConnection $sourceConnection = NULL) {
+    public function __construct(int $code, ?AConnection $sourceConnection = NULL) {
 
         $this->_sourceConnection = $sourceConnection;
         $this->_code = $code;

src/PHPWebSockets/Client.php

@@ -99,7 +99,7 @@ class Client extends AConnection {
      */
     protected $_path = NULL;
 
-    public function __construct(LoggerInterface $logger = NULL) {
+    public function __construct(?LoggerInterface $logger = NULL) {
 
         if ($logger) {
             $this->setLogger($logger);

src/PHPWebSockets/Framer.php

@@ -128,7 +128,7 @@ public static function GetFrameHeaders(string $frame) : ?array {
      *
      * @return string|bool|null
      */
-    public static function GetFramePayload(string $frame, array $headers = NULL) {
+    public static function GetFramePayload(string $frame, ?array $headers = NULL) {
 
         $headers = ($headers ?? self::GetFrameHeaders($frame));
         if ($headers === NULL) {

src/PHPWebSockets/Server.php

@@ -149,7 +149,7 @@ class Server implements LoggerAwareInterface, ITaggable {
      *
      * @return void
      */
-    public function __construct(string $address = NULL, array $streamContext = [], bool $useCrypto = FALSE, LoggerInterface $logger = NULL) {
+    public function __construct(?string $address = NULL, array $streamContext = [], bool $useCrypto = FALSE, ?LoggerInterface $logger = NULL) {
 
         if ($logger !== NULL) {
             $this->setLogger($logger);

src/PHPWebSockets/Server/Connection.php

@@ -317,7 +317,7 @@ protected function _parseHeaders() : void {
      *
      * @return void
      */
-    public function accept(string $protocol = NULL, array $additionalHeaders = []) : void {
+    public function accept(?string $protocol = NULL, array $additionalHeaders = []) : void {
 
         if ($this->isAccepted()) {
             throw new \LogicException('Connection has already been accepted!');

src/PHPWebSockets/Update/Read.php

@@ -67,7 +67,7 @@ class Read extends AUpdate {
      */
     protected $_stream = NULL;
 
-    public function __construct(int $code, AConnection $sourceConnection = NULL, int $opcode = NULL, string $message = NULL, $stream = NULL) {
+    public function __construct(int $code, ?AConnection $sourceConnection = NULL, ?int $opcode = NULL, ?string $message = NULL, $stream = NULL) {
 
         if ($stream !== NULL && !is_resource($stream)) {
             throw new \InvalidArgumentException('The $stream argument has to be NULL or a resource!');

src/PHPWebSockets/UpdatesWrapper.php

@@ -129,7 +129,7 @@ public function removeStreamContainer(IStreamContainer $container) : bool {
      *
      * @return void
      */
-    public function run(float $timeout = NULL, callable $runLoop = NULL) : void {
+    public function run(?float $timeout = NULL, ?callable $runLoop = NULL) : void {
 
         $this->_shouldRun = TRUE;
         while ($this->_shouldRun) {
@@ -288,7 +288,7 @@ public function update(?float $timeout, array $tempStreams = []) : void {
      *
      * @return void
      */
-    public function setClientConnectedHandler(callable $callable = NULL) : void {
+    public function setClientConnectedHandler(?callable $callable = NULL) : void {
         $this->_clientConnectedHandler = $callable;
     }
 
@@ -297,7 +297,7 @@ public function setClientConnectedHandler(callable $callable = NULL) : void {
      *
      * @return void
      */
-    public function setNewConnectionHandler(callable $callable = NULL) : void {
+    public function setNewConnectionHandler(?callable $callable = NULL) : void {
         $this->_newConnectionHandler = $callable;
     }
 
@@ -306,7 +306,7 @@ public function setNewConnectionHandler(callable $callable = NULL) : void {
      *
      * @return void
      */
-    public function setLastContactHandler(callable $callable = NULL) : void {
+    public function setLastContactHandler(?callable $callable = NULL) : void {
         $this->_lastContactHandler = $callable;
     }
 
@@ -315,7 +315,7 @@ public function setLastContactHandler(callable $callable = NULL) : void {
      *
      * @return void
      */
-    public function setMessageHandler(callable $callable = NULL) : void {
+    public function setMessageHandler(?callable $callable = NULL) : void {
         $this->_newMessageHandler = $callable;
     }
 
@@ -324,7 +324,7 @@ public function setMessageHandler(callable $callable = NULL) : void {
      *
      * @return void
      */
-    public function setDisconnectHandler(callable $callable = NULL) : void {
+    public function setDisconnectHandler(?callable $callable = NULL) : void {
         $this->_disconnectHandler = $callable;
     }
 
@@ -333,7 +333,7 @@ public function setDisconnectHandler(callable $callable = NULL) : void {
      *
      * @return void
      */
-    public function setErrorHandler(callable $callable = NULL) : void {
+    public function setErrorHandler(?callable $callable = NULL) : void {
         $this->_errorHandler = $callable;
     }
 
@@ -368,7 +368,7 @@ private function _triggerLastContactHandler(AConnection $connection) {
         }
     }
 
-    private function _triggerDisconnectHandler(AConnection $connection, bool $wasClean, string $data = NULL) : void {
+    private function _triggerDisconnectHandler(AConnection $connection, bool $wasClean, ?string $data = NULL) : void {
 
         $reason = '';
         $code = 0;