Skip to content

Commit bbb0b7d

Browse files
committed
rm handled
1 parent e190036 commit bbb0b7d

43 files changed

Lines changed: 441 additions & 323 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Please provide a clear and concise description of the suspected issue.
1414
If possible, provide information - possibly including code snippets - on how to reproduce the issue.
1515

1616
**Logs**
17-
If possible, provide logs that indicate the issue. See https://github.com/Textalk/websocket-php/blob/master/docs/Examples.md#logger on how to use a logger.
17+
If possible, provide logs that indicate the issue. See [Examples: Logger](../../docs/Examples.md#logger) on how to use a logger.
1818

1919
**Versions**
2020
* Version of this library

.github/workflows/acceptance.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Unit test
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616
- name: Set up PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
@@ -24,7 +24,7 @@ jobs:
2424
id: composer-cache
2525
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
2626
- name: Cache dependencies
27-
uses: actions/cache@v4
27+
uses: actions/cache@v5
2828
with:
2929
path: ${{ steps.composer-cache.outputs.dir }}
3030
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -39,7 +39,7 @@ jobs:
3939
name: Code standard
4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v6
4343
- name: Set up PHP
4444
uses: shivammathur/setup-php@v2
4545
with:
@@ -51,7 +51,7 @@ jobs:
5151
id: composer-cache
5252
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
5353
- name: Cache dependencies
54-
uses: actions/cache@v4
54+
uses: actions/cache@v5
5555
with:
5656
path: ${{ steps.composer-cache.outputs.dir }}
5757
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -66,7 +66,7 @@ jobs:
6666
name: Code coverage
6767
steps:
6868
- name: Checkout
69-
uses: actions/checkout@v4
69+
uses: actions/checkout@v6
7070
- name: Set up PHP
7171
uses: shivammathur/setup-php@v2
7272
with:
@@ -78,22 +78,22 @@ jobs:
7878
id: composer-cache
7979
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
8080
- name: Cache dependencies
81-
uses: actions/cache@v4
81+
uses: actions/cache@v5
8282
with:
8383
path: ${{ steps.composer-cache.outputs.dir }}
8484
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
8585
restore-keys: ${{ runner.os }}-composer-
8686
- name: Install dependencies
8787
run: composer install --prefer-dist
8888
- name: Code coverage
89-
run: vendor/bin/phpunit --coverage-clover coverage/clover.xml -d --min-coverage=100
89+
run: vendor/bin/phpunit --coverage-clover coverage/clover.xml --do-not-fail-on-phpunit-warning -d --min-coverage=100
9090

9191
stan:
9292
runs-on: ubuntu-latest
9393
name: Static analysis
9494
steps:
9595
- name: Checkout
96-
uses: actions/checkout@v4
96+
uses: actions/checkout@v6
9797
- name: Set up PHP
9898
uses: shivammathur/setup-php@v2
9999
with:
@@ -105,7 +105,7 @@ jobs:
105105
id: composer-cache
106106
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
107107
- name: Cache dependencies
108-
uses: actions/cache@v4
108+
uses: actions/cache@v5
109109
with:
110110
path: ${{ steps.composer-cache.outputs.dir }}
111111
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ and is maintained by Sören Jensen, who has been maintaining the original since
2929
* [Changelog](docs/Changelog.md) - The changelog of this repo
3030
* [Contributing](docs/Contributing.md) - Contributors and requirements
3131
* [Examples](docs/Examples.md) - Examples
32+
33+
## Migration
34+
35+
* [v1 -> v2](docs/Migrate_1_2.md) - How to migrate from v1 to v2
3236
* [v2 -> v3](docs/Migrate_2_3.md) - How to migrate from v2 to v3
33-
* [v3 -> v4](docs/Migrate_3_4.md) - How to migrate from v3 to v4
3437

3538
## Installing
3639

composer.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
],
1818
"autoload": {
1919
"psr-4": {
20-
"WebSocket\\": "src/",
21-
"X\\": "src-x/"
20+
"WebSocket\\": "src/"
2221
}
2322
},
2423
"autoload-dev": {
@@ -28,25 +27,24 @@
2827
},
2928
"require": {
3029
"php": "^8.1",
31-
"phrity/http": "^1.0",
30+
"nyholm/psr7": "^1.4",
31+
"phrity/http": "^1.1",
3232
"phrity/net-uri": "^2.1",
33-
"phrity/net-stream": "dev-ws4 as 2.4.0",
33+
"phrity/net-stream": "^2.4",
34+
"psr/http-factory": "^1.0",
3435
"psr/http-message": "^1.1 || ^2.0",
3536
"psr/log": "^1.0 || ^2.0 || ^3.0"
3637
},
3738
"require-dev": {
38-
"guzzlehttp/psr7": "^2.0",
3939
"phpstan/phpstan": "^2.0",
40-
"phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
40+
"phpunit/phpunit": "^10.0 || ^11.0 || ^12.0 || ^13.0",
4141
"phrity/logger-console": "^1.0",
42-
"phrity/net-mock": "dev-ws4 as 2.4.0",
42+
"phrity/net-mock": "^2.4",
4343
"phrity/util-errorhandler": "^1.1",
4444
"robiningelbrecht/phpunit-coverage-tools": "^1.9",
4545
"squizlabs/php_codesniffer": "^4.0"
4646
},
47-
"suggest": {
48-
"ext-zlib": "Required for per-message deflate compression",
49-
"psr/http-factory-implementation": "Use a complete http-factory implementation",
50-
"psr/log-implementation": "Use a logger implementation"
47+
"suggests": {
48+
"ext-zlib": "Required for per-message deflate compression"
5149
}
5250
}

docs/Changelog.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,28 @@
22

33
# Websocket: Changelog
44

5-
## `v4.0`
5+
## `v3.7`
66

77
> PHP version `^8.1`
88
9-
### `4.0.0`
9+
### `3.7.0`
1010

11-
* Shared stream observer, sharable across multiple cients and servers (@sirn-se)
1211
* Configuration class for various settings (@sirn-se)
13-
* MessageEncodingException when compression fails (@sirn-se)
14-
* General improvement of exceptions (@sirn-se)
15-
* Many class local configuration setters removed (@sirn-se)
16-
* Remove deprecated code (@sirn-se)
12+
* Identity interface and implementation (@sirn-se)
13+
* Using Nyholm PSR HTTP (intermediate solution) (@sirn-se)
14+
* Runner class wraps stream-select handler (@sirn-se)
15+
* StreamFactory as constructor option Client/Server (@sirn-se)
16+
* Preparations for v4 (@sirn-se)
1717

1818
## `v3.6`
1919

2020
> PHP version `^8.1`
2121
22+
### `3.6.2`
23+
24+
* Deflate compression fuzzy header parsing fix (@sirn-se)
25+
* More documentation (@sirn-se)
26+
2227
### `3.6.1`
2328

2429
* Fix typos and broken links (@pieterocp)

0 commit comments

Comments
 (0)