fixing deps

ThaDafinser · Mar 10, 2016 · a38ffc9 · a38ffc9
1 parent 280ae8c
commit a38ffc9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 48 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -0,0 +1,11 @@
+checks:
+    php:
+        code_rating: true
+        duplication: true
+
+filter:
+    excluded_paths: [tests/*]
+
+tools:
+    external_code_coverage:
+        timeout: 600    # Timeout in seconds.
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,27 @@
+
 language: php
 
+sudo: false
+
 php:
   - 5.5
   - 5.6
   - 7
   - hhvm
 
-matrix:
-  fast_finish: true
-
-# faster builds on new travis setup not using sudo
-sudo: false
+env:
+  matrix:
+    - DEPENDENCIES="--prefer-lowest --prefer-stable"
+    - DEPENDENCIES=""
 
 before_script:
  - composer self-update
- - composer update --prefer-source -n --verbose
+ - composer update -o --prefer-source $DEPENDENCIES
 
 script:
+ - vendor/bin/phpunit --coverage-clover ./clover.xml
  - vendor/bin/php-cs-fixer fix src --level=psr2 --dry-run -vv
- - mkdir -p build/logs
- - ./vendor/bin/phpunit -c travis.phpunit.xml --coverage-clover build/logs/clover.xml
 
 after_script:
-  - php vendor/bin/coveralls -v
-
+  - if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then php ocular.phar code-coverage:upload --format=php-clover ./clover.xml; fi
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,5 +1,5 @@
 <phpunit 
-	bootstrap="./tests/Bootstrap.php" 
+	bootstrap="./vendor/autoload.php" 
 	colors="false"
 	stopOnError="false"
 	stopOnFailure="false"

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
diff --git a/travis.phpunit.xml b/travis.phpunit.xml