Skip to content

Commit

Permalink
Tidying
Browse files Browse the repository at this point in the history
  • Loading branch information
olvlvl committed Nov 5, 2016
1 parent 3b70f78 commit ad3b84b
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 23 deletions.
1 change: 0 additions & 1 deletion .coveralls.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .gitattributes
@@ -1,7 +1,6 @@
.coveralls.yml export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
Makefile export-ignore
phpunit.xml.dist export-ignore
phpunit.xml export-ignore
/tests export-ignore
14 changes: 10 additions & 4 deletions .travis.yml
@@ -1,20 +1,26 @@
sudo: false

cache:
directories:
- $COMPOSER_CACHE_DIR
- $HOME/.composer/cache

language: php

php:
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm

before_script:
- travis_retry composer self-update
- composer require satooshi/php-coveralls --prefer-source
- if [[ $TRAVIS_PHP_VERSION != "5.5" ]]; then COMPOSER_ROOT_VERSION=0.5 composer install --prefer-dist; fi
- if [[ $TRAVIS_PHP_VERSION = "5.5" ]]; then COMPOSER_ROOT_VERSION=0.5 composer require satooshi/php-coveralls --prefer-dist; fi

script:
- mkdir -p build/logs
- phpunit --coverage-clover build/logs/clover.xml

after_script:
- sh -c 'if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then php vendor/bin/coveralls -v; fi;'
after_success:
- if [[ "$TRAVIS_PHP_VERSION" = "5.5" ]]; then php vendor/bin/coveralls -v; fi
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,7 +1,7 @@
The icanboogie/bind-render package is free software.
It is released under the terms of the following BSD License.

Copyright (c) 2015 by Olivier Laviale
Copyright (c) 2015-2016 by Olivier Laviale
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -9,10 +9,10 @@ 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 --prefer-dist

update:
@composer update
@COMPOSER_ROOT_VERSION=$(PACKAGE_VERSION) composer update --prefer-dist

autoload: vendor
@composer dump-autoload
Expand All @@ -29,7 +29,7 @@ doc: vendor
@apigen generate \
--source lib \
--destination build/docs/ \
--title "$(PACKAGE_NAME) $(PACKAGE_VERSION)" \
--title "$(PACKAGE_NAME) v$(PACKAGE_VERSION)" \
--template-theme "bootstrap"

clean:
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -22,9 +22,9 @@
"minimum-stability": "dev",

"require": {
"php": ">=5.5.0",
"icanboogie/icanboogie": "^3.0.0",
"icanboogie/render": "^0.5.0"
"php": ">=5.5",
"icanboogie/icanboogie": "^3.0",
"icanboogie/render": "^0.5"
},

"require-dev": {
Expand Down
18 changes: 9 additions & 9 deletions phpunit.xml.dist → phpunit.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="./tests/bootstrap.php"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="./tests/bootstrap.php"
>
<testsuites>
<testsuite name="ICanBoogie/bind-render Test Suite">
Expand Down

0 comments on commit ad3b84b

Please sign in to comment.