Skip to content

Commit 42cbebf

Browse files
f3athf3ath
authored
Introduced Meta object (#38)
1 parent 842c35c commit 42cbebf

23 files changed

+173
-198
lines changed

‎.php_cs.dist‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
<?php
2-
$header = <<<EOF
3-
This file is part of JSON:API implementation for PHP.
4-
5-
(c) Alexey Karapetov <karapetov@gmail.com>
6-
7-
For the full copyright and license information, please view the LICENSE
8-
file that was distributed with this source code.
9-
EOF;
102
$finder = PhpCsFixer\Finder::create()
113
->files()
124
->name('*.php')
@@ -22,7 +14,6 @@ return PhpCsFixer\Config::create()
2214
'cast_spaces' => true,
2315
'concat_space' => true,
2416
'declare_strict_types' => true,
25-
'header_comment' => array('header' => $header),
2617
'include' => true,
2718
'is_null' => true,
2819
'lowercase_cast' => true,
@@ -57,4 +48,4 @@ return PhpCsFixer\Config::create()
5748
'trailing_comma_in_multiline_array' => true,
5849
'whitespace_after_comma_in_array' => true,
5950
])
60-
->setFinder($finder);
51+
->setFinder($finder);

‎src/Document/Document.php‎ renamed to ‎src/Document.php‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
<?php
2-
declare(strict_types=1);
3-
4-
/*
5-
* This file is part of JSON:API implementation for PHP.
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
64
*
7-
* (c) Alexey Karapetov <karapetov@gmail.com>
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
86
*
9-
* For the full copyright and license information, please view the LICENSE
10-
* file that was distributed with this source code.
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
119
*/
10+
declare(strict_types=1);
1211

13-
namespace JsonApiPhp\JsonApi\Document;
12+
namespace JsonApiPhp\JsonApi;
1413

14+
use JsonApiPhp\JsonApi\Document\Error;
15+
use JsonApiPhp\JsonApi\Document\LinksTrait;
16+
use JsonApiPhp\JsonApi\Document\Meta;
17+
use JsonApiPhp\JsonApi\Document\MetaTrait;
1518
use JsonApiPhp\JsonApi\Document\Resource\ResourceInterface;
1619
use JsonApiPhp\JsonApi\Document\Resource\ResourceObject;
1720

