Merge branch 'develop'

CakeDC · Apr 20, 2018 · 2b13b14 · 2b13b14
2 parents e5acb23 + 28db47d
commit 2b13b14
Show file tree

Hide file tree

Showing 163 changed files with 1,271 additions and 694 deletions.
diff --git a/.semver b/.semver
@@ -1,5 +1,5 @@
 ---
-:major: 5
+:major: 6
 :minor: 0
 :patch: 0
 :special: ''
diff --git a/README.md b/README.md
@@ -13,11 +13,13 @@ The **CakePHP-API** Plugin allows to easily expose a versioned API in a few line
 Versions and branches
 ---------------------
 
-| CakePHP | CakeDC Users Plugin | Tag   | Notes |
+| CakePHP | CakeDC Api Plugin | Tag   | Notes |
 | :-------------: | :------------------------: | :--:  | :---- |
-| 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 |
-| 3.3             | [3.x](https://github.com/cakedc/cakephp-api/tree/3.3)                      | 3.3 | stable |
+| ^3.6            | [master](https://github.com/cakedc/cakephp-api/tree/master)            | 6.0.0 | 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   |
+| 3.3             | [3.x](https://github.com/cakedc/cakephp-api/tree/3.3)                  | 3.3   | stable   |
 
 Documentation
 -------------

diff --git a/composer.json b/composer.json
@@ -28,8 +28,8 @@
     },
     "require": {
         "php": ">=5.4.16",
-        "cakephp/cakephp": "^3.4",
-        "cakedc/users": "^5.0|^6.0"
+        "cakephp/cakephp": "^3.6",
+        "cakedc/users": "^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "<6.0"

diff --git a/src/Collection.php b/src/Collection.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+namespace CakeDC\Api;
+
+use ArrayIterator;
+use Cake\Core\InstanceConfigTrait;
+use Cake\Core\ObjectRegistry;
+use IteratorAggregate;
+
+abstract class Collection extends ObjectRegistry implements IteratorAggregate
+{
+    use InstanceConfigTrait;
+
+    /**
+     * Config array.
+     *
+     * @var array
+     */
+    protected $_defaultConfig = [];
+
+    /**
+     * Constructor
+     *
+     * @param array $config Configuration
+     */
+    public function __construct(array $config = [])
+    {
+        $this->setConfig($config);
+
+        foreach ($config as $key => $value) {
+            if (is_int($key)) {
+                $this->load($value);
+                continue;
+            }
+            $this->load($key, $value);
+        }
+    }
+
+    /**
+     * Returns true if a collection is empty.
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->_loaded);
+    }
+
+    /**
+     * Returns iterator.
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->_loaded);
+    }
+}
diff --git a/src/Controller/ApiController.php b/src/Controller/ApiController.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
@@ -106,7 +106,7 @@ protected function _process($options = [])
                     'baseUrl' => Inflector::underscore($url),
                 ];
                 $options += (new ConfigReader())->serviceOptions($service, $version);
-                $Service = ServiceRegistry::get($service, $options);
+                $Service = ServiceRegistry::getServiceLocator()->get($service, $options);
                 $result = $Service->dispatch();
 
                 return $Service->respond($result);

diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Exception/MethodNotAllowedException.php b/src/Exception/MethodNotAllowedException.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Exception/ServiceException.php b/src/Exception/ServiceException.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Exception/UnauthenticatedException.php b/src/Exception/UnauthenticatedException.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Exception/UnauthorizedException.php b/src/Exception/UnauthorizedException.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Exception/ValidationException.php b/src/Exception/ValidationException.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Middleware/ApiMiddleware.php b/src/Middleware/ApiMiddleware.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
@@ -64,7 +64,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
 
             try {
                 $options += (new ConfigReader())->serviceOptions($service, $version);
-                $Service = ServiceRegistry::get($service, $options);
+                $Service = ServiceRegistry::getServiceLocator()->get($service, $options);
                 $result = $Service->dispatch();
 
                 $response = $Service->respond($result);

diff --git a/src/Middleware/RequestHandlerMiddleware.php b/src/Middleware/RequestHandlerMiddleware.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Model/Entity/EntityDescriptionInterface.php b/src/Model/Entity/EntityDescriptionInterface.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Model/Entity/EntityLabelsInterface.php b/src/Model/Entity/EntityLabelsInterface.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/src/Routing/ApiRouter.php b/src/Routing/ApiRouter.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright 2016 - 2017, Cake Development Corporation (http://cakedc.com)
+ * @copyright Copyright 2016 - 2018, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */