Merge branch 'v2' of github.com:pixelandtonic/ElementAPI into v2

Author: brandonkelly

src/Plugin.php

@@ -63,7 +63,7 @@ public function getDefaultResourceAdapterConfig(): array
             return $this->_defaultResourceAdapterConfig;
         }
 
-        return $this->_defaultResourceAdapterConfig = $this->getSettings()->defaults;
+        return $this->_defaultResourceAdapterConfig = $this->getSettings()->getDefaults();
     }
 
     /**

src/Settings.php

@@ -12,13 +12,29 @@
  */
 class Settings extends Model
 {
+    // Properties
+    // =========================================================================
+
     /**
-     * @var array The default endpoint configuration.
+     * @var callable|array The default endpoint configuration.
      */
     public $defaults = [];
 
     /**
      * @var array The endpoint configurations.
      */
     public $endpoints = [];
+
+    // Public Methods
+    // =========================================================================
+
+    /**
+     * Returns the default endpoint configuration.
+     *
+     * @return array The default endpoint configuration.
+     */
+    public function getDefaults()
+    {
+        return is_callable($this->defaults) ? call_user_func($this->defaults) : $this->defaults;
+    }
 }