Merge pull request #40 from hyperf/2.0-dev

Upgrade skeleton from 1.1 to 2.0

Author: huangzhhui

.php_cs

@@ -6,7 +6,7 @@ This file is part of Hyperf.
 @link     https://www.hyperf.io
 @document https://doc.hyperf.io
 @contact  [email protected]
-@license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+@license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 EOF;
 
 return PhpCsFixer\Config::create()
@@ -62,11 +62,13 @@ return PhpCsFixer\Config::create()
         'multiline_whitespace_before_semicolons' => [
             'strategy' => 'no_multi_line',
         ],
+        'constant_case' => [
+            'case' => 'lower',
+        ],
         'class_attributes_separation' => true,
         'combine_consecutive_unsets' => true,
         'declare_strict_types' => true,
         'linebreak_after_opening_tag' => true,
-        'lowercase_constants' => true,
         'lowercase_static_reference' => true,
         'no_useless_else' => true,
         'no_unused_imports' => true,

Dockerfile

@@ -6,7 +6,7 @@
 # @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
 
 FROM hyperf/hyperf:7.2-alpine-v3.9-cli
-LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"
+LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT" app.name="Hyperf"
 
 ##
 # ---------- env settings ----------
@@ -16,7 +16,8 @@ ARG timezone
 
 ENV TIMEZONE=${timezone:-"Asia/Shanghai"} \
     COMPOSER_VERSION=1.9.1 \
-    APP_ENV=prod
+    APP_ENV=prod \
+    SCAN_CACHEABLE=(true)
 
 # update
 RUN set -ex \
@@ -29,6 +30,7 @@ RUN set -ex \
     # show php version and extensions
     && php -v \
     && php -m \
+    && php --ri swoole \
     #  ---------- some config ----------
     && cd /etc/php7 \
     # - config PHP
@@ -37,7 +39,7 @@ RUN set -ex \
         echo "post_max_size=108M"; \
         echo "memory_limit=1024M"; \
         echo "date.timezone=${TIMEZONE}"; \
-    } | tee conf.d/99-overrides.ini \
+    } | tee conf.d/99_overrides.ini \
     # - config timezone
     && ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
     && echo "${TIMEZONE}" > /etc/timezone \
@@ -52,7 +54,7 @@ WORKDIR /opt/www
 # RUN composer install --no-dev --no-scripts
 
 COPY . /opt/www
-RUN composer install --no-dev -o
+RUN composer install --no-dev -o && php bin/hyperf.php
 
 EXPOSE 9501
 

app/Controller/AbstractController.php

@@ -7,9 +7,8 @@
  * @link     https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact  [email protected]
- * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
-
 namespace App\Controller;
 
 use Hyperf\Di\Annotation\Inject;

app/Controller/IndexController.php

@@ -7,9 +7,8 @@
  * @link     https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact  [email protected]
- * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
-
 namespace App\Controller;
 
 class IndexController extends AbstractController

app/Exception/Handler/AppExceptionHandler.php

@@ -9,7 +9,6 @@
  * @contact  [email protected]
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
-
 namespace App\Exception\Handler;
 
 use Hyperf\Contract\StdoutLoggerInterface;
@@ -34,7 +33,7 @@ public function handle(Throwable $throwable, ResponseInterface $response)
     {
         $this->logger->error(sprintf('%s[%s] in %s', $throwable->getMessage(), $throwable->getLine(), $throwable->getFile()));
         $this->logger->error($throwable->getTraceAsString());
-        return $response->withHeader("Server", "Hyperf")->withStatus(500)->withBody(new SwooleStream('Internal Server Error.'));
+        return $response->withHeader('Server', 'Hyperf')->withStatus(500)->withBody(new SwooleStream('Internal Server Error.'));
     }
 
     public function isValid(Throwable $throwable): bool

app/Listener/DbQueryExecutedListener.php

@@ -7,9 +7,8 @@
  * @link     https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact  [email protected]
- * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
-
 namespace App\Listener;
 
 use Hyperf\Database\Events\QueryExecuted;

app/Model/Model.php

@@ -7,9 +7,8 @@
  * @link     https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact  [email protected]
- * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
-
 namespace App\Model;
 
 use Hyperf\DbConnection\Model\Model as BaseModel;

bin/hyperf.php

@@ -13,6 +13,7 @@
 
 // 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 */
     $container = require BASE_PATH . '/config/container.php';
 

composer.json

@@ -13,28 +13,28 @@
     "license": "Apache-2.0",
     "require": {
         "php": ">=7.2",
-        "ext-swoole": ">=4.4",
-        "hyperf/cache": "~1.1.0",
-        "hyperf/command": "~1.1.0",
-        "hyperf/config": "~1.1.0",
-        "hyperf/db-connection": "~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/process": "~1.1.0",
-        "hyperf/redis": "~1.1.0"
+        "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"
     },
     "require-dev": {
         "swoole/ide-helper": "^4.4",
         "phpmd/phpmd": "^2.6",
         "friendsofphp/php-cs-fixer": "^2.14",
         "mockery/mockery": "^1.0",
         "doctrine/common": "^2.9",
-        "phpstan/phpstan": "^0.11.2",
-        "hyperf/devtool": "~1.1.0",
-        "hyperf/testing": "~1.1.0"
+        "phpstan/phpstan": "^0.12",
+        "hyperf/devtool": "~2.0.0",
+        "hyperf/testing": "~2.0.0"
     },
     "suggest": {
         "ext-openssl": "Required to use HTTPS.",
@@ -67,7 +67,7 @@
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-autoload-dump": [
-            "init-proxy.sh"
+            "rm -rf runtime/container"
         ],
         "test": "co-phpunit -c phpunit.xml --colors=always",
         "cs-fix": "php-cs-fixer fix $1",

config/autoload/annotations.php

@@ -7,9 +7,8 @@
  * @link     https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact  [email protected]
- * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
-
 return [
     'scan' => [
         'paths' => [