Merge pull request #66 from UseMuffin/cake-3.6

Update for Cake 3.6.0.

Author: ADmad

.travis.yml

@@ -1,10 +1,10 @@
 language: php
 
 php:
-  - 7.1
   - 7.0
+  - 7.2
+  - 7.1
   - 5.6
-  - 5.5
 
 dist: trusty
 
@@ -27,7 +27,7 @@ matrix:
 before_script:
   - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi
 
-  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan; fi
+  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.9; fi
   - if [[ $PHPSTAN != 1 ]]; then composer install --no-interaction; fi
 
 script:

composer.json

@@ -41,9 +41,9 @@
     "require": {
     },
     "require-dev": {
-        "cakephp/cakephp": ">=3.2",
-        "cakephp/cakephp-codesniffer": "2.*",
-        "phpunit/phpunit": "<6.0"
+        "cakephp/cakephp": "^3.6",
+        "cakephp/cakephp-codesniffer": "^3.0",
+        "phpunit/phpunit": "5.7.14|^6.0"
     },
     "autoload": {
         "psr-4": {

src/AbstractDriver.php

@@ -44,7 +44,7 @@ abstract class AbstractDriver implements LoggerAwareInterface
     public function __construct($config = [])
     {
         if (!empty($config)) {
-            $this->config($config);
+            $this->setConfig($config);
         }
 
         $this->initialize();

src/Marshaller.php

@@ -55,7 +55,7 @@ public function one(array $data, array $options = [])
         $resourceClass = $this->_endpoint->resourceClass();
         /* @var \Muffin\Webservice\Model\Resource $entity */
         $entity = new $resourceClass();
-        $entity->source($this->_endpoint->registryAlias());
+        $entity->setSource($this->_endpoint->registryAlias());
 
         if (isset($options['accessibleFields'])) {
             foreach ((array)$options['accessibleFields'] as $key => $value) {
@@ -79,7 +79,7 @@ public function one(array $data, array $options = [])
 
         if (!isset($options['fieldList'])) {
             $entity->set($properties);
-            $entity->errors($errors);
+            $entity->setErrors($errors);
 
             return $entity;
         }
@@ -106,22 +106,23 @@ public function one(array $data, array $options = [])
      */
     protected function _validate($data, $options, $isNew)
     {
-        if (!$options['validate']) {
-            return [];
-        }
+        $validator = null;
+
         if ($options['validate'] === true) {
-            $options['validate'] = $this->_endpoint->validator('default');
+            $validator = $this->_endpoint->getValidator('default');
+        } elseif (is_string($options['validate'])) {
+            $validator = $this->_endpoint->getValidator($options['validate']);
+        } elseif (is_object($options['validate'])) {
+            $validator = $options['validate'];
         }
-        if (is_string($options['validate'])) {
-            $options['validate'] = $this->_endpoint->validator($options['validate']);
-        }
-        if (!is_object($options['validate'])) {
+
+        if ($validator === null) {
             throw new RuntimeException(
                 sprintf('validate must be a boolean, a string or an object. Got %s.', gettype($options['validate']))
             );
         }
 
-        return $options['validate']->errors($data, $isNew);
+        return $validator->errors($data, $isNew);
     }
 
     /**

src/Model/Endpoint.php

@@ -14,15 +14,13 @@
 use Cake\Event\EventDispatcherTrait;
 use Cake\Event\EventListenerInterface;
 use Cake\Event\EventManager;
-use Cake\Network\Exception\NotImplementedException;
 use Cake\Utility\Inflector;
 use Cake\Validation\ValidatorAwareTrait;
 use Muffin\Webservice\Exception\MissingResourceClassException;
 use Muffin\Webservice\Exception\UnexpectedDriverException;
 use Muffin\Webservice\Marshaller;
 use Muffin\Webservice\Query;
 use Muffin\Webservice\Schema;
-use Muffin\Webservice\StreamQuery;
 
 /**
  * The table equivalent of a webservice endpoint
@@ -839,11 +837,11 @@ public function save(EntityInterface $resource, $options = [])
                 'checkExisting' => false,
             ]);
 
-        if ($resource->errors()) {
+        if ($resource->getErrors()) {
             return false;
         }
 
-        if ($resource->isNew() === false && !$resource->dirty()) {
+        if ($resource->isNew() === false && !$resource->isDirty()) {
             return $resource;
         }
 

src/Model/Resource.php

@@ -41,7 +41,7 @@ public function __construct(array $properties = [], array $options = [])
         ];
 
         if (!empty($options['source'])) {
-            $this->source($options['source']);
+            $this->setSource($options['source']);
         }
 
         if ($options['markNew'] !== null) {

src/Query.php

@@ -175,7 +175,7 @@ public function clause($name)
     public function endpoint(Endpoint $endpoint = null)
     {
         if ($endpoint === null) {
-            return $this->repository();
+            return $this->getRepository();
         }
 
         $this->repository($endpoint);
@@ -206,7 +206,7 @@ public function webservice(WebserviceInterface $webservice = null)
      */
     public function find($finder, array $options = [])
     {
-        return $this->repository()->callFinder($finder, $this, $options);
+        return $this->getRepository()->callFinder($finder, $this, $options);
     }
 
     /**
@@ -224,7 +224,7 @@ public function firstOrFail()
         }
         throw new RecordNotFoundException(sprintf(
             'Record not found in endpoint "%s"',
-            $this->repository()->endpoint()
+            $this->getRepository()->endpoint()
         ));
     }
 
@@ -466,12 +466,12 @@ public function first()
     public function triggerBeforeFind()
     {
         if (!$this->_beforeFindFired && $this->action() === self::ACTION_READ) {
-            $endpoint = $this->repository();
+            $endpoint = $this->getRepository();
             $this->_beforeFindFired = true;
             $endpoint->dispatchEvent('Model.beforeFind', [
                 $this,
                 new ArrayObject($this->_options),
-                !$this->eagerLoaded()
+                !$this->isEagerLoaded()
             ]);
         }
     }

tests/TestCase/Model/ResourceTest.php

@@ -23,7 +23,7 @@ public function testSoureConstruct()
         $resource = new Resource([], [
             'source' => $endpoint
         ]);
-        $this->assertEquals($endpoint, $resource->source());
+        $this->assertEquals($endpoint, $resource->getSource());
     }
 
     public function testConstructUseSettersOff()

tests/TestCase/Webservice/WebserviceTest.php

@@ -173,7 +173,7 @@ public function testCreateResource()
 
         $this->assertInstanceOf('\Muffin\Webservice\Model\Resource', $resource);
         $this->assertFalse($resource->isNew());
-        $this->assertFalse($resource->dirty());
+        $this->assertFalse($resource->isDirty());
     }
 
     public function testTransformResults()

tests/bootstrap.php

@@ -68,7 +68,7 @@
     'defaults' => 'php'
 ]);
 
-Cache::config([
+Cache::setConfig([
     '_cake_core_' => [
         'engine' => 'File',
         'prefix' => 'cake_core_',
@@ -97,10 +97,10 @@
 ];
 
 // Use the test connection for 'debug_kit' as well.
-ConnectionManager::config('test', $config);
-ConnectionManager::config('test_webservice', $config);
+ConnectionManager::setConfig('test', $config);
+ConnectionManager::setConfig('test_webservice', $config);
 
-Log::config([
+Log::setConfig([
     'debug' => [
         'engine' => 'Cake\Log\Engine\FileLog',
         'levels' => ['notice', 'info', 'debug'],