Updated License, composer changes, moved tests.

Author: simensen

LICENSE

@@ -1,26 +1,19 @@
-Copyright (c) 2011, Dragonfly Development Inc 
-All rights reserved. 
+Copyright (c) 2012 Dragonfly Development Inc.
 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
 
- * Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer. 
- * Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution. 
- * Neither the name of Dragonfly Development Inc nor the names of its 
-   contributors may be used to endorse or promote products derived from 
-   this software without specific prior written permission. 
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

composer.json

@@ -3,8 +3,8 @@
     "type": "library",
     "description": "Given a deep data structure, access data by dot notation.",
     "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
-    "keywords": ["dot", "access", "data", "notation", "config", "yaml", "yml"],
-    "license": "New BSD License",
+    "keywords": ["dot", "access", "data", "notation"],
+    "license": "MIT",
     "authors": [
         {
             "name": "Dragonfly Development Inc.",

phpunit.xml.dist

@@ -2,7 +2,7 @@
 <phpunit colors="true" bootstrap="tests/bootstrap.php">
     <testsuites>
         <testsuite name="Dot Access Data Test Suite">
-            <directory>./tests/Dflydev/Tests/DotAccessData</directory>
+            <directory>./tests/Dflydev/DotAccessData</directory>
         </testsuite>
     </testsuites>
 

…Dflydev/Tests/DotAccessData/DataTest.php tests/Dflydev/DotAccessData/DataTest.phptests/Dflydev/Tests/DotAccessData/DataTest.php renamed to tests/Dflydev/DotAccessData/DataTest.php tests/Dflydev/Tests/DotAccessData/DataTest.php renamed to tests/Dflydev/DotAccessData/DataTest.php

@@ -9,10 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Dflydev\Tests\DotAccessData;
-
-use Dflydev\DotAccessData\Data;
-use Dflydev\DotAccessData\DataInterface;
+namespace Dflydev\DotAccessData;
 
 class DataTest extends \PHPUnit_Framework_TestCase
 {
@@ -186,4 +183,4 @@ public function testExport()
 
         $this->assertEquals($this->getSampleData(), $data->export());
     }
-}
+}

…Dflydev/Tests/DotAccessData/UtilTest.php tests/Dflydev/DotAccessData/UtilTest.phptests/Dflydev/Tests/DotAccessData/UtilTest.php renamed to tests/Dflydev/DotAccessData/UtilTest.php tests/Dflydev/Tests/DotAccessData/UtilTest.php renamed to tests/Dflydev/DotAccessData/UtilTest.php

@@ -9,9 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Dflydev\Tests\DotAccessData;
-
-use Dflydev\DotAccessData\Util;
+namespace Dflydev\DotAccessData;
 
 class UtilTest extends \PHPUnit_Framework_TestCase
 {
@@ -120,4 +118,4 @@ public function mergeAssocArrayProvider()
             ),
         );
     }
-}
+}

tests/bootstrap.php

@@ -9,5 +9,5 @@
  * file that was distributed with this source code.
  */
 
-$loader = require dirname(__DIR__).'/vendor/.composer/autoload.php';
-$loader->add('Dflydev\\Tests\\DotAccessData', 'tests');
+$loader = require dirname(__DIR__).'/vendor/autoload.php';
+