Merge branch '3.5' into 3.6

.travis.yml

@@ -12,14 +12,14 @@ php:
   - 5.5
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.5
+  - DB=MYSQL CORE_RELEASE=3.6
 
 matrix:
   include:
     - php: 5.6
       env: DB=PGSQL CORE_RELEASE=3
     - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.4
+      env: DB=PGSQL CORE_RELEASE=3.6
     - php: 7.1
       env: DB=MYSQL CORE_RELEASE=3.6
 

composer.json

@@ -25,6 +25,9 @@
 		}
 	},
 	"require-dev": {
-		"phpunit/PHPUnit": "~3.7"
+		"phpunit/phpunit": "^3 || ^4 || ^5"
+	},
+	"autoload": {
+		"classmap": ["code"]
 	}
 }