This repository has been archived by the owner on Feb 7, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 637
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Resolve conflicts * Apply fixes from StyleCI (#1042)
- Loading branch information
Showing
51 changed files
with
2,138 additions
and
782 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,41 +20,16 @@ jobs: | |
| fail-fast: false | ||
| matrix: | ||
| php: | ||
| - '7.3' | ||
| - '7.4' | ||
| - '8.0' | ||
| - '8.1' | ||
| laravel: | ||
| - 6.* | ||
| - 7.* | ||
| - 8.* | ||
| - 9.* | ||
| prefer: | ||
| - 'prefer-lowest' | ||
| - 'prefer-stable' | ||
| include: | ||
| - laravel: '6.*' | ||
| testbench: '4.*' | ||
| phpunit: '^8.5.8|^9.3.3' | ||
| - laravel: '7.*' | ||
| testbench: '5.*' | ||
| phpunit: '^8.5.8|^9.3.3' | ||
| - laravel: '8.*' | ||
| testbench: '6.*' | ||
| phpunit: '^9.3.3' | ||
| exclude: | ||
| - php: '8.0' | ||
| laravel: 6.* | ||
| prefer: 'prefer-lowest' | ||
| - php: '8.0' | ||
| laravel: 7.* | ||
| prefer: 'prefer-lowest' | ||
| - php: '8.1' | ||
| laravel: 6.* | ||
| - php: '8.1' | ||
| laravel: 7.* | ||
| - php: '8.1' | ||
| laravel: 8.* | ||
| prefer: 'prefer-lowest' | ||
| - laravel: '9.*' | ||
| testbench: '7.*' | ||
|
|
||
| name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} --${{ matrix.prefer }} | ||
|
|
||
|
|
@@ -68,6 +43,13 @@ jobs: | |
| extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv | ||
| coverage: pcov | ||
|
|
||
| - name: Setup MySQL | ||
| uses: haltuf/mysql-action@master | ||
| with: | ||
| mysql version: '8.0' | ||
| mysql database: 'websockets_test' | ||
| mysql root password: 'password' | ||
|
|
||
| - name: Setup Redis | ||
| uses: supercharge/[email protected] | ||
| with: | ||
|
|
@@ -81,7 +63,7 @@ jobs: | |
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "orchestra/testbench-browser-kit:${{ matrix.testbench }}" "orchestra/database:${{ matrix.testbench }}" --no-interaction --no-update | ||
| composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench-browser-kit:${{ matrix.testbench }}" "orchestra/database:${{ matrix.testbench }}" --no-interaction --no-update | ||
| composer update --${{ matrix.prefer }} --prefer-dist --no-interaction --no-suggest | ||
| - name: Run tests for Local | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
database/migrations/0000_00_00_000000_create_websockets_apps_table.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?php | ||
|
|
||
| use Illuminate\Database\Migrations\Migration; | ||
| use Illuminate\Database\Schema\Blueprint; | ||
| use Illuminate\Support\Facades\Schema; | ||
|
|
||
| class CreateWebSocketsAppsTable extends Migration | ||
| { | ||
| /** | ||
| * Run the migrations. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function up() | ||
| { | ||
| Schema::create('websockets_apps', function (Blueprint $table) { | ||
| $table->string('id')->index(); | ||
| $table->string('key'); | ||
| $table->string('secret'); | ||
| $table->string('name'); | ||
| $table->string('host')->nullable(); | ||
| $table->string('path')->nullable(); | ||
| $table->boolean('enable_client_messages')->default(false); | ||
| $table->boolean('enable_statistics')->default(true); | ||
| $table->unsignedInteger('capacity')->nullable(); | ||
| $table->string('allowed_origins'); | ||
| $table->nullableTimestamps(); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Reverse the migrations. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function down() | ||
| { | ||
| Schema::dropIfExists('websockets_apps'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 0 additions & 44 deletions
44
database/migrations/0000_00_00_000000_rename_statistics_counters.php
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
database/migrations/sqlite/0000_00_00_000000_create_apps_table.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| CREATE TABLE IF NOT EXISTS apps ( | ||
| id STRING NOT NULL, | ||
| key STRING NOT NULL, | ||
| secret STRING NOT NULL, | ||
| name STRING NOT NULL, | ||
| host STRING NULLABLE, | ||
| path STRING NULLABLE, | ||
| enable_client_messages BOOLEAN DEFAULT 0, | ||
| enable_statistics BOOLEAN DEFAULT 1, | ||
| capacity INTEGER NULLABLE, | ||
| allowed_origins STRING NULLABLE | ||
| ) |
Oops, something went wrong.