Skip to content

Commit 732e99d

Browse files
Art4Art4
committed
Remove Art4\JsonApiClient\Resource namespace
- Art4\JsonApiClient\Resource\Collection -> Art4\JsonApiClient\ResourceCollection - Art4\JsonApiClient\Resource\CollectionInterface -> Art4\JsonApiClient\ResourceCollectionInterface - Art4\JsonApiClient\Resource\Identifier -> Art4\JsonApiClient\ResourceIdentifier - Art4\JsonApiClient\Resource\IdentifierInterface -> Art4\JsonApiClient\ResourceIdentifierInterface - Art4\JsonApiClient\Resource\IdentifierCollection -> Art4\JsonApiClient\ResourceIdentifierCollection - Art4\JsonApiClient\Resource\IdentifierCollectionInterface -> Art4\JsonApiClient\ResourceIdentifierCollectionInterface - Art4\JsonApiClient\Resource\Item -> Art4\JsonApiClient\ResourceItem - Art4\JsonApiClient\Resource\ItemInterface -> Art4\JsonApiClient\ResourceItemInterface - Art4\JsonApiClient\Resource\ItemLink -> Art4\JsonApiClient\ResourceItemLink - Art4\JsonApiClient\Resource\ItemLinkInterface -> Art4\JsonApiClient\ResourceItemLinkInterface - Art4\JsonApiClient\Resource\NullResource -> Art4\JsonApiClient\ResourceNull - Art4\JsonApiClient\Resource\NullResourceInterface -> Art4\JsonApiClient\ResourceNullInterface refs #31
1 parent 0d0390f commit 732e99d

31 files changed

+233
-252
lines changed

‎src/Document.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function parse($object)
117117
}
118118

