Skip to content

Commit 370b72c

Browse files
JaZoJaZo
committed
Change namespace of error classes
1 parent 8cd1cf8 commit 370b72c

File tree

11 files changed

+37
-35
lines changed

11 files changed

+37
-35
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1515

1616
* `ClientInterface` must now return a `\Psr\Http\Message\ResponseInterface` for requests instead of our own (removed) `ResponseInterface`.
1717
N.B. This is a breaking change if you use the `Client` directly, the `DocumentClient` isn't affected.
18+
* Changed namespace of error classes:
19+
```
20+
\Swis\JsonApi\Client\Errors\Error -> \Swis\JsonApi\Client\Error
21+
\Swis\JsonApi\Client\Errors\ErrorCollection -> \Swis\JsonApi\Client\ErrorCollection
22+
\Swis\JsonApi\Client\Errors\ErrorSource -> \Swis\JsonApi\Client\ErrorSource
23+
```
1824

1925
### Removed
2026

‎src/Document.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Swis\JsonApi\Client;
44

55
use Psr\Http\Message\ResponseInterface;
6-
use Swis\JsonApi\Client\Errors\ErrorCollection;
76
use Swis\JsonApi\Client\Interfaces\DataInterface;
87
use Swis\JsonApi\Client\Interfaces\DocumentInterface;
98
use Swis\JsonApi\Client\Traits\HasLinks;
@@ -24,7 +23,7 @@ class Document implements DocumentInterface
2423
protected $data;
2524

2625
/**
27-
* @var \Swis\JsonApi\Client\Errors\ErrorCollection
26+
* @var \Swis\JsonApi\Client\ErrorCollection
2827
*/
2928
protected $errors;
3029

@@ -61,15 +60,15 @@ public function setResponse(ResponseInterface $response = null)
6160
}
6261

6362
/**
64-
* @return \Swis\JsonApi\Client\Errors\ErrorCollection
63+
* @return \Swis\JsonApi\Client\ErrorCollection
6564
*/
6665
public function getErrors(): ErrorCollection
6766
{
6867
return $this->errors;
6968
}
7069

