Skip to content

Commit

Permalink
Merge pull request #9 from lsv/feature/update
Browse files Browse the repository at this point in the history
Feature/update
  • Loading branch information
lsv authored May 17, 2018
2 parents 1f35705 + 24013e9 commit 603437f
Show file tree
Hide file tree
Showing 41 changed files with 1,398 additions and 871 deletions.
4 changes: 0 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/.phpmd.xml export-ignore
/.travis.yml export-ignore
/build.xml export-ignore
/phpunit.xml.dist export-ignore
/tests export-ignore
/.build export-ignore
/.styleci.yml
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/vendor
/.build
/phpunit.xml
/bin
composer.lock
/coverage.xml
29 changes: 0 additions & 29 deletions .phpmd.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .styleci.yml

This file was deleted.

33 changes: 14 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
language: php
sudo: false

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

language: php
php:
- 5.6
- 7.0
- hhvm
- nightly
directories:
- $HOME/.composer/cache/files

matrix:
fast_finish: true
fast_finish: true
include:
- php: 7.2

before_script:
- travis_retry composer self-update
- travis_retry composer update --no-interaction
before_install:
- composer self-update

script:
- php bin/phpunit --coverage-clover=clover.xml
install:
- composer install

after_script:
- bash <(curl -s https://codecov.io/bash)
script:
- composer test

notifications:
email: [email protected]
after_success:
- travis_retry bash <(curl -s https://codecov.io/bash)
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
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)
Rejseplanen - PHP API
---------------------

=================
[![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)

PHP wrapper for Rejseplanen.dk API

Expand Down
109 changes: 0 additions & 109 deletions build.xml

This file was deleted.

35 changes: 21 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,40 @@
}
],
"require": {
"php": "^5.6|^7.0",
"php": "^7.2",
"guzzlehttp/guzzle": "^6.0",
"symfony/options-resolver": "^2.6|^3.0",
"jms/serializer": "^1.3"
"symfony/options-resolver": "^4.0",
"jms/serializer": "^1.9|^2.0"
},
"autoload": {
"psr-4": {
"RejseplanApi\\": "src"
}
},
"require-dev": {
"phpunit/phpunit": "^5.3",
"phpmd/phpmd": "^2.2",
"sebastian/phpcpd": "^2.0",
"phploc/phploc": "^2.1",
"phing/phing": "^2.11",
"squizlabs/php_codesniffer": "^2.3",
"friendsofphp/php-cs-fixer": "^1.10",
"apigen/apigen": "dev-master",
"fzaninotto/faker": "^1.6"
"phpunit/phpunit": "^7.1",
"symplify/easy-coding-standard": "^4.2",
"phpstan/phpstan": "^0.9.2"
},
"autoload-dev": {
"psr-4": {
"RejseplanApiTest\\": "tests"
}
},
"config": {
"bin-dir": "bin"
"scripts": {
"fix": [
"composer validate --strict",
"./vendor/bin/phpunit --coverage-html=.build --coverage-text --colors=never",
"./vendor/bin/ecs check -q src --level psr12 --fix",
"./vendor/bin/ecs check -q tests --level psr12 --fix",
"./vendor/bin/phpstan analyze src --level 7 --no-progress"
],
"test": [
"composer validate --strict",
"./vendor/bin/phpunit --coverage-clover=coverage.xml",
"./vendor/bin/ecs check src --level psr12",
"./vendor/bin/ecs check tests --level psr12",
"./vendor/bin/phpstan analyze src --level 7 --no-progress"
]
}
}
4 changes: 2 additions & 2 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.1/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="tests/bootstrap.php"
bootstrap="vendor/autoload.php"
>
<testsuites>
<testsuite name="Lsv \ Rejseplan API">
Expand Down
Loading

0 comments on commit 603437f

Please sign in to comment.