Merge pull request #12 from martinssipenko/php7

Only support PHP 7.0 and above

Author: simensen

.travis.yml

@@ -1,13 +1,12 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
 
 before_script:
   - wget -nc http://getcomposer.org/composer.phar
-  - php composer.phar install --dev
+  - php composer.phar install
 
-script: phpunit --coverage-text
+script: ./vendor/bin/phpunit --coverage-text

README.md

@@ -7,7 +7,9 @@ Given a deep data structure, access data by dot notation.
 Requirements
 ------------
 
- * PHP (5.3+)
+ * PHP (7.0+)
+
+> For PHP (5.3+) please reffer to version `1.0`.
 
 
 Usage
@@ -23,15 +25,15 @@ $data = new Data;
 $data->set('a.b.c', 'C');
 $data->set('a.b.d', 'D1');
 $data->append('a.b.d', 'D2');
-$data->set('a.b.e', array('E0', 'E1', 'E2'));
+$data->set('a.b.e', ['E0', 'E1', 'E2']);
 
 // C
 $data->get('a.b.c');
 
-// array('D1', 'D2')
+// ['D1', 'D2']
 $data->get('a.b.d');
 
-// array('E0', 'E1', 'E2')
+// ['E0', 'E1', 'E2']
 $data->get('a.b.e');
 
 // true
