Update Travis, Makefile

ICanBoogie · Apr 6, 2017 · cbf1d29 · cbf1d29
1 parent 1c8ef20
commit cbf1d29
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,26 +4,17 @@ cache:
   directories:
     - $COMPOSER_CACHE_DIR
     - $HOME/.composer/cache
+    - $TRAVIS_BUILD_DIR/build
 
 language: php
 
 php:
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
-
-matrix:
-  allow_failures:
-    - php: hhvm
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != "5.6" ]]; then composer install; fi
-  - if [[ $TRAVIS_PHP_VERSION = "5.6" ]]; then composer require satooshi/php-coveralls; fi
+  - if [[ $TRAVIS_PHP_VERSION != "5.6" ]]; then phpenv config-rm xdebug.ini; fi
 
 script:
-  - mkdir -p build/logs
-  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-
-after_success:
-  - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then php vendor/bin/coveralls -v; fi
+  - if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then make test-coveralls; else make test; fi
diff --git a/Makefile b/Makefile
@@ -2,29 +2,43 @@
 
 PACKAGE_NAME = icanboogie/message-bus
 PACKAGE_VERSION = 0.1
-PHPUNIT = vendor/bin/phpunit
+PHPUNIT_VERSION = phpunit-5.7.phar
+PHPUNIT_FILENAME = build/$(PHPUNIT_VERSION)
+PHPUNIT = php $(PHPUNIT_FILENAME)
 
 # do not edit the following lines
 
+all: $(PHPUNIT_FILENAME) vendor
+
 usage:
 	@echo "test:  Runs the test suite.\ndoc:   Creates the documentation.\nclean: Removes the documentation, the dependencies and the Composer files."
 
 vendor:
-	@composer install
+	@COMPOSER_ROOT_VERSION=$(PACKAGE_VERSION) composer install
 
 update:
-	@composer update
+	@COMPOSER_ROOT_VERSION=$(PACKAGE_VERSION) composer update
 
 autoload: vendor
 	@composer dump-autoload
 
-test: vendor
+$(PHPUNIT_FILENAME):
+	mkdir -p build
+	wget https://phar.phpunit.de/$(PHPUNIT_VERSION) -O $(PHPUNIT_FILENAME)
+
+test: all
 	@$(PHPUNIT)
 
-test-coverage: vendor
+test-coverage: all
 	@mkdir -p build/coverage
 	@$(PHPUNIT) --coverage-html build/coverage
 
+test-coveralls: all
+	@mkdir -p build/logs
+	COMPOSER_ROOT_VERSION=$(PACKAGE_VERSION) composer require satooshi/php-coveralls
+	@$(PHPUNIT) --coverage-clover build/logs/clover.xml
+	php vendor/bin/coveralls -v
+
 doc: vendor
 	@mkdir -p build/docs
 	@apigen generate \
@@ -37,3 +51,5 @@ clean:
 	@rm -fR build
 	@rm -fR vendor
 	@rm -f composer.lock
+
+.PHONY: all autoload doc clean test test-coverage test-coveralls update
diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
 # MessageBus
 
 [![Packagist](https://img.shields.io/packagist/v/icanboogie/message-bus.svg)](https://packagist.org/packages/icanboogie/message-bus)
-[![Build Status](https://img.shields.io/travis/ICanBoogie/MessageBus/master.svg)](http://travis-ci.org/ICanBoogie/MessageBus)
-[![HHVM](https://img.shields.io/hhvm/ICanBoogie/MessageBus.svg)](http://hhvm.h4cc.de/package/ICanBoogie/MessageBus)
-[![Code Quality](https://img.shields.io/scrutinizer/g/ICanBoogie/MessageBus/master.svg)](https://scrutinizer-ci.com/g/ICanBoogie/MessageBus)
-[![Code Coverage](https://img.shields.io/coveralls/ICanBoogie/MessageBus/master.svg)](https://coveralls.io/r/ICanBoogie/MessageBus)
+[![Build Status](https://img.shields.io/travis/ICanBoogie/MessageBus.svg)](http://travis-ci.org/ICanBoogie/MessageBus)
+[![Code Quality](https://img.shields.io/scrutinizer/g/ICanBoogie/MessageBus.svg)](https://scrutinizer-ci.com/g/ICanBoogie/MessageBus)
+[![Code Coverage](https://img.shields.io/coveralls/ICanBoogie/MessageBus.svg)](https://coveralls.io/r/ICanBoogie/MessageBus)
 [![Downloads](https://img.shields.io/packagist/dt/icanboogie/message-bus.svg)](https://packagist.org/packages/icanboogie/message-bus/stats)
 
 **ICanBoogie/MessageBus** provides a very simple message bus that can handle messages right away or
@@ -155,8 +154,8 @@ clean` Message.
 
 The package is continuously tested by [Travis CI](http://about.travis-ci.org/).
 
-[![Build Status](https://img.shields.io/travis/ICanBoogie/MessageBus/master.svg)](http://travis-ci.org/ICanBoogie/MessageBus)
-[![Code Coverage](https://img.shields.io/coveralls/ICanBoogie/MessageBus/master.svg)](https://coveralls.io/r/ICanBoogie/MessageBus)
+[![Build Status](https://img.shields.io/travis/ICanBoogie/MessageBus.svg)](http://travis-ci.org/ICanBoogie/MessageBus)
+[![Code Coverage](https://img.shields.io/coveralls/ICanBoogie/MessageBus.svg)](https://coveralls.io/r/ICanBoogie/MessageBus)
 
 
 

diff --git a/composer.json b/composer.json
@@ -27,9 +27,6 @@
 		"php": ">=5.6",
 		"icanboogie/accessor": "^1.0"
 	},
-	"require-dev": {
-		"phpunit/phpunit": "^5.6"
-	},
 	"autoload": {
 		"psr-4": {
 			"ICanBoogie\\MessageBus\\": "lib/"