Skip to content

Commit

Permalink
Merge pull request #561 from Adyen/automation/release
Browse files Browse the repository at this point in the history
Release v15.3.0
  • Loading branch information
AdyenAutomationBot authored Sep 18, 2023
2 parents 9a43078 + 3e7a22a commit c7ed2a9
Show file tree
Hide file tree
Showing 157 changed files with 23,347 additions and 366 deletions.
25 changes: 25 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
max_line_length = 165
eclint_block_comment_start = /*
eclint_block_comment = *
eclint_block_comment_end = */

[Makefile]
indent_style = tab
max_line_length = unset

[{*.xml,*.yml,*.yaml}]
indent_size = 2

[{*.json,*.md,*.mustache}]
indent_size = 2
max_line_length = unset
insert_final_newline = unset
6 changes: 5 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@

# Exclude non-essential files from dist
/.github export-ignore
/tests export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/bin export-ignore
/CODE_OF_CONDUCT.md export-ignore
/composer.lock export-ignore
/CONTRIBUTING.md export-ignore
/phpcs.xml export-ignore
/phpunit.xml export-ignore
/Makefile export-ignore
/renovate.json export-ignore
/sonar-project.properties export-ignore
/tests export-ignore
/Vagrantfile export-ignore
9 changes: 1 addition & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
tools: composer:v2

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Disabling shallow clone to improve relevancy of SonarCloud reporting
fetch-depth: 0
Expand Down Expand Up @@ -58,10 +58,3 @@ jobs:

- name: Make sure project files are compilable
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 }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-latest
name: Generate Models
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: make models
- name: Setup PHP
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
Expand All @@ -36,4 +36,4 @@ jobs:
title: ${{ steps.vars.outputs.pr_title }}
body: ${{ steps.vars.outputs.pr_body }}
add-paths: |
src/Adyen/Model
src/Adyen/Model
6 changes: 3 additions & 3 deletions .github/workflows/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-latest
name: Generate Models
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: make all
- name: Setup PHP
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
Expand Down Expand Up @@ -37,4 +37,4 @@ jobs:
body: ${{ steps.vars.outputs.pr_body }}
add-paths: |
src/Adyen/Model
src/Adyen/Service
src/Adyen/Service
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ composer.lock
.phpunit.result.cache

# Automation
/target/
/target/
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ include:
Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
professional setting

## Our Responsibilities

Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ openapi-generator-jar:=target/openapi-generator-cli.jar
openapi-generator-cli:=java -jar $(openapi-generator-jar)

generator:=php
modelGen:=BalanceControl BalancePlatform Checkout ConfigurationWebhooks StoredValue Payments Payout Management LegalEntityManagement TransferWebhooks Transfers BinLookup StoredValue POSTerminalManagement Recurring ReportWebhooks
modelGen:=AcsWebhooks BalanceControl BalancePlatform Checkout ConfigurationWebhooks StoredValue Payments Payout Management ManagementWebhooks LegalEntityManagement TransferWebhooks Transfers BinLookup StoredValue POSTerminalManagement Recurring ReportWebhooks
models:=src/Adyen/Model
output:=target/out

Expand All @@ -24,10 +24,14 @@ Payout: spec=PayoutService-v68
Management: spec=ManagementService-v1
LegalEntityManagement: spec=LegalEntityService-v3
Transfers: spec=TransferService-v3

# BalanceWebhooks
AcsWebhooks: spec=BalancePlatformAcsNotification-v1
ConfigurationWebhooks: spec=BalancePlatformConfigurationNotification-v1
ReportWebhooks: spec=BalancePlatformReportNotification-v1
TransferWebhooks: spec=BalancePlatformTransferNotification-v3
# ManagementWebhooks
ManagementWebhooks: spec=ManagementNotificationService-v1

# Classic Platforms
marketpay/account: spec=AccountService-v6
Expand Down
62 changes: 40 additions & 22 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/composer-installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ fi
php composer-setup.php --quiet
RESULT=$?
rm composer-setup.php
exit $RESULT
exit $RESULT
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require-dev": {
"dms/phpunit-arraysubset-asserts": "0.5.0",
"friendsofphp/php-cs-fixer": "*",
"phpunit/phpunit": "9.6.10",
"phpunit/phpunit": "9.6.12",
"php-coveralls/php-coveralls": "2.6.0",
"squizlabs/php_codesniffer": "3.7.2"
},
Expand Down
8 changes: 5 additions & 3 deletions phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
~
-->

<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
<ruleset
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd"
>
<exclude-pattern>vendor/*</exclude-pattern>
<exclude-pattern>build/*</exclude-pattern>

Expand All @@ -20,4 +22,4 @@
<arg value="p"/>

<rule ref="PSR2"/>
</ruleset>
</ruleset>
6 changes: 0 additions & 6 deletions sonar-project.properties

This file was deleted.

2 changes: 1 addition & 1 deletion src/Adyen/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class Client
{
const LIB_VERSION = "15.1.0";
const LIB_VERSION = "15.3.0";
const LIB_NAME = "adyen-php-api-library";
const USER_AGENT_SUFFIX = "adyen-php-api-library/";
const ENDPOINT_TEST = "https://pal-test.adyen.com";
Expand Down
Loading

0 comments on commit c7ed2a9

Please sign in to comment.