From 486d14deecde9a6b2fc4162d9a746d8a1a48fc9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Jensen?= Date: Sat, 20 Jan 2024 12:42:54 +0100 Subject: [PATCH] Copyright, License, php ^8.1 --- .../PULL_REQUEST_TEMPLATE/pull_request_template.md | 11 +++++++++++ .github/workflows/acceptance.yml | 6 +++--- composer.json | 2 +- docs/Changelog.md | 3 ++- docs/Contributing.md | 2 +- examples/echoserver.php | 5 +++++ examples/random_client.php | 5 +++++ examples/random_server.php | 5 +++++ examples/send.php | 5 +++++ src/Client.php | 4 +--- src/Connection.php | 6 ++---- src/Exception/BadOpcodeException.php | 4 +--- src/Exception/BadUriException.php | 4 +--- src/Exception/ClientException.php | 4 +--- src/Exception/CloseException.php | 4 +--- src/Exception/ConnectionClosedException.php | 4 +--- src/Exception/ConnectionFailureException.php | 4 +--- src/Exception/ConnectionLevelInterface.php | 4 +--- src/Exception/ConnectionTimeoutException.php | 4 +--- src/Exception/Exception.php | 4 +--- src/Exception/HandshakeException.php | 4 +--- src/Exception/MessageLevelInterface.php | 4 +--- src/Exception/ServerException.php | 4 +--- src/Frame/Frame.php | 4 +--- src/Frame/FrameHandler.php | 4 +--- src/Http/HttpHandler.php | 4 +--- src/Http/Message.php | 4 +--- src/Http/Request.php | 4 +--- src/Http/Response.php | 4 +--- src/Http/ServerRequest.php | 4 +--- src/Message/Binary.php | 4 +--- src/Message/Close.php | 4 +--- src/Message/Message.php | 4 +--- src/Message/MessageHandler.php | 4 +--- src/Message/Ping.php | 4 +--- src/Message/Pong.php | 4 +--- src/Message/Text.php | 4 +--- src/Middleware/Callback.php | 4 +--- src/Middleware/CloseHandler.php | 4 +--- src/Middleware/MiddlewareHandler.php | 4 +--- src/Middleware/MiddlewareInterface.php | 4 +--- src/Middleware/PingInterval.php | 4 +--- src/Middleware/PingResponder.php | 4 +--- src/Middleware/ProcessHttpIncomingInterface.php | 4 +--- src/Middleware/ProcessHttpOutgoingInterface.php | 4 +--- src/Middleware/ProcessHttpStack.php | 4 +--- src/Middleware/ProcessIncomingInterface.php | 4 +--- src/Middleware/ProcessOutgoingInterface.php | 4 +--- src/Middleware/ProcessStack.php | 4 +--- src/Middleware/ProcessTickInterface.php | 4 +--- src/Middleware/ProcessTickStack.php | 4 +--- src/Server.php | 4 +--- src/Trait/ListenerTrait.php | 4 +--- src/Trait/OpcodeTrait.php | 4 +--- src/Trait/SendMethodsTrait.php | 4 +--- src/Trait/StringableTrait.php | 4 +--- tests/bootstrap.php | 5 +++++ tests/mock/EchoLog.php | 6 +++++- tests/mock/MockStreamTrait.php | 6 +++++- tests/mock/MockUri.php | 6 +++++- tests/suites/client/ClientErrorTest.php | 4 +--- tests/suites/client/ClientTest.php | 4 +--- tests/suites/client/ConfigErrorTest.php | 4 +--- tests/suites/client/ConfigTest.php | 4 +--- tests/suites/client/HandshakeTest.php | 4 +--- tests/suites/connection/ConnectionTest.php | 4 +--- tests/suites/connection/ExceptionTest.php | 4 +--- tests/suites/frame/FrameHandlerTest.php | 4 +--- tests/suites/frame/FrameTest.php | 4 +--- tests/suites/http/HttpHandlerTest.php | 4 +--- tests/suites/http/RequestTest.php | 4 +--- tests/suites/http/ResponseTest.php | 4 +--- tests/suites/http/ServerRequestTest.php | 4 +--- tests/suites/message/BinaryTest.php | 4 +--- tests/suites/message/CloseTest.php | 4 +--- tests/suites/message/MessageHandlerTest.php | 4 +--- tests/suites/message/PingTest.php | 4 +--- tests/suites/message/PongTest.php | 4 +--- tests/suites/message/TextTest.php | 4 +--- tests/suites/middleware/CallbackTest.php | 4 +--- tests/suites/middleware/CloseHandlerTest.php | 4 +--- tests/suites/middleware/PingIntervalTest.php | 4 +--- tests/suites/middleware/PingResponderTest.php | 4 +--- tests/suites/middleware/ProcessStackTest.php | 4 +--- tests/suites/server/ConfigErrorTest.php | 4 +--- tests/suites/server/ConfigTest.php | 4 +--- tests/suites/server/HandshakeTest.php | 4 +--- tests/suites/server/ServerTest.php | 4 +--- 88 files changed, 134 insertions(+), 235 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE/pull_request_template.md diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 0000000..7746407 --- /dev/null +++ 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 index 0695c98..03cef93 100644 --- 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 index fcd8163..8f4d805 100644 --- 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 index f4ce971..7110164 100644 --- 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 index 1dc05c7..34c4ec5 100644 --- 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 index 99db3ac..922f37b 100644 --- a/examples/echoserver.php +++ b/examples/echoserver.php @@ -1,5 +1,10 @@ diff --git a/src/Client.php b/src/Client.php index 65df2ec..7ee1116 100644 --- a/src/Client.php +++ b/src/Client.php @@ -1,10 +1,8 @@