Skip to content

Commit beea4a4

Browse files
committed
Renamed Resource -> ProviderResource because "resource" is a "soft-reserved" word.
1 parent 514dbdb commit beea4a4

File tree

15 files changed

+30
-31
lines changed

15 files changed

+30
-31
lines changed

src/Porter/Collection/CountableProviderRecords.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace ScriptFUSION\Porter\Collection;
33

4-
use ScriptFUSION\Porter\Provider\Resource\Resource;
4+
use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
55

66
class CountableProviderRecords extends ProviderRecords implements \Countable
77
{
@@ -12,7 +12,7 @@ class CountableProviderRecords extends ProviderRecords implements \Countable
1212
* @param int $count
1313
* @param Resource $resource
1414
*/
15-
public function __construct(\Iterator $providerRecords, $count, Resource $resource)
15+
public function __construct(\Iterator $providerRecords, $count, ProviderResource $resource)
1616
{
1717
parent::__construct($providerRecords, $resource);
1818

src/Porter/Collection/ProviderRecords.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22
namespace ScriptFUSION\Porter\Collection;
33

4-
use ScriptFUSION\Porter\Provider\Resource\Resource;
4+
use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
55

66
class ProviderRecords extends RecordCollection
77
{
88
private $resource;
99

10-
public function __construct(\Iterator $providerRecords, Resource $resource)
10+
public function __construct(\Iterator $providerRecords, ProviderResource $resource)
1111
{
1212
parent::__construct($providerRecords);
1313

src/Porter/Porter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use ScriptFUSION\Porter\Provider\ObjectNotCreatedException;
1818
use ScriptFUSION\Porter\Provider\Provider;
1919
use ScriptFUSION\Porter\Provider\ProviderFactory;
20-
use ScriptFUSION\Porter\Provider\Resource\Resource;
20+
use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
2121
use ScriptFUSION\Porter\Specification\ImportSpecification;
2222

2323
class Porter
@@ -71,7 +71,7 @@ private function createPorterRecords(RecordCollection $records, ImportSpecificat
7171
return new PorterRecords($records, $specification);
7272
}
7373

74-
private function fetch(Resource $resource, CacheAdvice $cacheAdvice = null)
74+
private function fetch(ProviderResource $resource, CacheAdvice $cacheAdvice = null)
7575
{
7676
$provider = $this->getProvider($resource->getProviderClassName(), $resource->getProviderTag());
7777
$this->applyCacheAdvice($provider, $cacheAdvice ?: $this->defaultCacheAdvice);

src/Porter/Provider/AbstractProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use ScriptFUSION\Porter\Cache\CacheToggle;
55
use ScriptFUSION\Porter\Cache\CacheUnavailableException;
66
use ScriptFUSION\Porter\Connector\Connector;
7-
use ScriptFUSION\Porter\Provider\Resource\Resource;
7+
use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
88

99
abstract class AbstractProvider implements Provider, CacheToggle
1010
{
@@ -22,7 +22,7 @@ public function __construct(Connector $connector)
2222
*
2323
* @throws ForeignResourceException A foreign resource was received.
2424
*/
25-
public function fetch(Resource $resource)
25+
public function fetch(ProviderResource $resource)
2626
{
2727
if ($resource->getProviderClassName() !== static::class) {
2828
throw new ForeignResourceException(sprintf(

src/Porter/Provider/Provider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace ScriptFUSION\Porter\Provider;
33

4-
use ScriptFUSION\Porter\Provider\Resource\Resource;
4+
use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
55

66
/**
77
* Provides a method for fetching data from a resource.
@@ -11,9 +11,9 @@ interface Provider
1111
/**
1212
* Fetches data from the specified resource.
1313
*
14-
* @param Resource $resource Resource.
14+
* @param ProviderResource $resource Resource.
1515
*
1616
* @return \Iterator Enumerable data series.
1717
*/
18-
public function fetch(Resource $resource);
18+
public function fetch(ProviderResource $resource);
1919
}

src/Porter/Provider/Resource/AbstractResource.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
namespace ScriptFUSION\Porter\Provider\Resource;
33

44
/**
5-
* Partially implements Resource.
5+
* Partially implements ProviderResource.
66
*/
7-
abstract class AbstractResource implements Resource
7+
abstract class AbstractResource implements ProviderResource
88
{
99
/** @var string */
1010
private $providerTag;

src/Porter/Provider/Resource/Resource.php renamed to src/Porter/Provider/Resource/ProviderResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* Defines methods for fetching data from a specific provider resource.
88
*/
9-
interface Resource
9+
interface ProviderResource
1010
{
1111
/**
1212
* Gets the class name of the provider this resource belongs to.

src/Porter/Provider/Resource/StaticResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use ScriptFUSION\Porter\Options\EncapsulatedOptions;
66
use ScriptFUSION\Porter\Provider\StaticDataProvider;
77

8-
class StaticResource implements Resource
8+
class StaticResource implements ProviderResource
99
{
1010
private $data;
1111

src/Porter/Specification/ImportSpecification.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use ScriptFUSION\Mapper\Mapping;
55
use ScriptFUSION\Porter\Cache\CacheAdvice;
6-
use ScriptFUSION\Porter\Provider\Resource\Resource;
6+
use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
77

88
class ImportSpecification
99
{
@@ -22,7 +22,7 @@ class ImportSpecification
2222
/** @var CacheAdvice */
2323
private $cacheAdvice;
2424

25-
public function __construct(Resource $resource)
25+
public function __construct(ProviderResource $resource)
2626
{
2727
$this->resource = $resource;
2828
}

test/Integration/Porter/Collection/CountableProviderRecordsTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
namespace ScriptFUSIONTest\Integration\Porter\Collection;
33

44
use ScriptFUSION\Porter\Collection\CountableProviderRecords;
5-
use ScriptFUSION\Porter\Provider\Resource\Resource;
5+
use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
66

77
final class CountableProviderRecordsTest extends \PHPUnit_Framework_TestCase
88
{
@@ -13,7 +13,7 @@ public function test()
1313
$records = new CountableProviderRecords(
1414
new \ArrayIterator($data),
1515
count($data),
16-
\Mockery::mock(Resource::class)
16+
\Mockery::mock(ProviderResource::class)
1717
);
1818

1919
self::assertCount(count($data), $records);

0 commit comments

Comments
 (0)