Merge pull request #1938 from limingxinleo/2.0-alias

Fixed branch alias.
2024-12-02 19:58:22 +08:00 · 2020-06-20 01:20:50 +08:00 · 2020-06-20 01:20:50 +08:00 · 80c08ac69c
commit 80c08ac69c
parent 920b8595a1 4cd23167b9
72 changed files with 74 additions and 71 deletions
--- a/src/amqp/composer.json
+++ b/src/amqp/composer.json
@ -54,7 +54,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Amqp\\ConfigProvider"
--- a/src/async-queue/composer.json
+++ b/src/async-queue/composer.json
@ -49,7 +49,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\AsyncQueue\\ConfigProvider"
--- a/src/cache/composer.json
+++ b/src/cache/composer.json
@ -48,7 +48,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Cache\\ConfigProvider"
--- a/src/circuit-breaker/composer.json
+++ b/src/circuit-breaker/composer.json
@ -45,7 +45,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\CircuitBreaker\\ConfigProvider"
--- a/src/command/composer.json
+++ b/src/command/composer.json
@ -38,7 +38,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        }
    },
    "scripts": {
--- a/src/config-aliyun-acm/composer.json
+++ b/src/config-aliyun-acm/composer.json
@ -52,7 +52,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\ConfigAliyunAcm\\ConfigProvider"
--- a/src/config-apollo/composer.json
+++ b/src/config-apollo/composer.json
@ -51,7 +51,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\ConfigApollo\\ConfigProvider"
--- a/src/config-etcd/composer.json
+++ b/src/config-etcd/composer.json
@ -36,7 +36,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\ConfigEtcd\\ConfigProvider"
--- a/src/config-zookeeper/composer.json
+++ b/src/config-zookeeper/composer.json
@ -51,7 +51,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\ConfigZookeeper\\ConfigProvider"
--- a/src/config/composer.json
+++ b/src/config/composer.json
@ -57,7 +57,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Config\\ConfigProvider"
--- a/src/constants/composer.json
+++ b/src/constants/composer.json
@ -43,7 +43,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Constants\\ConfigProvider"
--- a/src/consul/composer.json
+++ b/src/consul/composer.json
@ -43,7 +43,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Consul\\ConfigProvider"
--- a/src/contract/composer.json
+++ b/src/contract/composer.json
@ -39,7 +39,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
        }
--- a/src/crontab/composer.json
+++ b/src/crontab/composer.json
@ -42,7 +42,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Crontab\\ConfigProvider"
--- a/src/database/composer.json
+++ b/src/database/composer.json
@ -47,7 +47,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        }
    },
    "bin": [
--- a/src/db-connection/composer.json
+++ b/src/db-connection/composer.json
@ -47,7 +47,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\DbConnection\\ConfigProvider"
--- a/src/db/composer.json
+++ b/src/db/composer.json
@ -40,7 +40,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\DB\\ConfigProvider"
--- a/src/devtool/composer.json
+++ b/src/devtool/composer.json
@ -45,7 +45,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Devtool\\ConfigProvider"
--- a/src/di/composer.json
+++ b/src/di/composer.json
@ -55,7 +55,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Di\\ConfigProvider"
--- a/src/dispatcher/composer.json
+++ b/src/dispatcher/composer.json
@ -47,7 +47,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Dispatcher\\ConfigProvider"
--- a/src/elasticsearch/composer.json
+++ b/src/elasticsearch/composer.json
@ -29,7 +29,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        }
    },
    "scripts": {
--- a/src/etcd/composer.json
+++ b/src/etcd/composer.json
@ -38,7 +38,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Etcd\\ConfigProvider"
--- a/src/event/composer.json
+++ b/src/event/composer.json
@ -45,7 +45,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Event\\ConfigProvider"
--- a/src/exception-handler/composer.json
+++ b/src/exception-handler/composer.json
@ -36,7 +36,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\ExceptionHandler\\ConfigProvider"
--- a/src/filesystem/composer.json
+++ b/src/filesystem/composer.json
@ -54,7 +54,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Filesystem\\ConfigProvider"
--- a/src/framework/composer.json
+++ b/src/framework/composer.json
@ -55,7 +55,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Framework\\ConfigProvider"
--- a/src/graphql/composer.json
+++ b/src/graphql/composer.json
@ -29,7 +29,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\GraphQL\\ConfigProvider"
--- a/src/grpc-client/composer.json
+++ b/src/grpc-client/composer.json
@ -45,7 +45,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\GrpcClient\\ConfigProvider"
--- a/src/grpc-server/composer.json
+++ b/src/grpc-server/composer.json
@ -47,7 +47,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\GrpcServer\\ConfigProvider"
--- a/src/grpc/composer.json
+++ b/src/grpc/composer.json
@ -42,7 +42,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
        }