7170
/**
72-
* @param \Swis\JsonApi\Client\Errors\ErrorCollection $errors
71+
* @param \Swis\JsonApi\Client\ErrorCollection $errors
7372
*/
7473
public function setErrors(ErrorCollection $errors)
7574
{

‎src/Errors/Error.php‎ renamed to ‎src/Error.php‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?php
22

3-
namespace Swis\JsonApi\Client\Errors;
3+
namespace Swis\JsonApi\Client;
44

5-
use Swis\JsonApi\Client\Links;
6-
use Swis\JsonApi\Client\Meta;
75
use Swis\JsonApi\Client\Traits\HasLinks;
86
use Swis\JsonApi\Client\Traits\HasMeta;
97

@@ -37,19 +35,19 @@ class Error
3735
protected $detail;
3836

3937
/**
40-
* @var \Swis\JsonApi\Client\Errors\ErrorSource|null
38+
* @var \Swis\JsonApi\Client\ErrorSource|null
4139
*/
4240
protected $source;
4341

4442
/**
45-
* @param string|null $id
46-
* @param \Swis\JsonApi\Client\Links|null $links
47-
* @param string|null $status
48-
* @param string|null $code
49-
* @param string|null $title
50-
* @param string|null $detail
51-
* @param \Swis\JsonApi\Client\Errors\ErrorSource|null $source
52-
* @param \Swis\JsonApi\Client\Meta|null $meta
43+
* @param string|null $id
44+
* @param \Swis\JsonApi\Client\Links|null $links
45+
* @param string|null $status
46+
* @param string|null $code
47+
* @param string|null $title
48+
* @param string|null $detail
49+
* @param \Swis\JsonApi\Client\ErrorSource|null $source
50+
* @param \Swis\JsonApi\Client\Meta|null $meta
5351
*/
5452
public function __construct(
5553
string $id = null,
@@ -112,7 +110,7 @@ public function getDetail()
112110
}
113111

114112
/**
115-
* @return \Swis\JsonApi\Client\Errors\ErrorSource|null
113+
* @return \Swis\JsonApi\Client\ErrorSource|null
116114
*/
117115
public function getSource()
118116
{

‎src/Errors/ErrorCollection.php‎ renamed to ‎src/ErrorCollection.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Swis\JsonApi\Client\Errors;
3+
namespace Swis\JsonApi\Client;
44

55
use Illuminate\Support\Collection;
66

‎src/Errors/ErrorSource.php‎ renamed to ‎src/ErrorSource.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Swis\JsonApi\Client\Errors;
3+
namespace Swis\JsonApi\Client;
44

55
class ErrorSource
66
{

‎src/Interfaces/DocumentInterface.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Swis\JsonApi\Client\Interfaces;
44

55
use Swis\JsonApi\Client\Collection;
6-
use Swis\JsonApi\Client\Errors\ErrorCollection;
6+
use Swis\JsonApi\Client\ErrorCollection;
77

88
interface DocumentInterface extends \JsonSerializable
99
{
@@ -18,7 +18,7 @@ public function getResponse();
1818
public function getData();
1919

2020
/**
21-
* @return \Swis\JsonApi\Client\Errors\ErrorCollection
21+
* @return \Swis\JsonApi\Client\ErrorCollection
2222
*/
2323
public function getErrors(): ErrorCollection;
2424

‎src/InvalidResponseDocument.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Swis\JsonApi\Client;
44

55
use Psr\Http\Message\ResponseInterface;
6-
use Swis\JsonApi\Client\Errors\ErrorCollection;
76
use Swis\JsonApi\Client\Interfaces\DocumentInterface;
87

98
class InvalidResponseDocument implements DocumentInterface
@@ -38,7 +37,7 @@ public function getData()
3837
}
3938

4039
/**
41-
* @return \Swis\JsonApi\Client\Errors\ErrorCollection
40+
* @return \Swis\JsonApi\Client\ErrorCollection
4241
*/
4342
public function getErrors(): ErrorCollection
4443
{

‎src/JsonApi/ErrorsParser.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
use Art4\JsonApiClient\ErrorLink as JsonApiErrorLink;
88
use Art4\JsonApiClient\ErrorSource as JsonApiErrorSource;
99
use Art4\JsonApiClient\Meta as JsonApiMeta;
10-
use Swis\JsonApi\Client\Errors\Error;
11-
use Swis\JsonApi\Client\Errors\ErrorCollection;
12-
use Swis\JsonApi\Client\Errors\ErrorSource;
10+
use Swis\JsonApi\Client\Error;
11+
use Swis\JsonApi\Client\ErrorCollection;
12+
use Swis\JsonApi\Client\ErrorSource;
1313
use Swis\JsonApi\Client\Links;
1414
use Swis\JsonApi\Client\Meta;
1515

@@ -31,7 +31,7 @@ public function __construct(LinksParser $linksParser)
3131
/**
3232
* @param \Art4\JsonApiClient\ErrorCollection $errorCollection
3333
*
34-
* @return \Swis\JsonApi\Client\Errors\ErrorCollection
34+
* @return \Swis\JsonApi\Client\ErrorCollection
3535
*/
3636
public function parse(JsonApiErrorCollection $errorCollection)
3737
{
@@ -47,7 +47,7 @@ public function parse(JsonApiErrorCollection $errorCollection)
4747
/**
4848
* @param \Art4\JsonApiClient\Error $error
4949
*
50-
* @return \Swis\JsonApi\Client\Errors\Error
50+
* @return \Swis\JsonApi\Client\Error
5151
*/
5252
private function buildError(JsonApiError $error): Error
5353
{
@@ -76,7 +76,7 @@ private function buildLinks(JsonApiErrorLink $errorLink): Links
7676
/**
7777
* @param \Art4\JsonApiClient\ErrorSource $errorSource
7878
*
79-
* @return \Swis\JsonApi\Client\Errors\ErrorSource
79+
* @return \Swis\JsonApi\Client\ErrorSource
8080
*/
8181
private function buildErrorSource(JsonApiErrorSource $errorSource): ErrorSource
8282
{

‎src/JsonApi/Parser.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Swis\JsonApi\Client\Collection;
1111
use Swis\JsonApi\Client\CollectionDocument;
1212
use Swis\JsonApi\Client\Document;
13-
use Swis\JsonApi\Client\Errors\ErrorCollection;
13+
use Swis\JsonApi\Client\ErrorCollection;
1414
use Swis\JsonApi\Client\Interfaces\DocumentInterface;
1515
use Swis\JsonApi\Client\Interfaces\ParserInterface;
1616
use Swis\JsonApi\Client\InvalidResponseDocument;
@@ -247,7 +247,7 @@ private function parseLinks(Art4JsonApiDocumentInterface $document)
247247
/**
248248
* @param \Art4\JsonApiClient\DocumentInterface $document
249249
*
250-
* @return \Swis\JsonApi\Client\Errors\ErrorCollection
250+
* @return \Swis\JsonApi\Client\ErrorCollection
251251
*/
252252
private function parseErrors(Art4JsonApiDocumentInterface $document): ErrorCollection
253253
{

‎tests/DocumentTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use PHPUnit\Framework\TestCase;
66
use Swis\JsonApi\Client\Collection;
77
use Swis\JsonApi\Client\Document;
8-
use Swis\JsonApi\Client\Errors\ErrorCollection;
8+
use Swis\JsonApi\Client\ErrorCollection;
99
use Swis\JsonApi\Client\Item;
1010
use Swis\JsonApi\Client\Jsonapi;
1111
use Swis\JsonApi\Client\Link;

0 commit comments

Comments
 (0)