Upgrade 1.1

Author: limingxinleo

bin/hyperf.php

@@ -8,6 +8,7 @@
 date_default_timezone_set('Asia/Shanghai');
 
 ! defined('BASE_PATH') && define('BASE_PATH', dirname(__DIR__, 1));
+! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', SWOOLE_HOOK_ALL);
 
 require BASE_PATH . '/vendor/autoload.php';
 

composer.json

@@ -14,27 +14,27 @@
     "require": {
         "php": ">=7.2",
         "ext-swoole": ">=4.2",
-        "hyperf/cache": "~1.0.0",
-        "hyperf/command": "~1.0.0",
-        "hyperf/config": "~1.0.0",
-        "hyperf/contract": "~1.0.0",
-        "hyperf/database": "~1.0.0",
-        "hyperf/db-connection": "~1.0.0",
-        "hyperf/devtool": "~1.0.0",
-        "hyperf/di": "~1.0.0",
-        "hyperf/dispatcher": "~1.0.0",
-        "hyperf/event": "~1.0.0",
-        "hyperf/exception-handler": "~1.0.0",
-        "hyperf/framework": "~1.0.0",
-        "hyperf/guzzle": "~1.0.0",
-        "hyperf/http-server": "~1.0.0",
-        "hyperf/logger": "~1.0.0",
-        "hyperf/memory": "~1.0.0",
-        "hyperf/paginator": "~1.0.0",
-        "hyperf/pool": "~1.0.0",
-        "hyperf/process": "~1.0.0",
-        "hyperf/redis": "~1.0.0",
-        "hyperf/utils": "~1.0.0"
+        "hyperf/cache": "~1.1.0",
+        "hyperf/command": "~1.1.0",
+        "hyperf/config": "~1.1.0",
+        "hyperf/contract": "~1.1.0",
+        "hyperf/database": "~1.1.0",
+        "hyperf/db-connection": "~1.1.0",
+        "hyperf/devtool": "~1.1.0",
+        "hyperf/di": "~1.1.0",
+        "hyperf/dispatcher": "~1.1.0",
+        "hyperf/event": "~1.1.0",
+        "hyperf/exception-handler": "~1.1.0",
+        "hyperf/framework": "~1.1.0",
+        "hyperf/guzzle": "~1.1.0",
+        "hyperf/http-server": "~1.1.0",
+        "hyperf/logger": "~1.1.0",
+        "hyperf/memory": "~1.1.0",
+        "hyperf/paginator": "~1.1.0",
+        "hyperf/pool": "~1.1.0",
+        "hyperf/process": "~1.1.0",
+        "hyperf/redis": "~1.1.0",
+        "hyperf/utils": "~1.1.0"
     },
     "require-dev": {
         "swoft/swoole-ide-helper": "^4.2",
@@ -43,7 +43,7 @@
         "mockery/mockery": "^1.0",
         "doctrine/common": "^2.9",
         "phpstan/phpstan": "^0.11.2",
-        "hyperf/testing": "~1.0.0"
+        "hyperf/testing": "~1.1.0"
     },
     "suggest": {
         "ext-openssl": "Required to use HTTPS.",

config/container.php

@@ -13,22 +13,11 @@
  * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
  */
 
-use Hyperf\Config\ProviderConfig;
-use Hyperf\Di\Annotation\Scanner;
 use Hyperf\Di\Container;
-use Hyperf\Di\Definition\DefinitionSource;
+use Hyperf\Di\Definition\DefinitionSourceFactory;
 use Hyperf\Utils\ApplicationContext;
 
-$configFromProviders = ProviderConfig::load();
-$definitions = include __DIR__ . '/dependencies.php';
-$serverDependencies = array_replace($configFromProviders['dependencies'] ?? [], $definitions['dependencies'] ?? []);
-
-$annotations = include __DIR__ . '/autoload/annotations.php';
-$scanDirs = $configFromProviders['scan']['paths'];
-$scanDirs = array_merge($scanDirs, $annotations['scan']['paths'] ?? []);
-
-$ignoreAnnotations = $annotations['scan']['ignore_annotations'] ?? ['mixin'];
-$container = new Container(new DefinitionSource($serverDependencies, $scanDirs, new Scanner($ignoreAnnotations)));
+$container = new Container((new DefinitionSourceFactory(true))());
 
 if (! $container instanceof \Psr\Container\ContainerInterface) {
     throw new RuntimeException('The dependency injection container is invalid.');

installer/config.php

@@ -13,49 +13,49 @@
 return [
     'packages' => [
         'hyperf/amqp' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/async-queue' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/model-cache' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/constants' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/json-rpc' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/rpc' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/rpc-client' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/rpc-server' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/grpc-client' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/grpc-server' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/elasticsearch' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/config-apollo' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/config-aliyun-acm' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/tracer' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
         'hyperf/service-governance' => [
-            'version' => '~1.0.0',
+            'version' => '~1.1.0',
         ],
     ],
     'require-dev' => [

test/bootstrap.php

@@ -17,6 +17,7 @@
 date_default_timezone_set('Asia/Shanghai');
 
 ! defined('BASE_PATH') && define('BASE_PATH', dirname(__DIR__, 1));
+! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', SWOOLE_HOOK_ALL);
 
 Swoole\Runtime::enableCoroutine(true);