Skip to content

Commit 911633f

Browse files
f3athf3ath
authored
Performance improvements (#81)
1 parent 7fd1382 commit 911633f

90 files changed

Lines changed: 1270 additions & 787 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,21 @@ use JsonApiPhp\JsonApi\Attribute;
3535
use JsonApiPhp\JsonApi\DataDocument;
3636
use JsonApiPhp\JsonApi\Link\RelatedLink;
3737
use JsonApiPhp\JsonApi\Link\SelfLink;
38-
use JsonApiPhp\JsonApi\Link\Url;
39-
use JsonApiPhp\JsonApi\Relationship;
4038
use JsonApiPhp\JsonApi\ResourceIdentifier;
4139
use JsonApiPhp\JsonApi\ResourceObject;
42-
use JsonApiPhp\JsonApi\SingleLinkage;
40+
use JsonApiPhp\JsonApi\ToOne;
4341

4442
echo json_encode(
4543
new DataDocument(
4644
new ResourceObject(
4745
'articles',
4846
'1',
4947
new Attribute('title', 'Rails is Omakase'),
50-
new Relationship(
48+
new ToOne(
5149
'author',
52-
new SingleLinkage(new ResourceIdentifier('author', '9')),
53-
new SelfLink(new Url('/articles/1/relationships/author')),
54-
new RelatedLink(new Url('/articles/1/author'))
50+
new ResourceIdentifier('author', '9'),
51+
new SelfLink('/articles/1/relationships/author'),
52+
new RelatedLink('/articles/1/author')
5553
)
5654
)
5755
),
@@ -77,7 +75,7 @@ The library API and use-cases are expressed in comprehensive suite of tests.
7775
- [Compound Documents](./test/CompoundDocumentTest.php)
7876
- [Error Documents](./test/ErrorDocumentTest.php)
7977
- [Meta Documents (containing neither data nor errors)](./test/MetaDocumentTest.php)
80-
- [Pagination links](./test/PaginationLinksTest.php)
78+
- [Pagination](./test/PaginationTest.php)
8179
- [Link Objects](./test/LinkObjectTest.php)
8280
- [JSON API Object](./test/JsonApiTest.php)
8381
- [Meta Objects](./test/MetaTest.php)

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"php": ">=7.2"
1515
},
1616
"require-dev": {
17-
"phpunit/phpunit": "^6.0",
17+
"phpunit/phpunit": "^7.0",
1818
"friendsofphp/php-cs-fixer": "^2.2"
1919
},
2020
"autoload": {

‎examples/compound_doc.php‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?php declare(strict_types=1);
2+
23
use JsonApiPhp\JsonApi\Attribute;
34
use JsonApiPhp\JsonApi\CompoundDocument;
45
use JsonApiPhp\JsonApi\Included;
56
use JsonApiPhp\JsonApi\Link\LastLink;
67
use JsonApiPhp\JsonApi\Link\NextLink;
78
use JsonApiPhp\JsonApi\Link\RelatedLink;
89
use JsonApiPhp\JsonApi\Link\SelfLink;
9-
use JsonApiPhp\JsonApi\Link\Url;
10-
use JsonApiPhp\JsonApi\MultiLinkage;
11-
use JsonApiPhp\JsonApi\Relationship;
10+
use JsonApiPhp\JsonApi\PaginatedResourceCollection;
11+
use JsonApiPhp\JsonApi\Pagination;
1212
use JsonApiPhp\JsonApi\ResourceIdentifier;
13+
use JsonApiPhp\JsonApi\ResourceIdentifierCollection;
1314
use JsonApiPhp\JsonApi\ResourceObject;
14-
use JsonApiPhp\JsonApi\ResourceObjectSet;
15-
use JsonApiPhp\JsonApi\SingleLinkage;
15+
use JsonApiPhp\JsonApi\ToMany;
16+
use JsonApiPhp\JsonApi\ToOne;
1617

1718
require_once __DIR__.'/../vendor/autoload.php';
1819

@@ -22,53 +23,55 @@
2223
new Attribute('first-name', 'Dan'),
2324
new Attribute('last-name', 'Gebhardt'),
2425
new Attribute('twitter', 'dgeb'),
25-
new SelfLink(new Url('http://example.com/people/9'))
26+
new SelfLink('http://example.com/people/9')
2627
);
2728

2829
$comment05 = new ResourceObject(
2930
'comments',
3031
'5',
3132
new Attribute('body', 'First!'),
32-
new SelfLink(new Url('http://example.com/comments/5')),
33-
new Relationship('author', new SingleLinkage(new ResourceIdentifier('people', '2')))
33+
new SelfLink('http://example.com/comments/5'),
34+
new ToOne('author', new ResourceIdentifier('people', '2'))
3435

3536
);
3637
$comment12 = new ResourceObject(
3738
'comments',
3839
'12',
3940
new Attribute('body', 'I like XML better'),
40-
new SelfLink(new Url('http://example.com/comments/12')),
41-
new Relationship('author', new SingleLinkage($dan->identifier()))
41+
new SelfLink('http://example.com/comments/12'),
42+
new ToOne('author', $dan->toIdentifier())
4243
);
4344

4445
$document = new CompoundDocument(
45-
new ResourceObjectSet(
46+
new PaginatedResourceCollection(
47+
new Pagination(
48+
new NextLink('http://example.com/articles?page[offset]=2'),
49+
new LastLink('http://example.com/articles?page[offset]=10')
50+
),
4651
new ResourceObject(
4752
'articles',
4853
'1',
4954
new Attribute('title', 'JSON API paints my bikeshed!'),
50-
new SelfLink(new Url('http://example.com/articles/1')),
51-
new Relationship(
55+
new SelfLink('http://example.com/articles/1'),
56+
new ToOne(
5257
'author',
53-
new SingleLinkage($dan->identifier()),
54-
new SelfLink(new Url('http://example.com/articles/1/relationships/author')),
55-
new RelatedLink(new Url('http://example.com/articles/1/author'))
58+
$dan->toIdentifier(),
59+
new SelfLink('http://example.com/articles/1/relationships/author'),
60+
new RelatedLink('http://example.com/articles/1/author')
5661
),
57-
new Relationship(
62+
new ToMany(
5863
'comments',
59-
new MultiLinkage(
60-
$comment05->identifier(),
61-
$comment12->identifier()
64+
new ResourceIdentifierCollection(
65+
$comment05->toIdentifier(),
66+
$comment12->toIdentifier()
6267
),
63-
new SelfLink(new Url('http://example.com/articles/1/relationships/comments')),
64-
new RelatedLink(new Url('http://example.com/articles/1/comments'))
68+
new SelfLink('http://example.com/articles/1/relationships/comments'),
69+
new RelatedLink('http://example.com/articles/1/comments')
6570
)
6671
)
6772
),
6873
new Included($dan, $comment05, $comment12),
69-
new SelfLink(new Url('http://example.com/articles')),
70-
new NextLink(new Url('http://example.com/articles?page[offset]=2')),
71-
new LastLink(new Url('http://example.com/articles?page[offset]=10'))
74+
new SelfLink('http://example.com/articles')
7275
);
7376

7477
echo json_encode($document, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);

‎examples/simple_doc.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,21 @@
55
use JsonApiPhp\JsonApi\DataDocument;
66
use JsonApiPhp\JsonApi\Link\RelatedLink;
77
use JsonApiPhp\JsonApi\Link\SelfLink;
8-
use JsonApiPhp\JsonApi\Link\Url;
9-
use JsonApiPhp\JsonApi\Relationship;
108
use JsonApiPhp\JsonApi\ResourceIdentifier;
119
use JsonApiPhp\JsonApi\ResourceObject;
12-
use JsonApiPhp\JsonApi\SingleLinkage;
10+
use JsonApiPhp\JsonApi\ToOne;
1311

1412
echo json_encode(
1513
new DataDocument(
1614
new ResourceObject(
1715
'articles',
1816
'1',
1917
new Attribute('title', 'Rails is Omakase'),
20-
new Relationship(
18+
new ToOne(
2119
'author',
22-
new SingleLinkage(new ResourceIdentifier('author', '9')),
23-
new SelfLink(new Url('/articles/1/relationships/author')),
24-
new RelatedLink(new Url('/articles/1/author'))
20+
new ResourceIdentifier('author', '9'),
21+
new SelfLink('/articles/1/relationships/author'),
22+
new RelatedLink('/articles/1/author')
2523
)
2624
)
2725
),

‎src/AttachableValue.php‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/Attribute.php‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,23 @@
22

33
namespace JsonApiPhp\JsonApi;
44

5-
use JsonApiPhp\JsonApi\PrimaryData\ResourceField;
5+
use JsonApiPhp\JsonApi\Internal\ResourceField;
6+
use JsonApiPhp\JsonApi\Internal\ResourceFieldTrait;
67

7-
final class Attribute extends ResourceField
8+
final class Attribute implements ResourceField
89
{
10+
use ResourceFieldTrait;
11+
private $val;
12+
13+
public function __construct(string $name, $val)
14+
{
15+
$this->validateFieldName($name);
16+
$this->name = $name;
17+
$this->val = $val;
18+
}
19+
920
public function attachTo(object $o)
1021
{
11-
parent::attachTo(child($o, 'attributes'));
22+
child($o, 'attributes')->{$this->name} = $this->val;
1223
}
1324
}

‎src/CompoundDocument.php‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,21 @@
22

33
namespace JsonApiPhp\JsonApi;
44

5-
use JsonApiPhp\JsonApi\PrimaryData\PrimaryData;
5+
use JsonApiPhp\JsonApi\Internal\DataDocumentMember;
6+
use JsonApiPhp\JsonApi\Internal\PrimaryData;
67

7-
final class CompoundDocument extends JsonSerializableValue
8+
final class CompoundDocument implements \JsonSerializable
89
{
10+
private $doc;
11+
912
public function __construct(PrimaryData $data, Included $included, DataDocumentMember ...$members)
1013
{
11-
foreach ($included as $resource) {
12-
if ($data->identifies($resource)) {
13-
continue;
14-
}
15-
foreach ($included as $anotherResource) {
16-
if ($anotherResource->identifies($resource)) {
17-
continue 2;
18-
}
19-
}
20-
throw new \DomainException('Full linkage required for '.json_encode($resource->identifier()));
21-
}
22-
parent::__construct(combine($data, $included, ...$members));
14+
$included->validateLinkage($data);
15+
$this->doc = combine($data, $included, ...$members);
16+
}
17+
18+
public function jsonSerialize()
19+
{
20+
return $this->doc;
2321
}
2422
}

‎src/DataDocument.php‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22

33
namespace JsonApiPhp\JsonApi;
44

5-
use JsonApiPhp\JsonApi\PrimaryData\PrimaryData;
5+
use JsonApiPhp\JsonApi\Internal\DataDocumentMember;
6+
use JsonApiPhp\JsonApi\Internal\PrimaryData;
67

7-
final class DataDocument extends JsonSerializableValue
8+
final class DataDocument implements \JsonSerializable
89
{
10+
private $value;
11+
912
public function __construct(PrimaryData $data, DataDocumentMember ...$members)
1013
{
11-
parent::__construct(combine($data, ...$members));
14+
$this->value = combine($data, ...$members);
15+
}
16+
17+
public function jsonSerialize()
18+
{
19+
return $this->value;
1220
}
1321
}

‎src/DataDocumentMember.php‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/DocumentMember.php‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)