More configuration -> data

Author: simensen

src/Dflydev/DotAccessData/Data.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is a part of dflydev/dot-access-configuration.
+ * This file is a part of dflydev/dot-access-data.
  * 
  * (c) Dragonfly Development Inc.
  *
@@ -14,7 +14,7 @@
 class Data implements DataInterface
 {
     /**
-     * Internal representation of configuration data
+     * Internal representation of data data
      * 
      * @var array
      */
@@ -95,9 +95,9 @@ public function import(array $data, $clobber = true)
     /**
      * {@inheritdoc}
      */
-    public function importData(DataInterface $configuration, $clobber = true)
+    public function importData(DataInterface $data, $clobber = true)
     {
-        $this->import($configuration->export(), $clobber);
+        $this->import($data->export(), $clobber);
     }
 
     /**

src/Dflydev/DotAccessData/DataInterface.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is a part of dflydev/dot-access-configuration.
+ * This file is a part of dflydev/dot-access-data.
  * 
  * (c) Dragonfly Development Inc.
  *
@@ -45,31 +45,31 @@ public function remove($key);
     public function get($key);
 
     /**
-     * Get a configuration instance for a key
+     * Get a data instance for a key
      * 
      * @param string $key
      * @return DataInterface
      */
     public function getData($key);
 
     /**
-     * Import data into existing configuration
+     * Import data into existing data
      * 
      * @param array $data
      * @param bool $clobber
      */
     public function import(array $data, $clobber = true);
 
     /**
-     * Import data from an external configuration into existing configuration
+     * Import data from an external data into existing data
      * 
-     * @param DataInterface $configuration
+     * @param DataInterface $data
      * @param bool $clobber
      */
-    public function importData(DataInterface $configuration, $clobber = true);
+    public function importData(DataInterface $data, $clobber = true);
 
     /**
-     * Export configuration as raw data
+     * Export data as raw data
      * 
      * @return array
      */

src/Dflydev/DotAccessData/Util.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is a part of dflydev/dot-access-configuration.
+ * This file is a part of dflydev/dot-access-data.
  * 
  * (c) Dragonfly Development Inc.
  *

tests/Dflydev/Tests/DotAccessData/DataTest.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is a part of dflydev/dot-access-configuration.
+ * This file is a part of dflydev/dot-access-data.
  * 
  * (c) Dragonfly Development Inc.
  *
@@ -33,14 +33,14 @@ protected function getSampleData()
         );
     }
 
-    protected function runSampleDataTests(DataInterface $configuration)
+    protected function runSampleDataTests(DataInterface $data)
     {
-        $this->assertEquals('A', $configuration->get('a'));
-        $this->assertEquals('B', $configuration->get('b.b'));
-        $this->assertEquals(array('C1', 'C2', 'C3'), $configuration->get('b.c'));
-        $this->assertEquals('D3', $configuration->get('b.d.d3'));
-        $this->assertEquals(array('c1', 'c2', 'c3'), $configuration->get('c'));
-        $this->assertEquals(null, $configuration->get('foo'), 'Foo should not exist');
+        $this->assertEquals('A', $data->get('a'));
+        $this->assertEquals('B', $data->get('b.b'));
+        $this->assertEquals(array('C1', 'C2', 'C3'), $data->get('b.c'));
+        $this->assertEquals('D3', $data->get('b.d.d3'));
+        $this->assertEquals(array('c1', 'c2', 'c3'), $data->get('c'));
+        $this->assertEquals(null, $data->get('foo'), 'Foo should not exist');
     }
 
     public function testAppend()
@@ -60,9 +60,9 @@ public function testRemote()
 
     public function testGet()
     {
-        $configuration = new Data($this->getSampleData());
+        $data = new Data($this->getSampleData());
 
-        $this->runSampleDataTests($configuration);
+        $this->runSampleDataTests($data);
     }
 
     public function testGetData()
@@ -73,35 +73,35 @@ public function testGetData()
             ),
         ));
 
-        $configuration = $wrappedData->getData('wrapped.sampleData');
+        $data = $wrappedData->getData('wrapped.sampleData');
 
-        $this->runSampleDataTests($configuration);
+        $this->runSampleDataTests($data);
 
         $this->setExpectedException('RuntimeException');
 
-        $configuration = $wrappedData->getData('wrapped.sampleData.a');
+        $data = $wrappedData->getData('wrapped.sampleData.a');
     }
 
     public function testImport()
     {
-        $configuration = new Data();
-        $configuration->import($this->getSampleData());
+        $data = new Data();
+        $data->import($this->getSampleData());
 
-        $this->runSampleDataTests($configuration);
+        $this->runSampleDataTests($data);
     }
 
     public function testImportData()
     {
-        $configuration = new Data();
-        $configuration->importData(new Data($this->getSampleData()));
+        $data = new Data();
+        $data->importData(new Data($this->getSampleData()));
 
-        $this->runSampleDataTests($configuration);
+        $this->runSampleDataTests($data);
     }
 
     public function testExport()
     {
-        $configuration = new Data($this->getSampleData());
+        $data = new Data($this->getSampleData());
 
-        $this->assertEquals($this->getSampleData(), $configuration->export());
+        $this->assertEquals($this->getSampleData(), $data->export());
     }
 }

tests/Dflydev/Tests/DotAccessData/UtilTest.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is a part of dflydev/dot-access-configuration.
+ * This file is a part of dflydev/dot-access-data.
  * 
  * (c) Dragonfly Development Inc.
  *

tests/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is a part of dflydev/dot-access-configuration.
+ * This file is a part of dflydev/dot-access-data.
  * 
  * (c) Dragonfly Development Inc.
  *