Skip to content

NullData -> NullResource #32

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 31, 2017
Merged

NullData -> NullResource #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Document/Resource/NullData.php → src/Document/Resource/NullResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace JsonApiPhp\JsonApi\Document\Resource;

final class NullData extends IdentifiableResource
final class NullResource extends IdentifiableResource
{
public function isEqualTo(IdentifiableResource $that): bool
{
Expand Down
6 changes: 3 additions & 3 deletions test/Document/CompoundDocumentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace JsonApiPhp\JsonApi\Test\Document;

use JsonApiPhp\JsonApi\Document\Document;
use JsonApiPhp\JsonApi\Document\Resource\NullData;
use JsonApiPhp\JsonApi\Document\Resource\NullResource;
use JsonApiPhp\JsonApi\Document\Resource\Relationship\Linkage;
use JsonApiPhp\JsonApi\Document\Resource\Relationship\Relationship;
use JsonApiPhp\JsonApi\Document\Resource\ResourceObject;
Expand Down Expand Up @@ -89,14 +89,14 @@ public function testIncludedResourcesRepresentedAsArray()
*/
public function testFullLinkageIsRequired()
{
$doc = Document::fromResource(new NullData);
$doc = Document::fromResource(new NullResource);
$doc->setIncluded(new ResourceObject('apples', '1'));
json_encode($doc);
}

public function testFullLinkageIsNotRequiredIfSparse()
{
$doc = Document::fromResource(new NullData);
$doc = Document::fromResource(new NullResource);
$doc->markSparse();
$doc->setIncluded(new ResourceObject('apples', '1'));
$this->assertCanBeBuilt($doc);
Expand Down
4 changes: 2 additions & 2 deletions test/Document/DocumentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

use JsonApiPhp\JsonApi\Document\Document;
use JsonApiPhp\JsonApi\Document\Error;
use JsonApiPhp\JsonApi\Document\Resource\NullData;
use JsonApiPhp\JsonApi\Document\Resource\NullResource;
use JsonApiPhp\JsonApi\Document\Resource\ResourceId;
use JsonApiPhp\JsonApi\Test\HasAssertEqualsAsJson;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -144,6 +144,6 @@ private function createErrorDoc(): Document

private function createNullDoc(): Document
{
return Document::fromResource(new NullData);
return Document::fromResource(new NullResource);
}
}
6 changes: 3 additions & 3 deletions test/Document/Resource/Relationship/LinkageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace JsonApiPhp\JsonApi\Test\Document\Resource\Relationship;

use JsonApiPhp\JsonApi\Document\Resource\NullData;
use JsonApiPhp\JsonApi\Document\Resource\NullResource;
use JsonApiPhp\JsonApi\Document\Resource\Relationship\Linkage;
use JsonApiPhp\JsonApi\Document\Resource\ResourceId;
use JsonApiPhp\JsonApi\Test\HasAssertEqualsAsJson;
Expand Down Expand Up @@ -88,14 +88,14 @@ public function testNullLinkageIsLinkedToNothing()
{
$apple = new ResourceId('apples', '1');
$this->assertFalse(Linkage::nullLinkage()->isLinkedTo($apple));
$this->assertFalse(Linkage::nullLinkage()->isLinkedTo(new NullData));
$this->assertFalse(Linkage::nullLinkage()->isLinkedTo(new NullResource));
}

public function testEmptyArrayLinkageIsLinkedToNothing()
{
$apple = new ResourceId('apples', '1');
$this->assertFalse(Linkage::emptyArrayLinkage()->isLinkedTo($apple));
$this->assertFalse(Linkage::emptyArrayLinkage()->isLinkedTo(new NullData));
$this->assertFalse(Linkage::emptyArrayLinkage()->isLinkedTo(new NullResource));
}

public function testSingleLinkageIsLinkedOnlyToItself()
Expand Down