Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.

Commit 6f32b89

Browse files
rennokkirennokki
committed
wip
1 parent de6b1b2 commit 6f32b89

File tree

141 files changed

+4535
-5832
lines changed

Some content is hidden

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

141 files changed

+4535
-5832
lines changed

Diff for: ‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ end_of_line = lf
1111
insert_final_newline = true
1212
trim_trailing_whitespace = true
1313

14-
[*.blade.php]
14+
[*.{blade.php,yml,yaml}]
1515
indent_size = 2
1616

1717
[*.md]

Diff for: ‎.github/workflows/ci.yml

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- '*'
7+
tags:
8+
- '*'
9+
pull_request:
10+
branches:
11+
- '*'
12+
13+
jobs:
14+
build:
15+
if: "!contains(github.event.head_commit.message, 'skip ci')"
16+
17+
runs-on: ubuntu-latest
18+
19+
strategy:
20+
matrix:
21+
php: ['7.2', '7.3', '7.4']
22+
laravel: ['6.*', '7.*', '8.*']
23+
prefer: ['prefer-lowest', 'prefer-stable']
24+
include:
25+
- laravel: '6.*'
26+
testbench: '4.*'
27+
- laravel: '7.*'
28+
testbench: '5.*'
29+
- laravel: '8.*'
30+
testbench: '6.*'
31+
32+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} --${{ matrix.prefer }}
33+
34+
steps:
35+
- uses: actions/checkout@v1
36+
37+
- name: Setup Redis
38+
uses: supercharge/[email protected]
39+
with:
40+
redis-version: 6
41+
42+
- uses: actions/cache@v1
43+
name: Cache dependencies
44+
with:
45+
path: ~/.composer/cache/files
46+
key: composer-php-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.prefer }}-${{ hashFiles('composer.json') }}
47+
48+
- name: Install dependencies
49+
run: |
50+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench-browser-kit:${{ matrix.testbench }}" "orchestra/database:${{ matrix.testbench }}" --no-interaction --no-update
51+
composer update --${{ matrix.prefer }} --prefer-dist --no-interaction --no-suggest
52+
53+
- name: Run tests for Local
54+
run: |
55+
REPLICATION_MODE=local phpunit --coverage-text --coverage-clover=coverage_local.xml
56+
57+
- name: Run tests for Redis
58+
run: |
59+
REPLICATION_MODE=redis phpunit --coverage-text --coverage-clover=coverage_redis.xml
60+
61+
- uses: codecov/codecov-action@v1
62+
with:
63+
fail_ci_if_error: false
64+
file: '*.xml'
65+
token: ${{ secrets.CODECOV_TOKEN }}

Diff for: ‎.github/workflows/run-tests.yml

-65
This file was deleted.

Diff for: ‎.gitignore

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
/vendor
2+
/.idea
13
build
2-
composer.lock
3-
vendor
4-
coverage
54
.phpunit.result.cache
6-
.idea/
5+
coverage
6+
composer.phar
7+
composer.lock
8+
.DS_Store
79
database.sqlite