@@ -46,32 +48,32 @@ A more concrete example:
 ```php
 use Dflydev\DotAccessData\Data;
 
-$data = new Data(array(
-    'hosts' => array(
-        'hewey' => array(
+$data = new Data([
+    'hosts' => [
+        'hewey' => [
             'username' => 'hman',
             'password' => 'HPASS',
-            'roles' => array('web'),
-        ),
-        'dewey' => array(
+            'roles'    => ['web'],
+        ],
+        'dewey' => [
             'username' => 'dman',
             'password' => 'D---S',
-            'roles' => array('web', 'db'),
-            'nick' => 'dewey dman'
-        ),
-        'lewey' => array(
+            'roles'    => ['web', 'db'],
+            'nick'     => 'dewey dman',
+        ],
+        'lewey' => [
             'username' => 'lman',
             'password' => 'LP@$$',
-            'roles' => array('db'),
-        ),
-    )
-));
+            'roles'    => ['db'],
+        ],
+    ],
+]);
 
 // hman
 $username = $data->get('hosts.hewey.username');
 // HPASS
 $password = $data->get('hosts.hewey.password');
-// array('web')
+// ['web']
 $roles = $data->get('hosts.hewey.roles');
 // dewey dman
 $nick = $data->get('hosts.dewey.nick');
@@ -84,7 +86,7 @@ $dewey = $data->getData('hosts.dewey');
 $username = $dewey->get('username');
 // D---S
 $password = $dewey->get('password');
-// array('web', 'db')
+// ['web', 'db']
 $roles = $dewey->get('roles');
 
 // No more lewey
@@ -93,11 +95,11 @@ $data->remove('hosts.lewey');
 // Add DB to hewey's roles
 $data->append('hosts.hewey.roles', 'db');
 
-$data->set('hosts.april', array(
+$data->set('hosts.april', [
     'username' => 'aman',
     'password' => '@---S',
-    'roles' => array('web'),
-));
+    'roles'    => ['web'],
+]);
 
 // Check if a key exists (true to this case)
 $hasKey = $data->has('hosts.dewey.username');

composer.json

@@ -23,16 +23,24 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2"
+        "php": "^7.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^6.0"
     },
     "autoload": {
-        "psr-0": {
-            "Dflydev\\DotAccessData": "src"
+        "psr-4": {
+            "Dflydev\\DotAccessData\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Dflydev\\DotAccessData\\": "tests/"
         }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }

phpunit.xml.dist

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="tests/bootstrap.php">
+<phpunit colors="true">
     <testsuites>
         <testsuite name="Dot Access Data Test Suite">
-            <directory>./tests/Dflydev/DotAccessData</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./src/Dflydev/DotAccessData/</directory>
+            <directory>./src</directory>
         </whitelist>
     </filter>
 </phpunit>

src/Dflydev/DotAccessData/Data.php src/Data.phpsrc/Dflydev/DotAccessData/Data.php renamed to src/Data.php

@@ -11,6 +11,8 @@
 
 namespace Dflydev\DotAccessData;
 
+use RuntimeException;
+
 class Data implements DataInterface
 {
     /**
@@ -27,7 +29,7 @@ class Data implements DataInterface
      */
     public function __construct(array $data = null)
     {
-        $this->data = $data ?: array();
+        $this->data = $data ?: [];
     }
 
     /**
@@ -36,20 +38,20 @@ public function __construct(array $data = null)
     public function append($key, $value = null)
     {
         if (0 == strlen($key)) {
-            throw new \RuntimeException("Key cannot be an empty string");
+            throw new RuntimeException("Key cannot be an empty string");
         }
 
         $currentValue =& $this->data;
         $keyPath = explode('.', $key);
 
         if (1 == count($keyPath)) {
             if (!isset($currentValue[$key])) {
-                $currentValue[$key] = array();
+                $currentValue[$key] = [];
             }
             if (!is_array($currentValue[$key])) {
                 // Promote this key to an array.
                 // TODO: Is this really what we want to do?
-                $currentValue[$key] = array($currentValue[$key]);
+                $currentValue[$key] = [$currentValue[$key]];
             }
             $currentValue[$key][] = $value;
 
@@ -60,16 +62,16 @@ public function append($key, $value = null)
         for ( $i = 0; $i < count($keyPath); $i++ ) {
             $currentKey =& $keyPath[$i];
             if ( ! isset($currentValue[$currentKey]) ) {
-                $currentValue[$currentKey] = array();
+                $currentValue[$currentKey] = [];
             }
             $currentValue =& $currentValue[$currentKey];
         }
 
         if (!isset($currentValue[$endKey])) {
-            $currentValue[$endKey] = array();
+            $currentValue[$endKey] = [];
         }
         if (!is_array($currentValue[$endKey])) {
-            $currentValue[$endKey] = array($currentValue[$endKey]);
+            $currentValue[$endKey] = [$currentValue[$endKey]];
         }
         // Promote this key to an array.
         // TODO: Is this really what we want to do?
@@ -82,7 +84,7 @@ public function append($key, $value = null)
     public function set($key, $value = null)
     {
         if (0 == strlen($key)) {
-            throw new \RuntimeException("Key cannot be an empty string");
+            throw new RuntimeException("Key cannot be an empty string");
         }
 
         $currentValue =& $this->data;
@@ -98,10 +100,10 @@ public function set($key, $value = null)
         for ( $i = 0; $i < count($keyPath); $i++ ) {
             $currentKey =& $keyPath[$i];
             if (!isset($currentValue[$currentKey])) {
-                $currentValue[$currentKey] = array();
+                $currentValue[$currentKey] = [];
             }
             if (!is_array($currentValue[$currentKey])) {
-                throw new \RuntimeException("Key path at $currentKey of $key cannot be indexed into (is not an array)");
+                throw new RuntimeException("Key path at $currentKey of $key cannot be indexed into (is not an array)");
             }
             $currentValue =& $currentValue[$currentKey];
         }
@@ -114,7 +116,7 @@ public function set($key, $value = null)
     public function remove($key)
     {
         if (0 == strlen($key)) {
-            throw new \RuntimeException("Key cannot be an empty string");
+            throw new RuntimeException("Key cannot be an empty string");
         }
 
         $currentValue =& $this->data;
@@ -191,7 +193,7 @@ public function getData($key)
             return new Data($value);
         }
 
-        throw new \RuntimeException("Value at '$key' could not be represented as a DataInterface");
+        throw new RuntimeException("Value at '$key' could not be represented as a DataInterface");
     }
 
     /**