Merge pull request #1768 from meyerbaptiste/merge_2.2

meyerbaptiste · web-flow · commit f7c3dbce2afc · 2018-03-13T12:46:49.000+01:00
Merge 2.2
diff --git a/features/bootstrap/GraphqlContext.php b/features/bootstrap/GraphqlContext.php
@@ -17,7 +17,6 @@
 use Behat\Gherkin\Node\PyStringNode;
 use Behatch\Context\RestContext;
 use Behatch\HttpCall\Request;
-use Symfony\Component\HttpFoundation\Request as HttpFoundationRequest;
 
 /**
  * Context for GraphQL.
@@ -99,6 +98,6 @@ public function ISendTheGraphqlRequestWithOperation(string $operation)
     private function sendGraphqlRequest()
     {
         $this->request->setHttpHeader('Accept', null);
-        $this->restContext->iSendARequestTo(HttpFoundationRequest::METHOD_GET, '/graphql?'.http_build_query($this->graphqlRequest));
+        $this->restContext->iSendARequestTo('GET', '/graphql?'.http_build_query($this->graphqlRequest));
     }
 }
diff --git a/src/Api/OperationMethodResolverInterface.php b/src/Api/OperationMethodResolverInterface.php
@@ -16,13 +16,15 @@
 use ApiPlatform\Core\Exception\RuntimeException;
 
 /**
- * Resolves the HTTP method associated with an operation.
+ * Resolves the uppercased HTTP method associated with an operation.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 interface OperationMethodResolverInterface
 {
     /**
+     * Resolves the uppercased HTTP method associated with a collection operation.
+     *
      * @param string $resourceClass
      * @param string $operationName
      *
@@ -33,6 +35,8 @@ interface OperationMethodResolverInterface
     public function getCollectionOperationMethod(string $resourceClass, string $operationName): string;
 
     /**
+     * Resolves the uppercased HTTP method associated with an item operation.
+     *
      * @param string $resourceClass
      * @param string $operationName
      *
diff --git a/src/Bridge/Doctrine/EventListener/WriteListener.php b/src/Bridge/Doctrine/EventListener/WriteListener.php
@@ -16,7 +16,6 @@
 use ApiPlatform\Core\EventListener\WriteListener as BaseWriteListener;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 
 /**
@@ -58,10 +57,10 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
         }
 
         switch ($request->getMethod()) {
-            case Request::METHOD_POST:
+            case 'POST':
                 $objectManager->persist($controllerResult);
                 break;
-            case Request::METHOD_DELETE:
+            case 'DELETE':
                 $objectManager->remove($controllerResult);
                 $event->setControllerResult(null);
                 break;
diff --git a/src/Bridge/FosUser/EventListener.php b/src/Bridge/FosUser/EventListener.php
@@ -16,7 +16,6 @@
 use ApiPlatform\Core\Util\RequestAttributesExtractor;
 use FOS\UserBundle\Model\UserInterface;
 use FOS\UserBundle\Model\UserManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 
 /**
@@ -52,7 +51,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
         }
 
         switch ($request->getMethod()) {
-            case Request::METHOD_DELETE:
+            case 'DELETE':
                 $this->userManager->deleteUser($user);
                 $event->setControllerResult(null);
                 break;
diff --git a/src/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProvider.php b/src/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProvider.php
@@ -24,7 +24,6 @@
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Nelmio\ApiDocBundle\Extractor\AnnotationsProviderInterface;
 use Psr\Container\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
@@ -140,7 +139,7 @@ private function getApiDoc(bool $collection, string $resourceClass, ResourceMeta
             $data['output'] = sprintf('%s:%s:%s', ApiPlatformParser::OUT_PREFIX, $resourceClass, $operationName);
         }
 
-        if ($collection && Request::METHOD_GET === $method) {
+        if ($collection && 'GET' === $method) {
             $resourceFilters = $resourceMetadata->getCollectionOperationAttribute($operationName, 'filters', [], true);
 
             $data['filters'] = [];
diff --git a/src/Bridge/Symfony/Routing/OperationMethodResolver.php b/src/Bridge/Symfony/Routing/OperationMethodResolver.php
@@ -89,7 +89,7 @@ private function getOperationMethod(string $resourceClass, string $operationName
         }
 
         if (null !== $method) {
-            return $method;
+            return strtoupper($method);
         }
 
         if (null === $routeName = $this->getRouteName($resourceMetadata, $operationName, $operationType)) {
diff --git a/src/Bridge/Symfony/Validator/EventListener/ValidateListener.php b/src/Bridge/Symfony/Validator/EventListener/ValidateListener.php
@@ -18,7 +18,6 @@
 use ApiPlatform\Core\Util\RequestAttributesExtractor;
 use ApiPlatform\Core\Validator\EventListener\ValidateListener as MainValidateListener;
 use Psr\Container\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
@@ -56,7 +55,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
         $request = $event->getRequest();
         if (
             $request->isMethodSafe(false)
-            || $request->isMethod(Request::METHOD_DELETE)
+            || $request->isMethod('DELETE')
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
             || !$attributes['receive']
         ) {
diff --git a/src/EventListener/DeserializeListener.php b/src/EventListener/DeserializeListener.php
@@ -49,10 +49,10 @@ public function onKernelRequest(GetResponseEvent $event)
         $request = $event->getRequest();
         if (
             $request->isMethodSafe(false)
-            || $request->isMethod(Request::METHOD_DELETE)
+            || $request->isMethod('DELETE')
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
             || !$attributes['receive']
-            || ('' === ($requestContent = $request->getContent()) && $request->isMethod(Request::METHOD_PUT))
+            || ('' === ($requestContent = $request->getContent()) && $request->isMethod('PUT'))
         ) {
             return;
         }
diff --git a/src/EventListener/ReadListener.php b/src/EventListener/ReadListener.php
@@ -93,7 +93,7 @@ public function onKernelRequest(GetResponseEvent $event)
      */
     private function getCollectionData(Request $request, array $attributes, array $context)
     {
-        if ($request->isMethod(Request::METHOD_POST)) {
+        if ($request->isMethod('POST')) {
             return null;
         }
 
diff --git a/src/EventListener/RespondListener.php b/src/EventListener/RespondListener.php
@@ -13,7 +13,6 @@
 
 namespace ApiPlatform\Core\EventListener;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 
@@ -25,8 +24,8 @@
 final class RespondListener
 {
     const METHOD_TO_CODE = [
-        Request::METHOD_POST => Response::HTTP_CREATED,
-        Request::METHOD_DELETE => Response::HTTP_NO_CONTENT,
+        'POST' => Response::HTTP_CREATED,
+        'DELETE' => Response::HTTP_NO_CONTENT,
     ];
 
     /**
diff --git a/src/EventListener/WriteListener.php b/src/EventListener/WriteListener.php
@@ -14,7 +14,6 @@
 namespace ApiPlatform\Core\EventListener;
 
 use ApiPlatform\Core\DataPersister\DataPersisterInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 
 /**
@@ -48,12 +47,12 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
         }
 
         switch ($request->getMethod()) {
-            case Request::METHOD_PUT:
-            case Request::METHOD_PATCH:
-            case Request::METHOD_POST:
+            case 'PUT':
+            case 'PATCH':
+            case 'POST':
                 $this->dataPersister->persist($controllerResult);
                 break;
-            case Request::METHOD_DELETE:
+            case 'DELETE':
                 $this->dataPersister->remove($controllerResult);
                 $event->setControllerResult(null);
                 break;
diff --git a/src/Serializer/SerializerContextBuilder.php b/src/Serializer/SerializerContextBuilder.php
@@ -69,7 +69,7 @@ public function createFromRequest(Request $request, bool $normalization, array $
         $context['operation_type'] = $operationType ?: OperationType::ITEM;
 
         if (!$normalization && !isset($context['api_allow_update'])) {
-            $context['api_allow_update'] = in_array($request->getMethod(), [Request::METHOD_PUT, Request::METHOD_PATCH], true);
+            $context['api_allow_update'] = in_array($request->getMethod(), ['PUT', 'PATCH'], true);
         }
 
         $context['resource_class'] = $attributes['resource_class'];
diff --git a/src/Validator/EventListener/ValidateListener.php b/src/Validator/EventListener/ValidateListener.php
@@ -17,7 +17,6 @@
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use ApiPlatform\Core\Util\RequestAttributesExtractor;
 use ApiPlatform\Core\Validator\ValidatorInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 
 /**
@@ -46,7 +45,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
         $request = $event->getRequest();
         if (
             $request->isMethodSafe(false)
-            || $request->isMethod(Request::METHOD_DELETE)
+            || $request->isMethod('DELETE')
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
             || !$attributes['receive']
         ) {
diff --git a/tests/Bridge/Doctrine/EventListener/WriteListenerTest.php b/tests/Bridge/Doctrine/EventListener/WriteListenerTest.php
@@ -46,7 +46,7 @@ public function testOnKernelViewWithControllerResultAndPostMethod()
         $writeListener = new WriteListener($managerRegistryProphecy->reveal());
         $httpKernelProphecy = $this->prophesize(HttpKernelInterface::class);
         $request = new Request();
-        $request->setMethod(Request::METHOD_POST);
+        $request->setMethod('POST');
         $request->attributes->set('_api_resource_class', 'Dummy');
         $event = new GetResponseForControllerResultEvent($httpKernelProphecy->reveal(), $request, HttpKernelInterface::MASTER_REQUEST, $dummy);
 
@@ -70,7 +70,7 @@ public function testOnKernelViewWithControllerResultAndDeleteMethod()
 
         $writeListener = new WriteListener($managerRegistryProphecy->reveal());
         $request = new Request();
-        $request->setMethod(Request::METHOD_DELETE);
+        $request->setMethod('DELETE');
         $request->attributes->set('_api_resource_class', 'Dummy');
         $event = $this->prophesize(GetResponseForControllerResultEvent::class);
         $event->setControllerResult(null)->shouldBeCalled();
@@ -93,7 +93,7 @@ public function testOnKernelViewWithSafeMethod()
         $writeListener = new WriteListener($managerRegistryProphecy->reveal());
         $httpKernelProphecy = $this->prophesize(HttpKernelInterface::class);
         $request = new Request();
-        $request->setMethod(Request::METHOD_HEAD);
+        $request->setMethod('HEAD');
         $event = new GetResponseForControllerResultEvent($httpKernelProphecy->reveal(), $request, HttpKernelInterface::MASTER_REQUEST, $dummy);
 
         $this->assertNull($writeListener->onKernelView($event));
@@ -113,7 +113,7 @@ public function testOnKernelViewWithNoResourceClass()
         $writeListener = new WriteListener($managerRegistryProphecy->reveal());
         $httpKernelProphecy = $this->prophesize(HttpKernelInterface::class);
         $request = new Request();
-        $request->setMethod(Request::METHOD_POST);
+        $request->setMethod('POST');
         $event = new GetResponseForControllerResultEvent($httpKernelProphecy->reveal(), $request, HttpKernelInterface::MASTER_REQUEST, $dummy);
 
         $this->assertNull($writeListener->onKernelView($event));
@@ -134,7 +134,7 @@ public function testOnKernelViewWithNoManager()
         $writeListener = new WriteListener($managerRegistryProphecy->reveal());
         $httpKernelProphecy = $this->prophesize(HttpKernelInterface::class);
         $request = new Request();
-        $request->setMethod(Request::METHOD_DELETE);
+        $request->setMethod('DELETE');
         $request->attributes->set('_api_resource_class', 'Dummy');
         $event = new GetResponseForControllerResultEvent($httpKernelProphecy->reveal(), $request, HttpKernelInterface::MASTER_REQUEST, $dummy);
 
diff --git a/tests/Bridge/FosUser/EventListenerTest.php b/tests/Bridge/FosUser/EventListenerTest.php
@@ -31,7 +31,7 @@ public function testDelete()
         $user = $this->prophesize(UserInterface::class);
 
         $request = new Request([], [], ['_api_resource_class' => User::class, '_api_item_operation_name' => 'delete']);
-        $request->setMethod(Request::METHOD_DELETE);
+        $request->setMethod('DELETE');
 
         $manager = $this->prophesize(UserManagerInterface::class);
         $manager->deleteUser($user)->shouldBeCalled();
@@ -50,7 +50,7 @@ public function testUpdate()
         $user = $this->prophesize(UserInterface::class);
 
         $request = new Request([], [], ['_api_resource_class' => User::class, '_api_item_operation_name' => 'put']);
-        $request->setMethod(Request::METHOD_PUT);
+        $request->setMethod('PUT');
 
         $manager = $this->prophesize(UserManagerInterface::class);
         $manager->updateUser($user)->shouldBeCalled();
@@ -82,7 +82,7 @@ public function testNotApiRequest()
     public function testNotUser()
     {
         $request = new Request([], [], ['_api_resource_class' => User::class, '_api_item_operation_name' => 'put']);
-        $request->setMethod(Request::METHOD_PUT);
+        $request->setMethod('PUT');
 
         $manager = $this->prophesize(UserManagerInterface::class);
         $manager->deleteUser()->shouldNotBeCalled();
diff --git a/tests/Bridge/Symfony/Validator/EventListener/ValidateListenerTest.php b/tests/Bridge/Symfony/Validator/EventListener/ValidateListenerTest.php
@@ -195,7 +195,7 @@ private function createEventObject($expectedValidationGroups, $data, bool $recei
             '_api_receive' => $receive,
         ]);
 
-        $request->setMethod(Request::METHOD_POST);
+        $request->setMethod('POST');
         $event = new GetResponseForControllerResultEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $data);
 
         return [$resourceMetadataFactory, $event];
diff --git a/tests/EventListener/DeserializeListenerTest.php b/tests/EventListener/DeserializeListenerTest.php
@@ -34,7 +34,7 @@ public function testDoNotCallWhenRequestMethodIsSafe()
         $eventProphecy = $this->prophesize(GetResponseEvent::class);
 
         $request = new Request([], [], ['data' => new \stdClass()]);
-        $request->setMethod(Request::METHOD_GET);
+        $request->setMethod('GET');
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
 
         $serializerProphecy = $this->prophesize(SerializerInterface::class);
@@ -52,7 +52,7 @@ public function testDoNotCallWhenPutAndEmptyRequestContent()
         $eventProphecy = $this->prophesize(GetResponseEvent::class);
 
         $request = new Request([], [], ['data' => new \stdClass(), '_api_resource_class' => 'Foo', '_api_item_operation_name' => 'put'], [], [], [], '');
-        $request->setMethod(Request::METHOD_PUT);
+        $request->setMethod('PUT');
         $request->headers->set('Content-Type', 'application/json');
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
 
@@ -71,7 +71,7 @@ public function testDoNotCallWhenRequestNotManaged()
         $eventProphecy = $this->prophesize(GetResponseEvent::class);
 
         $request = new Request([], [], ['data' => new \stdClass()], [], [], [], '{}');
-        $request->setMethod(Request::METHOD_POST);
+        $request->setMethod('POST');
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
 
         $serializerProphecy = $this->prophesize(SerializerInterface::class);
@@ -89,7 +89,7 @@ public function testDoNotCallWhenReceiveFlagIsFalse()
         $eventProphecy = $this->prophesize(GetResponseEvent::class);
 
         $request = new Request([], [], ['data' => new \stdClass(), '_api_resource_class' => 'Foo', '_api_collection_operation_name' => 'post', '_api_receive' => false]);
-        $request->setMethod(Request::METHOD_POST);
+        $request->setMethod('POST');
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
 
         $serializerProphecy = $this->prophesize(SerializerInterface::class);
@@ -128,15 +128,15 @@ public function testDeserialize(string $method, bool $populateObject)
 
     public function methodProvider()
     {
-        return [[Request::METHOD_POST, false], [Request::METHOD_PUT, true]];
+        return [['POST', false], ['PUT', true]];
     }
 
     public function testContentNegotiation()
     {
         $eventProphecy = $this->prophesize(GetResponseEvent::class);
 
         $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_collection_operation_name' => 'post'], [], [], [], '{}');
-        $request->setMethod(Request::METHOD_POST);
+        $request->setMethod('POST');
         $request->headers->set('Content-Type', 'text/xml');
         $request->setFormat('xml', 'text/xml'); // Workaround to avoid weird behaviors
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
@@ -164,7 +164,7 @@ public function testNotSupportedContentType()
         $eventProphecy = $this->prophesize(GetResponseEvent::class);
 
         $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_collection_operation_name' => 'post'], [], [], [], '{}');
-        $request->setMethod(Request::METHOD_POST);
+        $request->setMethod('POST');
         $request->headers->set('Content-Type', 'application/rdf+xml');
         $request->setRequestFormat('xml');
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
@@ -192,7 +192,7 @@ public function testNoContentType()
         $eventProphecy = $this->prophesize(GetResponseEvent::class);
 
         $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_collection_operation_name' => 'post'], [], [], [], '{}');
-        $request->setMethod(Request::METHOD_POST);
+        $request->setMethod('POST');
         $request->setRequestFormat('unknown');
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
 
diff --git a/tests/EventListener/ReadListenerTest.php b/tests/EventListener/ReadListenerTest.php
diff --git a/tests/EventListener/RespondListenerTest.php b/tests/EventListener/RespondListenerTest.php
diff --git a/tests/EventListener/WriteListenerTest.php b/tests/EventListener/WriteListenerTest.php
diff --git a/tests/Serializer/SerializerContextBuilderTest.php b/tests/Serializer/SerializerContextBuilderTest.php
diff --git a/tests/Validator/EventListener/ValidateListenerTest.php b/tests/Validator/EventListener/ValidateListenerTest.php

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`use Behat\Gherkin\Node\PyStringNode;`
`18`	`18`	`use Behatch\Context\RestContext;`
`19`	`19`	`use Behatch\HttpCall\Request;`
`20`		`-use Symfony\Component\HttpFoundation\Request as HttpFoundationRequest;`
`21`	`20`
`22`	`21`	`/**`
`23`	`22`	`* Context for GraphQL.`
`@@ -99,6 +98,6 @@ public function ISendTheGraphqlRequestWithOperation(string $operation)`
`99`	`98`	`private function sendGraphqlRequest()`
`100`	`99`	`{`
`101`	`100`	`$this->request->setHttpHeader('Accept', null);`
`102`		`- $this->restContext->iSendARequestTo(HttpFoundationRequest::METHOD_GET, '/graphql?'.http_build_query($this->graphqlRequest));`
	`101`	`+ $this->restContext->iSendARequestTo('GET', '/graphql?'.http_build_query($this->graphqlRequest));`
`103`	`102`	`}`
`104`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,15 @@`
`16`	`16`	`use ApiPlatform\Core\Exception\RuntimeException;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * Resolves the HTTP method associated with an operation.`
	`19`	`+ * Resolves the uppercased HTTP method associated with an operation.`
`20`	`20`	`*`
`21`	`21`	`* @author Kévin Dunglas <[email protected]>`
`22`	`22`	`*/`
`23`	`23`	`interface OperationMethodResolverInterface`
`24`	`24`	`{`
`25`	`25`	`/**`
	`26`	`+ * Resolves the uppercased HTTP method associated with a collection operation.`
	`27`	`+ *`
`26`	`28`	`* @param string $resourceClass`
`27`	`29`	`* @param string $operationName`
`28`	`30`	`*`
`@@ -33,6 +35,8 @@ interface OperationMethodResolverInterface`
`33`	`35`	`public function getCollectionOperationMethod(string $resourceClass, string $operationName): string;`
`34`	`36`
`35`	`37`	`/**`
	`38`	`+ * Resolves the uppercased HTTP method associated with an item operation.`
	`39`	`+ *`
`36`	`40`	`* @param string $resourceClass`
`37`	`41`	`* @param string $operationName`
`38`	`42`	`*`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private function getOperationMethod(string $resourceClass, string $operationName`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (null !== $method) {`
`92`		`- return $method;`
	`92`	`+ return strtoupper($method);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (null === $routeName = $this->getRouteName($resourceMetadata, $operationName, $operationType)) {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function onKernelRequest(GetResponseEvent $event)`
`93`	`93`	`*/`
`94`	`94`	`private function getCollectionData(Request $request, array $attributes, array $context)`
`95`	`95`	`{`
`96`		`- if ($request->isMethod(Request::METHOD_POST)) {`
	`96`	`+ if ($request->isMethod('POST')) {`
`97`	`97`	`return null;`
`98`	`98`	`}`
`99`	`99`