Improve (#13)

Author: yoanm

features/demo_app/default_config_with_bundle/config.yaml

@@ -4,8 +4,8 @@ framework:
 json_rpc_http_server:
     methods_mapping:
         bundledMethodA:
-            service: 'jsonrpc.method.a'
+            service: '@jsonrpc.method.a'
             aliases: 'bundledMethodAAlias'
-        bundledMethodB: 'jsonrpc.method.b'
-        bundledGetDummy: 'jsonrpc.method.c'
-        bundledGetAnotherDummy: 'jsonrpc.method.d'
+        bundledMethodB: '@jsonrpc.method.b'
+        bundledGetDummy: '@jsonrpc.method.c'
+        bundledGetAnotherDummy: '@jsonrpc.method.d'

src/DependencyInjection/JsonRpcHttpServerExtension.php

@@ -279,7 +279,8 @@ private function loadJsonRpcMethods(ContainerBuilder $container)
         // Check if methods have been defined by tags
         $methodServiceList = $container->findTaggedServiceIds(self::JSONRPC_METHOD_TAG);
 
-        foreach ($methodServiceList as $serviceId => $tagAttributeList) {
+        foreach ($methodServiceList as $externalServiceIdString => $tagAttributeList) {
+            $serviceId = $this->cleanExternalServiceIdString($externalServiceIdString);
             $this->checkJsonRpcMethodService($container, $serviceId);
             $methodNameList = $this->extractMethodNameList($tagAttributeList, $serviceId);
             foreach ($methodNameList as $methodName) {
@@ -289,7 +290,7 @@ private function loadJsonRpcMethods(ContainerBuilder $container)
 
         if ($container->hasParameter(self::METHODS_MAPPING_CONTAINER_PARAM)) {
             foreach ($container->getParameter(self::METHODS_MAPPING_CONTAINER_PARAM) as $methodName => $mappingConfig) {
-                $serviceId = $mappingConfig['service'];
+                $serviceId = $this->cleanExternalServiceIdString($mappingConfig['service']);
                 $this->checkJsonRpcMethodService($container, $serviceId);
                 $this->injectMethodMappingToServiceNameResolver($methodName, $serviceId, $container);
                 foreach ($mappingConfig['aliases'] as $methodAlias) {
@@ -348,7 +349,10 @@ private function compileAndProcessConfigurations(array $configs, ContainerBuilde
             $config = (new Processor())->processConfiguration($configuration, $configs);
 
             if (array_key_exists('method_resolver', $config) && $config['method_resolver']) {
-                $container->setParameter(self::CUSTOM_METHOD_RESOLVER_CONTAINER_PARAM, $config['method_resolver']);
+                $container->setParameter(
+                    self::CUSTOM_METHOD_RESOLVER_CONTAINER_PARAM,
+                    $this->cleanExternalServiceIdString($config['method_resolver'])
+                );
             }
             if (array_key_exists('methods_mapping', $config) && is_array($config['methods_mapping'])) {
                 $container->setParameter(self::METHODS_MAPPING_CONTAINER_PARAM, $config['methods_mapping']);
@@ -369,4 +373,13 @@ private function injectMethodMappingToServiceNameResolver(
         $container->getDefinition(self::SERVICE_NAME_RESOLVER_SERVICE_NAME)
             ->addMethodCall('addMethodMapping', [$methodName, $serviceId]);
     }
+
+    private function cleanExternalServiceIdString(string $externalServiceIdString)
+    {
+        if ('@' === $externalServiceIdString[0]) {
+            return substr($externalServiceIdString, 1);
+        }
+
+        return $externalServiceIdString;
+    }
 }

tests/Common/DependencyInjection/AbstractTestClass.php

@@ -47,6 +47,14 @@ protected function assertEndpointIsUsable()
         $this->assertNotNull($this->container->get(self::EXPECTED_ENDPOINT_SERVICE_ID));
     }
 
+    /**
+     * @param $jsonRpcMethodServiceId
+     */
+    protected function assertJsonRpcMethodServiceIsAvailable($jsonRpcMethodServiceId)
+    {
+        $this->assertNotNull($this->container->get($jsonRpcMethodServiceId));
+    }
+
     /**
      * @return Definition
      */

tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionWithConfigParsedTest.php

@@ -101,6 +101,10 @@ public function testShouldManageMethodsMapping()
             [$methodCName, $serviceC]
         );
 
+        $this->assertJsonRpcMethodServiceIsAvailable($serviceA);
+        $this->assertJsonRpcMethodServiceIsAvailable($serviceB);
+        $this->assertJsonRpcMethodServiceIsAvailable($serviceC);
+
         $this->assertEndpointIsUsable();
     }
 

tests/Technical/DependencyInjection/JsonRpcHttpServerExtensionWithConfigurationParsedTest.php

@@ -0,0 +1,51 @@
+<?php
+namespace Tests\Technical\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Tests\Common\DependencyInjection\AbstractTestClass;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
+
+/**
+ * @covers \Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension
+ */
+class JsonRpcHttpServerExtensionWithConfigurationParsedTest extends AbstractTestClass
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function getContainerExtensions()
+    {
+        return [
+            new JsonRpcHttpServerExtension(true)
+        ];
+    }
+
+    public function testShouldNormalizeExternalServiceIdStringPassedForMethodResolver()
+    {
+        $myCustomResolverServiceId = 'my-custom-resolver';
+        $this->setDefinition($myCustomResolverServiceId, $this->createCustomMethodResolverDefinition());
+
+        $this->load(['method_resolver' => '@'.$myCustomResolverServiceId]);
+
+        $this->assertEndpointIsUsable();
+    }
+
+    public function testShouldNormalizeExternalServiceIdStringPassedForMethodMapping()
+    {
+        $jsonRpcMethodServiceId = uniqid();
+
+        $methodService = $this->createJsonRpcMethodDefinition();
+        $this->setDefinition($jsonRpcMethodServiceId, $methodService);
+
+
+        $this->load([
+            'methods_mapping' => [
+                'a-method' => '@'.$jsonRpcMethodServiceId
+            ]
+        ]);
+
+        $this->assertJsonRpcMethodServiceIsAvailable($jsonRpcMethodServiceId);
+
+        $this->assertEndpointIsUsable();
+    }
+}