Skip to content
This repository has been archived by the owner on Jun 26, 2023. It is now read-only.

Commit

Permalink
Merge branch 'php7' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
k-holy committed Sep 5, 2017
2 parents 4381fc1 + 3de8d07 commit 41ffcd6
Show file tree
Hide file tree
Showing 7 changed files with 640 additions and 634 deletions.
1 change: 0 additions & 1 deletion .coveralls.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
src_dir: ./src
coverage_clover: build/logs/clover.xml
json_path: build/logs/coveralls-upload.json
exclude_no_stmt: true
19 changes: 15 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
language: php

php:
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2

cache:
directories:
- vendor
- $HOME/.composer/cache
env:
matrix:
- DEPENDENCIES=""
- DEPENDENCIES="--prefer-lowest --prefer-stable"

before_script:
- composer self-update
- composer require satooshi/php-coveralls:0.* --dev
- composer install --dev --no-interaction --prefer-source
- composer require php-coveralls/php-coveralls
- composer update $DEPENDENCIES

script:
- mkdir -p build/logs
- phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml
- vendor/bin/phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml

after_script:
- php vendor/bin/coveralls -v -c .coveralls.yml
37 changes: 21 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
{
"name": "volcanus/radix-converter",
"homepage": "https://github.com/k-holy/volcanus-radix-converter",
"type": "library",
"version": "0.3.0",
"license": "MIT",
"authors": [
{
"name": "k-holy",
"email": "k.holy74@gmail.com"
}
],
"autoload": {
"psr-4": { "Volcanus\\RadixConverter\\": "src/" }
},
"require": {
"php": ">=5.5.9"
"name": "volcanus/radix-converter",
"homepage": "https://github.com/k-holy/volcanus-radix-converter",
"type": "library",
"version": "0.3.0",
"license": "MIT",
"authors": [
{
"name": "k-holy",
"email": "k.holy74@gmail.com"
}
],
"autoload": {
"psr-4": {
"Volcanus\\RadixConverter\\": "src/"
}
},
"require": {
"php": "^5.6||^7.0||^7.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7.20||^6.0"
}
}
28 changes: 6 additions & 22 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,32 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="tests/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="false"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
syntaxCheck="true"
verbose="true"
>
<phpunit bootstrap="tests/bootstrap.php">
<testsuites>
<testsuite name="Volcanus_RadixConverter">
<directory suffix="Test.php">./tests/Volcanus/RadixConverter/Test</directory>
<testsuite>
<directory suffix="Test.php">tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>./src</directory>
<directory suffix=".php">src</directory>
<exclude>
<directory>./tests</directory>
<directory>./vendor</directory>
<directory>tests</directory>
<directory>vendor</directory>
</exclude>
</whitelist>
</filter>
Expand Down
Loading

0 comments on commit 41ffcd6

Please sign in to comment.