Merge branch 'master' into 3.next

cakephp · Mar 24, 2016 · 6abb45a · 6abb45a
2 parents dca1eca + 625ca37
commit 6abb45a
Show file tree

Hide file tree

Showing 42 changed files with 1,690 additions and 235 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -73,7 +73,7 @@ before_script:
   - set +H
 
 script:
-  - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit; fi"
+  - sh -c "if [ '$DEFAULT' = '1' ]; then vendor/bin/phpunit; fi"
 
   - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"