Skip to content

Commit 603437f

Browse files
authored
Merge pull request #9 from lsv/feature/update
Feature/update
2 parents 1f35705 + 24013e9 commit 603437f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1398
-871
lines changed

.gitattributes

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/.phpmd.xml export-ignore
21
/.travis.yml export-ignore
3-
/build.xml export-ignore
42
/phpunit.xml.dist export-ignore
53
/tests export-ignore
6-
/.build export-ignore
7-
/.styleci.yml

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/vendor
22
/.build
33
/phpunit.xml
4-
/bin
54
composer.lock
5+
/coverage.xml

.phpmd.xml

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

.styleci.yml

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

.travis.yml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
1+
language: php
12
sudo: false
23

34
cache:
4-
directories:
5-
- $HOME/.composer/cache
6-
7-
language: php
8-
php:
9-
- 5.6
10-
- 7.0
11-
- hhvm
12-
- nightly
5+
directories:
6+
- $HOME/.composer/cache/files
137

148
matrix:
15-
fast_finish: true
9+
fast_finish: true
10+
include:
11+
- php: 7.2
1612

17-
before_script:
18-
- travis_retry composer self-update
19-
- travis_retry composer update --no-interaction
13+
before_install:
14+
- composer self-update
2015

21-
script:
22-
- php bin/phpunit --coverage-clover=clover.xml
16+
install:
17+
- composer install
2318

24-
after_script:
25-
- bash <(curl -s https://codecov.io/bash)
19+
script:
20+
- composer test
2621

27-
notifications:
28-
email: martin.aarhof@gmail.com
22+
after_success:
23+
- travis_retry bash <(curl -s https://codecov.io/bash)

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
Rejseplanen - PHP API &ndash; [![Build Status](https://travis-ci.org/lsv/rejseplan-php-api.svg?branch=master)](https://travis-ci.org/lsv/rejseplan-php-api) [![codecov](https://codecov.io/gh/lsv/rejseplan-php-api/branch/master/graph/badge.svg)](https://codecov.io/gh/lsv/rejseplan-php-api) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/babcfce8-7f31-45b4-999f-b78f7ab56960/mini.png)](https://insight.sensiolabs.com/projects/babcfce8-7f31-45b4-999f-b78f7ab56960) [![StyleCI](https://styleci.io/repos/67995566/shield)](https://styleci.io/repos/67995566)
1+
Rejseplanen - PHP API
2+
---------------------
23

3-
=================
4+
[![Build Status](https://travis-ci.org/lsv/rejseplan-php-api.svg?branch=master)](https://travis-ci.org/lsv/rejseplan-php-api)
5+
[![codecov](https://codecov.io/gh/lsv/rejseplan-php-api/branch/master/graph/badge.svg)](https://codecov.io/gh/lsv/rejseplan-php-api)
46

57
PHP wrapper for Rejseplanen.dk API
68

build.xml

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

composer.json

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,40 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^5.6|^7.0",
13+
"php": "^7.2",
1414
"guzzlehttp/guzzle": "^6.0",
15-
"symfony/options-resolver": "^2.6|^3.0",
16-
"jms/serializer": "^1.3"
15+
"symfony/options-resolver": "^4.0",
16+
"jms/serializer": "^1.9|^2.0"
1717
},
1818
"autoload": {
1919
"psr-4": {
2020
"RejseplanApi\\": "src"
2121
}
2222
},
2323
"require-dev": {
24-
"phpunit/phpunit": "^5.3",
25-
"phpmd/phpmd": "^2.2",
26-
"sebastian/phpcpd": "^2.0",
27-
"phploc/phploc": "^2.1",
28-
"phing/phing": "^2.11",
29-
"squizlabs/php_codesniffer": "^2.3",
30-
"friendsofphp/php-cs-fixer": "^1.10",
31-
"apigen/apigen": "dev-master",
32-
"fzaninotto/faker": "^1.6"
24+
"phpunit/phpunit": "^7.1",
25+
"symplify/easy-coding-standard": "^4.2",
26+
"phpstan/phpstan": "^0.9.2"
3327
},
3428
"autoload-dev": {
3529
"psr-4": {
3630
"RejseplanApiTest\\": "tests"
3731
}
3832
},
39-
"config": {
40-
"bin-dir": "bin"
33+
"scripts": {
34+
"fix": [
35+
"composer validate --strict",
36+
"./vendor/bin/phpunit --coverage-html=.build --coverage-text --colors=never",
37+
"./vendor/bin/ecs check -q src --level psr12 --fix",
38+
"./vendor/bin/ecs check -q tests --level psr12 --fix",
39+
"./vendor/bin/phpstan analyze src --level 7 --no-progress"
40+
],
41+
"test": [
42+
"composer validate --strict",
43+
"./vendor/bin/phpunit --coverage-clover=coverage.xml",
44+
"./vendor/bin/ecs check src --level psr12",
45+
"./vendor/bin/ecs check tests --level psr12",
46+
"./vendor/bin/phpstan analyze src --level 7 --no-progress"
47+
]
4148
}
4249
}

phpunit.xml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
4+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.1/phpunit.xsd"
55
backupGlobals="false"
66
colors="true"
7-
bootstrap="tests/bootstrap.php"
7+
bootstrap="vendor/autoload.php"
88
>
99
<testsuites>
1010
<testsuite name="Lsv \ Rejseplan API">

0 commit comments

Comments
 (0)