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

Commit

Permalink
Merge branch 'release-13.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
David T. Sadler committed Aug 28, 2017
2 parents 8d309d9 + 7a7b8e3 commit d0274d6
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 10 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,12 @@
# CHANGELOG

## 13.0.2 - 2017-08-28

## Fixes

- Pass through the request for grabbing the app token.
- Update PostOrderServer to that correct response object is returned.

## 13.0.1 - 2017-08-23

### Fixes
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Expand Up @@ -52,26 +52,26 @@ check_tag:
# Creates a release but does not push it. This task updates the changelog
# with the TAG environment variable, replaces the VERSION constant, ensures
# that the source is still valid after updating, commits the changelog and
# updated VERSION constant, creates an annotated git tag using chag, and
# prints out a diff of the last commit.
# updated VERSION constant, and prints out a diff of the last commit.
tag: check_tag
@echo Tagging $(TAG)
chag update $(TAG)
sed -i -e "s/const VERSION = '.*'/const VERSION = '$(TAG)'/" src/Sdk.php
php -l src/Sdk.php
git commit -a -m '$(TAG) release'
chag tag
git commit -a -m 'update: bump version to $(TAG)'
@echo "Release has been created. Push using 'make release'"
@echo "Changes made in the release commit"
git diff HEAD~1 HEAD

# Creates a release based on the master branch and latest tag. This task
# pushes the latest tag, pushes master, creates a phar and zip, and creates
# a Github release. Use "TAG=X.Y.Z make tag" to create a release, and use
# creates an annotated git tag using chag, pushes the latest tag,
# pushes master, creates a phar and zip, and creates Github release.
# Use "TAG=X.Y.Z make tag" to create a release, and use
# "make release" to push a release. This task requires that the
# OAUTH_TOKEN environment variable is available and the token has permission
# to push to the repository.
release: check_tag package
release: check_tag clean package
chag tag
git push origin master
git push origin $(TAG)
php build/gh-release.php $(TAG)
Expand Down
2 changes: 1 addition & 1 deletion src/OAuth/Services/OAuthService.php
Expand Up @@ -251,7 +251,7 @@ public function refreshUserTokenAsync(\DTS\eBaySDK\OAuth\Types\refreshUserTokenR
*/
public function getAppToken(\DTS\eBaySDK\OAuth\Types\GetAppTokenRestRequest $request = null)
{
return $this->getAppTokenAsync()->wait();
return $this->getAppTokenAsync($request)->wait();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/PostOrder/Services/PostOrderService.php
Expand Up @@ -632,7 +632,7 @@ class PostOrderService extends \DTS\eBaySDK\PostOrder\Services\PostOrderBaseServ
],
'ProcessReturnRequest' => [
'method' => 'POST',
'resource' => 'RES',
'resource' => 'return/{returnId}/decide',
'responseClass' => '\DTS\eBaySDK\PostOrder\Types\ProcessReturnRequestRestResponse',
'params' => [
'returnId' => [
Expand Down
2 changes: 1 addition & 1 deletion src/Sdk.php
Expand Up @@ -30,7 +30,7 @@
*/
class Sdk
{
const VERSION = '13.0.1';
const VERSION = '13.0.2';

/**
* @var bool Controls if the SDK should enforce strict types
Expand Down

0 comments on commit d0274d6

Please sign in to comment.