Skip to content

Commit

Permalink
Merge pull request #44 from chadicus/dev/composer
Browse files Browse the repository at this point in the history
 Implement composer best practices
  • Loading branch information
chadicus authored Jan 8, 2018
2 parents a8c99b7 + db5e8c6 commit d69d4e3
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 2,351 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/vendor/
composer.lock
13 changes: 10 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@ php:
- 7.1
- 7.2
- hhvm
install: composer install
script: ./vendor/bin/phpunit --coverage-clover clover.xml
after_success: sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/bin/coveralls -v; fi'
- nightly
env:
- PREFER_LOWEST="--prefer-lowest --prefer-stable"
- PREFER_LOWEST=""
matrix:
fast_finish: true
allow_failures:
- php: 7.2
- php: hhvm
- php: nightly
before_script:
- composer update $PREFER_LOWEST
script:
- ./vendor/bin/phpunit --coverage-clover clover.xml
after_success: sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/bin/coveralls -v; fi'
18 changes: 12 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,27 @@
"license": "MIT",
"require": {
"php": "^5.6 || ^7.0",
"bshaffer/oauth2-server-php": "^1.8",
"bshaffer/oauth2-server-php": "^1.9",
"chadicus/slim-oauth2-http": "^3.1"
},
"suggest": {
"chadicus/slim-oauth2-middleware": "Adds OAuth2 middleware for API requests.",
"slim/php-view": "Simple template rendering"
},
"config" : {
"sort-packages": true
},
"require-dev": {
"phpunit/phpunit": "^5.0",
"chadicus/coding-standard": "^1.0",
"slim/php-view": "^2.0",
"zendframework/zend-diactoros": "^1.3",
"php-coveralls/php-coveralls": "^1.0"
"chadicus/coding-standard": "^1.3",
"php-coveralls/php-coveralls": "^1.0",
"phpunit/phpunit": "^5.7",
"slim/php-view": "^2.0.5",
"zendframework/zend-diactoros": ">=1.3.2"
},
"autoload": {
"psr-4": {"Chadicus\\Slim\\OAuth2\\Routes\\" : "src"}
},
"autoload-dev": {
"psr-4": {"ChadicusTest\\Slim\\OAuth2\\Routes\\" : "tests"}
}
}
Loading

0 comments on commit d69d4e3

Please sign in to comment.