Refactoring RequestParameterMapper to use the new middleware interface

moufmouf · moufmouf · commit 4feb437857c4 · 2019-10-04T11:39:56.000+02:00
diff --git a/DependencyInjection/GraphqliteCompilerPass.php b/DependencyInjection/GraphqliteCompilerPass.php
@@ -243,7 +243,7 @@ public function process(ContainerBuilder $container)
         $this->mapAdderToTag('graphql.queryprovider', 'addQueryProvider', $container, $schemaFactory);
         $this->mapAdderToTag('graphql.queryprovider_factory', 'addQueryProviderFactory', $container, $schemaFactory);
         $this->mapAdderToTag('graphql.root_type_mapper', 'addRootTypeMapper', $container, $schemaFactory);
-        $this->mapAdderToTag('graphql.parameter_middleware', 'addParameterMapper', $container, $schemaFactory);
+        $this->mapAdderToTag('graphql.parameter_middleware', 'addParameterMiddleware', $container, $schemaFactory);
         $this->mapAdderToTag('graphql.field_middleware', 'addFieldMiddleware', $container, $schemaFactory);
         $this->mapAdderToTag('graphql.type_mapper', 'addTypeMapper', $container, $schemaFactory);
         $this->mapAdderToTag('graphql.type_mapper_factory', 'addTypeMapperFactory', $container, $schemaFactory);
diff --git a/Mappers/RequestParameterMiddleware.php b/Mappers/RequestParameterMiddleware.php
@@ -9,17 +9,18 @@
 use ReflectionParameter;
 use Symfony\Component\HttpFoundation\Request;
 use TheCodingMachine\GraphQLite\Annotations\ParameterAnnotations;
-use TheCodingMachine\GraphQLite\Mappers\Parameters\ParameterMapperInterface;
+use TheCodingMachine\GraphQLite\Mappers\Parameters\ParameterHandlerInterface;
+use TheCodingMachine\GraphQLite\Mappers\Parameters\ParameterMiddlewareInterface;
 use TheCodingMachine\GraphQLite\Parameters\ParameterInterface;
 
-class RequestParameterMapper implements ParameterMapperInterface
+class RequestParameterMiddleware implements ParameterMiddlewareInterface
 {
 
-    public function mapParameter(ReflectionParameter $parameter, DocBlock $docBlock, ?Type $paramTagType, ParameterAnnotations $parameterAnnotations): ?ParameterInterface
+    public function mapParameter(ReflectionParameter $parameter, DocBlock $docBlock, ?Type $paramTagType, ParameterAnnotations $parameterAnnotations, ParameterHandlerInterface $next): ParameterInterface
     {
         if ($parameter->getType()->getName() === Request::class) {
             return new RequestParameter();
         }
-        return null;
+        return $next->mapParameter($parameter, $docBlock, $paramTagType, $parameterAnnotations);
     }
-}
+}
diff --git a/Resources/config/container/graphqlite.xml b/Resources/config/container/graphqlite.xml
@@ -65,11 +65,7 @@
 
         <service id="TheCodingMachine\Graphqlite\Bundle\Controller\GraphqliteController" public="true" />
 
-        <service id="TheCodingMachine\Graphqlite\Bundle\Mappers\RequestParameterMapper">
-            <tag name="graphql.parameter_middleware"/>
-        </service>
-
-        <service id="TheCodingMachine\Graphqlite\Bundle\Mappers\RequestParameterMapper">
+        <service id="TheCodingMachine\Graphqlite\Bundle\Mappers\RequestParameterMiddleware">
             <tag name="graphql.parameter_middleware"/>
         </service>
 

Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,18 @@`
`9`	`9`	`use ReflectionParameter;`
`10`	`10`	`use Symfony\Component\HttpFoundation\Request;`
`11`	`11`	`use TheCodingMachine\GraphQLite\Annotations\ParameterAnnotations;`
`12`		`-use TheCodingMachine\GraphQLite\Mappers\Parameters\ParameterMapperInterface;`
	`12`	`+use TheCodingMachine\GraphQLite\Mappers\Parameters\ParameterHandlerInterface;`
	`13`	`+use TheCodingMachine\GraphQLite\Mappers\Parameters\ParameterMiddlewareInterface;`
`13`	`14`	`use TheCodingMachine\GraphQLite\Parameters\ParameterInterface;`
`14`	`15`
`15`		`-class RequestParameterMapper implements ParameterMapperInterface`
	`16`	`+class RequestParameterMiddleware implements ParameterMiddlewareInterface`
`16`	`17`	`{`
`17`	`18`
`18`		`- public function mapParameter(ReflectionParameter $parameter, DocBlock $docBlock, ?Type $paramTagType, ParameterAnnotations $parameterAnnotations): ?ParameterInterface`
	`19`	`+ public function mapParameter(ReflectionParameter $parameter, DocBlock $docBlock, ?Type $paramTagType, ParameterAnnotations $parameterAnnotations, ParameterHandlerInterface $next): ParameterInterface`
`19`	`20`	`{`
`20`	`21`	`if ($parameter->getType()->getName() === Request::class) {`
`21`	`22`	`return new RequestParameter();`
`22`	`23`	`}`
`23`		`- return null;`
	`24`	`+ return $next->mapParameter($parameter, $docBlock, $paramTagType, $parameterAnnotations);`
`24`	`25`	`}`
`25`		`-}`
	`26`	`+}`