Sync mit upstream/master #14
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… request urls Issue Ticketpark#68
Add support for PHP 8.2
…into fabianerni-master
* Implement Transaction Initialize including test and example * Correct annotation in InitializeRequest.php * Fix constructor codestyle InitializeRequest.php * Fix Code Style with php-cs-fixer * Add Transaction Authorize Request and Response * Add Transaction Authorize test and example * Change Line Endings * Delete non-existing property RedirectUrl from InitializeResponse.php in Transaction Namespace * Fix Annotations in AuthorizeResponse --------- Co-authored-by: Jozo Dra <[email protected]> Co-authored-by: jdraguljic <[email protected]> Co-authored-by: sagyemang <[email protected]>
(cherry picked from commit acd213c)
(cherry picked from commit 05e2066)
…ns_in_fraud_prevention Add type annotations in FraudPrevention
…pstream # Conflicts: # lib/SaferpayJson/Request/Transaction/AuthorizeRequest.php # lib/SaferpayJson/Request/Transaction/InitializeRequest.php
BashPrince
commented
Nov 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged Änderungen vom Upstream Ticketpark Branch in den master Branch unserer Fork. Da wir unsere eigenen Changes teilweise in unseren geforkten master gemerged haben bevor wir PRs zu Upstream Ticketpark erstellt haben (und diese PRs dann teilweise gesquasht wurden) waren gleiche Changes unter unterschiedlichen Commits in upstream/master und unserem master. Der resultierende Mergekonflikt wurde hier behoben indem einfach die upstream/master Variante akzeptiert wurde, die eh bereits alle unsere Änderungen enthält.