CS

Author: simensen

src/Dflydev/DotAccessData/Data.php

@@ -2,7 +2,7 @@
 
 /*
  * This file is a part of dflydev/dot-access-data.
- * 
+ *
  * (c) Dragonfly Development Inc.
  *
  * For the full copyright and license information, please view the LICENSE
@@ -15,14 +15,14 @@ class Data implements DataInterface
 {
     /**
      * Internal representation of data data
-     * 
+     *
      * @var array
      */
     protected $data;
 
     /**
      * Constructor
-     * 
+     *
      * @param array|null $data
      */
     public function __construct(array $data = null)
@@ -65,7 +65,7 @@ public function append($key, $value = null)
             $currentValue =& $currentValue[$currentKey];
         }
 
-        if(!isset($currentValue[$endKey])) {
+        if (!isset($currentValue[$endKey])) {
             $currentValue[$endKey] = array();
         }
         if (!is_array($currentValue[$endKey])) {
@@ -195,4 +195,4 @@ public function export()
     {
         return $this->data;
     }
-}
+}

src/Dflydev/DotAccessData/DataInterface.php

@@ -2,7 +2,7 @@
 
 /*
  * This file is a part of dflydev/dot-access-data.
- * 
+ *
  * (c) Dragonfly Development Inc.
  *
  * For the full copyright and license information, please view the LICENSE
@@ -15,63 +15,65 @@ interface DataInterface
 {
     /**
      * Append a value to a key (assumes key refers to an array value)
-     * 
+     *
      * @param string $key
-     * @param mixed $value
+     * @param mixed  $value
      */
     public function append($key, $value = null);
 
     /**
      * Set a value for a key
-     * 
+     *
      * @param string $key
-     * @param mixed $value
+     * @param mixed  $value
      */
     public function set($key, $value = null);
 
     /**
      * Remove a key
-     * 
+     *
      * @param string $key
      */
     public function remove($key);
 
     /**
      * Get the raw value for a key
-     * 
+     *
      * @param string $key
+     *
      * @return mixed
      */
     public function get($key);
 
     /**
      * Get a data instance for a key
-     * 
+     *
      * @param string $key
+     *
      * @return DataInterface
      */
     public function getData($key);
 
     /**
      * Import data into existing data
-     * 
+     *
      * @param array $data
-     * @param bool $clobber
+     * @param bool  $clobber
      */
     public function import(array $data, $clobber = true);
 
     /**
      * Import data from an external data into existing data
-     * 
+     *
      * @param DataInterface $data
-     * @param bool $clobber
+     * @param bool          $clobber
      */
     public function importData(DataInterface $data, $clobber = true);
 
     /**
      * Export data as raw data
-     * 
+     *
      * @return array
      */
     public function export();
-}
+}

src/Dflydev/DotAccessData/Util.php

@@ -2,7 +2,7 @@
 
 /*
  * This file is a part of dflydev/dot-access-data.
- * 
+ *
  * (c) Dragonfly Development Inc.
  *
  * For the full copyright and license information, please view the LICENSE
@@ -20,32 +20,35 @@ class Util
      * empty arrays will be treated as if they are associative arrays.
      *
      * @param array $arr
+     *
      * @return boolean
      */
-    static public function isAssoc(array $arr)
+    public static function isAssoc(array $arr)
     {
         return (is_array($arr) && (!count($arr) || count(array_filter(array_keys($arr),'is_string')) == count($arr)));
     }
 
     /**
      * Merge contents from one associtative array to another
-     * 
+     *
      * @param array $to
      * @param array $from
-     * @param bool $clobber
+     * @param bool  $clobber
      */
-    static public function mergeAssocArray($to, $from, $clobber = true)
+    public static function mergeAssocArray($to, $from, $clobber = true)
     {
         if ( is_array($from) ) {
-            foreach ( $from as $k => $v ) {
+            foreach ($from as $k => $v) {
                 if (!isset($to[$k])) {
                     $to[$k] = $v;
                 } else {
                     $to[$k] = self::mergeAssocArray($to[$k], $v, $clobber);
                 }
             }
+
             return $to;
         }
+
         return $clobber ? $from : $to;
     }
-}
+}