Skip to content

Commit

Permalink
Merge pull request #303 from Adyen/develop
Browse files Browse the repository at this point in the history
Release 11.0.0
  • Loading branch information
peterojo authored Oct 18, 2021
2 parents 9191751 + e36f329 commit c220713
Show file tree
Hide file tree
Showing 23 changed files with 1,069 additions and 713 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/tests export-ignore
/.editorconfig export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/CODE_OF_CONDUCT.md export-ignore
/composer.lock export-ignore
/CONTRIBUTING.md export-ignore
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @msilvagarcia @cyattilakiss @AlexandrosMor @acampos1916 @peterojo @Aleffio @rikterbeek @morerice
* @AlexandrosMor @acampos1916 @peterojo @Aleffio @rikterbeek @morerice
10 changes: 8 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@ jobs:
name: Run
runs-on: ubuntu-latest

strategy:
matrix:
php-version: [ 7.3, 7.4, 8.0 ]

steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: ${{ matrix.php-version }}
tools: composer:v1

- name: Checkout
uses: actions/checkout@v2
Expand All @@ -19,7 +24,7 @@ jobs:
fetch-depth: 0

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

- name: Install dependencies
run: composer install --prefer-dist --no-progress
Expand Down Expand Up @@ -53,6 +58,7 @@ jobs:
run: find -L . -path ./vendor -prune -o -path ./tests -prune -o -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l

- name: SonarCloud integration
if: ${{ env.SONAR_TOKEN }}
uses: sonarsource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
29 changes: 17 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
# ignore config file
tests/config
# OS
.DS_Store
Thumbs.db

# Ignore auto generated files directory
vendor
build
.phpunit.result.cache
.php_cs.cache
.vagrant
# IDE and local environment
/.vscode/
/.vagrant/
/.idea/

# ignore Mac OS X file
.DS_Store
# Packages
/vendor/

# ignore PhpStorm .idea folder
.idea
# Application
/tests/config/
!/tests/config/test.ini.sample

# Tests
/build/
.php_cs.cache
.phpunit.result.cache
48 changes: 0 additions & 48 deletions .travis.yml

This file was deleted.

13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# Adyen APIs Library for PHP

[![Build Status](https://api.travis-ci.org/Adyen/adyen-php-api-library.svg?branch=master)](https://travis-ci.org/Adyen/adyen-php-api-library)

This is the officially supported PHP library for using Adyen's APIs.

## Integration
The library supports all APIs under the following services:

* [Checkout API](https://docs.adyen.com/api-explorer/#/CheckoutService/v67/overview): Our latest integration for accepting online payments. Current supported version: **v67**
* [Checkout API](https://docs.adyen.com/api-explorer/#/CheckoutService/v68/overview): Our latest integration for accepting online payments. Current supported version: **v68**
* [Payments API](https://docs.adyen.com/api-explorer/#/Payment/v51/overview): Our classic integration for online payments. Current supported version: **v51**
* [Recurring API](https://docs.adyen.com/api-explorer/#/Recurring/v49/overview): Endpoints for managing saved payment details. Current supported version: **v49**
* [Payouts API](https://docs.adyen.com/api-explorer/#/Payout/v51/overview): Endpoints for sending funds to your customers. Current supported version: **v51**
Expand All @@ -17,7 +15,7 @@ The library supports all APIs under the following services:
* [Notification Configuration API](https://docs.adyen.com/api-explorer/#/NotificationConfigurationService/v5/overview) Current supported version: **v5**
* [Cloud-based Terminal API](https://docs.adyen.com/point-of-sale/terminal-api-reference): Our point-of-sale integration.
* [Referrals API](https://docs.adyen.com/risk-management/automate-submitting-referrals/referrals-api-reference): Endpoints to [automate submitting referrals](https://docs.adyen.com/risk-management/automate-submitting-referrals) for Adyen risk rules.

* [HOP API](https://docs.adyen.com/api-explorer/#/Hop/v5/overview): Adyen for Platforms Hosted Onboarding API. Current supported version: **v5**

For more information, refer to our [documentation](https://docs.adyen.com/) or the [API Explorer](https://docs.adyen.com/api-explorer/).

Expand All @@ -26,15 +24,14 @@ For more information, refer to our [documentation](https://docs.adyen.com/) or t

- [Adyen test account](https://docs.adyen.com/get-started-with-adyen)
- [API key](https://docs.adyen.com/development-resources/api-credentials#generate-api-key). For testing, your API credential needs to have the [API PCI Payments role](https://docs.adyen.com/development-resources/api-credentials#roles).
- PHP 5.6 or later for production
- PHP 7.3 or later for development
- PHP 7.3 or later
- cURL with SSL support.
- The JSON PHP extension.
- See [composer require list](https://github.com/Adyen/adyen-php-api-library/blob/develop/composer.json#L10) for the complete list of dependencies

### Legacy version support

If using PHP versions 5.3, 5.4, or 5.5, download our library version [6.3.0](https://github.com/Adyen/adyen-php-api-library/releases/tag/6.3.0).
If using PHP versions 7.2 or lower, download our library version [6.3.0](https://github.com/Adyen/adyen-php-api-library/releases/tag/6.3.0).

## Installation

Expand Down Expand Up @@ -92,7 +89,7 @@ $result = $service->payments($params);
~~~~ php
$client = new \Adyen\Client();
$client->setXApiKey("YOUR API KEY");
$client->setEnvironment(\Adyen\Environment::LIVE);
$client->setEnvironment(\Adyen\Environment::LIVE, 'Your live URL prefix');
$client->setTimeout(30);

...
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
"adyen"
],
"homepage": "https://github.com/Adyen/adyen-php-api-library",
"license": "Apache-2.0",
"license": "MIT",
"require": {
"php": ">=5.6",
"php": ">=7.3",
"ext-ctype": "*",
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"monolog/monolog": ">=1.16"
"monolog/monolog": "^1.16 || ^2.0"
},
"require-dev": {
"dms/phpunit-arraysubset-asserts": "0.2.1",
"dms/phpunit-arraysubset-asserts": "0.3.0",
"friendsofphp/php-cs-fixer": "*",
"phpunit/phpunit": "9.5.4",
"phpunit/phpunit": "9.5.10",
"php-coveralls/php-coveralls": "2.4.3",
"squizlabs/php_codesniffer": "3.6.0"
"squizlabs/php_codesniffer": "3.6.1"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit c220713

Please sign in to comment.