Skip to content
This repository has been archived by the owner on Mar 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #16 from heidelpay/develop
Browse files Browse the repository at this point in the history
merge for beta release
  • Loading branch information
Simon Gabriel authored Nov 1, 2018
2 parents dfa5edb + db9fd78 commit d1d58ff
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ install:
script:
- ./test/script/travis_script.sh
after_success:
- php vendor/bin/codacycoverage clover build/logs/clover.xml
- php vendor/bin/codacycoverage clover build/coverage/xml
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [v1.0.0][v1.0.0]
## [1.0.0-beta.1][1.0.0-beta.1]

### Added
* Beta release for the new php sdk.

[v1.0.0]: https://github.com/heidelpay/heidelpayPhpSdk/tree/v1.0.0
[1.0.0-beta.1]: https://github.com/heidelpay/heidelpayPhpSdk/tree/1.0.0-beta.1
2 changes: 1 addition & 1 deletion src/Heidelpay.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Heidelpay implements HeidelpayParentInterface
{
const BASE_URL = 'https://api.heidelpay.com/';
const API_VERSION = 'v1';
const SDK_VERSION = 'HeidelpayPHP 1.0.0-beta';
const SDK_VERSION = 'HeidelpayPHP 1.0.0-beta.1';
const DEBUG_MODE = false;

/** @var string $key */
Expand Down
4 changes: 2 additions & 2 deletions test/script/travis_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ trap '>&2 echo Error: Command \`$BASH_COMMAND\` on line $LINENO failed with exit
mv ~/.phpenv/versions/$(phpenv version-name)/xdebug.ini.bak ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini

## run the tests (todo: enable)
# ./vendor/bin/phpunit test/unit --coverage-clover build/logs/clover.xml
# ./vendor/bin/phpunit test/unit --coverage-clover build/coverage/xml

## perform this task only for php 7 with deps=no
if [[ ($(phpenv version-name) == "7.0") && ("$deps" == "no") ]]; then
echo "Perform integration tests";
#./vendor/bin/phpunit test/integration
./vendor/bin/phpunit test/integration --coverage-clover build/logs/clover.xml
./vendor/bin/phpunit test/integration --coverage-clover build/coverage/xml
fi

0 comments on commit d1d58ff

Please sign in to comment.