Skip to content

Commit

Permalink
Merge pull request PHPJasper#81 from PHPJasper/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
geekcom authored Oct 31, 2017
2 parents 8140797 + addbf04 commit 2d478cc
Show file tree
Hide file tree
Showing 13 changed files with 155 additions and 93 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
.idea/
/vendor
/vendor
tests/PHPJasper/*.jasper

# IDE
## Eclipse
.buildpath
.project
.settings
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
language: php
php:
- 7.0
before_script:
- composer install
script:
- vendor/bin/phpunit
- vendor/bin/phpcs --standard=PSR2 -n src tests
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ _A PHP Report Generator_
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/geekcom/phpjasper/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/geekcom/phpjasper/?branch=master)
[![Latest Stable Version](https://img.shields.io/packagist/v/geekcom/phpjasper.svg?style=flat-square)](https://packagist.org/packages/geekcom/phpjasper)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-blue.svg?style=flat-square)](https://php.net/)
[![License](https://poser.pugx.org/geekcom/phpjasper/license)](https://packagist.org/packages/geekcom/phpjasper)
[![License](https://poser.pugx.org/geekcom/phpjasper/license)](https://packagist.org/packages/geekcom/phpjasper)
[![Build Status](https://travis-ci.org/geekcom/phpjasper.svg?branch=master)](https://travis-ci.org/geekcom/phpjasper)

### Docs
[![Language-pt_BR](https://img.shields.io/badge/pt__BR-100%25-green.svg)](https://github.com/PHPJasper/phpjasper/blob/master/docs/pt_BR/LEIA-ME_pt_BR.md)
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
],
"minimum-stability": "stable",
"require": {
"php": ">=7.1"
"php": ">=7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.1"
"phpunit/phpunit": "^6.1",
"squizlabs/php_codesniffer": "^3.1"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 2d478cc

Please sign in to comment.