From 12f1ca2482a9603a454da9329ddd15f227332e43 Mon Sep 17 00:00:00 2001 From: "n.netesin" Date: Sun, 29 Sep 2019 20:34:31 +0300 Subject: [PATCH 1/6] add Timiki RpcServerBundle, RpcClientBundle --- .../4.0/config/packages/rpc_client.yaml | 9 +++++ timiki/rpc-client-bundle/4.0/manifest.json | 9 +++++ .../4.0/config/packages/rpc_server.yaml | 33 +++++++++++++++++++ .../4.0/config/routes/rpc_server.yaml | 4 +++ timiki/rpc-server-bundle/4.0/manifest.json | 10 ++++++ .../4.0/src/Method/.gitignore | 0 6 files changed, 65 insertions(+) create mode 100644 timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml create mode 100644 timiki/rpc-client-bundle/4.0/manifest.json create mode 100644 timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml create mode 100644 timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml create mode 100644 timiki/rpc-server-bundle/4.0/manifest.json create mode 100644 timiki/rpc-server-bundle/4.0/src/Method/.gitignore diff --git a/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml b/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml new file mode 100644 index 00000000..09d197b6 --- /dev/null +++ b/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml @@ -0,0 +1,9 @@ +# Read the documentation: https://github.com/timiki/rpc-client-bundle + +rpc_client: + + # connection: + # name_1: RPC_SERVER_URL_1 + # name_2: RPC_SERVER_URL_2 + + connection: ~ \ No newline at end of file diff --git a/timiki/rpc-client-bundle/4.0/manifest.json b/timiki/rpc-client-bundle/4.0/manifest.json new file mode 100644 index 00000000..6bcb6e97 --- /dev/null +++ b/timiki/rpc-client-bundle/4.0/manifest.json @@ -0,0 +1,9 @@ +{ + "aliases": ["rpc-client", "timiki-rpc-client"], + "bundles": { + "Timiki\\Bundle\\RpcClientBundle\\RpcClientBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} diff --git a/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml b/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml new file mode 100644 index 00000000..fec40994 --- /dev/null +++ b/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml @@ -0,0 +1,33 @@ +# Read the documentation: https://github.com/timiki/rpc-server-bundle + +rpc_server: + + # mapping configs + # + # Default mapping + # mapping: '%kernel.root_dir%/Method' + # + # Multi dir mapping + # mapping: + # - '%kernel.root_dir%/Method1' + # - '%kernel.root_dir%/Method2' + # + # Multi handler|dir mapping + # mapping: + # v1: + # - '%kernel.root_dir%/Method/V1' + # v2: + # - '%kernel.root_dir%/Method/V2' + # + + mapping: '%kernel.root_dir%/Method' + + # id cache service, must be instance of Doctrine\Common\Cache\CacheProvider + # by default use file cache + + cache: ~ + + # id serializer service, must be instance of Timiki\Bundle\RpcServerBundle\Serializer\SerializerInterface + # by default use 'rpc.server.serializer.base' service + + serializer: 'rpc.server.serializer.base' diff --git a/timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml b/timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml new file mode 100644 index 00000000..5d180cb9 --- /dev/null +++ b/timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml @@ -0,0 +1,4 @@ +rpc: + path: /rpc + defaults: { _controller: RpcServerBundle:Rpc:handler } + methods: [POST] \ No newline at end of file diff --git a/timiki/rpc-server-bundle/4.0/manifest.json b/timiki/rpc-server-bundle/4.0/manifest.json new file mode 100644 index 00000000..0fc1955e --- /dev/null +++ b/timiki/rpc-server-bundle/4.0/manifest.json @@ -0,0 +1,10 @@ +{ + "aliases": ["rpc-server", "timiki-rpc-server"], + "bundles": { + "Timiki\\Bundle\\RpcServerBundle\\RpcServerBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/", + "src/": "%SRC_DIR%/" + } +} diff --git a/timiki/rpc-server-bundle/4.0/src/Method/.gitignore b/timiki/rpc-server-bundle/4.0/src/Method/.gitignore new file mode 100644 index 00000000..e69de29b From 4906ecf5240450e2901e914a20238d82b716a1a0 Mon Sep 17 00:00:00 2001 From: "n.netesin" Date: Sun, 29 Sep 2019 20:37:59 +0300 Subject: [PATCH 2/6] fix --- timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml b/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml index 09d197b6..9b9020b6 100644 --- a/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml +++ b/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml @@ -6,4 +6,4 @@ rpc_client: # name_1: RPC_SERVER_URL_1 # name_2: RPC_SERVER_URL_2 - connection: ~ \ No newline at end of file + connection: null \ No newline at end of file From af19f6441b26051ad26b912a1357f468c6a7a9dd Mon Sep 17 00:00:00 2001 From: "n.netesin" Date: Sun, 29 Sep 2019 20:38:31 +0300 Subject: [PATCH 3/6] fix manifests --- timiki/rpc-client-bundle/4.0/manifest.json | 1 - timiki/rpc-server-bundle/4.0/manifest.json | 1 - 2 files changed, 2 deletions(-) diff --git a/timiki/rpc-client-bundle/4.0/manifest.json b/timiki/rpc-client-bundle/4.0/manifest.json index 6bcb6e97..8e36a4b2 100644 --- a/timiki/rpc-client-bundle/4.0/manifest.json +++ b/timiki/rpc-client-bundle/4.0/manifest.json @@ -1,5 +1,4 @@ { - "aliases": ["rpc-client", "timiki-rpc-client"], "bundles": { "Timiki\\Bundle\\RpcClientBundle\\RpcClientBundle": ["all"] }, diff --git a/timiki/rpc-server-bundle/4.0/manifest.json b/timiki/rpc-server-bundle/4.0/manifest.json index 0fc1955e..0966a1b2 100644 --- a/timiki/rpc-server-bundle/4.0/manifest.json +++ b/timiki/rpc-server-bundle/4.0/manifest.json @@ -1,5 +1,4 @@ { - "aliases": ["rpc-server", "timiki-rpc-server"], "bundles": { "Timiki\\Bundle\\RpcServerBundle\\RpcServerBundle": ["all"] }, From b0ce0be6550c3557ae397c6020056f32bc768ead Mon Sep 17 00:00:00 2001 From: "n.netesin" Date: Sun, 29 Sep 2019 20:39:20 +0300 Subject: [PATCH 4/6] fix yaml --- timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml | 2 +- timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml b/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml index 9b9020b6..f4f1c677 100644 --- a/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml +++ b/timiki/rpc-client-bundle/4.0/config/packages/rpc_client.yaml @@ -6,4 +6,4 @@ rpc_client: # name_1: RPC_SERVER_URL_1 # name_2: RPC_SERVER_URL_2 - connection: null \ No newline at end of file + connection: null diff --git a/timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml b/timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml index 5d180cb9..134ab17e 100644 --- a/timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml +++ b/timiki/rpc-server-bundle/4.0/config/routes/rpc_server.yaml @@ -1,4 +1,4 @@ rpc: path: /rpc defaults: { _controller: RpcServerBundle:Rpc:handler } - methods: [POST] \ No newline at end of file + methods: [POST] From b216963e0fdd3181709e4170f27fb337f7b4df5f Mon Sep 17 00:00:00 2001 From: "n.netesin" Date: Sun, 29 Sep 2019 20:40:06 +0300 Subject: [PATCH 5/6] fix config --- timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml b/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml index fec40994..e0f786dd 100644 --- a/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml +++ b/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml @@ -25,7 +25,7 @@ rpc_server: # id cache service, must be instance of Doctrine\Common\Cache\CacheProvider # by default use file cache - cache: ~ + cache: null # id serializer service, must be instance of Timiki\Bundle\RpcServerBundle\Serializer\SerializerInterface # by default use 'rpc.server.serializer.base' service From d61a6c2cdde7e584b43f6c7b7a881941408970b4 Mon Sep 17 00:00:00 2001 From: "n.netesin" Date: Fri, 18 Oct 2019 15:41:13 +0300 Subject: [PATCH 6/6] fix long comment --- .../4.0/config/packages/rpc_server.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml b/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml index e0f786dd..8c5042d4 100644 --- a/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml +++ b/timiki/rpc-server-bundle/4.0/config/packages/rpc_server.yaml @@ -2,24 +2,6 @@ rpc_server: - # mapping configs - # - # Default mapping - # mapping: '%kernel.root_dir%/Method' - # - # Multi dir mapping - # mapping: - # - '%kernel.root_dir%/Method1' - # - '%kernel.root_dir%/Method2' - # - # Multi handler|dir mapping - # mapping: - # v1: - # - '%kernel.root_dir%/Method/V1' - # v2: - # - '%kernel.root_dir%/Method/V2' - # - mapping: '%kernel.root_dir%/Method' # id cache service, must be instance of Doctrine\Common\Cache\CacheProvider