Fix endpoint path (#4)

Author: yoanm

src/Event/DocEvent.php

@@ -3,7 +3,6 @@
 namespace Yoanm\SymfonyJsonRpcHttpServerDoc\Event;
 
 use Symfony\Component\EventDispatcher\Event;
-use Yoanm\SymfonyJsonRpcHttpServerDoc\Model\DocumentationContext;
 
 /**
  * Class DocEvent

src/Resources/config/services.public.yaml

@@ -11,7 +11,7 @@ services:
     class: Yoanm\SymfonyJsonRpcHttpServerDoc\Creator\HttpServerDocCreator
     arguments:
       - '@event_dispatcher'
-      - '%json_rpc_http_server_doc.http_endpoint_path%'
+      - '%json_rpc_http_server.http_endpoint_path%'
     tags:
       - 'json_rpc_http_server.method_aware' # From yoanm/symfony-jsonrpc-http-server
 

tests/Common/DependencyInjection/AbstractTestClass.php

@@ -6,13 +6,14 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Tests\Common\Mock\ConcreteResolver;
 use Yoanm\JsonRpcServer\Domain\JsonRpcMethodResolverInterface;
+use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\DependencyInjection\JsonRpcHttpServerDocExtension;
 
 abstract class AbstractTestClass extends AbstractExtensionTestCase
 {
     const EXPECTED_DOC_PROVIDER_TAG = 'json_rpc_server_doc.doc_provider';
     const EXPECTED_EXTENSION_IDENTIFIER = 'json_rpc_http_server_doc';
-    const EXPECTED_CHAIN_PROVIDER_SERVICE_ID = 'json_rpc_http_server_doc.finder.normalized_doc';
+    const EXPECTED_NORMALIZED_DOC_FINDER_SERVICE_ID = 'json_rpc_http_server_doc.finder.normalized_doc';
 
     // Public services
     const EXPECTED_ENDPOINT_SERVICE_ID = 'json_rpc_http_server_doc.endpoint';
@@ -35,6 +36,12 @@ protected function load(array $configurationValues = [], $mockResolver = true, $
         // Inject event dispatcher
         $this->setDefinition('event_dispatcher', new Definition(EventDispatcher::class));
 
+        // Mock json-rpc endpoint path
+        $this->container->setParameter(
+            JsonRpcHttpServerExtension::ENDPOINT_PATH_CONTAINER_PARAM_ID,
+            '/fake-endpoint'
+        );
+
         if (true == $mockResolver) {
             $this->mockResolver();
         }

tests/Functional/Creator/HttpServerDocCreatorTest.php

@@ -1,14 +1,12 @@
 <?php
 namespace Tests\Functional\Creator;
 
-use Grpc\Server;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Yoanm\JsonRpcServer\Domain\JsonRpcMethodInterface;
 use Yoanm\JsonRpcServerDoc\Domain\Model\MethodDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\ServerDoc;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Creator\HttpServerDocCreator;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Event\MethodDocCreatedEvent;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Event\ServerDocCreatedEvent;

tests/Functional/DependencyInjection/JsonRpcHttpServerDocExtensionTest.php

@@ -2,13 +2,9 @@
 namespace Tests\Functional\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Reference;
 use Tests\Common\DependencyInjection\AbstractTestClass;
 use Tests\Common\DependencyInjection\ConcreteDocProvider;
-use Tests\Common\DependencyInjection\ConcreteJsonRpcServerDispatcherAware;
-use Tests\Common\Mock\ConcreteParamsValidator;
-use Yoanm\JsonRpcServer\App\Dispatcher\JsonRpcServerDispatcherAwareTrait;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\DependencyInjection\JsonRpcHttpServerDocExtension;
 
 /**
@@ -50,7 +46,7 @@ public function testShouldReturnAnXsdValidationBasePath()
         $this->assertNotNull((new JsonRpcHttpServerDocExtension())->getXsdValidationBasePath());
     }
 
-    public function testShouldBindServerDispatcherToDispatcherAwareService()
+    public function testShouldBindDocProviderToNormalizedDocFinder()
     {
         $docProviderServiceId =  'my-doc-provider';
         $docProviderServiceDefinition = new Definition(ConcreteDocProvider::class);
@@ -62,7 +58,7 @@ public function testShouldBindServerDispatcherToDispatcherAwareService()
 
         // Assert custom resolver is an alias of the stub
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            self::EXPECTED_CHAIN_PROVIDER_SERVICE_ID,
+            self::EXPECTED_NORMALIZED_DOC_FINDER_SERVICE_ID,
             'addProvider',
             [new Reference($docProviderServiceId)],
             0

tests/Functional/Endpoint/DocumentationEndpointTest.php

@@ -2,11 +2,9 @@
 namespace Tests\Functional\Endpoint;
 
 use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Yoanm\JsonRpcServer\Infra\Endpoint\JsonRpcEndpoint as SDKJsonRpcEndpoint;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Endpoint\DocumentationEndpoint;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Finder\NormalizedDocFinder;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Provider\RawDocProvider;