Skip to content
This repository was archived by the owner on Jan 2, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Document.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public function addIncluded($link)

foreach ($resources as $k => $resource) {
foreach ($this->included as $includedResource) {
if ($includedResource->getType() === $resource->getType() && $includedResource->getId() === $resource->getId()) {
if ($includedResource->getType() === $resource->getType()
&& $includedResource->getId() === $resource->getId()) {
$includedResource->merge($resource);
unset($resources[$k]);
break;
Expand Down Expand Up @@ -125,7 +126,7 @@ public function __toString()
{
return json_encode($this->toArray());
}

public function jsonSerialize()
{
return $this->toArray();
Expand Down
3 changes: 1 addition & 2 deletions src/SerializerAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ public function resource($data)
);
}

if ($method && $element)
{
if ($method && $element) {
if (! ($element instanceof Relationship)) {
$element = new Relationship($element);
}
Expand Down
62 changes: 62 additions & 0 deletions tests/CriteriaTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?php namespace Tobscure\JsonApi;

use Tobscure\JsonApi\Criteria;

class CriteriaTest extends \PHPUnit_Framework_TestCase
{
public function testGetIncludeReturnsArrayOfIncludes()
{
$criteria = new Criteria(['include' => 'posts,images']);

$this->assertEquals(['posts', 'images'], $criteria->getInclude());
}

public function testGetSortReturnsArrayOfFieldToSortDirection()
{
$criteria = new Criteria(['sort' => '+firstname']);

$this->assertEquals(['firstname' => 'asc'], $criteria->getSort());
}

public function testGetSortSupportsMultipleSortedFieldsSeparatedByComma()
{
$criteria = new Criteria(['sort' => '+firstname,-lastname']);

$this->assertEquals(['firstname' => 'asc', 'lastname' => 'desc'], $criteria->getSort());
}

public function testGetSortIgnoresInvalidDirections()
{
$criteria = new Criteria(['sort' => '*firstname']);

$this->assertEmpty($criteria->getSort());
}

public function testGetSortDefaultsToEmptyArray()
{
$criteria = new Criteria([]);

$this->assertEmpty($criteria->getSort());
}

public function testGetOffsetParsesThePageOffset()
{
$criteria = new Criteria(['page' => ['offset' => 10]]);

$this->assertEquals(10, $criteria->getOffset());
}

public function testGetOffsetIsAtLeastZero()
{
$criteria = new Criteria(['page' => ['offset' => -5]]);

$this->assertEquals(0, $criteria->getOffset());
}

public function testGetLimitParsesThePageLimit()
{
$criteria = new Criteria(['page' => ['limit' => 100]]);

$this->assertEquals(100, $criteria->getLimit());
}
}
21 changes: 21 additions & 0 deletions tests/DocumentTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php namespace Tobscure\JsonApi;

use Tobscure\JsonApi\Document;
use Tobscure\JsonApi\Elements\Resource;

class DocumentTest extends \PHPUnit_Framework_TestCase
{
public function testToArrayIncludesTheResourcesRepresentation()
{
$resource = new Resource('post', 1);
$document = new Document();
$document->setData($resource);

$this->assertEquals(['data' => $resource->toArray()], $document->toArray());
}

public function testItCanBeSerializedToJson()
{
$this->assertEquals('[]', (string) new Document());
}
}
25 changes: 25 additions & 0 deletions tests/Elements/CollectionTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php namespace Tobscure\JsonApi\Elements;

use Tobscure\JsonApi\Elements\Collection;
use Tobscure\JsonApi\Elements\Resource;

class CollectionTest extends \PHPUnit_Framework_TestCase
{
public function testToArrayReturnsArrayOfResources()
{
$post1 = new Resource('post', 1);
$post2 = new Resource('post', 2);
$collection = new Collection('post', [$post1, $post2]);

$this->assertEquals([$post1->toArray(), $post2->toArray()], $collection->toArray());
}

public function testGetIdReturnsArrayOfResourceIds()
{
$post1 = new Resource('post', 1);
$post2 = new Resource('post', 2);
$collection = new Collection('post', [$post1, $post2]);

$this->assertEquals([1, 2], $collection->getId());
}
}