Merge pull request #18 from itosho/correspond-to-3.5-or-more

Update CakePHP 3.6

Author: itosho

.semver

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

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 sudo: false
 
@@ -17,26 +18,32 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 7.0
+    - php: 7.1
       env: PHPCS=1 DEFAULT=0
 
+    - php: 7.1
+      env: PHPSTAN=1 DEFAULT=0
+
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION != 7.1 ]]; then phpenv config-rm xdebug.ini; fi
 
   - composer self-update
   - composer install --prefer-dist --no-interaction
 
   - if [[ $DB = 'mysql' ]]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi
 
   - if [[ $PHPCS = 1 ]]; then composer require cakephp/cakephp-codesniffer:"^3.0"; fi
+  - if [[ $PHPSTAN = 1 ]]; then composer require phpstan/phpstan; fi
 
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then vendor/bin/phpunit; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.1 ]]; then vendor/bin/phpunit; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.1 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml; fi
+
   - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
+  - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -c phpstan.neon -l 7 src; fi
 
 after_success:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then bash <(curl -s https://codecov.io/bash); fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.1 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
 notifications:
   email: false

CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## v1.1.1
+- :up: Correspond to CakePHP 3.5 or higher version.
+- :green_heart: Improve CI.
+
 ## v1.1.0
 - :wrench: Add event config dispatch beforeSave event.
 - :memo: support CHANGES.

README.md

@@ -11,7 +11,7 @@ CakePHP behavior plugin for easily some complicated queries like upsert, bulk up
 ## Requirements
 
 - PHP 7.0+
-- CakePHP 3.5.0+
+- CakePHP 3.5+
 - MySQL 5.6+
 
 ## Installation
@@ -83,7 +83,7 @@ $entities = $this->Articles->newEntities($data);
 $this->Articles->bulkInsert($entities);
 ```
 
-### Notice from v1.1.0
+### Advanced 
 Need to use `Timestamp` behavior, if you want to update `created` and `modified` fields automatically.
 And you can change the action manually by using `event` config like this.
 

composer.json

@@ -24,10 +24,10 @@
     "source": "https://github.com/itosho/easy-query"
   },
   "require": {
-    "cakephp/orm": "3.5.*"
+    "cakephp/orm": "^3.5"
   },
   "require-dev": {
-    "cakephp/cakephp": "3.5.*",
+    "cakephp/cakephp": "^3.5",
     "phpunit/phpunit": "^5.7"
   },
   "autoload": {

phpstan.neon

@@ -0,0 +1,2 @@
+parameters:
+    ignoreErrors: []

src/Model/Behavior/InsertBehavior.php

@@ -45,7 +45,7 @@ public function bulkInsert(array $entities)
         $query = $this->_table
             ->query()
             ->insert($fields);
-        $query->clause('values')->values($saveData);
+        $query->clause('values')->setValues($saveData);
 
         return $query->execute();
     }

src/Model/Behavior/UpsertBehavior.php

@@ -115,7 +115,7 @@ public function bulkUpsert(array $entities)
             ->query()
             ->insert($fields)
             ->epilog($expression);
-        $query->clause('values')->values($saveData);
+        $query->clause('values')->setValues($saveData);
 
         return $query->execute();
     }

tests/TestCase/Model/Behavior/InsertBehaviorTest.php

@@ -30,7 +30,7 @@ class InsertBehaviorTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->Articles = TableRegistry::get('Itosho/EasyQuery.Articles');
+        $this->Articles = TableRegistry::getTableLocator()->get('Itosho/EasyQuery.Articles');
         $this->Articles->addBehavior('Itosho/EasyQuery.Insert');
     }
 
@@ -40,7 +40,7 @@ public function setUp()
     public function tearDown()
     {
         parent::tearDown();
-        TableRegistry::clear();
+        TableRegistry::getTableLocator()->clear();
         unset($this->Articles);
     }
 

tests/TestCase/Model/Behavior/UpsertBehaviorTest.php

@@ -30,7 +30,7 @@ class UpsertBehaviorTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->Tags = TableRegistry::get('Itosho/EasyQuery.Tags');
+        $this->Tags = TableRegistry::getTableLocator()->get('Itosho/EasyQuery.Tags');
         $this->Tags->addBehavior('Itosho/EasyQuery.Upsert', [
             'uniqueColumns' => ['name'],
             'updateColumns' => ['description', 'modified']
@@ -43,7 +43,7 @@ public function setUp()
     public function tearDown()
     {
         parent::tearDown();
-        TableRegistry::clear();
+        TableRegistry::getTableLocator()->clear();
         unset($this->Tags);
     }