Merge pull request #14 from owncloud/fix-repo-setup

Revert "Test against the notification-manager branch for now"

.travis.yml

@@ -8,7 +8,7 @@ php:
 
 env:
   global:
-    - CORE_BRANCH=notification-manager # TODO revert once the manager is merged: - CORE_BRANCH=master
+    - CORE_BRANCH=master
     - APP_NAME=notifications
   matrix:
     - DB=sqlite
@@ -45,8 +45,8 @@ script:
   - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then phpunit --configuration phpunit.xml; fi"
 
   # Create coverage report
-  # TODO activate once scrutinizer is set up - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi"
-  # TODO activate once scrutinizer is set up - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi"
+  - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi"
+  - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi"
   - cd ../
 
   # Run Javascript unit tests