diff --git a/src/Relationship.php b/src/Relationship.php index 087571f..35b0123 100644 --- a/src/Relationship.php +++ b/src/Relationship.php @@ -85,13 +85,6 @@ class Relationship implements RelationshipInterface { /** * {@inheritdoc} */ - public function setValues(array $values = []) { - $this->values = $values; - } - - /** - * {@inheritdoc} - */ public function getTargetResourceConfig() { return $this->targetResourceConfig; } diff --git a/src/RelationshipInterface.php b/src/RelationshipInterface.php index 162c69c..80643e1 100644 --- a/src/RelationshipInterface.php +++ b/src/RelationshipInterface.php @@ -22,13 +22,6 @@ interface RelationshipInterface extends AccessibleInterface { public function getValues(); /** - * Sets the values. - * - * @param array $values - */ - public function setValues(array $values = []); - - /** * Gets the targetResourceConfig. * * @return mixed diff --git a/tests/src/Kernel/Normalizer/DocumentRootNormalizerTest.php b/tests/src/Kernel/Normalizer/DocumentRootNormalizerTest.php index d0d9964..7b542bc 100644 --- a/tests/src/Kernel/Normalizer/DocumentRootNormalizerTest.php +++ b/tests/src/Kernel/Normalizer/DocumentRootNormalizerTest.php @@ -121,11 +121,11 @@ class DocumentRootNormalizerTest extends KernelTestBase { $query->get('include')->willReturn('uid'); $query->getIterator()->willReturn(new \ArrayIterator()); $request->query = $query->reveal(); - $route = $this->prophesize(Route::class); - $route->getPath()->willReturn('/node/article/{node}'); - $route->getRequirement('_entity_type')->willReturn('node'); - $route->getRequirement('_bundle')->willReturn('article'); - $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route->reveal()); + $route = new Route('/node/article/{node}', [], [ + '_entity_type' => 'node', + '_bundle' => 'article', + ]); + $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route); $document_wrapper = $this->prophesize(DocumentWrapper::class); $document_wrapper->getData()->willReturn($this->node); $resource_config = $this->prophesize(ResourceConfigInterface::CLASS); @@ -134,7 +134,7 @@ class DocumentRootNormalizerTest extends KernelTestBase { // Make sure the route contains the entity type and bundle. $current_context = $this->container->get('jsonapi.current_context'); - $current_context->setCurrentRoute($route->reveal()); + $current_context->setCurrentRoute($route); $this->container->set('jsonapi.current_context', $current_context); $this->container->get('serializer'); @@ -189,11 +189,8 @@ class DocumentRootNormalizerTest extends KernelTestBase { $query->get('include')->willReturn('bundle-resource'); $query->getIterator()->willReturn(new \ArrayIterator()); $request->query = $query->reveal(); - $route = $this->prophesize(Route::class); - $route->getPath()->willReturn('/node/{node}'); - $route->getRequirement('_entity_type')->willReturn('node'); - $route->getRequirement('_bundle')->willReturn(NULL); - $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route->reveal()); + $route = new Route('/node/{node}', [], ['_entity_type' => 'node']); + $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route); $document_wrapper = $this->prophesize(DocumentWrapper::class); $document_wrapper->getData()->willReturn($this->node); $resource_config = $this->prophesize(ResourceConfigInterface::CLASS); @@ -202,7 +199,7 @@ class DocumentRootNormalizerTest extends KernelTestBase { // Make sure the route contains the entity type. $current_context = $this->container->get('jsonapi.current_context'); - $current_context->setCurrentRoute($route->reveal()); + $current_context->setCurrentRoute($route); $this->container->set('jsonapi.current_context', $current_context); $this->container->get('serializer'); @@ -260,11 +257,11 @@ class DocumentRootNormalizerTest extends KernelTestBase { $query->get('include')->willReturn(NULL); $query->getIterator()->willReturn(new \ArrayIterator()); $request->query = $query->reveal(); - $route = $this->prophesize(Route::class); - $route->getPath()->willReturn('/node_type/node_type/{node_type}'); - $route->getRequirement('_entity_type')->willReturn('node'); - $route->getRequirement('_bundle')->willReturn('article'); - $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route->reveal()); + $route = new Route('/node_type/node_type/{node_type}', [], [ + '_entity_type' => 'node_type', + '_bundle' => 'node_type', + ]); + $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route); $document_wrapper = $this->prophesize(DocumentWrapper::class); $document_wrapper->getData()->willReturn($this->nodeType); $resource_config = $this->prophesize(ResourceConfigInterface::CLASS); @@ -273,7 +270,7 @@ class DocumentRootNormalizerTest extends KernelTestBase { // Make sure the route contains the entity type and bundle. $current_context = $this->container->get('jsonapi.current_context'); - $current_context->setCurrentRoute($route->reveal()); + $current_context->setCurrentRoute($route); $this->container->set('jsonapi.current_context', $current_context); $this->container->get('serializer'); @@ -303,11 +300,8 @@ class DocumentRootNormalizerTest extends KernelTestBase { $query->get('include')->willReturn('bundle-resource'); $query->getIterator()->willReturn(new \ArrayIterator()); $request->query = $query->reveal(); - $route = $this->prophesize(Route::class); - $route->getPath()->willReturn('/node_type/{node_type}'); - $route->getRequirement('_entity_type')->willReturn('node'); - $route->getRequirement('_bundle')->willReturn(NULL); - $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route->reveal()); + $route = new Route('/node_type/{node_type}', [], ['_entity_type' => 'node']); + $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route); $document_wrapper = $this->prophesize(DocumentWrapper::class); $document_wrapper->getData()->willReturn($this->nodeType); $resource_config = $this->prophesize(ResourceConfigInterface::CLASS); @@ -316,7 +310,7 @@ class DocumentRootNormalizerTest extends KernelTestBase { // Make sure the route contains the entity type and bundle. $current_context = $this->container->get('jsonapi.current_context'); - $current_context->setCurrentRoute($route->reveal()); + $current_context->setCurrentRoute($route); $this->container->set('jsonapi.current_context', $current_context); $this->container->get('serializer'); @@ -354,12 +348,11 @@ class DocumentRootNormalizerTest extends KernelTestBase { public function testDenormalize() { $payload = '{"type":"article", "data":{"attributes":{"title":"Testing article"}}}'; $request = $this->prophesize(Request::class); - $route = $this->prophesize(Route::class); - $route->getPath()->willReturn('/node/article'); - $route->getRequirement('_entity_type')->willReturn('node'); - $route->getRequirement('_bundle')->willReturn('article'); - $route->getDefault('_on_relationship')->willReturn(NULL); - $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route->reveal()); + $route = new Route('/node/article', ['_on_relationship' => NULL], [ + '_entity_type' => 'node', + '_bundle' => 'article', + ]); + $request->get(RouteObjectInterface::ROUTE_OBJECT)->willReturn($route); $resource_config = $this->prophesize(ResourceConfigInterface::CLASS); $resource_config->getTypeName()->willReturn('node--article'); $resource_config->getEntityTypeId()->willReturn('node');