Skip to content

Commit

Permalink
Merge pull request #107 from koriym/meta
Browse files Browse the repository at this point in the history
Update composer.json
  • Loading branch information
koriym authored Feb 27, 2017
2 parents 817f287 + 1a8624e commit 0652354
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ php:
- 5.6
- 7.0
- hhvm
- 7.1
sudo: false
cache:
directories:
Expand All @@ -15,13 +16,15 @@ matrix:
env: dependencies=lowest
- php: 7.0
env: dependencies=lowest
- php: 7.1
env: dependencies=lowest
before_script:
- composer self-update
- if [ -z "$dependencies" ]; then composer install; fi;
- if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest; fi;
script:
- if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then phpunit; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then phpunit --coverage-text --coverage-clover=coverage.clover; fi
- if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then vendor/bin/phpunit; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover; fi
after_script:
- wget https://scrutinizer-ci.com/ocular.phar
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
13 changes: 9 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,16 @@
],
"require": {
"php": ">=5.6.0",
"bear/resource": "~1.4",
"doctrine/cache": "~1.0",
"psr/log": "~1.0"
"bear/resource": "^1.4.1",
"doctrine/cache": "^1.6.1",
"psr/log": "^1.0.2"
},
"autoload": {
"require-dev": {
"phpunit/phpunit": "~5.7 < 6.0",
"squizlabs/php_codesniffer": "^2.8",
"phpmd/phpmd": "^2.6"
},
"autoload": {
"psr-4": {
"BEAR\\Sunday\\": "src/"
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Module/Constant/NamedModuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace BEAR\Sunday\Module\Constant;

use Ray\Di\Injector;
use BEAR\Sunday\FakeApplication;
use Ray\Di\Injector;

class ConstantModuleTest extends \PHPUnit_Framework_TestCase
class NamedModuleTest extends \PHPUnit_Framework_TestCase
{
/**
* @var FakeApplication
Expand Down

0 comments on commit 0652354

Please sign in to comment.