Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync mit upstream/master #14

Merged
merged 17 commits into from
Nov 9, 2023
Merged

Sync mit upstream/master #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d906a58
Remove trailing slash from root urls to prevent a double slash in the…
fabianerni Apr 13, 2023
feb34d2
Add support for PHP 8.2
sprain Apr 15, 2023
05e5414
Ignore PHPStan quirk
sprain Apr 15, 2023
27195ec
Remove Scrutinizer
sprain Apr 15, 2023
c809e84
Merge pull request #70 from Ticketpark/php82
sprain Apr 15, 2023
6686d74
Merge branch 'master' of https://github.com/Ticketpark/SaferpayJsonAp…
sprain Apr 15, 2023
6888994
Add PHP version in composer
sprain Apr 15, 2023
52ccc93
Merge branch 'master' into fabianerni-master
sprain Apr 15, 2023
a244d8f
Add composer.lock
sprain Apr 15, 2023
3c0aba4
Merge branch 'master' into fabianerni-master
sprain Apr 15, 2023
bc56830
Add Transaction/InitializeRequest and Transaction/AuthorizeRequest
May 9, 2023
b0d703f
Codestyle adjustments
sprain May 9, 2023
cfb02f8
Move license to root folder
sprain May 9, 2023
eb1e8e6
Add missing type annotation to result property in FraudPrevention.php
Oct 9, 2023
a30ba9c
CMS-12026 @Type Annotation for fraudPrevention Property
Oct 10, 2023
c653bfe
Merge pull request #79 from world4youcom/fix_type_annotations_in_frau…
sprain Oct 19, 2023
0dca150
Merge remote-tracking branch 'upstream/master' into wartung/sync_to_u…
Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
php: ['7.4', '8.0', '8.1']
php: ['7.4', '8.0', '8.1', '8.2']
stability: ['prefer-lowest', 'prefer-stable']

name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.DS_Store
composer.lock
vendor
/.php_cs.cache
.idea
Expand Down
19 changes: 0 additions & 19 deletions .scrutinizer.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Resources/meta/LICENSE → LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016-2022 Ticketpark GmbH
Copyright (c) 2016-2023 Ticketpark GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# SaferpayJsonApi

[![Build Status](https://github.com/Ticketpark/SaferpayJsonApi/actions/workflows/tests.yml/badge.svg)](https://github.com/Ticketpark/SaferpayJsonApi/actions)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ticketpark/saferpayjsonapi/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/ticketpark/saferpayjsonapi/?branch=master)


A php library to use the [Saferpay Json API](http://saferpay.github.io/jsonapi/).

Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
}
],
"require": {
"php": "^7.4|^8.0.0|^8.1.0",
"doctrine/annotations": "^1.11",
"php": "^7.4|^8.0.0|^8.1.0|^8.2.0",
"doctrine/annotations": "^1.11|^2.0",
"jms/serializer": "^3.16",
"guzzlehttp/guzzle": "^6.3|^7.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0",
"phpstan/phpstan": "^1.6",
"friendsofphp/php-cs-fixer": "^3.8"
"friendsofphp/php-cs-fixer": "^3.16"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading