Skip to content

Commit

Permalink
Copyright, License, php ^8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sirn-se committed Jan 20, 2024
1 parent 9722804 commit 486d14d
Show file tree
Hide file tree
Showing 88 changed files with 134 additions and 235 deletions.
11 changes: 11 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 3 additions & 3 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion docs/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion docs/Contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
5 changes: 5 additions & 0 deletions examples/echoserver.php
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions examples/random_client.php
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions examples/random_server.php
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions examples/send.php
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 1 addition & 3 deletions src/Client.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 2 additions & 4 deletions src/Connection.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/BadOpcodeException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/BadUriException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/ClientException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/CloseException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/ConnectionClosedException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/ConnectionFailureException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/ConnectionLevelInterface.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/ConnectionTimeoutException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/Exception.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/HandshakeException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/MessageLevelInterface.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/ServerException.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Frame/Frame.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Frame/FrameHandler.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Http/HttpHandler.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Http/Message.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Http/Request.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Http/Response.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Http/ServerRequest.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Message/Binary.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/Message/Close.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit 486d14d

Please sign in to comment.