improved configuration loader

Author: skie

.semver

@@ -1,5 +1,5 @@
 ---
 :major: 8
 :minor: 0
-:patch: 13
+:patch: 14
 :special: ''

README.md

@@ -15,7 +15,7 @@ Versions and branches
 
 | CakePHP | CakeDC Api Plugin | Tag   | Notes |
 | :-------------: | :------------------------: | :--:  | :---- |
-| 4.0             | [8.x](https://github.com/cakedc/cakephp-api/tree/8.x)                  | 8.0.13 | unstable |
+| 4.0             | [8.x](https://github.com/cakedc/cakephp-api/tree/8.x)                  | 8.0.14 | unstable |
 | ^3.7            | [master](https://github.com/cakedc/cakephp-api/tree/master)            | 7.0.0 | stable   |
 | ^3.7       <4.0 | [7.x](https://github.com/cakedc/cakephp-api/tree/7.x)                  | 7.1.0 | stable |
 | 3.6             | [6.x](https://github.com/cakedc/cakephp-api/tree/6.x)                  | 6.0.1 | stable   |

config/bootstrap.php

@@ -13,8 +13,12 @@
 use Cake\Log\Log;
 
 Configure::load('CakeDC/Api.api');
-collection((array)Configure::read('Api.config'))->each(function ($file) {
-    Configure::load($file);
+collection((array)Configure::read('Api.config'))->each(function ($merge, $file) {
+	if (is_int($file)) {
+		$file = $merge;
+		$merge = true;
+	}
+    Configure::load($file, 'default', $merge);
 });
 
 if (!Log::engine('api')) {

docs/Documentation/installation.md

@@ -21,24 +21,50 @@ Plugin::load('CakeDC/Api', ['bootstrap' => true, 'routes' => true]);
 
 ## Configuration
 You can configure the api overwriting the api.php, how?
-we need to create an **api.php** file in the *config* folder. You can copy the existing configuration file 
+we need to create an **api.php** file in the *config* folder. You can copy the existing configuration file
 under `vendor/cakedc/cakephp-api/config/api.php` and customize it for your application.
 Remember to load the new configuration file in `bootstrap.php`
 
 ```php
 Plugin::load('CakeDC/Api', ['bootstrap' => false, 'routes' => true]);
 Configure::load('api');
-``` 
+```
+
+CakePHP 4.x configuration loading form Application class:
+
+```php
+Configure::write('Api.config', ['api']);
+$this->addPlugin('CakeDC/Api', ['bootstrap' => true, 'routes' => true]);
+```
+In this case plugin will load default configuration file from CakeDC/Api/config/api.php
+and after that append the configuration from ./config/api.php
+
+If needed to overwrite one of sections in the default confugration file it is possible to pass
+config names as key and merge param as value of `Api.config` settings.
+
+Example, if we want merge api.php and overwrite specific node like Api.Middleware we can create addtional configuration file config/api_mw.php
+```php
+return [
+    'Api.Middleware' => [
+		// ... overwrite section here
+	]
+];
+```
+And in Application.php we will have
+```php
+Configure::write('Api.config', ['api' => true, 'api_mw' => false]);
+$this->addPlugin('CakeDC/Api', ['bootstrap' => true, 'routes' => true]);
+```
 
 ## OPTIONAL: User Plugin
 
-We rely on CakeDC/Users plugin for Auth, in case you need to define Auth for your API, 
+We rely on CakeDC/Users plugin for Auth, in case you need to define Auth for your API,
 ensure *CakeDC/Users* plugin is installed and loaded from your `bootstrap.php`.
 
 ### Configuration and Loading
 
 ```
 Configure::write('Users.config', ['users']);
 Plugin::load('CakeDC/Users', ['bootstrap' => false, 'routes' => true]);
-``` 
+```
 Check more details about how CakeDC/Users plugin could be configured here: https://github.com/CakeDC/users/blob/master/Docs/Documentation/Configuration.md