Merge pull request #600 from api-platform/rename_events

dunglas · web-flow · commit 4774609eadd3 · 2016-07-07T16:01:12.000+02:00
Rename events
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/api.xml b/src/Bridge/Symfony/Bundle/Resources/config/api.xml
@@ -53,43 +53,44 @@
 
         <!-- Event listeners -->
 
-        <service id="api_platform.listener.request.format" class="ApiPlatform\Core\EventListener\FormatListener">
+        <service id="api_platform.listener.request.add_format" class="ApiPlatform\Core\EventListener\AddFormatListener">
             <argument type="service" id="api_platform.negotiator" />
             <argument>%api_platform.formats%</argument>
 
             <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="7" />
         </service>
 
         <!-- kernel.request piorities must be >8 to be executed after the firewall -->
-        <service id="api_platform.listener.request.data_provider" class="ApiPlatform\Core\EventListener\DataProviderListener">
+        <service id="api_platform.listener.request.read" class="ApiPlatform\Core\EventListener\ReadListener">
             <argument type="service" id="api_platform.collection_data_provider" />
             <argument type="service" id="api_platform.item_data_provider" />
 
             <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="4" />
         </service>
 
-        <service id="api_platform.listener.request.deserializer" class="ApiPlatform\Core\EventListener\DeserializerListener">
+        <service id="api_platform.listener.request.deserialize" class="ApiPlatform\Core\EventListener\DeserializeListener">
             <argument type="service" id="api_platform.serializer" />
             <argument type="service" id="api_platform.serializer.context_builder" />
 
             <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="2" />
         </service>
 
-        <service id="api_platform.listener.view.validator" class="ApiPlatform\Core\Bridge\Symfony\Validator\EventListener\ValidatorListener">
+        <service id="api_platform.listener.view.validate" class="ApiPlatform\Core\Bridge\Symfony\Validator\EventListener\ValidateListener">
             <argument type="service" id="validator" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
 
             <tag name="kernel.event_listener" event="kernel.view" method="onKernelView" priority="64" />
+            <tag name="kernel.event_listener" event="kernel.view" method="onKernelView" priority="64" />
         </service>
 
-        <service id="api_platform.listener.view.serializer" class="ApiPlatform\Core\EventListener\SerializerListener">
+        <service id="api_platform.listener.view.serialize" class="ApiPlatform\Core\EventListener\SerializeListener">
             <argument type="service" id="api_platform.serializer" />
             <argument type="service" id="api_platform.serializer.context_builder" />
 
             <tag name="kernel.event_listener" event="kernel.view" method="onKernelView" priority="16" />
         </service>
 
-        <service id="api_platform.listener.view.responder" class="ApiPlatform\Core\EventListener\ResponderListener">
+        <service id="api_platform.listener.view.respond" class="ApiPlatform\Core\EventListener\RespondListener">
             <tag name="kernel.event_listener" event="kernel.view" method="onKernelView" priority="8" />
         </service>
 
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/hydra.xml b/src/Bridge/Symfony/Bundle/Resources/config/hydra.xml
@@ -21,7 +21,7 @@
 
         <!-- Event listeners -->
 
-        <service id="api_platform.hydra.listener.response.link_header" class="ApiPlatform\Core\Hydra\EventListener\LinkHeaderListener">
+        <service id="api_platform.hydra.listener.response.add_link_header" class="ApiPlatform\Core\Hydra\EventListener\AddLinkHeaderListener">
             <argument type="service" id="api_platform.router" />
 
             <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
