From 28fd3f1a0b555ba12dc33cd77828a260dfd01b72 Mon Sep 17 00:00:00 2001 From: Olivier Laviale Date: Fri, 17 Feb 2017 22:32:53 +0100 Subject: [PATCH] Bump v1.2.0 --- .gitattributes | 4 ++-- .gitignore | 6 +++--- .travis.yml | 14 ++++++++++---- LICENSE | 4 ++-- Makefile | 2 +- README.md | 12 ++++++------ composer.json | 16 +++++++++------- phpunit.xml.dist => phpunit.xml | 18 +++++++++--------- 8 files changed, 42 insertions(+), 34 deletions(-) rename phpunit.xml.dist => phpunit.xml (55%) diff --git a/.gitattributes b/.gitattributes index 05fa7f9..585645a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ -.gitattributes export-ignore +.gitattributes export-ignore .gitignore export-ignore .travis.yml export-ignore Makefile export-ignore phpunit.xml.dist export-ignore -/tests export-ignore +tests/ export-ignore diff --git a/.gitignore b/.gitignore index 2c1258d..7cc1897 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -composer.lock build -tests/cache/ -vendor/ +composer.lock +tests/cache +vendor diff --git a/.travis.yml b/.travis.yml index 445bd8e..22532b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,17 @@ sudo: false +cache: + directories: + - $COMPOSER_CACHE_DIR + - $HOME/.composer/cache + language: php php: - 5.5 - 5.6 - 7.0 + - 7.1 - hhvm matrix: @@ -13,12 +19,12 @@ matrix: - php: hhvm before_script: - - travis_retry composer self-update - - composer require satooshi/php-coveralls --prefer-source + - if [[ $TRAVIS_PHP_VERSION != "5.5" ]]; then composer install; fi + - if [[ $TRAVIS_PHP_VERSION = "5.5" ]]; then composer require satooshi/php-coveralls; 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 diff --git a/LICENSE b/LICENSE index c74b10c..40a0d00 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ -The ICanBoogie/Config package is free software. +The icanboogie/config package is free software. It is released under the terms of the following BSD License. -Copyright (c) 2015 by Olivier Laviale +Copyright (c) 2015-2017 by Olivier Laviale All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Makefile b/Makefile index 66e9379..b1e21ed 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # customization PACKAGE_NAME = icanboogie/config -PACKAGE_VERSION = 1.1.0 +PACKAGE_VERSION = 1.2 # do not edit the following lines diff --git a/README.md b/README.md index e45b70f..8ebb79e 100644 --- a/README.md +++ b/README.md @@ -186,8 +186,8 @@ cloned with the following command line: ## Documentation -The package is documented as part of the [ICanBoogie](http://icanboogie.org/) framework -[documentation](http://icanboogie.org/docs/). You can generate the documentation for the package +The package is documented as part of the [ICanBoogie](https://icanboogie.org/) framework +[documentation](https://icanboogie.org/docs/). You can generate the documentation for the package and its dependencies with the `make doc` command. The documentation is generated in the `docs` directory. [ApiGen](http://apigen.org/) is required. You can later clean the directory with the `make clean` command. @@ -219,9 +219,9 @@ The package is continuously tested by [Travis CI](http://about.travis-ci.org/). -[icanboogie/event]: https://github.com/ICanBoogie/Event -[ICanBoogie]: https://github.com/ICanBoogie +[icanboogie/event]: https://github.com/ICanBoogie/Event +[ICanBoogie]: https://github.com/ICanBoogie -[Config]: https://icanboogie.org/api/config/1.1/class-ICanBoogie.Config.html +[Config]: https://icanboogie.org/api/config/1.2/class-ICanBoogie.Config.html +[NoFragmentDefined]: https://icanboogie.org/api/config/1.2/class-ICanBoogie.NoFragmentDefined.html [Storage]: https://icanboogie.org/api/storage/2.0/class-ICanBoogie.Storage.Storage.html -[NoFragmentDefined]: https://icanboogie.org/api/config/master/class-ICanBoogie.NoFragmentDefined.html diff --git a/composer.json b/composer.json index ea31dd3..dd6610c 100644 --- a/composer.json +++ b/composer.json @@ -2,15 +2,17 @@ "name": "icanboogie/config", "type": "library", "description": "Synthesizes low-level configurations.", - "keywords": [ "config" ], - "homepage": "http://icanboogie.org/", + "keywords": [ + "config" + ], + "homepage": "https://icanboogie.org/", "license": "BSD-3-Clause", "authors": [ { "name": "Olivier Laviale", "email": "olivier.laviale@gmail.com", - "homepage": "http://www.weirdog.com/", - "role" : "Developer" + "homepage": "https://olvlvl.com/", + "role": "Developer" } ], "support": { @@ -19,9 +21,9 @@ }, "minimum-stability": "dev", "require": { - "php": ">=5.5.0", - "icanboogie/common": "^1.2.2", - "icanboogie/storage": "^2.0.0" + "php": ">=5.5", + "icanboogie/common": "^1.2", + "icanboogie/storage": "^2.0" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml similarity index 55% rename from phpunit.xml.dist rename to phpunit.xml index fee7b2e..aa517a3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml @@ -1,15 +1,15 @@