Merge branch 'master' of github.com:toin0u/Geotools-laravel

toin0u · Jul 30, 2014 · eaa74ac · eaa74ac
2 parents ee36a39 + 0d5487b
commit eaa74ac
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,9 @@
+* text=auto
+
+/tests export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/phpunit.xml.dist export-ignore
+/CHANGELOG.md export-ignore
+/README.md export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,14 @@ php:
  - 5.3
  - 5.4
  - 5.5
+ - 5.6
+ - hhvm
 
 before_script:
- - curl -sS http://getcomposer.org/installer | php
- - php composer.phar install --dev --prefer-dist --no-interaction
+ - travis_retry composer self-update
+ - travis_retry composer install --no-interaction --prefer-source --dev
 
-script: phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
+script:
+ - vendor/bin/phpunit --verbose --coverage-text --coverage-clover ./build/logs/clover.xml
 
 after_script: php vendor/bin/coveralls
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Edit `compose.json` and add:
 ```json
 {
  "require": {
- "toin0u/geotools-laravel": "~0.2"
+ "toin0u/geotools-laravel": "0.2.*"
  }
 }
 ```

diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
  },
 
  "require-dev" : {
+ "phpunit/phpunit" : "~4.0",
  "orchestra/testbench" : "~2.0",
  "satooshi/php-coveralls" : "~0.6"
  },