Merge pull request #1819 from Simperfit/bug/throw-when-an-subresources-id-is-not-found

bugfix: throw when a subresources id is not found

Author: soyuka

features/main/subresource.feature

@@ -24,6 +24,12 @@ Feature: Subresource support
     }
     """
 
+  Scenario: Get a non existant subresource
+    Given there is an answer "42" to the question "What's the answer to the Ultimate Question of Life, the Universe and Everything?"
+    When I send a "GET" request to "/questions/999999/answer"
+    And the response status code should be 404
+    And the response should be in JSON
+
   Scenario: Get subresource one to one relation
     When I send a "GET" request to "/questions/1/answer/related_questions"
     And the response status code should be 200

src/EventListener/ReadListener.php

@@ -147,6 +147,10 @@ private function getSubresourceData(Request $request, array $attributes, array $
 
         $data = $this->subresourceDataProvider->getSubresource($attributes['resource_class'], $identifiers, $attributes['subresource_context'], $attributes['subresource_operation_name']);
 
+        if (null === $data) {
+            throw new NotFoundHttpException('Not Found.');
+        }
+
         return $data;
     }
 }

tests/EventListener/ReadListenerTest.php

@@ -160,6 +160,30 @@ public function testRetrieveSubresource()
         $this->assertSame($data, $request->attributes->get('data'));
     }
 
+    /**
+     * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+     */
+    public function testRetrieveSubresourceNotFound()
+    {
+        $collectionDataProvider = $this->prophesize(CollectionDataProviderInterface::class);
+        $collectionDataProvider->getCollection()->shouldNotBeCalled();
+
+        $itemDataProvider = $this->prophesize(ItemDataProviderInterface::class);
+        $itemDataProvider->getItem()->shouldNotBeCalled();
+
+        $subresourceDataProvider = $this->prophesize(SubresourceDataProviderInterface::class);
+        $subresourceDataProvider->getSubresource('Foo', ['id' => 1], ['identifiers' => [['id', 'Bar', true]], 'property' => 'bar'], 'get')->willReturn(null)->shouldBeCalled();
+
+        $request = new Request([], [], ['id' => 1, '_api_resource_class' => 'Foo', '_api_subresource_operation_name' => 'get', '_api_format' => 'json', '_api_mime_type' => 'application/json', '_api_subresource_context' => ['identifiers' => [['id', 'Bar', true]], 'property' => 'bar']]);
+        $request->setMethod('GET');
+
+        $event = $this->prophesize(GetResponseEvent::class);
+        $event->getRequest()->willReturn($request)->shouldBeCalled();
+
+        $listener = new ReadListener($collectionDataProvider->reveal(), $itemDataProvider->reveal(), $subresourceDataProvider->reveal());
+        $listener->onKernelRequest($event->reveal());
+    }
+
     /**
      * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */