Skip to content

Commit

Permalink
Merge pull request #32 from Taluu/composer
Browse files Browse the repository at this point in the history
Composer and Travis improvements
  • Loading branch information
Taluu committed Dec 25, 2015
2 parents e165077 + e1aead4 commit 399276a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 28 deletions.
1 change: 0 additions & 1 deletion .coveralls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Coveralls configuration
#

src_dir: src
service_name: travis-ci
coverage_clover: clover.xml
json_path: coveralls-upload.json
Expand Down
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ php:
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm

matrix:
allow_failures:
- php: hhvm
sudo: false

before_script:
- composer self-update
- composer install --prefer-source -o
install:
- travis_retry composer install --prefer-source --no-dev --no-interaction

script:
- bin/phpunit --coverage-text --coverage-clover clover.xml
- phpunit --coverage-text --coverage-clover clover.xml

after_script:
- bin/coveralls
- chmod +rwx clover.xml
- wget https://github.com/satooshi/php-coveralls/releases/download/v0.7.1/coveralls.phar
- php coveralls.phar

22 changes: 3 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,14 @@
"source": "https://github.com/Wisembly/Totem"
},

"replace": {
"taluu/totem": "self.version"
},

"autoload": {
"psr-4": {
"Totem\\": ["src/", "test/"]
}
},

"require": {
"php": ">=5.4",
"symfony/property-access": "~2.5"
},

"require-dev": {
"phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "~0.6"
},

"config": {
"bin-dir": "bin"
},

"minimum-stability": "dev",
"prefer-stable": true
"php": "^5.4|^7.0",
"symfony/property-access": "^2.5|^3.0"
}
}

0 comments on commit 399276a

Please sign in to comment.