Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -142,23 +142,3 @@ jobs:
         - mysql -e 'CREATE DATABASE spiral;'
       script:
         - vendor/bin/phpunit tests/ORM/Driver/MySQL
-
-    # MySQL 5.7
-    - stage: Test
-      php: 7.2
-      addons:
-        apt:
-          sources:
-            - mysql-5.7-trusty
-          packages:
-            - mysql-server
-            - mysql-client
-      env:
-        - "DB=mysql MYSQL=5.7"
-      before_install:
-        - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('root') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-        - sudo mysql_upgrade -u root -proot
-        - sudo service mysql restart
-        - mysql -u root -proot -e 'CREATE DATABASE spiral;'
-      script:
-        - vendor/bin/phpunit tests/ORM/Driver/MySQL

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG 
 
+v1.1.7 (16.07.2019)
+--------------------
+- DatabaseMapper will not generate new PK if value has been set by user
+
+v1.1.6 (02.07.2019)
+--------------------
+- minor CS (is_null => === null, !empty => === type)
+- ORM->get() and Heap->find() can now accept multiple kv pairs (search is still done using first pair) for future composite key support
+
 v1.1.5 (24.06.2019)
 --------------------
 - first public release with documentation

README.md

@@ -5,7 +5,7 @@
 [![Codecov](https://codecov.io/gh/cycle/orm/graph/badge.svg)](https://codecov.io/gh/cycle/orm)
 <a href="https://discord.gg/TFeEmCs"><img src="https://img.shields.io/badge/discord-chat-magenta.svg"></a>
 
-Cycle is PHP DataMapper ORM and Data Modelling engine designed to safely work in classic and long-running PHP applications (like [RoadRunner](https://github.com/spiral/roadrunner)). The ORM provides flexible configuration options to model datasets and support dynamic mapping schema. ORM can work with plain PHP objects and support annotation declarations as extension.
+Cycle is PHP DataMapper ORM and Data Modelling engine designed to safely work in classic and daemonized PHP applications (like [RoadRunner](https://github.com/spiral/roadrunner)). The ORM provides flexible configuration options to model datasets and support dynamic mapping schema at runtime. Engine can work with plain PHP objects, support annotation declarations and proxies via extensions.
 
 <p align="center">
 	<a href="https://github.com/cycle/docs"><b>Documentation</b></a> | <a href="https://github.com/cycle/docs/issues/3">Comparison with Eloquent and Doctrine</a>