-
-
Notifications
You must be signed in to change notification settings - Fork 846
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adds jsonld context, Adds support for jsonld typed values #752
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the API Platform project. | ||
| * | ||
| * (c) Kévin Dunglas <dunglas@gmail.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity; | ||
|
|
||
| use ApiPlatform\Core\Annotation\ApiProperty; | ||
| use ApiPlatform\Core\Annotation\ApiResource; | ||
| use Doctrine\ORM\Mapping as ORM; | ||
|
|
||
| /** | ||
| * Jsonld Context Dummy. | ||
| * | ||
| * | ||
| * @ApiResource | ||
| * @ORM\Entity | ||
| */ | ||
| class JsonldContextDummy | ||
| { | ||
| /** | ||
| * @var int The id. | ||
| * | ||
| * @ApiProperty(identifier=true) | ||
| * @ORM\Column(type="integer") | ||
| * @ORM\Id | ||
| * @ORM\GeneratedValue(strategy="AUTO") | ||
| */ | ||
| private $id; | ||
|
|
||
| /** | ||
| * @var string The dummy person. | ||
| * | ||
| * @ApiProperty( | ||
| * attributes={ | ||
| * "jsonld_context"= { | ||
| * "@id"="http://example.com/id", | ||
| * "@type"="@id", | ||
| * "foo"="bar" | ||
| * } | ||
| * }, | ||
| * ) | ||
| */ | ||
| private $person; | ||
|
|
||
| public function getId() | ||
| { | ||
| return $this->id; | ||
| } | ||
|
|
||
| public function setPerson($person) | ||
| { | ||
| $this->person = $person; | ||
| } | ||
|
|
||
| public function getPerson() | ||
| { | ||
| return $this->person; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the API Platform project. | ||
| * | ||
| * (c) Kévin Dunglas <dunglas@gmail.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace ApiPlatform\Core\Tests\JsonLd; | ||
|
|
||
| use ApiPlatform\Core\Api\UrlGeneratorInterface; | ||
| use ApiPlatform\Core\JsonLd\ContextBuilder; | ||
| use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; | ||
| use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; | ||
| use ApiPlatform\Core\Metadata\Property\PropertyMetadata; | ||
| use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; | ||
| use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; | ||
| use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; | ||
| use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; | ||
| use Symfony\Component\PropertyInfo\Type; | ||
|
|
||
| /** | ||
| * @author Markus Mächler <markus.maechler@bithost.ch> | ||
| */ | ||
| class ContextBuilderTest extends \PHPUnit_Framework_TestCase | ||
| { | ||
| private $entityClass; | ||
| private $resourceNameCollectionFactoryProphecy; | ||
| private $resourceMetadataFactoryProphecy; | ||
| private $propertyNameCollectionFactoryProphecy; | ||
| private $propertyMetadataFactoryProphecy; | ||
| private $urlGeneratorProphecy; | ||
|
|
||
| public function setUp() | ||
| { | ||
| $this->entityClass = '\Dummy\DummyEntity'; | ||
| $this->resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class); | ||
| $this->resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class); | ||
| $this->propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class); | ||
| $this->propertyMetadataFactoryProphecy = $this->prophesize(PropertyMetadataFactoryInterface::class); | ||
| $this->urlGeneratorProphecy = $this->prophesize(UrlGeneratorInterface::class); | ||
| } | ||
|
|
||
| public function testResourceContext() | ||
| { | ||
| $this->resourceMetadataFactoryProphecy->create($this->entityClass)->willReturn(new ResourceMetadata('DummyEntity')); | ||
| $this->propertyNameCollectionFactoryProphecy->create($this->entityClass)->willReturn(new PropertyNameCollection(['dummyPropertyA'])); | ||
| $this->propertyMetadataFactoryProphecy->create($this->entityClass, 'dummyPropertyA')->willReturn(new PropertyMetadata(new Type(Type::BUILTIN_TYPE_STRING), 'Dummy property A', true, true, true, true, false, false, null, null, [])); | ||
|
|
||
| $contextBuilder = new ContextBuilder($this->resourceNameCollectionFactoryProphecy->reveal(), $this->resourceMetadataFactoryProphecy->reveal(), $this->propertyNameCollectionFactoryProphecy->reveal(), $this->propertyMetadataFactoryProphecy->reveal(), $this->urlGeneratorProphecy->reveal()); | ||
|
|
||
| $expected = [ | ||
| '@vocab' => '#', | ||
| 'hydra' => 'http://www.w3.org/ns/hydra/core#', | ||
| 'dummyPropertyA' => '#DummyEntity/dummyPropertyA', | ||
| ]; | ||
|
|
||
| $this->assertEquals($expected, $contextBuilder->getResourceContext($this->entityClass)); | ||
| } | ||
|
|
||
| public function testResourceContextWithJsonldContext() | ||
| { | ||
| $this->resourceMetadataFactoryProphecy->create($this->entityClass)->willReturn(new ResourceMetadata('DummyEntity')); | ||
| $this->propertyNameCollectionFactoryProphecy->create($this->entityClass)->willReturn(new PropertyNameCollection(['dummyPropertyA'])); | ||
| $this->propertyMetadataFactoryProphecy->create($this->entityClass, 'dummyPropertyA')->willReturn(new PropertyMetadata(new Type(Type::BUILTIN_TYPE_STRING), 'Dummy property A', true, true, true, true, false, false, null, null, ['jsonld_context' => ['@type' => '@id', '@id' => 'customId', 'foo' => 'bar']])); | ||
|
|
||
| $contextBuilder = new ContextBuilder($this->resourceNameCollectionFactoryProphecy->reveal(), $this->resourceMetadataFactoryProphecy->reveal(), $this->propertyNameCollectionFactoryProphecy->reveal(), $this->propertyMetadataFactoryProphecy->reveal(), $this->urlGeneratorProphecy->reveal()); | ||
|
|
||
| $expected = [ | ||
| '@vocab' => '#', | ||
| 'hydra' => 'http://www.w3.org/ns/hydra/core#', | ||
| 'dummyPropertyA' => [ | ||
| '@type' => '@id', | ||
| '@id' => 'customId', | ||
| 'foo' => 'bar', | ||
| ], | ||
| ]; | ||
|
|
||
| $this->assertEquals($expected, $contextBuilder->getResourceContext($this->entityClass)); | ||
| } | ||
|
|
||
| public function testResourceContextWithReverse() | ||
| { | ||
| $this->resourceMetadataFactoryProphecy->create($this->entityClass)->willReturn(new ResourceMetadata('DummyEntity')); | ||
| $this->propertyNameCollectionFactoryProphecy->create($this->entityClass)->willReturn(new PropertyNameCollection(['dummyPropertyA'])); | ||
| $this->propertyMetadataFactoryProphecy->create($this->entityClass, 'dummyPropertyA')->willReturn(new PropertyMetadata(new Type(Type::BUILTIN_TYPE_STRING), 'Dummy property A', true, true, true, true, false, false, null, null, ['jsonld_context' => ['@reverse' => 'parent']])); | ||
|
|
||
| $contextBuilder = new ContextBuilder($this->resourceNameCollectionFactoryProphecy->reveal(), $this->resourceMetadataFactoryProphecy->reveal(), $this->propertyNameCollectionFactoryProphecy->reveal(), $this->propertyMetadataFactoryProphecy->reveal(), $this->urlGeneratorProphecy->reveal()); | ||
|
|
||
| $expected = [ | ||
| '@vocab' => '#', | ||
| 'hydra' => 'http://www.w3.org/ns/hydra/core#', | ||
| 'dummyPropertyA' => [ | ||
| '@id' => '#DummyEntity/dummyPropertyA', | ||
| '@reverse' => 'parent' | ||
| ], | ||
| ]; | ||
|
|
||
| $this->assertEquals($expected, $contextBuilder->getResourceContext($this->entityClass)); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's set in the
jsonld_contextattribute should be used as the base. We don't want to limit it to just@type.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See for example how
hydra_contextis handled incore/src/Hydra/Serializer/DocumentationNormalizer.php
Lines 209 to 273 in 7ac1866
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great input! I did not think of that, I updated the pull request.