Merge pull request #1 from EvolutedNewMedia/feature/pull-upstream

Feature/pull upstream

Author: rickmills

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
   - 5.5
-
+  - 5.6
+  - 7.0
 env:
   global:
     - PLUGIN_NAME=Migrations
@@ -13,20 +12,19 @@ env:
     - REQUIRE="phpunit/phpunit:3.7.31"
 
   matrix:
-    - DB=mysql CAKE_VERSION=2.6
+    - DB=mysql CAKE_VERSION=2.7
 
 matrix:
   include:
-    - php: 5.3
+    - php: 5.5
       env:
-        - CAKE_VERSION=2.6
-    - php: 5.4
+        - CAKE_VERSION=2.7
+    - php: 5.6
       env:
-        - CAKE_VERSION=2.6
-    - php: 5.5
+        - CAKE_VERSION=2.7
+    - php: 7.0
       env:
-        - CAKE_VERSION=2.6
-
+        - CAKE_VERSION=2.8
 before_script:
   - git clone https://github.com/steinkel/travis.git --depth 1 ../travis
   - ../travis/before_script.sh

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+Release 3.2.0
+-------------
+
+* Merged in CakeDC 2.5.1
+* Updated CakeSchema to extend from CakeObject to avoid class collisions with php object.
+
 Release 3.1.0
 -------------
 
@@ -21,6 +27,33 @@ First version for Evoluted New Medias Core.
 
 * [921842c](https://github.com/evolutednewmedia/migrations/commit/921842c) Added the fixes for our core. Fixes issue with overriden plugin models appearing in app migration. Increased semver
 
+Release 2.5.1
+-------------
+
+* [955e10b3](https://github.com/CakeDC/migrations/commit/955e10b3) fix phpdo
+* [7d9b053](https://github.com/CakeDC/migrations/commit/7d9b053a6) Missing note about the schema/database comparison.
+* [7b47ae3](https://github.com/CakeDC/migrations/commit/7b47ae3) Updating the docs.
+* [a59d1d1](https://github.com/CakeDC/migrations/commit/a59d1d1) Fix missing return statements.
+* [9363915](https://github.com/CakeDC/migrations/commit/9363915) Migration name check.
+* [263c739](https://github.com/CakeDC/migrations/commit/263c739) New preview options.
+* [0a4dc0b](https://github.com/CakeDC/migrations/commit/0a4dc0b) Fix missing translation domain.
+* [dfbed18](https://github.com/CakeDC/migrations/commit/dfbed18) New name param.
+
+
+Release 2.5.0
+-------------
+
+* [ff07928](https://github.com/cakedc/migrations/commit/ff07928) adding unit test to skip feature
+* [be0922a](https://github.com/cakedc/migrations/commit/be0922a) adding skip migration feature, updating the documentation
+* [cb3281f](https://github.com/cakedc/migrations/commit/cb3281f) update docs re --compare parameter
+
+**Note:** The release **2.4.2** was created wrong, there we have new features too, not only bugfixes and improvements. 
+
+Release 2.4.2
+-------------
+
+* Bugfixes and doc improvements
+
 Release 2.4.1
 -------------