Skip to content
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: php
php:
- '7.2'
- '7.1'

before_script:
- composer install
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
}
],
"require": {
"php": ">=7.2"
"php": ">=7.1"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"friendsofphp/php-cs-fixer": "^2.2"
"friendsofphp/php-cs-fixer": "^2.13"
},
"autoload": {
"psr-4": {
Expand Down
5 changes: 4 additions & 1 deletion src/Attribute.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ public function __construct(string $name, $val)
$this->val = $val;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'attributes')->{$this->name} = $this->val;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Error.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ public function __construct(ErrorMember ...$members)
}
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->errors[] = $this->error;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Error/Code.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ public function __construct(string $code)
$this->code = $code;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->code = $this->code;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Error/Detail.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ public function __construct(string $detail)
$this->detail = $detail;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->detail = $this->detail;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Error/Id.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ public function __construct(string $id)
$this->id = $id;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->id = $this->id;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Error/SourceParameter.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ public function __construct(string $parameter)
$this->parameter = $parameter;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'source')->parameter = $this->parameter;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Error/SourcePointer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ public function __construct(string $pointer)
$this->pointer = $pointer;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'source')->pointer = $this->pointer;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Error/Status.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ public function __construct(string $status)
$this->status = $status;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->status = $this->status;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Error/Title.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ public function __construct(string $title)
$this->title = $title;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->title = $this->title;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Included.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ public function validateLinkage(PrimaryData $data): void
}
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
foreach ($this->resources as $resource) {
$resource->attachAsIncludedTo($o);
Expand Down
5 changes: 4 additions & 1 deletion src/Internal/Attachable.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
*/
interface Attachable
{
public function attachTo(object $o): void;
/**
* @param object $o
*/
public function attachTo($o): void;
}
5 changes: 4 additions & 1 deletion src/JsonApi.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ public function __construct(string $version = '1.0', Meta $meta = null)
}
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->jsonapi = $this->obj;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Link/AboutLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ final class AboutLink implements ErrorMember
{
use LinkTrait;

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'links')->about = $this->link;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Link/FirstLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ final class FirstLink implements PaginationLink
{
use LinkTrait;

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'links')->first = $this->link;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Link/LastLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ final class LastLink implements PaginationLink
{
use LinkTrait;

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'links')->last = $this->link;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Link/NextLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ final class NextLink implements PaginationLink
{
use LinkTrait;

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'links')->next = $this->link;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Link/PrevLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ final class PrevLink implements PaginationLink
{
use LinkTrait;

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'links')->prev = $this->link;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Link/RelatedLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ final class RelatedLink implements ToOneMember
{
use LinkTrait;

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'links')->related = $this->link;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Link/SelfLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ final class SelfLink implements DataDocumentMember, ResourceMember, ToOneMember
{
use LinkTrait;

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
child($o, 'links')->self = $this->link;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function __construct(string $key, $value)
$this->value = $value;
}

public function attachTo(object $o): void
public function attachTo($o): void
{
child($o, 'meta')->{$this->key} = $this->value;
}
Expand Down
5 changes: 4 additions & 1 deletion src/NullData.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

final class NullData implements PrimaryData
{
public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->data = null;
}
Expand Down
5 changes: 4 additions & 1 deletion src/PaginatedCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ public function __construct(Pagination $pagination, Collection $collection)
$this->collection = $collection;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$this->collection->attachTo($o);
$this->pagination->attachTo($o);
Expand Down
5 changes: 4 additions & 1 deletion src/Pagination.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ public function __construct(PaginationLink ...$links)
$this->links = $links;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
foreach ($this->links as $link) {
$link->attachTo($o);
Expand Down
5 changes: 4 additions & 1 deletion src/ResourceCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ public function __construct(ResourceObject ...$resources)
$this->resources = $resources;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->data = [];
foreach ($this->resources as $resource) {
Expand Down
10 changes: 8 additions & 2 deletions src/ResourceIdentifier.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,18 @@ public function __construct(string $type, string $id, Meta $meta = null)
$this->id = $id;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->data = $this->obj;
}

public function attachToCollection(object $o): void
/**
* @param object $o
*/
public function attachToCollection($o): void
{
$o->data[] = $this->obj;
}
Expand Down
5 changes: 4 additions & 1 deletion src/ResourceIdentifierCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ public function __construct(ResourceIdentifier ...$identifiers)
$this->identifiers = $identifiers;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->data = [];
foreach ($this->identifiers as $identifier) {
Expand Down
15 changes: 12 additions & 3 deletions src/ResourceObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,26 @@ public function registerIn(array &$registry): void
$registry = array_merge($registry, $this->registry);
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$o->data = $this->obj;
}

public function attachAsIncludedTo(object $o): void
/**
* @param object $o
*/
public function attachAsIncludedTo($o): void
{
$o->included[] = $this->obj;
}

public function attachToCollection(object $o): void
/**
* @param object $o
*/
public function attachToCollection($o): void
{
$o->data[] = $this->obj;
}
Expand Down
5 changes: 4 additions & 1 deletion src/ToMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ public function __construct(string $name, ResourceIdentifierCollection $collecti
$this->collection = $collection;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$rel = child(child($o, 'relationships'), $this->name);
$rel->data = [];
Expand Down
5 changes: 4 additions & 1 deletion src/ToNull.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ public function __construct(string $name, ToOneMember ...$members)
$this->members = $members;
}

public function attachTo(object $o): void
/**
* @param object $o
*/
public function attachTo($o): void
{
$obj = combine(...$this->members);
$obj->data = null;
Expand Down
Loading