Skip to content
This repository has been archived by the owner on Jan 9, 2019. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Timo committed May 21, 2015
2 parents 4c47dd1 + f0dbf9f commit 50c0491
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ before_script:
- composer update --prefer-source

script:
- ./vendor/bin/phpunit --bootstrap=tests/bootstrap.php
- phpunit
- ./vendor/bin/phpcs -n --standard=PSR2 ./src ./tests

after_script:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
]
},
"require-dev": {
"phpunit/phpunit": "4.2.*",
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.4.*",
"satooshi/php-coveralls": "dev-master",
"phpunit/phpcov": "2.0.*"
Expand Down
28 changes: 28 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<phpunit bootstrap="./tests/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
verbose="true"
stopOnFailure="false"
processIsolation="false"
backupGlobals="false"
syntaxCheck="true"
>
<testsuite name="tteMaintenance Test Suite">
<directory>./tests/tteMaintenanceTest</directory>
</testsuite>


<filter>
<whitelist>
<directory suffix=".php">./src</directory>
</whitelist>
</filter>

<logging>
<log type="coverage-text" target="php://stdout"/>
<log type="coverage-clover" target="./build/logs/clover.xml"/>
<log type="coverage-html" target="./build/logs/unittest.html"/>
</logging>
</phpunit>
5 changes: 0 additions & 5 deletions src/tteMaintenance/Provider/AbstractProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,4 @@ public function onBootstrap(MvcEvent $event)
// @todo at the moment the module only supports HTTP-Request
return;
}

/**
* @return bool
*/
abstract public function isMaintenance();
}

0 comments on commit 50c0491

Please sign in to comment.