Merge branch 'master' into develop

Author: steinkel

.semver

@@ -1,5 +1,5 @@
 ---
 :major: 6
 :minor: 0
-:patch: 0
+:patch: 1
 :special: ''

CHANGELOG.md

@@ -4,6 +4,9 @@ Changelog
 Releases for CakePHP 3
 -------------
 
+* 6.0.1
+  * Fix deprecation messages
+
 * 1.0.0-beta.2
   * Implements api middleware with PSR-7 support
 

README.md

@@ -15,7 +15,7 @@ Versions and branches
 
 | CakePHP | CakeDC Api Plugin | Tag   | Notes |
 | :-------------: | :------------------------: | :--:  | :---- |
-| ^3.6            | [master](https://github.com/cakedc/cakephp-api/tree/master)            | 6.0.0 | stable   |
+| ^3.6            | [master](https://github.com/cakedc/cakephp-api/tree/master)            | 6.0.1 | stable   |
 | ^3.6            | [develop](https://github.com/cakedc/cakephp-api/tree/develop)          |   -   | unstable |
 | 3.5             | [5.x](https://github.com/cakedc/cakephp-api/tree/5.0.0)                | 5.0.0 | stable   |
 | 3.4             | [4.x](https://github.com/cakedc/cakephp-api/tree/4.0.0)                | 4.0.0 | stable   |
@@ -41,6 +41,6 @@ This repository follows the [CakeDC Plugin Standard](http://cakedc.com/plugin-st
 License
 -------
 
-Copyright 2016 Cake Development Corporation (CakeDC). All rights reserved.
+Copyright 2016-2018 Cake Development Corporation (CakeDC). All rights reserved.
 
 Licensed under the [MIT](http://www.opensource.org/licenses/mit-license.php) License. Redistributions of the source code included in this repository must retain the copyright notice found in each file.

config/api.php

@@ -18,6 +18,9 @@
         // Data parse from cakephp request object
         'parser' => 'CakeDC/Api.Form',
 
+        //routes inflector: specify underscore, dasherize, or false for neither/no inflection
+        'routesInflectorMethod' => false,
+
         // version is not used
         'useVersioning' => false,
         'versionPrefix' => 'v',

src/Controller/ApiController.php

@@ -13,6 +13,7 @@
 
 use CakeDC\Api\Service\ConfigReader;
 use CakeDC\Api\Service\ServiceRegistry;
+use Cake\Core\Configure;
 use Cake\Utility\Inflector;
 use Exception;
 
@@ -57,7 +58,7 @@ public function process()
      */
     public function listing()
     {
-        $this->request['service'] = 'listing';
+        $this->request = $this->request->withParam('service', 'listing');
         $options = [
             'className' => 'CakeDC/Api.Listing'
         ];
@@ -71,7 +72,7 @@ public function listing()
      */
     public function describe()
     {
-        $this->request['service'] = 'describe';
+        $this->request = $this->request->withParam('service', 'describe');
         $options = [
             'className' => 'CakeDC/Api.Describe'
         ];
@@ -86,13 +87,15 @@ public function describe()
      */
     protected function _process($options = [])
     {
+        $routesInflectorMethod = Configure::read('Api.routesInflectorMethod', 'underscore');
+
         $this->autoRender = false;
         try {
-            if (!empty($this->request['service'])) {
-                $service = $this->request['service'];
+            if (!empty($this->request->getParam('service'))) {
+                $service = $this->request->getParam('service');
                 $version = null;
-                if (!empty($this->request['version'])) {
-                    $version = $this->request['version'];
+                if (!empty($this->request->getParam('version'))) {
+                    $version = $this->request->getParam('version');
                 }
 
                 $url = '/' . $service;
@@ -103,7 +106,7 @@ protected function _process($options = [])
                     'version' => $version,
                     'request' => $this->request,
                     'response' => $this->response,
-                    'baseUrl' => Inflector::underscore($url),
+                    'baseUrl' => $routesInflectorMethod === false ? $url : Inflector::{$routesInflectorMethod}($url)
                 ];
                 $options += (new ConfigReader())->serviceOptions($service, $version);
                 $Service = ServiceRegistry::getServiceLocator()->get($service, $options);