Skip to content

Commit

Permalink
Upgrade to 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuanyanwow
xuanyanwow committed Nov 5, 2023
1 parent 376bfe2 commit 82dea98
Show file tree
Hide file tree
Showing 13 changed files with 51 additions and 34 deletions.
24 changes: 12 additions & 12 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
"license": "Apache-2.0",
"require": {
"php": ">=8.0",
"hyperf/cache": "~3.0.0",
"hyperf/command": "~3.0.0",
"hyperf/config": "~3.0.0",
"hyperf/db-connection": "~3.0.0",
"hyperf/cache": "~3.1.0",
"hyperf/command": "~3.1.0",
"hyperf/config": "~3.1.0",
"hyperf/db-connection": "~3.1.0",
"hyperf/engine": "^2.10",
"hyperf/framework": "~3.0.0",
"hyperf/guzzle": "~3.0.0",
"hyperf/http-server": "~3.0.0",
"hyperf/logger": "~3.0.0",
"hyperf/memory": "~3.0.0",
"hyperf/process": "~3.0.0"
"hyperf/framework": "~3.1.0",
"hyperf/guzzle": "~3.1.0",
"hyperf/http-server": "~3.1.0",
"hyperf/logger": "~3.1.0",
"hyperf/memory": "~3.1.0",
"hyperf/process": "~3.1.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.0",
"hyperf/devtool": "~3.0.0",
"hyperf/testing": "~3.0.0",
"hyperf/devtool": "~3.1.0",
"hyperf/testing": "~3.1.0",
"mockery/mockery": "^1.0",
"phpstan/phpstan": "^1.0",
"swoole/ide-helper": "^5.0"
Expand Down
40 changes: 20 additions & 20 deletions installer/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,64 +12,64 @@
return [
'packages' => [
'hyperf/amqp' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/async-queue' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/database' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/db-connection' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/model-cache' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/constants' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/json-rpc' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/redis' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/rpc' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/rpc-client' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/rpc-server' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/grpc-client' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/grpc-server' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/elasticsearch' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/config-apollo' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/config-aliyun-acm' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/config-etcd' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/config-nacos' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/tracer' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
'hyperf/service-governance' => [
'version' => '~3.0.0',
'version' => '~3.1.0',
],
],
'require-dev' => [
Expand Down
3 changes: 3 additions & 0 deletions installer/resources/amqp/amqp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* @contact group@hyperf.io
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/

use function Hyperf\Support\env;

return [
'default' => [
'host' => env('AMQP_HOST', 'localhost'),
Expand Down
2 changes: 1 addition & 1 deletion installer/resources/async_queue/async_queue.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
return [
'default' => [
'driver' => Hyperf\AsyncQueue\Driver\RedisDriver::class,
'driver' => \Hyperf\AsyncQueue\Driver\RedisDriver::class,
'redis' => [
'pool' => 'default',
],
Expand Down
2 changes: 1 addition & 1 deletion installer/resources/bin/hyperf.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ error_reporting(E_ALL);
date_default_timezone_set('%TIME_ZONE%');

! defined('BASE_PATH') && define('BASE_PATH', dirname(__DIR__, 1));
! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', SWOOLE_HOOK_ALL);
! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', Hyperf\Engine\DefaultOption::hookFlags());

require BASE_PATH . '/vendor/autoload.php';

Expand Down
1 change: 1 addition & 0 deletions installer/resources/config_center/config_acm.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/
use Hyperf\ConfigCenter\Mode;
use function Hyperf\Support\env;

return [
'enable' => (bool) env('CONFIG_CENTER_ENABLE', true),
Expand Down
1 change: 1 addition & 0 deletions installer/resources/config_center/config_apollo.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*/
use Hyperf\ConfigApollo\PullMode;
use Hyperf\ConfigCenter\Mode;
use function Hyperf\Support\env;

return [
'enable' => (bool) env('CONFIG_CENTER_ENABLE', true),
Expand Down
1 change: 1 addition & 0 deletions installer/resources/config_center/config_etcd.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/
use Hyperf\ConfigCenter\Mode;
use function Hyperf\Support\env;

return [
'enable' => (bool) env('CONFIG_CENTER_ENABLE', true),
Expand Down
1 change: 1 addition & 0 deletions installer/resources/config_center/config_nacos.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/
use Hyperf\ConfigCenter\Mode;
use function Hyperf\Support\env;

return [
'enable' => (bool) env('CONFIG_CENTER_ENABLE', true),
Expand Down
3 changes: 3 additions & 0 deletions installer/resources/database/databases.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* @contact group@hyperf.io
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/

use function Hyperf\Support\env;

return [
'default' => [
'driver' => env('DB_DRIVER', 'mysql'),
Expand Down
3 changes: 3 additions & 0 deletions installer/resources/database/redis.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* @contact group@hyperf.io
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/

use function Hyperf\Support\env;

return [
'default' => [
'host' => env('REDIS_HOST', 'localhost'),
Expand Down
3 changes: 3 additions & 0 deletions installer/resources/model_cache/databases.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* @contact group@hyperf.io
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/

use function Hyperf\Support\env;

return [
'default' => [
'driver' => env('DB_DRIVER', 'mysql'),
Expand Down
1 change: 1 addition & 0 deletions installer/resources/tracer/opentracing.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
*/
use Zipkin\Samplers\BinarySampler;
use function Hyperf\Support\env;

return [
'default' => env('TRACER_DRIVER', 'zipkin'),
Expand Down

0 comments on commit 82dea98

Please sign in to comment.