From e989a206cf43bd6a0b9ae8a96b617a28f113193f Mon Sep 17 00:00:00 2001 From: Timo Date: Thu, 21 May 2015 12:47:04 +0200 Subject: [PATCH 1/5] Changed Version Number for PHPUnit from 4.2.* to 4.* --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0b12bfd..8ed5f5d 100755 --- a/composer.json +++ b/composer.json @@ -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.*" From 358e007fa3ad911228be86d5fde602277c1c1b01 Mon Sep 17 00:00:00 2001 From: Timo Date: Thu, 21 May 2015 12:47:46 +0200 Subject: [PATCH 2/5] Removed abstract Method from AbstractProvider, because it was already defined in Interface --- src/tteMaintenance/Provider/AbstractProvider.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tteMaintenance/Provider/AbstractProvider.php b/src/tteMaintenance/Provider/AbstractProvider.php index e5a0a0e..4321e98 100755 --- a/src/tteMaintenance/Provider/AbstractProvider.php +++ b/src/tteMaintenance/Provider/AbstractProvider.php @@ -60,9 +60,4 @@ public function onBootstrap(MvcEvent $event) // @todo at the moment the module only supports HTTP-Request return; } - - /** - * @return bool - */ - abstract public function isMaintenance(); } From 99c5636b540e37c3c9e9f2c35cb38ceae9d9cb39 Mon Sep 17 00:00:00 2001 From: Timo Date: Thu, 21 May 2015 12:56:15 +0200 Subject: [PATCH 3/5] Changed PHPUnit call for Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 12ab70f..689c6ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_script: - composer update --prefer-source -v --dev script: - - phpunit --bootstrap=tests/bootstrap.php + - phpunit -c tests/phpunit.xml - ./vendor/bin/phpcs -n --standard=PSR2 ./src ./tests after_script: From 90e5db07a5149e45631806b20b36badc818a9080 Mon Sep 17 00:00:00 2001 From: Timo Date: Thu, 21 May 2015 15:58:06 +0200 Subject: [PATCH 4/5] Moved phpunit configuration file into root folder --- phpunit.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 phpunit.xml diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000..329ea82 --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,28 @@ + + + ./tests/tteMaintenanceTest + + + + + + ./src + + + + + + + + + From 6176d3d9d167e63730d0e708c79e9fb57d399d00 Mon Sep 17 00:00:00 2001 From: Timo Date: Thu, 21 May 2015 16:04:41 +0200 Subject: [PATCH 5/5] Changed path to phpunit configuration in travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 689c6ae..2e6a6e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_script: - composer update --prefer-source -v --dev script: - - phpunit -c tests/phpunit.xml + - phpunit - ./vendor/bin/phpcs -n --standard=PSR2 ./src ./tests after_script: