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

Commit b7cd6db

Browse files
committed
Merge changes from 0.8-dev
1 parent 785ed13 commit b7cd6db

File tree

12 files changed

+29
-245
lines changed

12 files changed

+29
-245
lines changed

README.en.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ visit [Quick Deployment](https://ripple.cloudtay.com/docs/install/server)
4848
### Thanks
4949

5050
<a href="https://www.jetbrains.com/?from=ripple" target="__blank">
51-
<img src="https://www.jetbrains.com/company/brand/img/jetbrains_logo.png" width="200">
51+
<img src="https://www.jetbrains.com/company/brand/img/jetbrains_logo.png" width="200" alt="">
5252
</a>
5353

5454
[Jetbrains](https://www.jetbrains.com/?from=ripple) Free development tools are provided for this project

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ composer require cloudtay/ripple-driver
4646
### 特别致谢
4747

4848
<a href="https://www.jetbrains.com/?from=ripple" target="__blank">
49-
<img src="https://www.jetbrains.com/company/brand/img/jetbrains_logo.png" width="200">
49+
<img src="https://www.jetbrains.com/company/brand/img/jetbrains_logo.png" width="200" alt="">
5050
</a>
5151

5252
[Jetbrains](https://www.jetbrains.com/?from=ripple) 为本项目提供了免费的开发工具

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
"phpunit/phpunit": "*",
3737
"symfony/console": "*",
3838
"topthink/framework": "*",
39-
"workerman/workerman": "dev-master",
39+
"workerman/workerman": "*",
4040
"workerman/webman-framework": "dev-master",
4141
"yiisoft/yii2": "^2.0@beta",
42-
"cloudtay/ripple": "0.8.x-dev",
42+
"cloudtay/ripple": "dev-main",
4343
"cloudtay/ripple-http": "dev-main",
4444
"cloudtay/ripple-websocket": "dev-main"
4545
},

qodana.yaml

-32
This file was deleted.

src/Laravel/DriverOld.php

-76
This file was deleted.

src/Laravel/Events/RequestTerminated.php

-12
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
namespace Ripple\Driver\Laravel\Events;
3636

37-
use Illuminate\Contracts\Container\BindingResolutionException;
3837
use Illuminate\Foundation\Application;
3938
use Illuminate\Http\Request;
4039
use Ripple\Driver\Laravel\Coroutine\ContainerMap;
@@ -49,16 +48,5 @@ public function __construct(
4948
public Response $response
5049
) {
5150
ContainerMap::unbind();
52-
53-
if ($app->bound('session')) {
54-
try {
55-
$app->make('session')->forgetDrivers();
56-
} catch (BindingResolutionException) {
57-
}
58-
}
59-
60-
if ($sandbox->bound('session.store')) {
61-
$app->forgetInstance('session.store');
62-
}
6351
}
6452
}

src/Laravel/Provider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class Provider extends ServiceProvider
4848
*/
4949
public function register(): void
5050
{
51-
$this->commands([Driver::class, DriverOld::class]);
51+
$this->commands([Driver::class]);
5252
$this->app->singleton(Manager::class, static function () {
5353
return new Manager();
5454
});

src/ThinkPHP/Service.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public function register(): void
5555

5656
// 注册终端
5757
$this->commands([
58-
'ripple:server' => Driver::class,
59-
'p:server' => Driver::class
58+
'ripple:server' => Driver::class
6059
]);
6160
}
6261
}

src/Workerman/Driver.php

-42
This file was deleted.

0 commit comments

Comments
 (0)