18-
final class Document implements \JsonSerializable
21+
class Document implements \JsonSerializable
1922
{
2023
const MEDIA_TYPE = 'application/vnd.api+json';
2124
const DEFAULT_API_VERSION = '1.0';
@@ -33,10 +36,10 @@ private function __construct()
3336
{
3437
}
3538

36-
public static function fromMeta(array $meta): self
39+
public static function fromMeta(Meta $meta): self
3740
{
3841
$doc = new self;
39-
$doc->replaceMeta($meta);
42+
$doc->setMeta($meta);
4043
return $doc;
4144
}
4245

‎src/Document/ArrayMeta.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
4+
*
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
9+
*/
10+
declare(strict_types=1);
11+
12+
namespace JsonApiPhp\JsonApi\Document;
13+
14+
class ArrayMeta extends Meta
15+
{
16+
public function __construct(array $array)
17+
{
18+
parent::__construct((object) $array);
19+
}
20+
}

‎src/Document/Error.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php
2-
declare(strict_types=1);
3-
4-
/*
5-
* This file is part of JSON:API implementation for PHP.
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
64
*
7-
* (c) Alexey Karapetov <karapetov@gmail.com>
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
86
*
9-
* For the full copyright and license information, please view the LICENSE
10-
* file that was distributed with this source code.
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
119
*/
10+
declare(strict_types=1);
1211

1312
namespace JsonApiPhp\JsonApi\Document;
1413

‎src/Document/LinksTrait.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php
2-
declare(strict_types=1);
3-
4-
/*
5-
* This file is part of JSON:API implementation for PHP.
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
64
*
7-
* (c) Alexey Karapetov <karapetov@gmail.com>
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
86
*
9-
* For the full copyright and license information, please view the LICENSE
10-
* file that was distributed with this source code.
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
119
*/
10+
declare(strict_types=1);
1211

1312
namespace JsonApiPhp\JsonApi\Document;
1413

‎src/Document/Meta.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
4+
*
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
9+
*/
10+
declare(strict_types=1);
11+
12+
namespace JsonApiPhp\JsonApi\Document;
13+
14+
class Meta implements \JsonSerializable
15+
{
16+
private $data;
17+
18+
public function __construct(\stdClass $data)
19+
{
20+
$this->data = $data;
21+
}
22+
23+
public function jsonSerialize()
24+
{
25+
return $this->data;
26+
}
27+
}

‎src/Document/MetaTrait.php‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,22 @@
11
<?php
2-
declare(strict_types=1);
3-
4-
/*
5-
* This file is part of JSON:API implementation for PHP.
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
64
*
7-
* (c) Alexey Karapetov <karapetov@gmail.com>
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
86
*
9-
* For the full copyright and license information, please view the LICENSE
10-
* file that was distributed with this source code.
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
119
*/
10+
declare(strict_types=1);
1211

1312
namespace JsonApiPhp\JsonApi\Document;
1413

1514
trait MetaTrait
1615
{
1716
protected $meta;
1817

19-
public function setMeta(string $key, $val)
20-
{
21-
$this->meta[$key] = $val;
22-
}
23-
24-
public function replaceMeta(array $meta)
18+
public function setMeta(Meta $meta)
2519
{
26-
$this->meta = null;
27-
foreach ($meta as $key => $value) {
28-
$this->setMeta($key, $value);
29-
}
20+
$this->meta = $meta;
3021
}
3122
}

‎src/Document/Resource/NullResource.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php
2-
declare(strict_types=1);
3-
4-
/*
5-
* This file is part of JSON:API implementation for PHP.
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
64
*
7-
* (c) Alexey Karapetov <karapetov@gmail.com>
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
86
*
9-
* For the full copyright and license information, please view the LICENSE
10-
* file that was distributed with this source code.
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
119
*/
10+
declare(strict_types=1);
1211

1312
namespace JsonApiPhp\JsonApi\Document\Resource;
1413

‎src/Document/Resource/Relationship/Linkage.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php
2-
declare(strict_types=1);
3-
4-
/*
5-
* This file is part of JSON:API implementation for PHP.
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
64
*
7-
* (c) Alexey Karapetov <karapetov@gmail.com>
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
86
*
9-
* For the full copyright and license information, please view the LICENSE
10-
* file that was distributed with this source code.
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
119
*/
10+
declare(strict_types=1);
1211

1312
namespace JsonApiPhp\JsonApi\Document\Resource\Relationship;
1413

‎src/Document/Resource/Relationship/Relationship.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
2-
declare(strict_types=1);
3-
4-
/*
5-
* This file is part of JSON:API implementation for PHP.
2+
/**
3+
* This file is part of JSON:API implementation for PHP.
64
*
7-
* (c) Alexey Karapetov <karapetov@gmail.com>
5+
* (c) Alexey Karapetov <karapetov@gmail.com>
86
*
9-
* For the full copyright and license information, please view the LICENSE
10-
* file that was distributed with this source code.
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
119
*/
10+
declare(strict_types=1);
1211

1312
namespace JsonApiPhp\JsonApi\Document\Resource\Relationship;
1413

1514
use JsonApiPhp\JsonApi\Document\LinksTrait;
15+
use JsonApiPhp\JsonApi\Document\Meta;
1616
use JsonApiPhp\JsonApi\Document\MetaTrait;
1717
use JsonApiPhp\JsonApi\Document\Resource\ResourceInterface;
1818

@@ -30,10 +30,10 @@ private function __construct()
3030
{
3131
}
3232

33-
public static function fromMeta(array $meta): self
33+
public static function fromMeta(Meta $meta): self
3434
{
3535
$r = new self;
36-
$r->replaceMeta($meta);
36+
$r->setMeta($meta);
3737
return $r;
3838
}
3939

0 commit comments

Comments
 (0)