Master dev kit (#427) - Fix master, prepare nex minor

* DevKit updates

* prepare CHANGELOG file for next version, prepare composer.json to go on 2.x only

Author: ElectricMaxxx

.travis.yml

@@ -44,10 +44,8 @@ matrix:
       env: SYMFONY_VERSION=3.3.*
     - php: 7.2
       env: SYMFONY_VERSION=3.4.*
-    - env: TEST_INSTALLATION=true
   fast_finish: true
   allow_failures:
-    - env: TEST_INSTALLATION=true
 
 before_install:
   - phpenv config-rm xdebug.ini || true

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.2.0(ureleased)
+---------------
+
+* **YYYY-MM-DD**:
+
 2.1.1
 -----
 

Makefile

@@ -26,11 +26,10 @@ list:
 	@echo 'unit_tests:               will run unit tests only'
 	@echo 'functional_tests_phpcr:  will run functional tests with PHPCR'
 	@echo 'functional_tests_orm:    will run functional tests with ORM'
-	@echo 'test_installation:    will run installation test'
+
 include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
 include ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk
 include ${TESTING_SCRIPTS_DIR}/make/functional_tests_orm.mk
-include ${TESTING_SCRIPTS_DIR}/make/test_installation.mk
 
 .PHONY: test
 test: unit_tests functional_tests_phpcr functional_tests_orm

composer.json

@@ -51,7 +51,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }