Upgrade to charcoal-config 0.7

composer.json

@@ -27,8 +27,8 @@
         "ext-mbstring": "*",
         "psr/log": "^1.0",
         "psr/cache": "^1.0",
-        "locomotivemtl/charcoal-config": "~0.6",
-        "locomotivemtl/charcoal-property": "~0.2",
+        "locomotivemtl/charcoal-config": "~0.7",
+        "locomotivemtl/charcoal-property": "~0.3",
         "locomotivemtl/charcoal-factory": "~0.4",
         "locomotivemtl/charcoal-view": "~0.1",
         "locomotivemtl/charcoal-translation": "~0.1",

src/Charcoal/Loader/CollectionLoader.php

@@ -81,9 +81,9 @@ class CollectionLoader implements LoggerAwareInterface
     /**
      * Return a new CollectionLoader object.
      *
-     * @param array|\ArrayAccess $data The loader's dependencies.
+     * @param array $data The loader's dependencies.
      */
-    public function __construct($data)
+    public function __construct(array $data)
     {
         if (!isset($data['logger'])) {
             $data['logger'] = new NullLogger();

src/Charcoal/Model/AbstractModel.php

@@ -145,10 +145,10 @@ protected function setIdFromData($data)
     /**
      * Sets the object data, from an associative array map (or any other Traversable).
      *
-     * @param array|\Traversable $data The entity data. Will call setters.
+     * @param array $data The entity data. Will call setters.
      * @return AbstractModel Chainable
      */
-    public function setData($data)
+    public function setData(array $data)
     {
         $data = $this->setIdFromData($data);
 

src/Charcoal/Model/DescribableInterface.php

@@ -13,10 +13,10 @@
 interface DescribableInterface
 {
     /**
-     * @param array|Traversable $data The object data.
+     * @param array $data The object data.
      * @return DescribableInterface Chainable
      */
-    public function setData($data);
+    public function setData(array $data);
 
     /**
      * @param MetadataLoader $loader The loader instance, used to load metadata.

src/Charcoal/Model/DescribableTrait.php

@@ -32,10 +32,10 @@ trait DescribableTrait
     /**
      * Describable object needs to have a `setData()` method
      *
-     * @param array|\Traversable $data The object's data.
+     * @param array $data The object's data.
      * @return DescribableInterface Chainable
      */
-    abstract public function setData($data);
+    abstract public function setData(array $data);
 
     /**
      * @param MetadataLoader $loader The loader instance, used to load metadata.

src/Charcoal/Model/ModelInterface.php

@@ -8,10 +8,10 @@
 interface ModelInterface
 {
     /**
-     * @param array|\ArrayAccess $data The model data.
+     * @param array $data The model data.
      * @return ModelInterface Chainable
      */
-    public function setData($data);
+    public function setData(array $data);
 
     /**
      * @return array

src/Charcoal/Source/Filter.php

@@ -58,10 +58,10 @@ class Filter implements FilterInterface
     protected $active;
 
     /**
-     * @param array|\ArrayAccess $data The filter data.
+     * @param array $data The filter data.
      * @return Filter Chainable
      */
-    public function setData($data)
+    public function setData(array $data)
     {
         if (isset($data['property'])) {
             $this->setProperty($data['property']);

src/Charcoal/Source/FilterInterface.php

@@ -5,10 +5,10 @@
 interface FilterInterface
 {
     /**
-     * @param array|\ArrayAccess $data The filter data.
+     * @param array $data The filter data.
      * @return Filter Chainable
      */
-    public function setData($data);
+    public function setData(array $data);
 
     /**
      * @param boolean $active The active flag.

src/Charcoal/Source/Order.php

@@ -61,10 +61,10 @@ class Order implements OrderInterface
     protected $active = true;
 
     /**
-     * @param array|\ArrayAccess $data The order data.
+     * @param array $data The order data.
      * @return Order Chainable
      */
-    public function setData($data)
+    public function setData(array $data)
     {
         if (isset($data['property'])) {
             $this->setProperty($data['property']);

src/Charcoal/Source/OrderInterface.php

@@ -5,10 +5,10 @@
 interface OrderInterface
 {
     /**
-     * @param array|\ArrayAccess $data The order data.
+     * @param array $data The order data.
      * @return Order Chainable
      */
-    public function setData($data);
+    public function setData(array $data);
 
     /**
      * @param string $property The property to order with.

src/Charcoal/Source/Pagination.php

@@ -22,10 +22,10 @@ class Pagination implements PaginationInterface
     protected $numPerPage = self::DEFAULT_NUM_PER_PAGE;
 
     /**
-     * @param array|\ArrayAccess $data The pagination data (page, num_per_page).
+     * @param array $data The pagination data (page, num_per_page).
      * @return Pagination Chainable
      */
-    public function setData($data)
+    public function setData(array $data)
     {
         if (isset($data['page'])) {
             $this->setPage($data['page']);

src/Charcoal/Source/PaginationInterface.php

@@ -8,10 +8,10 @@
 interface PaginationInterface
 {
     /**
-     * @param array|\ArrayAcess $data The pagination data (page, num_per_page).
+     * @param array $data The pagination data (page, num_per_page).
      * @return Pagination Chainable
      */
-    public function setData($data);
+    public function setData(array $data);
 
     /**
      * @param integer $page The current page. Starts at 0.

src/Charcoal/Validator/ValidatorResult.php

@@ -47,10 +47,10 @@ public function __construct($data = null)
     }
 
     /**
-     * @param array|\ArrayAccess $data The validator result data.
+     * @param array $data The validator result data.
      * @return ValidatorResult Chainable
      */
-    public function setData($data)
+    public function setData(array $data)
     {
         if (isset($data['ident'])) {
             $this->setIdent($data['ident']);