diff --git a/.travis.yml b/.travis.yml index 15e3f6e..001bb8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: php php: - - '7.0' - '7.1' - - hhvm - nightly before_script: diff --git a/README.md b/README.md index 73b2571..1bfd67d 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ $author = Relationship::fromLinkage( $author->setLink('self', '/articles/1/relationships/author'); $author->setLink('related', '/articles/1/author'); -$articles = new Resource('articles', '1'); +$articles = new ResourceObject('articles', '1'); $articles->setRelationship('author', $author); $articles->setAttribute('title', 'Rails is Omakase'); diff --git a/src/Document/Resource/Resource.php b/src/Document/Resource/ResourceObject.php similarity index 96% rename from src/Document/Resource/Resource.php rename to src/Document/Resource/ResourceObject.php index e637894..2f251f1 100644 --- a/src/Document/Resource/Resource.php +++ b/src/Document/Resource/ResourceObject.php @@ -8,7 +8,7 @@ use JsonApiPhp\JsonApi\Document\Resource\Relationship\Relationship; use JsonApiPhp\JsonApi\HasLinksAndMeta; -final class Resource implements PrimaryData, PrimaryDataItem +final class ResourceObject implements PrimaryData, PrimaryDataItem { use HasLinksAndMeta; diff --git a/test/Document/Resource/ResourceTest.php b/test/Document/Resource/ResourceTest.php index 010b8e6..b455284 100644 --- a/test/Document/Resource/ResourceTest.php +++ b/test/Document/Resource/ResourceTest.php @@ -4,7 +4,7 @@ namespace JsonApiPhp\JsonApi\Test\Document\Resource; use JsonApiPhp\JsonApi\Document\Resource\Relationship\Relationship; -use JsonApiPhp\JsonApi\Document\Resource\Resource; +use JsonApiPhp\JsonApi\Document\Resource\ResourceObject; use JsonApiPhp\JsonApi\Document\Resource\ResourceId; use JsonApiPhp\JsonApi\Test\HasAssertEqualsAsJson; use PHPUnit\Framework\TestCase; @@ -71,7 +71,7 @@ public function resourceProvider() ], ], (function () { - $resource = new Resource('books', '42abc'); + $resource = new ResourceObject('books', '42abc'); $resource->setMeta('foo', 'bar'); $resource->setAttribute('attr', 'val'); $resource->setLink('self', 'http://localhost'); @@ -90,7 +90,7 @@ public function resourceProvider() */ public function testAttributeCanNotHaveReservedNames(string $name) { - $r = new Resource('books', 'abc'); + $r = new ResourceObject('books', 'abc'); $r->setAttribute($name, 1); } @@ -108,7 +108,7 @@ public function invalidAttributeNames(): array */ public function testCanNotSetRelationshipIfAttributeExists() { - $res = new Resource('books', '1'); + $res = new ResourceObject('books', '1'); $res->setAttribute('foo', 'bar'); $res->setRelationship('foo', Relationship::fromMeta(['a' => 'b'])); } @@ -119,7 +119,7 @@ public function testCanNotSetRelationshipIfAttributeExists() */ public function testCanNotSetAttributeIfRelationshipExists() { - $res = new Resource('books', '1'); + $res = new ResourceObject('books', '1'); $res->setRelationship('foo', Relationship::fromMeta(['a' => 'b'])); $res->setAttribute('foo', 'bar'); } diff --git a/test/IntegrationTest.php b/test/IntegrationTest.php index 10b3318..62ea346 100644 --- a/test/IntegrationTest.php +++ b/test/IntegrationTest.php @@ -1,11 +1,12 @@