Removed Context dep.

Author: dantleech

Enhancer/EnhancerInterface.php

@@ -31,5 +31,5 @@ interface EnhancerInterface
      * @param Context Serialization context
      * @param Resource The resource being serialized
      */
-    public function enhance(array $data, Context $context, Resource $resource);
+    public function enhance(array $data, Resource $resource);
 }

Enhancer/PayloadEnhancer.php

@@ -24,11 +24,9 @@ class PayloadEnhancer implements EnhancerInterface
     /**
      * {@inheritDoc}
      */
-    public function enhance(array $data, Context $context, Resource $resource)
+    public function enhance(array $data, Resource $resource)
     {
-        $visitor = $context->getVisitor();
         $payload = $resource->getPayload();
-
         $data['payload'] = $payload;
 
         return $data;

Enhancer/SonataAdminEnhancer.php

@@ -36,7 +36,7 @@ public function __construct(Pool $pool, UrlGeneratorInterface $urlGenerator)
     /**
      * {@inheritDoc}
      */
-    public function enhance(array $data, Context $context, Resource $resource)
+    public function enhance(array $data, Resource $resource)
     {
         $object = $resource->getPayload();
 
@@ -48,7 +48,6 @@ public function enhance(array $data, Context $context, Resource $resource)
         }
 
         $admin = $this->pool->getAdminByClass($class);
-        $visitor = $context->getVisitor();
 
         $links = array();
         foreach (array_keys($admin->getRoutes()) as $routeName) {

Serializer/Handler/ResourceHandler.php

@@ -81,7 +81,7 @@ public function serializeResource(
         $enhancers = $this->enhancerRegistry->getEnhancers($repositoryAlias);
 
         foreach ($enhancers as $enhancer) {
-            $data = $enhancer->enhance($data, $context, $resource);
+            $data = $enhancer->enhance($data, $resource);
         }
 
         $context->accept($data);

Tests/Unit/DependencyInjection/CmfResourceRestExtensionTest.php

@@ -50,6 +50,7 @@ public function provideExtension()
      */
     public function testExtension($config)
     {
+        $this->container->setParameter('kernel.bundles', array());
         $this->container->addCompilerPass(new EnhancerPass());
         $this->load($config);
         $this->compile();

Tests/Unit/Enhancer/SonataAdminEnhancerTest.php

@@ -24,11 +24,11 @@ public function setUp()
     {
         $this->admin = $this->prophesize('Sonata\AdminBundle\Admin\Admin');
         $this->pool = $this->prophesize('Sonata\AdminBundle\Admin\Pool');
-        $this->context = $this->prophesize('JMS\Serializer\Context');
         $this->visitor = $this->prophesize('JMS\Serializer\GenericSerializationVisitor');
         $this->generator = $this->prophesize('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
         $this->payload = new \stdClass;
         $this->resource = $this->prophesize('Puli\Repository\Api\Resource\Resource');
+        $this->route = $this->prophesize('Symfony\Component\Routing\Route');
 
         $this->enhancer = new SonataAdminEnhancer($this->pool->reveal(), $this->generator->reveal());
 
@@ -40,11 +40,9 @@ public function testEnhancerNoHasClass()
         $this->resource->getPayload()->willReturn($this->payload);
 
         $result = $this->enhancer->enhance(
-            $this->context->reveal(),
+            array(),
             $this->resource->reveal()
         );
-
-        $this->visitor->addData()->shouldNotBeCalled();
     }
 
     public function testEnhancer()
@@ -53,9 +51,18 @@ public function testEnhancer()
         $this->pool->getAdminByClass('stdClass')->willReturn($this->admin);
 
         $this->resource->getPayload()->willReturn($this->payload);
+        $data = array();
+        $this->admin->getRoutes()->willReturn(
+            array(
+                'foo' => $this->route
+            )
+        );
+        $this->admin->getIdParameter()->willReturn('id');
+        $this->admin->getUrlsafeIdentifier($this->payload)->willReturn(10);
+        $this->admin->getLabel()->willReturn('asd');
 
         $result = $this->enhancer->enhance(
-            $this->context->reveal(),
+            $data,
             $this->resource->reveal()
         );