Skip to content

Commit 889ed12

Browse files
simensensimensen
committed
Renamed to dot access data
1 parent 7d7bff4 commit 889ed12

8 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"name": "dflydev/dot-access-configuration",
2+
"name": "dflydev/dot-access-data",
33
"type": "library",
4-
"description": "Given a deep data structure representing a configuration, access configuration by dot notation.",
4+
"description": "Given a deep data structure, access data by dot notation.",
55
"homepage": "https://github.com/dflydev/dot-access-configuration",
6-
"keywords": ["dot", "access", "configuration", "notation", "config", "yaml"],
6+
"keywords": ["dot", "access", "data", "notation", "config", "yaml", "yml"],
77
"license": "New BSD License",
88
"authors": [
99
{
@@ -24,7 +24,7 @@
2424
},
2525
"autoload": {
2626
"psr-0": {
27-
"Dflydev\\DotAccessConfiguration": "src"
27+
"Dflydev\\DotAccessData": "src"
2828
}
2929
},
3030
"extra": {

‎phpunit.xml.dist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit colors="true" bootstrap="tests/bootstrap.php">
33
<testsuites>
4-
<testsuite name="Dot Access Configuration Test Suite">
5-
<directory>./tests/Dflydev/Tests/DotAccessConfiguration</directory>
4+
<testsuite name="Dot Access Data Test Suite">
5+
<directory>./tests/Dflydev/Tests/DotAccessData</directory>
66
</testsuite>
77
</testsuites>
88

99
<filter>
1010
<whitelist>
11-
<directory>./src/Dflydev/DotAccessConfiguration/</directory>
11+
<directory>./src/Dflydev/DotAccessData/</directory>
1212
</whitelist>
1313
</filter>
1414
</phpunit>

src/Dflydev/DotAccessConfiguration/Configuration.php renamed to src/Dflydev/DotAccessData/Data.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\DotAccessConfiguration;
12+
namespace Dflydev\DotAccessData;
1313

14-
class Configuration implements ConfigurationInterface
14+
class Data implements DataInterface
1515
{
1616
/**
1717
* Internal representation of configuration data
@@ -74,14 +74,14 @@ public function get($key)
7474
/**
7575
* {@inheritdoc}
7676
*/
77-
public function getConfiguration($key)
77+
public function getData($key)
7878
{
7979
$value = $this->get($key);
8080
if (is_array($value) && Util::isAssoc($value)) {
81-
return new Configuration($value);
81+
return new Data($value);
8282
}
8383

84-
throw new \RuntimeException("Value at '$key' could not be represented as a ConfigurationInterface");
84+
throw new \RuntimeException("Value at '$key' could not be represented as a DataInterface");
8585
}
8686

8787
/**
@@ -95,7 +95,7 @@ public function import(array $data, $clobber = true)
9595
/**
9696
* {@inheritdoc}
9797
*/
98-
public function importConfiguration(ConfigurationInterface $configuration, $clobber = true)
98+
public function importData(DataInterface $configuration, $clobber = true)
9999
{
100100
$this->import($configuration->export(), $clobber);
101101
}

src/Dflydev/DotAccessConfiguration/ConfigurationInterface.php renamed to src/Dflydev/DotAccessData/DataInterface.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\DotAccessConfiguration;
12+
namespace Dflydev\DotAccessData;
1313

14-
interface ConfigurationInterface
14+
interface DataInterface
1515
{
1616
/**
1717
* Append a value to a key (assumes key refers to an array value)
@@ -48,9 +48,9 @@ public function get($key);
4848
* Get a configuration instance for a key
4949
*
5050
* @param string $key
51-
* @return ConfigurationInterface
51+
* @return DataInterface
5252
*/
53-
public function getConfiguration($key);
53+
public function getData($key);
5454

5555
/**
5656
* Import data into existing configuration
@@ -63,10 +63,10 @@ public function import(array $data, $clobber = true);
6363
/**
6464
* Import data from an external configuration into existing configuration
6565
*
66-
* @param ConfigurationInterface $configuration
66+
* @param DataInterface $configuration
6767
* @param bool $clobber
6868
*/
69-
public function importConfiguration(ConfigurationInterface $configuration, $clobber = true);
69+
public function importData(DataInterface $configuration, $clobber = true);
7070

7171
/**
7272
* Export configuration as raw data

src/Dflydev/DotAccessConfiguration/Util.php renamed to src/Dflydev/DotAccessData/Util.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\DotAccessConfiguration;
12+
namespace Dflydev\DotAccessData;
1313

1414
class Util
1515
{

tests/Dflydev/Tests/DotAccessConfiguration/ConfigurationTest.php renamed to tests/Dflydev/Tests/DotAccessData/DataTest.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\Tests\DotAccessConfiguration;
12+
namespace Dflydev\Tests\DotAccessData;
1313

14-
use Dflydev\DotAccessConfiguration\Configuration;
15-
use Dflydev\DotAccessConfiguration\ConfigurationInterface;
14+
use Dflydev\DotAccessData\Data;
15+
use Dflydev\DotAccessData\DataInterface;
1616

17-
class ConfigurationTest extends \PHPUnit_Framework_TestCase
17+
class DataTest extends \PHPUnit_Framework_TestCase
1818
{
1919
protected function getSampleData()
2020
{
@@ -33,7 +33,7 @@ protected function getSampleData()
3333
);
3434
}
3535

36-
protected function runSampleDataTests(ConfigurationInterface $configuration)
36+
protected function runSampleDataTests(DataInterface $configuration)
3737
{
3838
$this->assertEquals('A', $configuration->get('a'));
3939
$this->assertEquals('B', $configuration->get('b.b'));
@@ -60,47 +60,47 @@ public function testRemote()
6060

6161
public function testGet()
6262
{
63-
$configuration = new Configuration($this->getSampleData());
63+
$configuration = new Data($this->getSampleData());
6464

6565
$this->runSampleDataTests($configuration);
6666
}
6767

68-
public function testGetConfiguration()
68+
public function testGetData()
6969
{
70-
$wrappedConfiguration = new Configuration(array(
70+
$wrappedData = new Data(array(
7171
'wrapped' => array(
7272
'sampleData' => $this->getSampleData()
7373
),
7474
));
7575

76-
$configuration = $wrappedConfiguration->getConfiguration('wrapped.sampleData');
76+
$configuration = $wrappedData->getData('wrapped.sampleData');
7777

7878
$this->runSampleDataTests($configuration);
7979

8080
$this->setExpectedException('RuntimeException');
8181

82-
$configuration = $wrappedConfiguration->getConfiguration('wrapped.sampleData.a');
82+
$configuration = $wrappedData->getData('wrapped.sampleData.a');
8383
}
8484

8585
public function testImport()
8686
{
87-
$configuration = new Configuration();
87+
$configuration = new Data();
8888
$configuration->import($this->getSampleData());
8989

9090
$this->runSampleDataTests($configuration);
9191
}
9292

93-
public function testImportConfiguration()
93+
public function testImportData()
9494
{
95-
$configuration = new Configuration();
96-
$configuration->importConfiguration(new Configuration($this->getSampleData()));
95+
$configuration = new Data();
96+
$configuration->importData(new Data($this->getSampleData()));
9797

9898
$this->runSampleDataTests($configuration);
9999
}
100100

101101
public function testExport()
102102
{
103-
$configuration = new Configuration($this->getSampleData());
103+
$configuration = new Data($this->getSampleData());
104104

105105
$this->assertEquals($this->getSampleData(), $configuration->export());
106106
}

tests/Dflydev/Tests/DotAccessConfiguration/UtilTest.php renamed to tests/Dflydev/Tests/DotAccessData/UtilTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\Tests\DotAccessConfiguration;
12+
namespace Dflydev\Tests\DotAccessData;
1313

14-
use Dflydev\DotAccessConfiguration\Util;
14+
use Dflydev\DotAccessData\Util;
1515

1616
class UtilTest extends \PHPUnit_Framework_TestCase
1717
{

‎tests/bootstrap.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
*/
1111

1212
$loader = require dirname(__DIR__).'/vendor/.composer/autoload.php';
13-
$loader->add('Dflydev\\Tests\\DotAccessConfiguration', 'tests');
13+
$loader->add('Dflydev\\Tests\\DotAccessData', 'tests');

0 commit comments

Comments
 (0)