Merge pull request #342 from josegonzalez/josegonzalez-patch-1

Fix runs on docker-based platforms

Author: josegonzalez

.travis.yml

@@ -11,7 +11,7 @@ sudo: false
 env:
   matrix:
     - DB=mysql db_dsn='mysql://[email protected]/cakephp_test'
-    - DB=pgsql  db_dsn='postgres://[email protected]/cakephp_test'
+    - DB=pgsql db_dsn='postgres://[email protected]/cakephp_test'
     - DB=sqlite db_dsn='sqlite:///:memory:'
   global:
     - DEFAULT=1
@@ -39,7 +39,7 @@ before_script:
   - composer self-update
   - composer install --prefer-source --no-interaction --dev
 
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then if [ '$DOCKER' = '1' ]; then apt-get -qq install -qq -y mysql-server && service mysql start; fi; mysql -e 'CREATE DATABASE cakephp_test;'; fi"
 
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"
 
@@ -48,9 +48,7 @@ before_script:
   - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
   - sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
 
-  - phpenv rehash
-  - set +H
-  - cp phpunit.xml.dist phpunit.xml
+  - command -v phpenv > /dev/null && phpenv rehash || true
 
 script:
   - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"

composer.json

@@ -18,7 +18,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.*",
-        "league/flysystem-vfs": "*"
+        "league/flysystem-vfs": "*",
+        "cakephp/cakephp-codesniffer": "dev-master",
+        "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {
         "psr-4": {