hyperf · limingxinleo · Aug 2, 2019 · Aug 2, 2019 · Aug 2, 2019 · Aug 2, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # v1.0.9 - TBD
 
+## Added
+
+- [#317](https://github.com/hyperf-cloud/hyperf/pull/317) Added composer-json-fixer and Optimized composer.json. @[wenbinye](https://github.com/wenbinye)
+
 ## Fixed
 
 - [#300](https://github.com/hyperf-cloud/hyperf/pull/300) Let message queues run in sub-coroutines. Fixed async queue attempts twice to handle message, but only once actually.

diff --git a/bin/composer-json-fixer b/bin/composer-json-fixer
@@ -0,0 +1,49 @@
+#!/usr/bin/env php
+<?php
+
+use Symfony\Component\Finder\Finder;
+
+foreach ([__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php'] as $file) {
+    if (file_exists($file)) {
+        require $file;
+        break;
+    }
+}
+
+$files = Finder::create()
+    ->in(__DIR__ . '/../src')
+    ->name('composer.json')
+    ->files();
+
+$require = [];
+$autoload = [];
+$autoloadDev = [];
+$configProviders = [];
+foreach ($files as $file) {
+    $component = basename(dirname($file));
+    $composerJson = json_decode(file_get_contents($file), true);
+
+    foreach (isset($composerJson['autoload']['psr-4']) ? $composerJson['autoload']['psr-4'] : [] as $ns => $dir) {
+        $autoload[$ns] = "src/{$component}/" . trim($dir, '/') . '/';
+    }
+    foreach (isset($composerJson['autoload-dev']['psr-4']) ? $composerJson['autoload-dev']['psr-4'] : [] as $ns => $dir) {
+        $autoloadDev[$ns] = "src/{$component}/" . trim($dir, '/') . '/';
+    }
+    if (isset($composerJson['extra']['hyperf']['config'])) {
+        $configProviders = array_merge($configProviders, (array)$composerJson['extra']['hyperf']['config']);
+    }
+}
+
+ksort($autoload);
+ksort($autoloadDev);
+sort($configProviders);
+
+$json = json_decode(file_get_contents(__DIR__ . '/../composer.json'));
+$json->autoload->{'psr-4'} = $autoload;
+$json->{'autoload-dev'}->{'psr-4'} = $autoloadDev;
+$json->extra->hyperf->config = $configProviders;
+
+file_put_contents(
+    __DIR__ . '/../composer.json',
+    json_encode($json, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)
+);
diff --git a/composer.json b/composer.json
@@ -7,8 +7,7 @@
         "swoole",
         "hyperf"
     ],
-    "support": {
-    },
+    "support": {},
     "require": {
         "php": ">=7.2",
         "bandwidth-throttle/token-bucket": "^2.0",
@@ -95,8 +94,7 @@
         "hyperf/websocket-client": "self.version",
         "hyperf/websocket-server": "self.version"
     },
-    "suggest": {
-    },
+    "suggest": {},
     "autoload": {
         "files": [
             "src/di/src/Functions.php",
@@ -105,15 +103,17 @@
         "psr-4": {
             "Hyperf\\Amqp\\": "src/amqp/src/",
             "Hyperf\\AsyncQueue\\": "src/async-queue/src/",
-            "Hyperf\\CircuitBreaker\\": "src/circuit-breaker/src/",
             "Hyperf\\Cache\\": "src/cache/src/",
-            "Hyperf\\Config\\": "src/config/src/",
+            "Hyperf\\CircuitBreaker\\": "src/circuit-breaker/src/",
             "Hyperf\\Command\\": "src/command/src/",
+            "Hyperf\\ConfigAliyunAcm\\": "src/config-aliyun-acm/src/",
             "Hyperf\\ConfigApollo\\": "src/config-apollo/src/",
             "Hyperf\\ConfigEtcd\\": "src/config-etcd/src/",
+            "Hyperf\\Config\\": "src/config/src/",
             "Hyperf\\Constants\\": "src/constants/src/",
             "Hyperf\\Consul\\": "src/consul/src/",
             "Hyperf\\Contract\\": "src/contract/src/",
+            "Hyperf\\Crontab\\": "src/crontab/src/",
             "Hyperf\\Database\\": "src/database/src/",
             "Hyperf\\DbConnection\\": "src/db-connection/src/",
             "Hyperf\\Devtool\\": "src/devtool/src/",
@@ -125,12 +125,14 @@
             "Hyperf\\ExceptionHandler\\": "src/exception-handler/src/",
             "Hyperf\\Framework\\": "src/framework/src/",
             "Hyperf\\GraphQL\\": "src/graphql/src/",
-            "Hyperf\\Grpc\\": "src/grpc/src/",
             "Hyperf\\GrpcClient\\": "src/grpc-client/src/",
             "Hyperf\\GrpcServer\\": "src/grpc-server/src/",
+            "Hyperf\\Grpc\\": "src/grpc/src/",
             "Hyperf\\Guzzle\\": "src/guzzle/src/",
             "Hyperf\\HttpMessage\\": "src/http-message/src/",
             "Hyperf\\HttpServer\\": "src/http-server/src/",
+            "Hyperf\\JsonRpc\\": "src/json-rpc/src/",
+            "Hyperf\\LoadBalancer\\": "src/load-balancer/src/",
             "Hyperf\\Logger\\": "src/logger/src/",
             "Hyperf\\Memory\\": "src/memory/src/",
             "Hyperf\\ModelCache\\": "src/model-cache/src/",
@@ -139,11 +141,15 @@
             "Hyperf\\Process\\": "src/process/src/",
             "Hyperf\\RateLimit\\": "src/rate-limit/src/",
             "Hyperf\\Redis\\": "src/redis/src/",
+            "Hyperf\\RpcClient\\": "src/rpc-client/src/",
+            "Hyperf\\RpcServer\\": "src/rpc-server/src/",
+            "Hyperf\\Rpc\\": "src/rpc/src/",
             "Hyperf\\Server\\": "src/server/src/",
             "Hyperf\\ServiceGovernance\\": "src/service-governance/src/",
             "Hyperf\\Swagger\\": "src/swagger/src/",
             "Hyperf\\SwooleEnterprise\\": "src/swoole-enterprise/src/",
             "Hyperf\\Task\\": "src/task/src/",
+            "Hyperf\\Testing\\": "src/testing/src/",
             "Hyperf\\Tracer\\": "src/tracer/src/",
             "Hyperf\\Utils\\": "src/utils/src/",
             "Hyperf\\View\\": "src/view/src/",
@@ -153,59 +159,67 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "HyperfTest\\Amqp\\": "./src/amqp/tests/",
-            "HyperfTest\\AsyncQueue\\": "./src/async-queue/tests/",
-            "HyperfTest\\Cache\\": "./src/cache/tests/",
-            "HyperfTest\\ConfigApollo\\": "./src/config-apollo/tests/",
-            "HyperfTest\\ConfigEtcd\\": "./src/config-etcd/tests/",
-            "HyperfTest\\Constants\\": "./src/constants/tests/",
-            "HyperfTest\\Consul\\": "./src/consul/tests/",
-            "HyperfTest\\Di\\": "./src/di/tests/",
-            "HyperfTest\\Dispatcher\\": "./src/dispatcher/tests/",
-            "HyperfTest\\Database\\": "./src/database/tests/",
-            "HyperfTest\\DbConnection\\": "./src/db-connection/tests/",
-            "HyperfTest\\Etcd\\": "./src/etcd/tests/",
-            "HyperfTest\\Event\\": "./src/event/tests/",
-            "HyperfTest\\Guzzle\\": "./src/guzzle/tests/",
-            "HyperfTest\\HttpServer\\": "./src/http-server/tests/",
-            "HyperfTest\\Logger\\": "./src/logger/tests/",
-            "HyperfTest\\ModelCache\\": "./src/model-cache/tests/",
-            "HyperfTest\\Paginator\\": "./src/paginator/tests/",
-            "HyperfTest\\Redis\\": "./src/redis/tests/",
-            "HyperfTest\\SwooleEnterprise\\": "./src/swoole-enterprise/tests/",
-            "HyperfTest\\Task\\": "./src/task/tests/",
-            "HyperfTest\\Utils\\": "./src/utils/tests/",
-            "HyperfTest\\View\\": "./src/view/tests/",
-            "HyperfTest\\WebSocketClient\\": "src/websocket-client/tests/",
-            "HyperfTest\\WebSocketServer\\": "src/websocket-server/tests/"
+            "HyperfTest\\Amqp\\": "src/amqp/tests/",
+            "HyperfTest\\AsyncQueue\\": "src/async-queue/tests/",
+            "HyperfTest\\Cache\\": "src/cache/tests/",
+            "HyperfTest\\ConfigAliyunAcm\\": "src/config-aliyun-acm/tests/",
+            "HyperfTest\\ConfigApollo\\": "src/config-apollo/tests/",
+            "HyperfTest\\ConfigEtcd\\": "src/config-etcd/tests/",
+            "HyperfTest\\Constants\\": "src/constants/tests/",
+            "HyperfTest\\Consul\\": "src/consul/tests/",
+            "HyperfTest\\Crontab\\": "src/crontab/tests/",
+            "HyperfTest\\Database\\": "src/database/tests/",
+            "HyperfTest\\DbConnection\\": "src/db-connection/tests/",
+            "HyperfTest\\Di\\": "src/di/tests/",
+            "HyperfTest\\Dispatcher\\": "src/dispatcher/tests/",
+            "HyperfTest\\Elasticsearch\\": "src/elasticsearch/tests/",
+            "HyperfTest\\Etcd\\": "src/etcd/tests/",
+            "HyperfTest\\Event\\": "src/event/tests/",
+            "HyperfTest\\Guzzle\\": "src/guzzle/tests/",
+            "HyperfTest\\HttpServer\\": "src/http-server/tests/",
+            "HyperfTest\\LoadBalancer\\": "src/load-balancer/tests/",
+            "HyperfTest\\Logger\\": "src/logger/tests/",
+            "HyperfTest\\ModelCache\\": "src/model-cache/tests/",
+            "HyperfTest\\Paginator\\": "src/paginator/tests/",
+            "HyperfTest\\Pool\\": "src/pool/tests/",
+            "HyperfTest\\Process\\": "src/process/tests/",
+            "HyperfTest\\Redis\\": "src/redis/tests/",
+            "HyperfTest\\Task\\": "src/task/tests/",
+            "HyperfTest\\Utils\\": "src/utils/tests/",
+            "HyperfTest\\WebSocketClient\\": "src/websocket-client/tests/"
         }
     },
     "config": {
         "sort-packages": true
     },
     "extra": {
-        "branch-alias": {
-        },
+        "branch-alias": {},
         "hyperf": {
             "config": [
                 "Hyperf\\Amqp\\ConfigProvider",
                 "Hyperf\\AsyncQueue\\ConfigProvider",
                 "Hyperf\\Cache\\ConfigProvider",
                 "Hyperf\\CircuitBreaker\\ConfigProvider",
-                "Hyperf\\Config\\ConfigProvider",
+                "Hyperf\\ConfigAliyunAcm\\ConfigProvider",
                 "Hyperf\\ConfigApollo\\ConfigProvider",
                 "Hyperf\\ConfigEtcd\\ConfigProvider",
-                "Hyperf\\Devtool\\ConfigProvider",
+                "Hyperf\\Config\\ConfigProvider",
+                "Hyperf\\Consul\\ConfigProvider",
+                "Hyperf\\Crontab\\ConfigProvider",
                 "Hyperf\\DbConnection\\ConfigProvider",
+                "Hyperf\\Devtool\\ConfigProvider",
                 "Hyperf\\Di\\ConfigProvider",
                 "Hyperf\\Dispatcher\\ConfigProvider",
                 "Hyperf\\Etcd\\ConfigProvider",
                 "Hyperf\\Event\\ConfigProvider",
                 "Hyperf\\ExceptionHandler\\ConfigProvider",
                 "Hyperf\\Framework\\ConfigProvider",
+                "Hyperf\\GraphQL\\ConfigProvider",
                 "Hyperf\\GrpcClient\\ConfigProvider",
                 "Hyperf\\GrpcServer\\ConfigProvider",
                 "Hyperf\\HttpServer\\ConfigProvider",
+                "Hyperf\\JsonRpc\\ConfigProvider",
+                "Hyperf\\LoadBalancer\\ConfigProvider",
                 "Hyperf\\Logger\\ConfigProvider",
                 "Hyperf\\Memory\\ConfigProvider",
                 "Hyperf\\ModelCache\\ConfigProvider",
@@ -214,24 +228,28 @@
                 "Hyperf\\Process\\ConfigProvider",
                 "Hyperf\\RateLimit\\ConfigProvider",
                 "Hyperf\\Redis\\ConfigProvider",
+                "Hyperf\\RpcClient\\ConfigProvider",
+                "Hyperf\\RpcServer\\ConfigProvider",
                 "Hyperf\\Server\\ConfigProvider",
+                "Hyperf\\ServiceGovernance\\ConfigProvider",
+                "Hyperf\\Swagger\\ConfigProvider",
+                "Hyperf\\SwooleEnterprise\\ConfigProvider",
                 "Hyperf\\Task\\ConfigProvider",
                 "Hyperf\\Tracer\\ConfigProvider",
-                "Hyperf\\Utils\\ConfigProvider",
                 "Hyperf\\View\\ConfigProvider",
                 "Hyperf\\WebSocketClient\\ConfigProvider",
                 "Hyperf\\WebSocketServer\\ConfigProvider"
             ]
         }
     },
-    "bin": [
-    ],
+    "bin": [],
     "scripts": {
         "test": "./bin/co-phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "license-check": "docheader check src/ test/",
-        "cs-fix": "php-cs-fixer fix $1"
+        "cs-fix": "php-cs-fixer fix $1",
+        "json-fix": "./bin/composer-json-fixer"
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}
diff --git a/src/amqp/composer.json b/src/amqp/composer.json
@@ -35,14 +35,13 @@
         "hyperf/event": "Declare queue and start consumers automatically."
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
-            "Hyperf\\Amqp\\": "src"
+            "Hyperf\\Amqp\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
+            "HyperfTest\\Amqp\\": "tests/"
         }
     },
     "config": {

diff --git a/src/async-queue/composer.json b/src/async-queue/composer.json
@@ -29,14 +29,13 @@
         "hyperf/process": "Auto register the consumer process for server."
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
             "Hyperf\\AsyncQueue\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
+            "HyperfTest\\AsyncQueue\\": "tests/"
         }
     },
     "config": {

diff --git a/src/cache/composer.json b/src/cache/composer.json
@@ -29,14 +29,13 @@
         "hyperf/event": "Use listener to delete annotation cache."
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
-            "Hyperf\\Cache\\": "src"
+            "Hyperf\\Cache\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
+            "HyperfTest\\Cache\\": "tests/"
         }
     },
     "config": {

diff --git a/src/circuit-breaker/composer.json b/src/circuit-breaker/composer.json
@@ -27,10 +27,8 @@
         "hyperf/di": "Required to use annotations."
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
-            "Hyperf\\CircuitBreaker\\": "src"
+            "Hyperf\\CircuitBreaker\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/src/config-aliyun-acm/composer.json b/src/config-aliyun-acm/composer.json
@@ -33,10 +33,8 @@
         "hyperf/process": "Use hyperf process to run ConfigFetcherProcess."
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
-            "Hyperf\\ConfigAliyunAcm\\": "src"
+            "Hyperf\\ConfigAliyunAcm\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/src/config-apollo/composer.json b/src/config-apollo/composer.json
@@ -32,10 +32,8 @@
         "hyperf/process": "Use hyperf process to run ConfigFetcherProcess."
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
-            "Hyperf\\ConfigApollo\\": "src"
+            "Hyperf\\ConfigApollo\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/src/config/composer.json b/src/config/composer.json
@@ -39,7 +39,7 @@
             "./src/Functions.php"
         ],
         "psr-4": {
-            "Hyperf\\Config\\": "src"
+            "Hyperf\\Config\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/src/constants/composer.json b/src/constants/composer.json
@@ -23,14 +23,13 @@
     "suggest": {
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
-            "Hyperf\\Constants\\": "src"
+            "Hyperf\\Constants\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
+            "HyperfTest\\Constants\\": "tests/"
         }
     },
     "config": {

diff --git a/src/consul/composer.json b/src/consul/composer.json
@@ -24,10 +24,8 @@
     "suggest": {
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
-            "Hyperf\\Consul\\": "src"
+            "Hyperf\\Consul\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/src/contract/composer.json b/src/contract/composer.json
@@ -21,10 +21,8 @@
     "suggest": {
     },
     "autoload": {
-        "files": [
-        ],
         "psr-4": {
-            "Hyperf\\Contract\\": "src"
+            "Hyperf\\Contract\\": "src/"
         }
     },
     "autoload-dev": {