Skip to content

Commit 1ee2122

Browse files
Merge branch 'master' into analysis-zdNO67
2 parents f5e7b95 + 30d79d4 commit 1ee2122

File tree

6 files changed

+13
-27
lines changed

6 files changed

+13
-27
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ data/
33
vendor/
44
node_modules/
55
.env
6+
phpunit.xml

.travis.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,14 @@
22
language: php
33

44
php:
5-
- '5.6'
5+
- '7.2'
66

77
before_script:
8-
- mkdir -p build/logs
9-
- composer install --no-interaction
8+
- travis_retry composer self-update
9+
- travis_retry composer install --no-interaction --prefer-source --dev
1010

1111
script:
12-
- vendor/bin/phpunit
13-
--configuration phpunit.xml
14-
--bootstrap ./vendor/autoload.php
15-
--coverage-clover build/logs/clover.xml
12+
- vendor/bin/phpunit --coverage-clover=coverage.xml
1613

1714
after_success:
18-
- ./vendor/bin/test-reporter
19-
20-
notifications:
21-
email: "bianco@javanile.org"
15+
- bash <(curl -s https://codecov.io/bash)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ipqueue
2-
2+
[![StyleCI](https://github.styleci.io/repos/158704688/shield?branch=master)](https://github.styleci.io/repos/158704688)
33
[![Build Status](https://travis-ci.org/javanile/ipqueue.svg?branch=master)](https://travis-ci.org/javanile/ipqueue)
44

55

index.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
/**
33
* javanile/ipqueue (v0.0.1).
44
*/
5-
define('IPQUEUE_HOST', 'www.ipqueue.com');
65

7-
if ($_SERVER['HTTP_HOST'] == IPQUEUE_HOST) {
6+
if (preg_match('/^www\.', $_SERVER['HTTP_HOST'])) {
87
return require_once __DIR__.'/public/index.php';
98
}
109

10+
use Javanile\IpQueue\IpQueueApp;
11+
1112
$app = new IpQueueApp(getallheaders(), $_SERVER);
1213

1314
echo $app->run();

phpunit.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

phpunit.xml.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit>
3+
<logging>
4+
<log type="coverage-clover" target="clover.xml"/>
5+
</logging>
36
<filter>
47
<whitelist>
58
<directory>./src</directory>

0 commit comments

Comments
 (0)