--- a/src/guzzle/composer.json
+++ b/src/guzzle/composer.json
@ -37,7 +37,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Guzzle\\ConfigProvider"
--- a/src/http-message/composer.json
+++ b/src/http-message/composer.json
@ -35,7 +35,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\HttpMessage\\ConfigProvider"
--- a/src/http-server/composer.json
+++ b/src/http-server/composer.json
@ -53,7 +53,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\HttpServer\\ConfigProvider"
--- a/src/json-rpc/composer.json
+++ b/src/json-rpc/composer.json
@ -53,7 +53,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\JsonRpc\\ConfigProvider"
--- a/src/load-balancer/composer.json
+++ b/src/load-balancer/composer.json
@ -42,7 +42,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\LoadBalancer\\ConfigProvider"
--- a/src/logger/composer.json
+++ b/src/logger/composer.json
@ -45,7 +45,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Logger\\ConfigProvider"
--- a/src/memory/composer.json
+++ b/src/memory/composer.json
@ -40,7 +40,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Memory\\ConfigProvider"
--- a/src/metric/composer.json
+++ b/src/metric/composer.json
@ -57,7 +57,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Metric\\ConfigProvider"
--- a/src/model-cache/composer.json
+++ b/src/model-cache/composer.json
@ -47,7 +47,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\ModelCache\\ConfigProvider"
--- a/src/model-listener/composer.json
+++ b/src/model-listener/composer.json
@ -48,7 +48,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\ModelListener\\ConfigProvider"
--- a/src/nats/composer.json
+++ b/src/nats/composer.json
@ -50,7 +50,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Nats\\ConfigProvider"
--- a/src/nsq/composer.json
+++ b/src/nsq/composer.json
@ -45,7 +45,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Nsq\\ConfigProvider"
--- a/src/paginator/composer.json
+++ b/src/paginator/composer.json
@ -48,7 +48,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Paginator\\ConfigProvider"
--- a/src/pool/composer.json
+++ b/src/pool/composer.json
@ -44,7 +44,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Pool\\ConfigProvider"
--- a/src/process/composer.json
+++ b/src/process/composer.json
@ -48,7 +48,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Process\\ConfigProvider"
--- a/src/protocol/composer.json
+++ b/src/protocol/composer.json
@ -42,7 +42,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Protocol\\ConfigProvider"
--- a/src/rate-limit/composer.json
+++ b/src/rate-limit/composer.json
@ -53,7 +53,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\RateLimit\\ConfigProvider"
--- a/src/reactive-x/composer.json
+++ b/src/reactive-x/composer.json
@ -45,6 +45,9 @@
        "cs-fix": "php-cs-fixer fix $1"
    },
    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0-dev"
+        },
        "hyperf": {
            "config": "Hyperf\\ReactiveX\\ConfigProvider"
        }
--- a/src/redis/composer.json
+++ b/src/redis/composer.json
@ -48,7 +48,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Redis\\ConfigProvider"
--- a/src/retry/composer.json
+++ b/src/retry/composer.json
@ -46,7 +46,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Retry\\ConfigProvider"
--- a/src/rpc-client/composer.json
+++ b/src/rpc-client/composer.json
@ -50,7 +50,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\RpcClient\\ConfigProvider"
--- a/src/rpc-server/composer.json
+++ b/src/rpc-server/composer.json
@ -44,7 +44,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\RpcServer\\ConfigProvider"
--- a/src/rpc/composer.json
+++ b/src/rpc/composer.json
@ -43,7 +43,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
        }
--- a/src/server/composer.json
+++ b/src/server/composer.json
@ -49,7 +49,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Server\\ConfigProvider"
--- a/src/service-governance/composer.json
+++ b/src/service-governance/composer.json
@ -46,7 +46,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\ServiceGovernance\\ConfigProvider"
--- a/src/session/composer.json
+++ b/src/session/composer.json
@ -43,7 +43,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Session\\ConfigProvider"
--- a/src/signal/composer.json
+++ b/src/signal/composer.json
@ -44,7 +44,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Signal\\ConfigProvider"
--- a/src/snowflake/composer.json
+++ b/src/snowflake/composer.json
@ -42,7 +42,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Snowflake\\ConfigProvider"
--- a/src/socket/composer.json
+++ b/src/socket/composer.json
@ -44,7 +44,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Socket\\ConfigProvider"
--- a/src/socketio-server/composer.json
+++ b/src/socketio-server/composer.json
@ -50,7 +50,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\SocketIOServer\\ConfigProvider"
--- a/src/super-globals/composer.json
+++ b/src/super-globals/composer.json
@ -45,7 +45,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\SuperGlobals\\ConfigProvider"
--- a/src/swagger/composer.json
+++ b/src/swagger/composer.json
@ -42,7 +42,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Swagger\\ConfigProvider"
--- a/src/swoole-tracker/composer.json
+++ b/src/swoole-tracker/composer.json
@ -45,7 +45,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\SwooleTracker\\ConfigProvider"
--- a/src/task/composer.json
+++ b/src/task/composer.json
@ -50,7 +50,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Task\\ConfigProvider"
--- a/src/testing/composer.json
+++ b/src/testing/composer.json
@ -36,7 +36,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        }
    },
    "bin": [
--- a/src/tracer/composer.json
+++ b/src/tracer/composer.json
@ -51,7 +51,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Tracer\\ConfigProvider"
--- a/src/translation/composer.json
+++ b/src/translation/composer.json
@ -39,7 +39,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Translation\\ConfigProvider"
--- a/src/utils/composer.json
+++ b/src/utils/composer.json
@ -57,7 +57,7 @@
            "config": "Hyperf\\Utils\\ConfigProvider"
        },
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        }
    },
    "bin": [
--- a/src/validation/composer.json
+++ b/src/validation/composer.json
@ -50,7 +50,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\Validation\\ConfigProvider"
--- a/src/view/composer.json
+++ b/src/view/composer.json
@ -50,7 +50,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\View\\ConfigProvider"
--- a/src/websocket-client/composer.json
+++ b/src/websocket-client/composer.json
@ -46,7 +46,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\WebSocketClient\\ConfigProvider"
--- a/src/websocket-server/composer.json
+++ b/src/websocket-server/composer.json
@ -47,7 +47,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
        },
        "hyperf": {
            "config": "Hyperf\\WebSocketServer\\ConfigProvider"