Skip to content

Commit

Permalink
Merge pull request #20 from xsolla/token_set_purchase
Browse files Browse the repository at this point in the history
Token set purchase
  • Loading branch information
zakharovvi committed Sep 28, 2015
2 parents 9ae36c1 + 2807945 commit 1fb7a5f
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 1,287 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vendor
build/artifacts
phpunit.xml
phpunit.xml
composer.lock
2 changes: 2 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tools:
external_code_coverage: true
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ php:
- 5.5
- 5.6
- 7.0
- nightly
- hhvm

sudo: false
Expand All @@ -16,16 +15,18 @@ env:
- COMPOSER_OPTS="--prefer-lowest"

matrix:
fast_finish: true
allow_failures:
- php: nightly
- php: 7

install:
- travis_retry composer update $COMPOSER_OPTS --no-interaction --prefer-source

script:
- phpunit --colors --verbose --exclude-group webhook
- if [[ "`phpenv version-name`" != "5.3" && "`phpenv version-name`" != "hhvm" ]]; then phpunit --colors --verbose --group Webhook; fi
- if [[ "`phpenv version-name`" == "5.6" && $COMPOSER_OPTS == "" ]]; then phpunit --coverage-clover=coverage.clover; wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi;
- if [[ "`phpenv version-name`" == "5.6" && $COMPOSER_OPTS != "" ]]; then phpunit; fi;
- if [[ "`phpenv version-name`" != "5.6" ]]; then phpunit --exclude-group webhook; fi;
- versions=(5.4 5.5 7.0) && if [[ ${versions[*]} =~ "`phpenv version-name`" ]]; then phpunit --group webhook; fi;

notifications:
slack: xsolla:V74WgCQlV6kas6X9SNQKl5R1
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.

## [Unreleased](https://github.com/xsolla/xsolla-sdk-php/compare/v2.0.0...master)
## [Unreleased](https://github.com/xsolla/xsolla-sdk-php/compare/v2.1.0...master)

## [v2.1.0](https://github.com/xsolla/xsolla-sdk-php/compare/v2.0.0...v2.1.0)
### Added
* Added `TokenRequest::setPurchase($amount, $currency)` method for [Simple Checkout module](http://developers.xsolla.com/#simple-checkout)

## [v2.0.0](https://github.com/xsolla/xsolla-sdk-php/compare/v2.0.0-BETA1...v2.0.0)
### Added
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

[![Latest Stable Version](https://poser.pugx.org/xsolla/xsolla-sdk-php/v/stable.png)](https://packagist.org/packages/xsolla/xsolla-sdk-php)
[![Build Status](https://travis-ci.org/xsolla/xsolla-sdk-php.png?branch=master)](https://travis-ci.org/xsolla/xsolla-sdk-php)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/xsolla/xsolla-sdk-php/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/xsolla/xsolla-sdk-php)
[![Code Coverage](https://scrutinizer-ci.com/g/xsolla/xsolla-sdk-php/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/xsolla/xsolla-sdk-php/?branch=master)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/xsolla/xsolla-sdk-php/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/xsolla/xsolla-sdk-php/?branch=master)
[![Join the chat at https://gitter.im/xsolla/xsolla-sdk-php](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/xsolla/xsolla-sdk-php?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/xsolla/xsolla-sdk-php/master/LICENSE)

Expand Down
Loading

0 comments on commit 1fb7a5f

Please sign in to comment.