Clean up type definition issues found by phpstan

Author: colinodell

src/Data.php

@@ -18,24 +18,24 @@ class Data implements DataInterface
     /**
      * Internal representation of data data
      *
-     * @var array
+     * @var array<string, mixed>
      */
     protected $data;
 
     /**
      * Constructor
      *
-     * @param array|null $data
+     * @param array<string, mixed> $data
      */
-    public function __construct(array $data = null)
+    public function __construct(array $data = [])
     {
-        $this->data = $data ?: [];
+        $this->data = $data;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function append($key, $value = null)
+    public function append(string $key, $value = null): void
     {
         if (0 == strlen($key)) {
             throw new RuntimeException("Key cannot be an empty string");
@@ -81,7 +81,7 @@ public function append($key, $value = null)
     /**
      * {@inheritdoc}
      */
-    public function set($key, $value = null)
+    public function set(string $key, $value = null): void
     {
         if (0 == strlen($key)) {
             throw new RuntimeException("Key cannot be an empty string");
@@ -113,7 +113,7 @@ public function set($key, $value = null)
     /**
      * {@inheritdoc}
      */
-    public function remove($key)
+    public function remove(string $key): void
     {
         if (0 == strlen($key)) {
             throw new RuntimeException("Key cannot be an empty string");
@@ -142,7 +142,7 @@ public function remove($key)
     /**
      * {@inheritdoc}
      */
-    public function get($key, $default = null)
+    public function get(string $key, $default = null)
     {
         $currentValue = $this->data;
         $keyPath = explode('.', $key);
@@ -164,7 +164,7 @@ public function get($key, $default = null)
     /**
      * {@inheritdoc}
      */
-    public function has($key)
+    public function has(string $key): bool
     {
         $currentValue = &$this->data;
         $keyPath = explode('.', $key);
@@ -186,7 +186,7 @@ public function has($key)
     /**
      * {@inheritdoc}
      */
-    public function getData($key)
+    public function getData(string $key): DataInterface
     {
         $value = $this->get($key);
         if (is_array($value) && Util::isAssoc($value)) {
@@ -199,23 +199,23 @@ public function getData($key)
     /**
      * {@inheritdoc}
      */
-    public function import(array $data, $clobber = true)
+    public function import(array $data, bool $clobber = true): void
     {
         $this->data = Util::mergeAssocArray($this->data, $data, $clobber);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function importData(DataInterface $data, $clobber = true)
+    public function importData(DataInterface $data, bool $clobber = true): void
     {
         $this->import($data->export(), $clobber);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function export()
+    public function export(): array
     {
         return $this->data;
     }

src/DataInterface.php

@@ -19,22 +19,22 @@ interface DataInterface
      * @param string $key
      * @param mixed  $value
      */
-    public function append($key, $value = null);
+    public function append(string $key, $value = null): void;
 
     /**
      * Set a value for a key
      *
      * @param string $key
      * @param mixed  $value
      */
-    public function set($key, $value = null);
+    public function set(string $key, $value = null): void;
 
     /**
      * Remove a key
      *
      * @param string $key
      */
-    public function remove($key);
+    public function remove(string $key): void;
 
     /**
      * Get the raw value for a key
@@ -44,7 +44,7 @@ public function remove($key);
      *
      * @return mixed
      */
-    public function get($key, $default = null);
+    public function get(string $key, $default = null);
 
     /**
      * Check if the key exists
@@ -53,7 +53,7 @@ public function get($key, $default = null);
      *
      * @return bool
      */
-    public function has($key);
+    public function has(string $key): bool;
 
     /**
      * Get a data instance for a key
@@ -62,28 +62,28 @@ public function has($key);
      *
      * @return DataInterface
      */
-    public function getData($key);
+    public function getData(string $key): DataInterface;
 
     /**
      * Import data into existing data
      *
-     * @param array $data
-     * @param bool  $clobber
+     * @param array<string, mixed> $data
+     * @param bool                 $clobber
      */
-    public function import(array $data, $clobber = true);
+    public function import(array $data, bool $clobber = true): void;
 
     /**
      * Import data from an external data into existing data
      *
      * @param DataInterface $data
      * @param bool          $clobber
      */
-    public function importData(DataInterface $data, $clobber = true);
+    public function importData(DataInterface $data, bool $clobber = true): void;
 
     /**
      * Export data as raw data
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    public function export();
+    public function export(): array;
 }

src/Util.php

@@ -19,21 +19,23 @@ class Util
      * Note that this function will return true if an array is empty. Meaning
      * empty arrays will be treated as if they are associative arrays.
      *
-     * @param array $arr
+     * @param array<mixed> $arr
      *
-     * @return boolean
+     * @return bool
      */
-    public static function isAssoc(array $arr)
+    public static function isAssoc(array $arr): bool
     {
         return !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 mixed $to
+     * @param mixed $from
      * @param bool  $clobber
+     *
+     * @return mixed
      */
     public static function mergeAssocArray($to, $from, $clobber = true)
     {