Diff for: ‎.scrutinizer.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
filter:
2-
excluded_paths: [tests/*]
2+
excluded_paths: [tests/*]
33

44
checks:
5-
php:
6-
remove_extra_empty_lines: true
7-
remove_php_closing_tag: true
8-
remove_trailing_whitespace: true
9-
fix_use_statements:
10-
remove_unused: true
11-
preserve_multiple: false
12-
preserve_blanklines: true
13-
order_alphabetically: true
14-
fix_php_opening_tag: true
15-
fix_linefeed: true
16-
fix_line_ending: true
17-
fix_identation_4spaces: true
18-
fix_doc_comments: true
5+
php:
6+
remove_extra_empty_lines: true
7+
remove_php_closing_tag: true
8+
remove_trailing_whitespace: true
9+
fix_use_statements:
10+
remove_unused: true
11+
preserve_multiple: false
12+
preserve_blanklines: true
13+
order_alphabetically: true
14+
fix_php_opening_tag: true
15+
fix_linefeed: true
16+
fix_line_ending: true
17+
fix_identation_4spaces: true
18+
fix_doc_comments: true
1919

Diff for: ‎.styleci.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
preset: laravel
2-
3-
disabled:
4-
- single_class_element_per_statement
1+
preset: laravel

Diff for: ‎CHANGELOG.md

-21
This file was deleted.

Diff for: ‎LICENSE.md renamed to ‎LICENSE

File renamed without changes.

Diff for: ‎composer.json

+22-27
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
22
"name": "beyondcode/laravel-websockets",
3-
"description": "An easy to use WebSocket server",
4-
"keywords": [
5-
"beyondcode",
6-
"laravel-websockets"
7-
],
8-
"homepage": "https://github.com/beyondcode/laravel-websockets",
3+
"description": ":package_description",
4+
"keywords": ["laravel", "php"],
95
"license": "MIT",
6+
"homepage": "https://github.com/beyondcode/laravel-websockets",
107
"authors": [
118
{
129
"name": "Marcel Pociot",
@@ -19,6 +16,11 @@
1916
"email": "[email protected]",
2017
"homepage": "https://spatie.be",
2118
"role": "Developer"
19+
},
20+
{
21+
"name": "Alex Renoki",
22+
"homepage": "https://github.com/rennokki",
23+
"role": "Developer"
2224
}
2325
],
2426
"require": {
@@ -28,50 +30,43 @@
2830
"clue/buzz-react": "^2.5",
2931
"clue/redis-react": "^2.3",
3032
"evenement/evenement": "^2.0|^3.0",
31-
"facade/ignition-contracts": "^1.0",
3233
"guzzlehttp/psr7": "^1.5",
33-
"illuminate/broadcasting": "^6.0|^7.0",
34-
"illuminate/console": "^6.0|^7.0",
35-
"illuminate/http": "^6.0|^7.0",
36-
"illuminate/routing": "^6.0|^7.0",
37-
"illuminate/support": "^6.0|^7.0",
34+
"laravel/framework": "^6.0|^7.0|^8.0",
3835
"pusher/pusher-php-server": "^3.0|^4.0",
3936
"react/promise": "^2.0",
4037
"symfony/http-kernel": "^4.0|^5.0",
4138
"symfony/psr-http-message-bridge": "^1.1|^2.0"
4239
},
43-
"require-dev": {
44-
"clue/block-react": "^1.4",
45-
"mockery/mockery": "^1.3",
46-
"orchestra/testbench-browser-kit": "^4.0|^5.0",
47-
"phpunit/phpunit": "^8.0|^9.0"
48-
},
4940
"autoload": {
5041
"psr-4": {
51-
"BeyondCode\\LaravelWebSockets\\": "src"
42+
"BeyondCode\\LaravelWebSockets\\": "src/"
5243
}
5344
},
5445
"autoload-dev": {
5546
"psr-4": {
56-
"BeyondCode\\LaravelWebSockets\\Tests\\": "tests"
47+
"BeyondCode\\LaravelWebSockets\\Test\\": "tests"
5748
}
5849
},
5950
"scripts": {
60-
"test": "vendor/bin/phpunit",
61-
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"
62-
51+
"test": "vendor/bin/phpunit"
52+
},
53+
"require-dev": {
54+
"clue/block-react": "^1.4",
55+
"laravel/legacy-factories": "^1.0.4",
56+
"mockery/mockery": "^1.3",
57+
"orchestra/testbench-browser-kit": "^4.0|^5.0|^6.0",
58+
"orchestra/database": "^4.0|^5.0|^6.0",
59+
"phpunit/phpunit": "^8.0|^9.0"
6360
},
6461
"config": {
6562
"sort-packages": true
6663
},
64+
"minimum-stability": "dev",
6765
"extra": {
6866
"laravel": {
6967
"providers": [
7068
"BeyondCode\\LaravelWebSockets\\WebSocketsServiceProvider"
71-
],
72-
"aliases": {
73-
"WebSocketRouter": "BeyondCode\\LaravelWebSockets\\Facades\\WebSocketRouter"
74-
}
69+
]
7570
}
7671
}
7772
}

0 commit comments

Comments
 (0)