Copyright, License, php ^8.1

sirn-se · Jan 20, 2024 · 486d14d · 486d14d
1 parent 9722804
commit 486d14d
Show file tree

Hide file tree

Showing 88 changed files with 134 additions and 235 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,11 @@
+---
+name: Pull Request
+about: Pull Request
+title: ''
+labels: ''
+assignees: ''
+---
+
+Thanks for contributing!
+
+Before you create a Pull Request, make sure to read the [Contributing](../../docs/Contributing.md) specification.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -7,7 +7,7 @@ jobs:
   test:
     strategy:
       matrix:
-        php-versions: ["8.0", "8.1", "8.2", "8.3", "8.4"]
+        php-versions: ["8.1", "8.2", "8.3", "8.4"]
     runs-on: ubuntu-latest
     name: Unit test
     steps:
@@ -43,7 +43,7 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: "8.2"
+        php-version: "8.3"
         coverage: none
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -70,7 +70,7 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: "8.2"
+        php-version: "8.3"
         coverage: xdebug
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         }
     },
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "phrity/net-uri": "^1.2",
         "phrity/net-stream": "^1.3",
         "phrity/util-errorhandler": "^1.0",

diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -4,11 +4,12 @@
 
 ## `v2.2`
 
- > PHP version `^8.0`
+ > PHP version `^8.1`
 
 ### `2.2.0`
 
  * Documentation overview (@sirn-se)
+ * Removed PHP `8.0` support (@sirn-se)
 
 ## `v2.1`
 

diff --git a/docs/Contributing.md b/docs/Contributing.md
@@ -16,7 +16,7 @@ Base your patch on corresponding version branch, and target that version branch
 
 | Version | Branch | PHP | Status |
 | --- | --- | --- | --- |
-| [`2.2`](https://github.com/sirn-se/websocket-php/tree/2.2.0) | `v2.2-main` | `^8.0` | Future version |
+| [`2.2`](https://github.com/sirn-se/websocket-php/tree/2.2.0) | `v2.2-main` | `^8.1` | Future version |
 | [`2.1`](https://github.com/sirn-se/websocket-php/tree/2.1.0) | `v2.1-main` | `^8.0` | Current version |
 | [`2.0`](https://github.com/sirn-se/websocket-php/tree/2.0.0) | `v2.0-main` | `^8.0` | Bug fixes only |
 | [`1.7`](https://github.com/sirn-se/websocket-php/tree/1.7.0) | `v1.7-master` | `^7.4\|^8.0` | Bug fixes only |

diff --git a/examples/echoserver.php b/examples/echoserver.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2024 Textalk and contributors.
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ */
+
 /**
  * This file is used for the tests, but can also serve as an example of a WebSocket\Server.
  * Run in console: php examples/echoserver.php

diff --git a/examples/random_client.php b/examples/random_client.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2024 Textalk and contributors.
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ */
+
 /**
  * Websocket client that read/write random data.
  * Run in console: php examples/random_client.php

diff --git a/examples/random_server.php b/examples/random_server.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2024 Textalk and contributors.
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ */
+
 /**
  * Websocket server that read/write random data.
  * Run in console: php examples/random_server.php

diff --git a/examples/send.php b/examples/send.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2024 Textalk and contributors.
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ */
+
 /**
  * Simple send & receive client for test purpose.
  * Run in console: php examples/send.php <options> <message>

diff --git a/src/Client.php b/src/Client.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket;

diff --git a/src/Connection.php b/src/Connection.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket;
@@ -349,7 +347,7 @@ public function getHandshakeResponse(): Response|null
 
     /* ---------- Internal helper methods -------------------------------------------------------------------------- */
 
-    protected function throwException(Throwable $e): void
+    protected function throwException(Throwable $e): never
     {
         // Internal exceptions are handled and re-thrown
         if ($e instanceof Exception) {

diff --git a/src/Exception/BadOpcodeException.php b/src/Exception/BadOpcodeException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/BadUriException.php b/src/Exception/BadUriException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/ClientException.php b/src/Exception/ClientException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/CloseException.php b/src/Exception/CloseException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/ConnectionClosedException.php b/src/Exception/ConnectionClosedException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/ConnectionFailureException.php b/src/Exception/ConnectionFailureException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/ConnectionLevelInterface.php b/src/Exception/ConnectionLevelInterface.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/ConnectionTimeoutException.php b/src/Exception/ConnectionTimeoutException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/Exception.php b/src/Exception/Exception.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/HandshakeException.php b/src/Exception/HandshakeException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/MessageLevelInterface.php b/src/Exception/MessageLevelInterface.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Exception/ServerException.php b/src/Exception/ServerException.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Exception;

diff --git a/src/Frame/Frame.php b/src/Frame/Frame.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Frame;

diff --git a/src/Frame/FrameHandler.php b/src/Frame/FrameHandler.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Frame;

diff --git a/src/Http/HttpHandler.php b/src/Http/HttpHandler.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Http;

diff --git a/src/Http/Message.php b/src/Http/Message.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Http;

diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Http;

diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Http;

diff --git a/src/Http/ServerRequest.php b/src/Http/ServerRequest.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Http;

diff --git a/src/Message/Binary.php b/src/Message/Binary.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Message;

diff --git a/src/Message/Close.php b/src/Message/Close.php
@@ -1,10 +1,8 @@
 <?php
 
 /**
- * Copyright (C) 2014-2023 Textalk and contributors.
- *
+ * Copyright (C) 2014-2024 Textalk and contributors.
  * This file is part of Websocket PHP and is free software under the ISC License.
- * License text: https://raw.githubusercontent.com/sirn-se/websocket-php/master/COPYING.md
  */
 
 namespace WebSocket\Message;