Merge branch 'master' into 'master'

Travis, CodeClimate and Composer

Github has now been fully implemented.

See merge request !2
This commit is contained in:
Abel Hoogeveen 2016-07-19 17:35:22 +02:00
commit 10fa5c5e8d
7 changed files with 52 additions and 16 deletions

25
.codeclimate.yml Normal file
View File

@ -0,0 +1,25 @@
---
engines:
duplication:
enabled: true
config:
languages:
- ruby
- javascript
- python
- php
fixme:
enabled: true
phpmd:
enabled: true
ratings:
paths:
- "**.inc"
- "**.js"
- "**.jsx"
- "**.module"
- "**.php"
- "**.py"
- "**.rb"
exclude_paths:
- tests/

2
.gitattributes vendored
View File

@ -1,5 +1,7 @@
.gitattributes export-ignore
.gitignore export-ignore
.gitlab_ci.yml export-ignore
.travis.yml export-ignore
.codeclimate.yml export-ignore
DCO export-ignore
CONTRIBUTING.md export-ignore

15
.travis.yml Normal file
View File

@ -0,0 +1,15 @@
language: php
php:
- 7
- 5.6
script:
- php vendor/bin/phpunit -v -c tests/phpunit.xml --coverage-text
before_script:
- composer install
addons:
code_climate:
repo_token: $CODECLIMATE_REPO_TOKEN

View File

@ -1,4 +1,4 @@
FuzeWorks Application Skeleton [![build status](http://10.0.0.32/fuzeworks/Application/badges/master/build.svg)](http://10.0.0.32/fuzeworks/Application/commits/master)
FuzeWorks Application Skeleton [![Build Status](https://travis-ci.org/FuzeWorks/Application.svg?branch=master)](https://travis-ci.org/FuzeWorks/Application)
=================
This is a simple, skeleton application using [FuzeWorks](https://techfuze.net/fuzeworks). This is meant to

View File

@ -31,7 +31,6 @@
*/
return array(
'enable_composer' => true,
'enable_modules' => true,
'enable_events' => true,
'composer_autoloader' => '',

View File

@ -13,12 +13,6 @@
"homepage": "https://techfuze.net/fuzeworks/contributors"
}
],
"repositories": [
{
"type": "vcs",
"url": "http://10.0.0.32/fuzeworks/core.git"
}
],
"require": {
"php": ">=5.6.0",
"fuzeworks/core": "dev-master",
@ -27,7 +21,8 @@
"smarty/smarty": "~3.1"
},
"require-dev": {
"phpunit/phpunit": "5.3.*"
"phpunit/phpunit": "5.3.*",
"codeclimate/php-test-reporter": "dev-master"
},
"config": {
"secure-http": false

View File

@ -16,14 +16,14 @@
</testsuites>
<logging>
<log type="json" target="../build/phpunit/logfile.json"/>
<log type="junit" target="../build/phpunit/logfile.xml" logIncompleteSkipped="false"/>
<log type="testdox-html" target="../build/phpunit/testdox.html"/>
<log type="testdox-text" target="../build/phpunit/testdox.txt"/>
<log type="coverage-html" target="../build/phpunit/coverage_html" lowUpperBound="35"
<log type="json" target="../build/logs/logfile.json"/>
<log type="junit" target="../build/logs/logfile.xml" logIncompleteSkipped="false"/>
<log type="testdox-html" target="../build/logs/testdox.html"/>
<log type="testdox-text" target="../build/logs/testdox.txt"/>
<log type="coverage-html" target="../build/logs/coverage_html" lowUpperBound="35"
highLowerBound="70"/>
<log type="coverage-clover" target="../build/phpunit/coverage.xml"/>
<log type="coverage-php" target="../build/phpunit/coverage.serialized"/>
<log type="coverage-clover" target="../build/logs/clover.xml"/>
<log type="coverage-php" target="../build/logs/coverage.serialized"/>
<log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
</logging>