diff --git a/src/Bridge/Symfony/Validator/EventListener/ValidateListener.php b/src/Bridge/Symfony/Validator/EventListener/ValidateListener.php
@@ -24,7 +24,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-final class ValidatorListener
+final class ValidateListener
 {
     private $validator;
     private $resourceMetadataFactory;
diff --git a/src/EventListener/AddFormatListener.php b/src/EventListener/AddFormatListener.php
@@ -19,7 +19,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-final class FormatListener
+final class AddFormatListener
 {
     private $negotiator;
     private $formats;
diff --git a/src/EventListener/DeserializeListener.php b/src/EventListener/DeserializeListener.php
@@ -23,7 +23,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-final class DeserializerListener
+final class DeserializeListener
 {
     private $serializer;
     private $serializerContextBuilder;
diff --git a/src/EventListener/ReadListener.php b/src/EventListener/ReadListener.php
@@ -25,7 +25,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-final class DataProviderListener
+final class ReadListener
 {
     private $collectionDataProvider;
     private $itemDataProvider;
diff --git a/src/EventListener/RespondListener.php b/src/EventListener/RespondListener.php
@@ -20,7 +20,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-final class ResponderListener
+final class RespondListener
 {
     const METHOD_TO_CODE = [
         Request::METHOD_POST => Response::HTTP_CREATED,
diff --git a/src/EventListener/SerializeListener.php b/src/EventListener/SerializeListener.php
@@ -23,7 +23,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-final class SerializerListener
+final class SerializeListener
 {
     private $serializer;
     private $serializerContextBuilder;
diff --git a/src/Hydra/EventListener/AddLinkHeaderListener.php b/src/Hydra/EventListener/AddLinkHeaderListener.php
@@ -20,7 +20,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-final class LinkHeaderListener
+final class AddLinkHeaderListener
 {
     private $urlGenerator;
 
diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
@@ -248,12 +248,12 @@ private function getContainerBuilderProphecy()
             'api_platform.iri_converter',
             'api_platform.naming.resource_path_naming_strategy.underscore',
             'api_platform.naming.resource_path_naming_strategy.dash',
-            'api_platform.listener.request.format',
-            'api_platform.listener.request.data_provider',
-            'api_platform.listener.request.deserializer',
-            'api_platform.listener.view.serializer',
-            'api_platform.listener.view.validator',
-            'api_platform.listener.view.responder',
+            'api_platform.listener.request.add_format',
+            'api_platform.listener.request.read',
+            'api_platform.listener.request.deserialize',
+            'api_platform.listener.view.serialize',
+            'api_platform.listener.view.validate',
+            'api_platform.listener.view.respond',
             'api_platform.serializer.context_builder',
             'api_platform.doctrine.metadata_factory',
             'api_platform.doctrine.orm.collection_data_provider',
@@ -283,8 +283,8 @@ private function getContainerBuilderProphecy()
             'api_platform.swagger.command.swagger_command',
             'api_platform.swagger.action.documentation',
             'api_platform.hydra.documentation_builder',
+            'api_platform.hydra.listener.response.add_link_header',
             'api_platform.hydra.listener.exception.validation',
-            'api_platform.hydra.listener.response.link_header',
             'api_platform.hydra.listener.exception',
             'api_platform.hydra.normalizer.collection',
             'api_platform.hydra.normalizer.partial_collection_view',
diff --git a/tests/Bridge/Symfony/Validator/EventListener/ValidateListenerTest.php b/tests/Bridge/Symfony/Validator/EventListener/ValidateListenerTest.php
@@ -11,7 +11,7 @@
 
 namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\EventListener;
 
-use ApiPlatform\Core\Bridge\Symfony\Validator\EventListener\ValidatorListener;
+use ApiPlatform\Core\Bridge\Symfony\Validator\EventListener\ValidateListener;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Resource\ResourceMetadata;
 use ApiPlatform\Core\Tests\Fixtures\DummyEntity;
@@ -24,7 +24,7 @@
 /**
  * @author Samuel ROZE <samuel.roze@gmail.com>
  */
-class ValidatorListenerTest extends \PHPUnit_Framework_TestCase
+class ValidateListenerTest extends \PHPUnit_Framework_TestCase
 {
     public function testValidatorIsCalled()
     {
@@ -37,7 +37,7 @@ public function testValidatorIsCalled()
 
         list($resourceMetadataFactory, $event) = $this->createEventObject($expectedValidationGroups, $data);
 
-        $validationViewListener = new ValidatorListener($validator, $resourceMetadataFactory);
+        $validationViewListener = new ValidateListener($validator, $resourceMetadataFactory);
         $validationViewListener->onKernelView($event);
     }
 
@@ -59,7 +59,7 @@ public function testThrowsValidationExceptionWithViolationsFound()
 
         list($resourceMetadataFactory, $event) = $this->createEventObject($expectedValidationGroups, $data);
 
-        $validationViewListener = new ValidatorListener($validator, $resourceMetadataFactory);
+        $validationViewListener = new ValidateListener($validator, $resourceMetadataFactory);
         $validationViewListener->onKernelView($event);
     }
 
diff --git a/tests/EventListener/AddFormatListenerTest.php b/tests/EventListener/AddFormatListenerTest.php
@@ -11,15 +11,15 @@
 
 namespace ApiPlatform\Core\Tests\EventListener;
 
-use ApiPlatform\Core\EventListener\FormatListener;
+use ApiPlatform\Core\EventListener\AddFormatListener;
 use Negotiation\Negotiator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class FormatListenerTest extends \PHPUnit_Framework_TestCase
+class AddFormatListenerTest extends \PHPUnit_Framework_TestCase
 {
     public function testNoResourceClass()
     {
@@ -29,7 +29,7 @@ public function testNoResourceClass()
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
         $event = $eventProphecy->reveal();
 
-        $listener = new FormatListener(new Negotiator(), []);
+        $listener = new AddFormatListener(new Negotiator(), []);
         $listener->onKernelRequest($event);
 
         $this->assertFalse($request->attributes->has('_api_format'));
@@ -46,7 +46,7 @@ public function testSupportedRequestFormat()
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
         $event = $eventProphecy->reveal();
 
-        $listener = new FormatListener(new Negotiator(), ['text/xml' => 'xml']);
+        $listener = new AddFormatListener(new Negotiator(), ['text/xml' => 'xml']);
         $listener->onKernelRequest($event);
 
         $this->assertSame('xml', $request->attributes->get('_api_format'));
@@ -63,7 +63,7 @@ public function testUnsupportedRequestFormat()
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
         $event = $eventProphecy->reveal();
 
-        $listener = new FormatListener(new Negotiator(), ['application/json' => 'json']);
+        $listener = new AddFormatListener(new Negotiator(), ['application/json' => 'json']);
         $listener->onKernelRequest($event);
 
         $this->assertSame('json', $request->attributes->get('_api_format'));
@@ -80,7 +80,7 @@ public function testSupportedAcceptHeader()
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
         $event = $eventProphecy->reveal();
 
-        $listener = new FormatListener(new Negotiator(), ['application/octet-stream' => 'binary', 'application/json' => 'json']);
+        $listener = new AddFormatListener(new Negotiator(), ['application/octet-stream' => 'binary', 'application/json' => 'json']);
         $listener->onKernelRequest($event);
 
         $this->assertSame('json', $request->attributes->get('_api_format'));
@@ -97,7 +97,7 @@ public function testUnsupportedAcceptHeader()
         $eventProphecy->getRequest()->willReturn($request)->shouldBeCalled();
         $event = $eventProphecy->reveal();
 
-        $listener = new FormatListener(new Negotiator(), ['application/octet-stream' => 'binary', 'application/json' => 'json']);
+        $listener = new AddFormatListener(new Negotiator(), ['application/octet-stream' => 'binary', 'application/json' => 'json']);
         $listener->onKernelRequest($event);
 
         $this->assertSame('binary', $request->attributes->get('_api_format'));
diff --git a/tests/EventListener/DeserializeListenerTest.php b/tests/EventListener/DeserializeListenerTest.php
@@ -11,7 +11,7 @@
 
 namespace ApiPlatform\Core\Tests\EventListener;
 
-use ApiPlatform\Core\EventListener\DeserializerListener;
+use ApiPlatform\Core\EventListener\DeserializeListener;
 use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface;
 use Prophecy\Argument;
 use Symfony\Component\HttpFoundation\Request;
@@ -21,7 +21,7 @@
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class DeserializerListenerTest extends \PHPUnit_Framework_TestCase
+class DeserializeListenerTest extends \PHPUnit_Framework_TestCase
 {
     public function testDoNotCallWhenRequestMethodIsSafe()
     {
@@ -37,7 +37,7 @@ public function testDoNotCallWhenRequestMethodIsSafe()
         $serializerContextBuilderProphecy = $this->prophesize(SerializerContextBuilderInterface::class);
         $serializerContextBuilderProphecy->createFromRequest(Argument::type(Request::class), false, Argument::type('array'))->shouldNotBeCalled();
 
-        $listener = new DeserializerListener($serializerProphecy->reveal(), $serializerContextBuilderProphecy->reveal());
+        $listener = new DeserializeListener($serializerProphecy->reveal(), $serializerContextBuilderProphecy->reveal());
         $listener->onKernelRequest($eventProphecy->reveal());
     }
 
@@ -55,7 +55,7 @@ public function testDoNotCallWhenRequestNotManaged()
         $serializerContextBuilderProphecy = $this->prophesize(SerializerContextBuilderInterface::class);
         $serializerContextBuilderProphecy->createFromRequest(Argument::type(Request::class), false, Argument::type('array'))->shouldNotBeCalled();
 
-        $listener = new DeserializerListener($serializerProphecy->reveal(), $serializerContextBuilderProphecy->reveal());
+        $listener = new DeserializeListener($serializerProphecy->reveal(), $serializerContextBuilderProphecy->reveal());
         $listener->onKernelRequest($eventProphecy->reveal());
     }
 
@@ -78,7 +78,7 @@ public function testDeserialize(string $method, bool $populateObject)
         $serializerContextBuilderProphecy = $this->prophesize(SerializerContextBuilderInterface::class);
         $serializerContextBuilderProphecy->createFromRequest(Argument::type(Request::class), false, Argument::type('array'))->willReturn([])->shouldBeCalled();
 
-        $listener = new DeserializerListener($serializerProphecy->reveal(), $serializerContextBuilderProphecy->reveal());
+        $listener = new DeserializeListener($serializerProphecy->reveal(), $serializerContextBuilderProphecy->reveal());
         $listener->onKernelRequest($eventProphecy->reveal());
     }
 
diff --git a/tests/EventListener/ReadListenerTest.php b/tests/EventListener/ReadListenerTest.php
@@ -13,14 +13,14 @@
 
 use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
-use ApiPlatform\Core\EventListener\DataProviderListener;
+use ApiPlatform\Core\EventListener\ReadListener;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class DataProviderListenerTest extends \PHPUnit_Framework_TestCase
+class ReadListenerTest extends \PHPUnit_Framework_TestCase
 {
     public function testNotAnApiPlatformRequest()
     {
@@ -35,7 +35,7 @@ public function testNotAnApiPlatformRequest()
         $event = $this->prophesize(GetResponseEvent::class);
         $event->getRequest()->willReturn($request)->shouldBeCalled();
 
-        $listener = new DataProviderListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
+        $listener = new ReadListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
         $listener->onKernelRequest($event->reveal());
     }
 
@@ -53,7 +53,7 @@ public function testRetrieveCollectionPost()
         $event = $this->prophesize(GetResponseEvent::class);
         $event->getRequest()->willReturn($request)->shouldBeCalled();
 
-        $listener = new DataProviderListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
+        $listener = new ReadListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
         $listener->onKernelRequest($event->reveal());
 
         $this->assertTrue($request->attributes->has('data'));
@@ -74,7 +74,7 @@ public function testRetrieveCollectionGet()
         $event = $this->prophesize(GetResponseEvent::class);
         $event->getRequest()->willReturn($request)->shouldBeCalled();
 
-        $listener = new DataProviderListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
+        $listener = new ReadListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
         $listener->onKernelRequest($event->reveal());
 
         $this->assertSame([], $request->attributes->get('data'));
@@ -95,7 +95,7 @@ public function testRetrieveItem()
         $event = $this->prophesize(GetResponseEvent::class);
         $event->getRequest()->willReturn($request)->shouldBeCalled();
 
-        $listener = new DataProviderListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
+        $listener = new ReadListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
         $listener->onKernelRequest($event->reveal());
 
         $this->assertSame($data, $request->attributes->get('data'));
@@ -117,7 +117,7 @@ public function testRetrieveItemNotFound()
         $event = $this->prophesize(GetResponseEvent::class);
         $event->getRequest()->willReturn($request)->shouldBeCalled();
 
-        $listener = new DataProviderListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
+        $listener = new ReadListener($collectionDataProvider->reveal(), $itemDataProvider->reveal());
         $listener->onKernelRequest($event->reveal());
     }
 }
diff --git a/tests/EventListener/RespondListenerTest.php b/tests/EventListener/RespondListenerTest.php
diff --git a/tests/EventListener/SerializeListenerTest.php b/tests/EventListener/SerializeListenerTest.php

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @author Kévin Dunglas <[email protected]>`
`26`	`26`	`*/`
`27`		`-final class ValidatorListener`
	`27`	`+final class ValidateListener`
`28`	`28`	`{`
`29`	`29`	`private $validator;`
`30`	`30`	`private $resourceMetadataFactory;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`* @author Kévin Dunglas <[email protected]>`
`21`	`21`	`*/`
`22`		`-final class FormatListener`
	`22`	`+final class AddFormatListener`
`23`	`23`	`{`
`24`	`24`	`private $negotiator;`
`25`	`25`	`private $formats;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*`
`24`	`24`	`* @author Kévin Dunglas <[email protected]>`
`25`	`25`	`*/`
`26`		`-final class DeserializerListener`
	`26`	`+final class DeserializeListener`
`27`	`27`	`{`
`28`	`28`	`private $serializer;`
`29`	`29`	`private $serializerContextBuilder;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Kévin Dunglas <[email protected]>`
`27`	`27`	`*/`
`28`		`-final class DataProviderListener`
	`28`	`+final class ReadListener`
`29`	`29`	`{`
`30`	`30`	`private $collectionDataProvider;`
`31`	`31`	`private $itemDataProvider;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Kévin Dunglas <[email protected]>`
`22`	`22`	`*/`
`23`		`-final class ResponderListener`
	`23`	`+final class RespondListener`
`24`	`24`	`{`
`25`	`25`	`const METHOD_TO_CODE = [`
`26`	`26`	`Request::METHOD_POST => Response::HTTP_CREATED,`