Skip to content

Commit

Permalink
Merge branch 'release/0.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Deinhamer committed Mar 21, 2016
2 parents 9c1ebaa + 57e5e1c commit dd5d9d6
Show file tree
Hide file tree
Showing 7 changed files with 538 additions and 7 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,15 @@ php:

before_install:
- composer self-update
- composer --version

install:
- composer install

script: phpunit tests
before_script:
- mkdir -p build/logs/

script: phpunit --coverage-clover build/logs/clover.xml tests

after_success:
- php vendor/bin/coveralls
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log

## [Next][next]
## [next]

## [0.1.2]

### Fixed
- Fix getting a specific result key when no result was found.

## [0.1.1] - 2015-06-26

Expand All @@ -16,5 +21,6 @@

Initial release.

[next]: https://github.com/thasmo/vagrant.box/compare/v0.1.1...HEAD
[next]: https://github.com/thasmo/vagrant.box/compare/v0.1.2...HEAD
[0.1.2]: https://github.com/thasmo/vagrant.box/compare/v0.1.1...v0.1.2
[0.1.1]: https://github.com/thasmo/php.honeypot-blacklist/compare/v0.1.0...v0.1.1
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
A simple PHP library for querying the [Project Honeypot Http:BL API](http://www.projecthoneypot.org/httpbl_api.php).

[![Build Status](https://travis-ci.org/thasmo/php.honeypot-blacklist.svg?branch=develop)](https://travis-ci.org/thasmo/php.honeypot-blacklist)
[![Coverage Status](https://coveralls.io/repos/thasmo/php.honeypot-blacklist/badge.svg?branch=develop)](https://coveralls.io/r/thasmo/php.honeypot-blacklist?branch=develop)
[![Latest Stable Version](https://poser.pugx.org/thasmo/honeypot-blacklist/v/stable)](https://packagist.org/packages/thasmo/honeypot-blacklist)

## Usage

Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"php": ">=5.5.0"
},
"require-dev": {
"phpunit/phpunit": "4.7.*"
"phpunit/phpunit": "4.7.*",
"satooshi/php-coveralls": "0.6.*"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit dd5d9d6

Please sign in to comment.