Merge pull request #85 from UseMuffin/dev

Dev

Author: ADmad

.semver

@@ -1,9 +1,10 @@
 language: php
 
 php:
+  - 5.6
   - 7.0
   - 7.1
-  - 5.6
+  - 7.2
 
 dist: trusty
 
@@ -24,7 +25,7 @@ matrix:
     - php: 7.0
       env: PHPCS=1 DEFAULT=0
 
-    - php: 7.0
+    - php: 7.1
       env: PHPSTAN=1 DEFAULT=0
 
     - php: 5.6
@@ -33,7 +34,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:^0.9; fi
+  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.11; fi
   - if [[ $PHPSTAN != 1 ]]; then composer install --no-interaction; fi
 
 script:
@@ -42,7 +43,7 @@ script:
 
   - if [[ $PHPCS = 1 ]]; then ./vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
-  - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -l 2 src; fi
+  - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse src; fi
 
 after_success:
 - if [[ $CODECOVERAGE = 1 ]]; then bash <(curl -s https://codecov.io/bash); fi

.travis.yml

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Use Muffin
+Copyright (c) 2015-Present Use Muffin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -21,12 +21,6 @@ You then need to load the plugin. You can use the shell command:
 bin/cake plugin load Muffin/Webservice
 ```
 
-or by manually adding statement shown below to `boostrap.php`:
-
-```php
-Plugin::load('Muffin/Webservice', ['bootstrap' => true]);
-```
-
 ## Usage
 
 ### As an ORM
@@ -35,21 +29,19 @@ Plugin::load('Muffin/Webservice', ['bootstrap' => true]);
 
 ```php
 <?php
-
 namespace App\Webservice\Driver;
 
 use Cake\Network\Http\Client;
 use Muffin\Webservice\AbstractDriver;
 
 class Articles extends AbstractDriver
 {
-
     /**
-     * {@inheritDoc}
+     * Initialize is used to easily extend the constructor.
      */
     public function initialize()
     {
-        $this->client(new Client([
+        $this->setClient(new Client([
             'host' => 'example.com'
         ]));
     }
@@ -60,23 +52,20 @@ class Articles extends AbstractDriver
 
 ```php
 <?php
-
 namespace App\Webservice;
 
-use Cake\Network\Http\Client;
 use Muffin\Webservice\Query;
 use Muffin\Webservice\ResultSet;
 use Muffin\Webservice\Webservice\Webservice;
 
 class ArticlesWebservice extends Webservice
 {
-
     /**
-     * {@inheritDoc}
+     * Executes a query with the read action using the Cake HTTP Client
      */
     protected function _executeReadQuery(Query $query, array $options = [])
     {
-        $response = $this->driver()->client()->get('/articles.json');
+        $response = $this->getDriver()->getClient()->get('/articles.json');
 
         if (!$response->isOk()) {
             return false;
@@ -93,59 +82,51 @@ class ArticlesWebservice extends Webservice
 
 ```php
 <?php
-
 namespace App\Model\Endpoint;
 
 use Muffin\Webservice\Model\Endpoint;
 
 class ArticlesEndpoint extends Endpoint
 {
-
 }
 ```
 
 #### Create a resource (optional)
 
 ```php
 <?php
-
 namespace App\Model\Resource;
 
 use Muffin\Webservice\Model\Resource;
 
 class Article extends Resource
 {
-
 }
 ```
 
 #### Use it
 
 ```php
 <?php
-
 namespace App\Controller;
 
 use Cake\Event\Event;
+use Muffin\Webservice\Model\EndpointLocator;
 
 class ArticlesController extends AppController
 {
-    public function initialize()
-    {
-        // You can also put this in AppController::initialize() itself
-        $this->modelFactory('Endpoint', ['Muffin\Webservice\Model\EndpointRegistry', 'get']);
-    }
+    // Either set the default model type to "Endpoint" or explicitly specify
+    // model type in loadModel() call as shown below.
+    protected $_modelType = 'Endpoint';
 
-    public function beforeFilter(Event $event)
+    public function index()
     {
+        // This is required only if you haven't set `$_modelType` property to
+        // "Endpoint" as shown above.
         $this->loadModel('Articles', 'Endpoint');
-    }
 
-    public function index()
-    {
         $articles = $this->Articles->find();
     }
-
 }
 ```
 
@@ -195,7 +176,7 @@ http://github.com/usemuffin/webservice/issues
 
 ## License
 
-Copyright (c) 2015, [Use Muffin] and licensed under [The MIT License][mit].
+Copyright (c) 2015-Present, [Use Muffin] and licensed under [The MIT License][mit].
 
 [cakephp]:http://cakephp.org
 [composer]:http://getcomposer.org

README.md

@@ -39,11 +39,11 @@
         "irc": "irc://irc.freenode.org/muffin"
     },
     "require": {
+        "cakephp/cakephp": "^3.6"
     },
     "require-dev": {
-        "cakephp/cakephp": "^3.6",
         "cakephp/cakephp-codesniffer": "^3.0",
-        "phpunit/phpunit": "5.7.14|^6.0"
+        "phpunit/phpunit": "^5.7.14|^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -54,10 +54,5 @@
         "psr-4": {
             "Muffin\\Webservice\\Test\\": "tests"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
     }
 }

VERSION

@@ -1,3 +1,5 @@
 <?php
+use Cake\Datasource\FactoryLocator;
+use Muffin\Webservice\Model\EndpointLocator;
 
-\Cake\Routing\DispatcherFactory::add('Muffin/Webservice.ControllerEndpoint');
+FactoryLocator::add('Endpoint', [new EndpointLocator(), 'get']);

composer.json

@@ -0,0 +1,12 @@
+parameters:
+    level: 4
+    ignoreErrors:
+        - '#Method Muffin\\Webservice\\Query::endpoint\(\) should return \$this\(Muffin\\Webservice\\Query\)|Muffin\\Webservice\\Model\\Endpoint but returns Cake\Datasource\RepositoryInterface#'
+        - '#Call to an undefined method Cake\\Datasource\\RepositoryInterface::callFinder\(\)#'
+        - '#Call to an undefined method Cake\\Datasource\\RepositoryInterface::dispatchEvent\(\)#'
+        - '#Method Muffin\\Webservice\\Query::offset\(\) should return \$this\(Cake\\Datasource\\QueryInterface\) but returns \$this\(Muffin\\Webservice\\Query\)#'
+        - '#Return type \(array\) of method Muffin\\Webservice\\Query::aliasField\(\) should be compatible with return type \(string\) of method Cake\\Datasource\\QueryInterface::aliasField\(\)#'
+        - '#Call to an undefined method Cake\\Datasource\\RepositoryInterface::getName\(\)#'
+        - '#Call to an undefined method Traversable::count\(\)#'
+        - '#Strict comparison using === between string and null will always evaluate to false#'
+        - '#Negated boolean expression is always false#'