Merge branch 'master' into v1.6-master

Author: sirn-se

README.md

@@ -24,7 +24,8 @@ Preferred way to install is with [Composer](https://getcomposer.org/).
 composer require textalk/websocket
 ```
 
-* Current version support PHP versions `^7.2|8.0`.
+* Current version support PHP versions `^7.4|^8.0`.
+* For PHP `7.2` and `7.3` support use version [`1.5`](https://github.com/Textalk/websocket-php/tree/1.5.0).
 * For PHP `7.1` support use version [`1.4`](https://github.com/Textalk/websocket-php/tree/1.4.0).
 * For PHP `^5.4` and `7.0` support use version [`1.3`](https://github.com/Textalk/websocket-php/tree/1.3.0).
 
@@ -63,4 +64,4 @@ Fredrik Liljegren, Armen Baghumian Sankbarani, Ruslan Bekenev,
 Joshua Thijssen, Simon Lipp, Quentin Bellus, Patrick McCarren, swmcdonnell,
 Ignas Bernotas, Mark Herhold, Andreas Palm, Sören Jensen, pmaasz, Alexey Stavrov,
 Michael Slezak, Pierre Seznec, rmeisler, Nickolay V. Shmyrev, Christoph Kempen,
-Marc Roberts.
+Marc Roberts, Antonio Mora, Simon Podlipsky.

docs/Changelog.md

@@ -4,18 +4,33 @@
 
 ## `v1.6`
 
- > PHP version `^7.3|^8.0`
+ > PHP version `^7.4|^8.0`
 
 ### `1.6.0`
-
- * Listener functions (@sirn-se)
- * Multi connection server (@sirn-se)
- * Major refactoring, using Connections (@sirn-se)
+ * Connection separate from Client and Server (@sirn-se)
+ * getPier() deprecated, replaces by getRemoteName() (@sirn-se)
+ * Client accepts Psr\Http\Message\UriInterface as input for URI:s (@sirn-se)
+ * Bad URI throws exception when Client is instanciated, previously when used (@sirn-se)
+ * Major internal refactoring (@sirn-se)
+ * Preparations for multiple conection and listeners (@sirn-se)
 
 ## `v1.5`
 
  > PHP version `^7.2|^8.0`
 
+### `1.5.8`
+
+ * Handle read error during handshake (@sirn-se)
+
+### `1.5.7`
+
+ * Large header block fix (@sirn-se)
+
+### `1.5.6`
+
+ * Add test for PHP 8.1 (@sirn-se)
+ * Code standard (@sirn-se)
+
 ### `1.5.5`
 
  * Support for psr/log v2 and v3 (@simPod)

docs/Client.md

@@ -10,27 +10,27 @@ It internally supports Upgrade handshake and implicit close and ping/pong operat
 ```php
 WebSocket\Client {
 
-    public __construct(string $uri, array $options = [])
-    public __destruct()
-    public __toString() : string
-
-    public text(string $payload) : void
-    public binary(string $payload) : void
-    public ping(string $payload = '') : void
-    public pong(string $payload = '') : void
-    public send(mixed $payload, string $opcode = 'text', bool $masked = true) : void
-    public receive() : mixed
-    public close(int $status = 1000, mixed $message = 'ttfn') : mixed
-
-    public getName() : string|null
-    public getPeer() : string|null
-    public getLastOpcode() : string
-    public getCloseStatus() : int
-    public isConnected() : bool
-    public setTimeout(int $seconds) : void
-    public setFragmentSize(int $fragment_size) : self
-    public getFragmentSize() : int
-    public setLogger(Psr\Log\LoggerInterface $logger = null) : void
+    public __construct(UriInterface|string $uri, array $options = []);
+    public __destruct();
+    public __toString() : string;
+
+    public text(string $payload) : void;
+    public binary(string $payload) : void;
+    public ping(string $payload = '') : void;
+    public pong(string $payload = '') : void;
+    public send(Message|string $payload, string $opcode = 'text', bool $masked = true) : void;
+    public close(int $status = 1000, mixed $message = 'ttfn') : void;
+    public receive() : Message|string|null;
+
+    public getName() : string|null;
+    public getRemoteName() : string|null;
+    public getLastOpcode() : string;
+    public getCloseStatus() : int;
+    public isConnected() : bool;
+    public setTimeout(int $seconds) : void;
+    public setFragmentSize(int $fragment_size) : self;
+    public getFragmentSize() : int;
+    public setLogger(Psr\Log\LoggerInterface $logger = null) : void;
 }
 ```
 

docs/Message.md

@@ -21,15 +21,15 @@ Additionally;
 ```php
 WebSocket\Message\Message {
 
-    public __construct(string $payload = '')
-    public __toString() : string
-
-    public getOpcode() : string
-    public getLength() : int
-    public getTimestamp() : DateTime
-    public getContent() : string
-    public setContent(string $payload = '') : void
-    public hasContent() : bool
+    public __construct(string $payload = '');
+    public __toString() : string;
+
+    public getOpcode() : string;
+    public getLength() : int;
+    public getTimestamp() : DateTime;
+    public getContent() : string;
+    public setContent(string $payload = '') : void;
+    public hasContent() : bool;
 }
 ```
 

docs/Server.md

@@ -13,33 +13,33 @@ If you require this kind of server behavior, you need to build it on top of prov
 ```php
 WebSocket\Server {
 
-    public __construct(array $options = [])
-    public __destruct()
-    public __toString() : string
-
-    public accept() : bool
-    public text(string $payload) : void
-    public binary(string $payload) : void
-    public ping(string $payload = '') : void
-    public pong(string $payload = '') : void
-    public send(mixed $payload, string $opcode = 'text', bool $masked = true) : void
-    public receive() : mixed
-    public close(int $status = 1000, mixed $message = 'ttfn') : mixed
-
-    public getPort() : int
-    public getPath() : string
-    public getRequest() : array
-    public getHeader(string $header_name) : string|null
-
-    public getName() : string|null
-    public getPeer() : string|null
-    public getLastOpcode() : string
-    public getCloseStatus() : int
+    public __construct(array $options = []);
+    public __destruct();
+    public __toString() : string;
+
+    public accept() : bool;
+    public text(string $payload) : void;
+    public binary(string $payload) : void;
+    public ping(string $payload = '') : void;
+    public pong(string $payload = '') : void;
+    public send(Message|string $payload, string $opcode = 'text', bool $masked = true) : void;
+    public close(int $status = 1000, mixed $message = 'ttfn') : void;
+    public receive() : Message|string|null;
+
+    public getPort() : int;
+    public getPath() : string;
+    public getRequest() : array;
+    public getHeader(string $header_name) : string|null;
+
+    public getName() : string|null;
+    public getRemoteName() : string|null;
+    public getLastOpcode() : string;
+    public getCloseStatus() : int;
     public isConnected() : bool
-    public setTimeout(int $seconds) : void
-    public setFragmentSize(int $fragment_size) : self
-    public getFragmentSize() : int
-    public setLogger(Psr\Log\LoggerInterface $logger = null) : void
+    public setTimeout(int $seconds) : void;
+    public setFragmentSize(int $fragment_size) : self;
+    public getFragmentSize() : int;
+    public setLogger(Psr\Log\LoggerInterface $logger = null) : void;
 }
 ```
 

lib/BadUriException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
- *
- * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
- */
-
 namespace WebSocket;
 
 class BadUriException extends Exception