Merge branch '3.0'

.gitignore

@@ -0,0 +1,20 @@
+*.diff
+*.err
+*.orig
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+.DS_Store
+.cache
+.project
+.settings
+.svn
+errors.err
+tags
+/nbproject/
+/composer.lock
+/vendor
+/phpunit.xml
+/tmp

.travis.yml

@@ -1,30 +1,43 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
+  - 5.6
 
 env:
   global:
-    - PLUGIN_NAME=CakePdf
+    - DEFAULT=1
 
-  matrix:
-    - CAKE_VERSION=2.4
-    - CAKE_VERSION=2.5
-    - CAKE_VERSION=2.6
-    - CAKE_VERSION=2.7
+matrix:
+  allow_failures:
+    - php: hhvm
+
+    - php: hhvm-nightly
+
+  fast_finish: true
+
+  include:
+    - php: 5.4
+      env: PHPCS=1 DEFAULT=0
+
+    - php: hhvm
+
+    - php: hhvm-nightly
 
 before_script:
   - sudo touch /usr/bin/wkhtmltopdf && sudo chmod +x /usr/bin/wkhtmltopdf
-  - git clone -b master https://github.com/FriendsOfCake/travis.git --depth 1 ../travis
-  - ../travis/before_script.sh
+  - composer self-update
+  - composer install --prefer-source --no-interaction --dev
 
-script:
-  - ../travis/script.sh
+  - sh -c "if [ '$PHPCS' = '1' ]; then composer require cakephp/cakephp-codesniffer:dev-master; fi"
 
-after_success:
-  - ../travis/after_success.sh
+  - phpenv rehash
+  - set +H
+
+script:
+  - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
+  - sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -p -n --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests ./config; fi"
 
 notifications:
   email: false