Upgrade hyperf version to v2.1

Author: limingxinleo

.github/workflows/Dockerfile

@@ -3,9 +3,9 @@
 # @link     https://www.hyperf.io
 # @document https://hyperf.wiki
 # @contact  [email protected]
-# @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+# @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 
-FROM hyperf/hyperf:7.4-alpine-v3.11-cli
+FROM hyperf/hyperf:7.4-alpine-v3.11-swoole
 LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT" app.name="Hyperf"
 
 ##
@@ -15,17 +15,11 @@ LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MI
 ARG timezone
 
 ENV TIMEZONE=${timezone:-"Asia/Shanghai"} \
-    COMPOSER_VERSION=1.10.10 \
     APP_ENV=prod \
     SCAN_CACHEABLE=(true)
 
 # update
 RUN set -ex \
-    # install composer
-    && cd /tmp \
-    && wget https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
-    && chmod u+x composer.phar \
-    && mv composer.phar /usr/local/bin/composer \
     # show php version and extensions
     && php -v \
     && php -m \

.gitignore

@@ -10,4 +10,5 @@ vendor/
 .env
 .DS_Store
 *.lock
-.phpunit*
+.phpunit*
+*.cache

Dockerfile

@@ -3,7 +3,7 @@
 # @link     https://www.hyperf.io
 # @document https://hyperf.wiki
 # @contact  [email protected]
-# @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+# @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 
 FROM hyperf/hyperf:7.4-alpine-v3.11-swoole
 LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT" app.name="Hyperf"

bin/hyperf.php

@@ -15,9 +15,9 @@
 // Self-called anonymous function that creates its own scope and keep the global namespace clean.
 (function () {
     Hyperf\Di\ClassLoader::init();
-    /** @var \Psr\Container\ContainerInterface $container */
+    /** @var Psr\Container\ContainerInterface $container */
     $container = require BASE_PATH . '/config/container.php';
 
-    $application = $container->get(\Hyperf\Contract\ApplicationInterface::class);
+    $application = $container->get(Hyperf\Contract\ApplicationInterface::class);
     $application->run();
 })();

composer.json

@@ -12,27 +12,25 @@
     "description": "A coroutine framework that focuses on hyperspeed and flexible, specifically use for build microservices and middlewares.",
     "license": "Apache-2.0",
     "require": {
-        "php": ">=7.2",
-        "ext-swoole": ">=4.5",
-        "hyperf/cache": "~2.0.0",
-        "hyperf/command": "~2.0.0",
-        "hyperf/config": "~2.0.0",
-        "hyperf/db-connection": "~2.0.0",
-        "hyperf/framework": "~2.0.0",
-        "hyperf/guzzle": "~2.0.0",
-        "hyperf/http-server": "~2.0.0",
-        "hyperf/logger": "~2.0.0",
-        "hyperf/memory": "~2.0.0",
-        "hyperf/process": "~2.0.0",
-        "hyperf/redis": "~2.0.0"
+        "php": ">=7.3",
+        "hyperf/cache": "~2.1.0",
+        "hyperf/command": "~2.1.0",
+        "hyperf/config": "~2.1.0",
+        "hyperf/db-connection": "~2.1.0",
+        "hyperf/framework": "~2.1.0",
+        "hyperf/guzzle": "~2.1.0",
+        "hyperf/http-server": "~2.1.0",
+        "hyperf/logger": "~2.1.0",
+        "hyperf/memory": "~2.1.0",
+        "hyperf/process": "~2.1.0"
     },
     "require-dev": {
         "swoole/ide-helper": "^4.5",
         "friendsofphp/php-cs-fixer": "^2.14",
         "mockery/mockery": "^1.0",
         "phpstan/phpstan": "^0.12",
-        "hyperf/devtool": "~2.0.0",
-        "hyperf/testing": "~2.0.0"
+        "hyperf/devtool": "~2.1.0",
+        "hyperf/testing": "~2.1.0"
     },
     "suggest": {
         "ext-openssl": "Required to use HTTPS.",
@@ -56,8 +54,11 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "extra": {
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
     },
+    "extra": {},
     "scripts": {
         "pre-install-cmd": "Installer\\Script::install",
         "pre-update-cmd": "Installer\\Script::install",

config/autoload/server.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 use Hyperf\Server\Server;
-use Hyperf\Server\SwooleEvent;
+use Hyperf\Server\Event;
 
 return [
     'mode' => SWOOLE_PROCESS,
@@ -22,7 +22,7 @@
             'port' => 9501,
             'sock_type' => SWOOLE_SOCK_TCP,
             'callbacks' => [
-                SwooleEvent::ON_REQUEST => [Hyperf\HttpServer\Server::class, 'onRequest'],
+                Event::ON_REQUEST => [Hyperf\HttpServer\Server::class, 'onRequest'],
             ],
         ],
     ],
@@ -38,8 +38,8 @@
         'buffer_output_size' => 2 * 1024 * 1024,
     ],
     'callbacks' => [
-        SwooleEvent::ON_WORKER_START => [Hyperf\Framework\Bootstrap\WorkerStartCallback::class, 'onWorkerStart'],
-        SwooleEvent::ON_PIPE_MESSAGE => [Hyperf\Framework\Bootstrap\PipeMessageCallback::class, 'onPipeMessage'],
-        SwooleEvent::ON_WORKER_EXIT => [Hyperf\Framework\Bootstrap\WorkerExitCallback::class, 'onWorkerExit'],
+        Event::ON_WORKER_START => [Hyperf\Framework\Bootstrap\WorkerStartCallback::class, 'onWorkerStart'],
+        Event::ON_PIPE_MESSAGE => [Hyperf\Framework\Bootstrap\PipeMessageCallback::class, 'onPipeMessage'],
+        Event::ON_WORKER_EXIT => [Hyperf\Framework\Bootstrap\WorkerExitCallback::class, 'onWorkerExit'],
     ],
 ];

installer/config.php

@@ -12,61 +12,61 @@
 return [
     'packages' => [
         'hyperf/amqp' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/async-queue' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/database' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/db-connection' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/model-cache' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/constants' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/json-rpc' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/redis' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/rpc' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/rpc-client' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/rpc-server' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/grpc-client' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/grpc-server' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/elasticsearch' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/config-apollo' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/config-aliyun-acm' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/config-etcd' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/tracer' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
         'hyperf/service-governance' => [
-            'version' => '~2.0.0',
+            'version' => '~2.1.0',
         ],
     ],
     'require-dev' => [

installer/resources/bin/hyperf.stub

@@ -3,6 +3,7 @@
 
 ini_set('display_errors', 'on');
 ini_set('display_startup_errors', 'on');
+ini_set('memory_limit', '1G');
 
 error_reporting(E_ALL);
 date_default_timezone_set('%TIME_ZONE%');
@@ -15,9 +16,9 @@ require BASE_PATH . '/vendor/autoload.php';
 // Self-called anonymous function that creates its own scope and keep the global namespace clean.
 (function () {
     Hyperf\Di\ClassLoader::init();
-    /** @var \Psr\Container\ContainerInterface $container */
+    /** @var Psr\Container\ContainerInterface $container */
     $container = require BASE_PATH . '/config/container.php';
 
-    $application = $container->get(\Hyperf\Contract\ApplicationInterface::class);
+    $application = $container->get(Hyperf\Contract\ApplicationInterface::class);
     $application->run();
 })();