Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.2.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
justmd5 committed Jun 15, 2020
2 parents b7b1066 + 374d82e commit 8a8ea0f
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
27 changes: 27 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: PHP Composer

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Validate composer.json and composer.lock
run: composer validate

- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-suggest

# Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
# Docs: https://getcomposer.org/doc/articles/scripts.md

# - name: Run test suite
# run: composer run-script test
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"require": {
"php": ">=7.0",
"hanson/foundation-sdk": "^3.0",
"hanson/foundation-sdk": "^3.0 || ^4.0",
"ext-json": "*"
}
}
1 change: 1 addition & 0 deletions src/Api.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Api extends AbstractAPI

public function __construct(PinDuoDuo $pinduoduo, $needToken = false)
{
parent::__construct($pinduoduo);
$this->pinduoduo = $pinduoduo;
$this->needToken = $needToken;
}
Expand Down

0 comments on commit 8a8ea0f

Please sign in to comment.