119119
$collection = $this->manager->getFactory()->make(
120-
'Resource\Collection',
120+
'ResourceCollection',
121121
[$this->manager, $this]
122122
);
123123
$collection->parse($object->included);
@@ -181,7 +181,7 @@ protected function parseData($data)
181181
if ( $data === null )
182182
{
183183
$resource = $this->manager->getFactory()->make(
184-
'Resource\NullResource',
184+
'ResourceNull',
185185
[$this->manager, $this]
186186
);
187187
$resource->parse($data);
@@ -192,7 +192,7 @@ protected function parseData($data)
192192
if ( is_array($data) )
193193
{
194194
$collection = $this->manager->getFactory()->make(
195-
'Resource\Collection',
195+
'ResourceCollection',
196196
[$this->manager, $this]
197197
);
198198
$collection->parse($data);
@@ -212,15 +212,15 @@ protected function parseData($data)
212212
if ( count($object_vars) === 2 or (count($object_vars) === 3 and property_exists($data, 'meta')) )
213213
{
214214
$resource = $this->manager->getFactory()->make(
215-
'Resource\Identifier',
215+
'ResourceIdentifier',
216216
[$this->manager, $this]
217217
);
218218
$resource->parse($data);
219219
}
220220
else
221221
{
222222
$resource = $this->manager->getFactory()->make(
223-
'Resource\Item',
223+
'ResourceItem',
224224
[$this->manager, $this]
225225
);
226226
$resource->parse($data);

‎src/Link.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
namespace Art4\JsonApiClient;
2121

22-
use Art4\JsonApiClient\Resource\ItemInterface;
2322
use Art4\JsonApiClient\Utils\AccessTrait;
2423
use Art4\JsonApiClient\Utils\DataContainer;
2524
use Art4\JsonApiClient\Utils\FactoryManagerInterface;

‎src/Relationship.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function get($key)
133133
* @throws ValidationException If $data isn't null or an object
134134
*
135135
* @param null|array|object $data Data value
136-
* @return null|Resource\Identifier|Resource\IdentifierCollection The parsed data
136+
* @return null|ResourceIdentifier|ResourceIdentifierCollection The parsed data
137137
*/
138138
protected function parseData($data)
139139
{
@@ -145,7 +145,7 @@ protected function parseData($data)
145145
if ( is_array($data) )
146146
{
147147
$collection = $this->manager->getFactory()->make(
148-
'Resource\IdentifierCollection',
148+
'ResourceIdentifierCollection',
149149
[$this->manager, $this]
150150
);
151151
$collection->parse($data);
@@ -154,7 +154,7 @@ protected function parseData($data)
154154
}
155155

156156
$identifier = $this->manager->getFactory()->make(
157-
'Resource\Identifier',
157+
'ResourceIdentifier',
158158
[$this->manager, $this]
159159
);
160160
$identifier->parse($data);

‎src/RelationshipLink.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
namespace Art4\JsonApiClient;
2121

22-
use Art4\JsonApiClient\Resource\IdentifierCollectionInterface;
2322
use Art4\JsonApiClient\Utils\AccessTrait;
2423
use Art4\JsonApiClient\Utils\DataContainer;
2524
use Art4\JsonApiClient\Utils\FactoryManagerInterface;
@@ -122,7 +121,7 @@ public function parse($object)
122121
}
123122

124123
// Pagination links
125-
if ( $this->parent->has('data') and $this->parent->get('data') instanceof IdentifierCollectionInterface )
124+
if ( $this->parent->has('data') and $this->parent->get('data') instanceof ResourceIdentifierCollectionInterface )
126125
{
127126
if ( array_key_exists('first', $links) )
128127
{

‎src/Resource/IdentifierCollectionInterface.php‎

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

‎src/Resource/NullResourceInterface.php‎

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

src/Resource/Collection.php renamed to src/ResourceCollection.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
namespace Art4\JsonApiClient\Resource;
20+
namespace Art4\JsonApiClient;
2121

22-
use Art4\JsonApiClient\AccessInterface;
2322
use Art4\JsonApiClient\Utils\AccessTrait;
2423
use Art4\JsonApiClient\Utils\DataContainer;
2524
use Art4\JsonApiClient\Utils\FactoryManagerInterface;
@@ -31,7 +30,7 @@
3130
*
3231
* @see http://jsonapi.org/format/#document-resource-objects
3332
*/
34-
final class Collection implements CollectionInterface
33+
final class ResourceCollection implements ResourceCollectionInterface
3534
{
3635
use AccessTrait;
3736

@@ -123,15 +122,15 @@ protected function parseResource($data)
123122
if ( count($object_vars) === 2 or ( count($object_vars) === 3 and property_exists($data, 'meta') ) )
124123
{
125124
$resource = $this->manager->getFactory()->make(
126-
'Resource\Identifier',
125+
'ResourceIdentifier',
127126
[$this->manager, $this]
128127
);
129128
$resource->parse($data);
130129
}
131130
else
132131
{
133132
$resource = $this->manager->getFactory()->make(
134-
'Resource\Item',
133+
'ResourceItem',
135134
[$this->manager, $this]
136135
);
137136
$resource->parse($data);

src/Resource/ItemLinkInterface.php renamed to src/ResourceCollectionInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
namespace Art4\JsonApiClient\Resource;
20+
namespace Art4\JsonApiClient;
2121

2222
use Art4\JsonApiClient\ElementInterface;
2323

2424
/**
25-
* Resource\ItemLink Interface
25+
* ResourceCollection Interface
2626
*/
27-
interface ItemLinkInterface extends ElementInterface { }
27+
interface ResourceCollectionInterface extends ElementInterface { }

src/Resource/Identifier.php renamed to src/ResourceIdentifier.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
namespace Art4\JsonApiClient\Resource;
20+
namespace Art4\JsonApiClient;
2121

22-
use Art4\JsonApiClient\AccessInterface;
2322
use Art4\JsonApiClient\Utils\AccessTrait;
2423
use Art4\JsonApiClient\Utils\DataContainer;
2524
use Art4\JsonApiClient\Utils\FactoryManagerInterface;
@@ -31,7 +30,7 @@
3130
*
3231
* @see http://jsonapi.org/format/#document-resource-identifier-objects
3332
*/
34-
final class Identifier implements IdentifierInterface
33+
final class ResourceIdentifier implements ResourceIdentifierInterface
3534
{
3635
use AccessTrait;
3736

src/Resource/IdentifierCollection.php renamed to src/ResourceIdentifierCollection.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
namespace Art4\JsonApiClient\Resource;
20+
namespace Art4\JsonApiClient;
2121

22-
use Art4\JsonApiClient\AccessInterface;
2322
use Art4\JsonApiClient\Utils\AccessTrait;
2423
use Art4\JsonApiClient\Utils\DataContainer;
2524
use Art4\JsonApiClient\Utils\FactoryManagerInterface;
@@ -31,7 +30,7 @@
3130
*
3231
* @see http://jsonapi.org/format/#document-resource-objects
3332
*/
34-
final class IdentifierCollection implements IdentifierCollectionInterface
33+
final class ResourceIdentifierCollection implements ResourceIdentifierCollectionInterface
3534
{
3635
use AccessTrait;
3736

@@ -112,7 +111,7 @@ public function get($key)
112111
protected function parseResource($data)
113112
{
114113
$identifier = $resource = $this->manager->getFactory()->make(
115-
'Resource\Identifier',
114+
'ResourceIdentifier',
116115
[$this->manager, $this]
117116
);
118117
$identifier->parse($data);

0 commit comments

Comments
 (0)