From c328876abbc29fe5bc1ca74540667d30bf4f8ad0 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 16 Dec 2022 15:44:48 +0100 Subject: [PATCH] add 6.4.1.0 (sourceGuardian for PHP 8.x) --- composer.json | 2 +- docs/daux/changelog/010_Changelog.md | 17 +- docs/daux/config.json | 4 +- .../010_Systemanforderungen.md | 4 +- docs/html/changelog/Changelog.html | 31 +++- .../changelog/Channel_Rekonfiguration.html | 2 +- docs/html/changelog/MGW_Implementation.html | 2 +- .../Cronjob_per_Konsole_einrichten.html | 2 +- .../Cronjob_per_Webaufruf_einrichten.html | 2 +- .../OXID_eShop_Enterprise_Edition.html | 2 +- ...ingaenge_bei_Heidelpay_erneut_abrufen.html | 2 +- .../Infos_fuer_Entwickler.html | 2 +- ..._hat_sich_im_Bestellprozess_geaendert.html | 2 +- .../Was_ist_noch_zu_beachten.html | 2 +- .../Was_macht_der_Cronjob.html | 2 +- .../Was_passiert_bei_einem_Refund.html | 2 +- .../Wie_ist_der_Cronjob_einzurichten.html | 2 +- .../Konfiguration_der_Zahlungsarten.html | 2 +- .../configuration/Konfiguration/Webhooks.html | 2 +- ...ungskauf_und_Vorkasse_anzeigen_lassen.html | 2 +- ...tomatische_Vorkasse_und_Rechnungskauf.html | 2 +- .../Konfiguration/Channeleinstellungen.html | 2 +- .../Konfiguration/Channelzuordnungen.html | 2 +- .../Schluesselpaar_eintragen.html | 2 +- .../Schnittstellenwechsel/Nacharbeiten.html | 2 +- .../Schnittstellenwechsel/Start.html | 2 +- .../Vorbereitung/Schluesselpaare_finden.html | 2 +- .../Vorbereitung/Sicherung.html | 2 +- .../Vorbereitung/Unzer_Insights.html | 2 +- .../Vorbereitung/Zahlarten.html | 2 +- .../Vorbereitung/was_wird_benoetigt.html | 2 +- docs/html/configuration/index.html | 2 +- docs/html/description/Beschreibung.html | 2 +- .../description/Editionsunterschiede.html | 2 +- docs/html/index.html | 2 +- .../Beiliegende_Bibliotheken.html | 2 +- .../Anforderungen/Systemanforderungen.html | 6 +- .../Anforderungen/Vorbereitungen.html | 2 +- .../Anforderungen/wichtige_Hinweise.html | 2 +- .../Deinstallation/Dateien_loeschen.html | 2 +- .../Deinstallation/Datenbank_bereinigen.html | 2 +- .../Modul_aus_der_Installation_entfernen.html | 2 +- .../Deinstallation/Modul_deaktivieren.html | 2 +- ...eiterungen_deaktivieren_und_entfernen.html | 2 +- .../Deinstallation/TMP-Ordner_leeren.html | 2 +- docs/html/installation/Installation.html | 2 +- .../installation/Installationspruefung.html | 2 +- .../Konfiguration_einstellen.html | 2 +- .../Neuinstallation/Lizenz_eintragen.html | 2 +- .../Neuinstallation/Modul_hinzufuegen.html | 4 +- .../Modul_im_Shop_aktivieren.html | 2 +- .../Providerspezifische_Installation.html | 2 +- .../Shopanpassungen_installieren.html | 2 +- .../Neuinstallation/TMP-Ordner_leeren.html | 2 +- .../Neuinstallation/Updatefaehigkeit.html | 2 +- .../Verwendung_eigener_Themes.html | 2 +- .../installation/Neuinstallation/index.html | 4 +- docs/html/installation/Schnellstart.html | 2 +- .../Update/Aenderungen_kontrollieren.html | 2 +- .../installation/Update/Dateien_erneuern.html | 4 +- .../Update/Erweiterungen_anpassen.html | 2 +- .../Lizenzschluessel_aktualisieren.html | 2 +- .../Update/Modul_deaktivieren.html | 2 +- .../Modulinformationen_aktualisieren.html | 2 +- .../Providerspezifische_Installation.html | 2 +- .../Update/Shopanpassungen_installieren.html | 2 +- .../Update/TMP-Ordner_leeren.html | 2 +- .../installation/Update/Updatedefinition.html | 2 +- docs/html/support/Hilfe-und-Support.html | 2 +- .../html/tipuesearch/tipuesearch_content.json | 2 +- src/.php-cs-fixer.php | 4 +- src/Controllers/Admin/AdminList.php | 4 +- src/Controllers/Admin/Base.php | 4 +- src/Controllers/Admin/Channels/AdminList.php | 4 +- src/Controllers/Admin/Channels/Base.php | 4 +- src/Controllers/Admin/Channels/Main.php | 4 +- src/Controllers/Admin/Channels/Payments.php | 4 +- src/Controllers/Admin/Log.php | 4 +- src/Controllers/Admin/LogList.php | 4 +- src/Controllers/Admin/Order/Heidelpay.php | 4 +- src/Controllers/Admin/Settings.php | 4 +- src/Controllers/Admin/Support.php | 4 +- src/Controllers/Admin/TransactionlogList.php | 4 +- src/Controllers/ChannelProvider.php | 4 +- src/Controllers/MGWUserInputValidator.php | 4 +- src/Controllers/MgwOrder.php | 4 +- src/Controllers/MgwResourceHandler.php | 4 +- src/Controllers/ModuleProvider.php | 4 +- src/Controllers/Notify.php | 4 +- src/Controllers/Order.php | 4 +- src/Controllers/OxidProvider.php | 4 +- src/Controllers/Payment.php | 4 +- src/Controllers/PaymentCollector.php | 4 +- src/Controllers/PaymentGateway.php | 4 +- src/Controllers/Response.php | 4 +- src/Interfaces/Config/ConstantInterface.php | 4 +- .../Criterion/ContainerInterface.php | 4 +- src/Interfaces/Parameter/GroupInterface.php | 4 +- src/Models/Actions/Action.php | 4 +- src/Models/Actions/Capture.php | 4 +- src/Models/Actions/Debit.php | 4 +- src/Models/Actions/Finalize.php | 4 +- src/Models/Actions/Preauthorization.php | 4 +- src/Models/Actions/Rebill.php | 4 +- src/Models/Actions/Refund.php | 4 +- src/Models/Actions/Reversal.php | 4 +- src/Models/Bankaccount.php | 4 +- src/Models/Communicator.php | 4 +- src/Models/Configuration/ModProfile.php | 4 +- src/Models/Containers/Criterions.php | 4 +- .../Containers/Criterions/Easycredit.php | 4 +- src/Models/Containers/InputContainer.php | 4 +- src/Models/Containers/Parameter.php | 4 +- src/Models/Containers/PrepaymentData.php | 4 +- src/Models/Containers/Skeleton.php | 4 +- src/Models/Factory.php | 4 +- .../MgwCustomerAttributeFormatter.php | 4 +- src/Models/Formatters/abstractFormatter.php | 4 +- src/Models/Generators/Basket.php | 4 +- src/Models/Generators/Body.php | 4 +- src/Models/Generators/MGWBasket.php | 4 +- .../hostDecoratorsInterface.php | 4 +- .../Hostdecorators/hostDecoratorsRegistry.php | 4 +- .../Hostdecorators/removePortFromHost.php | 4 +- src/Models/MGWDebugHandler.php | 4 +- src/Models/Mail.php | 4 +- src/Models/Ngw.php | 4 +- src/Models/Parameter/Criterion.php | 4 +- src/Models/Parameter/Dynvalues.php | 4 +- src/Models/Parameter/Group/AccountData.php | 4 +- src/Models/Parameter/Group/CompanyData.php | 4 +- src/Models/Parameter/Group/CustomerData.php | 4 +- src/Models/Parameter/Group/FrontendData.php | 4 +- src/Models/Parameter/Group/MandatoryData.php | 4 +- .../Parameter/Group/RiskInformationData.php | 4 +- src/Models/Parameter/StoredData.php | 4 +- src/Models/Payment/Btobbillpurchase.php | 4 +- src/Models/Payment/Cards.php | 4 +- src/Models/Payment/Creditcard.php | 4 +- src/Models/Payment/Debitcard.php | 4 +- src/Models/Payment/Directdebit.php | 4 +- src/Models/Payment/Directdebit/Secured.php | 4 +- src/Models/Payment/Easycredit.php | 4 +- src/Models/Payment/Eps.php | 4 +- ...ymentNotReferencedToHeidelpayException.php | 4 +- .../UnknownRedirectParameterException.php | 4 +- src/Models/Payment/FlexiPayDirect.php | 4 +- src/Models/Payment/Giropay.php | 4 +- src/Models/Payment/Ideal.php | 4 +- src/Models/Payment/Invoice/Secured.php | 4 +- src/Models/Payment/Invoice/Unsecured.php | 4 +- src/Models/Payment/Masterpass.php | 4 +- src/Models/Payment/Payment.php | 4 +- src/Models/Payment/Paypal.php | 4 +- src/Models/Payment/Postfinance.php | 4 +- src/Models/Payment/Prepayment.php | 4 +- src/Models/Payment/Przelewy24.php | 4 +- src/Models/Payment/Sofortueberweisung.php | 4 +- src/Models/Redirect.php | 4 +- src/Models/Request.php | 4 +- .../InvalidHeidelpayDataException.php | 4 +- .../Exception/InvalidTagNameException.php | 4 +- .../Request/Exception/NoBasketException.php | 4 +- .../Request/Exception/NoOrderException.php | 4 +- .../Exception/NoPaymentMethodException.php | 4 +- .../Exception/NoPaymentOptionException.php | 4 +- .../Exception/NoTransactionUniqueId.php | 4 +- ...eidelpayOnlinetransferPaymentException.php | 4 +- .../Request/Pattern/BankAccountCheck.php | 4 +- src/Models/Request/Pattern/Creditcard.php | 4 +- src/Models/Request/Pattern/Debitcard.php | 4 +- src/Models/Request/Pattern/Directdebit.php | 4 +- src/Models/Request/Pattern/Hip.php | 4 +- src/Models/Request/Pattern/Onlinetransfer.php | 4 +- .../Request/Pattern/OnlinetransferCheck.php | 4 +- src/Models/Request/Pattern/Pattern.php | 4 +- src/Models/Request/Pattern/Prepayment.php | 4 +- src/Models/Request/Xml.php | 4 +- src/Models/Response.php | 4 +- src/Models/Response/Parser.php | 4 +- .../Settings/Channels/BToBBillPurchase.php | 4 +- src/Models/Settings/Channels/CardPayments.php | 4 +- src/Models/Settings/Channels/Cards.php | 4 +- src/Models/Settings/Channels/Channels.php | 4 +- src/Models/Settings/Channels/CreditCard.php | 4 +- src/Models/Settings/Channels/DebitCard.php | 4 +- .../Settings/Channels/Directdebit/Secured.php | 4 +- .../Channels/Directdebit/Unsecured.php | 4 +- src/Models/Settings/Channels/EasyCredit.php | 4 +- src/Models/Settings/Channels/Eps.php | 4 +- .../Settings/Channels/FlexiPayDirect.php | 4 +- src/Models/Settings/Channels/Giropay.php | 4 +- src/Models/Settings/Channels/Ideal.php | 4 +- .../Settings/Channels/Invoice/Secured.php | 4 +- .../Settings/Channels/Invoice/Unsecured.php | 4 +- src/Models/Settings/Channels/Masterpass.php | 4 +- .../Settings/Channels/OnlineTransfer.php | 4 +- src/Models/Settings/Channels/Paypal.php | 4 +- src/Models/Settings/Channels/Postfinance.php | 4 +- src/Models/Settings/Channels/Prepayment.php | 4 +- src/Models/Settings/Channels/Przelewy24.php | 4 +- src/Models/Settings/Channels/Sofort.php | 4 +- .../Exception/EmptyPasswordException.php | 4 +- .../EmptySecuritySenderException.php | 4 +- .../Exception/EmptyUsernameException.php | 4 +- src/Models/Settings/Heidelpay.php | 4 +- .../Statushandlers/AbstractErrorHandler.php | 4 +- src/Models/Statushandlers/AbstractHandler.php | 4 +- .../Statushandlers/AbstractOkHandler.php | 4 +- .../Statushandlers/AbstractPendingHandler.php | 4 +- .../Statushandlers/HandlerInterface.php | 4 +- src/Models/Statushandlers/HandlerList.php | 4 +- .../Statushandlers/OnPaymentCanceled.php | 4 +- .../Statushandlers/OnPaymentChargeback.php | 4 +- .../Statushandlers/OnPaymentCompleted.php | 4 +- .../Statushandlers/OnPaymentPartlyPaid.php | 4 +- .../Statushandlers/OnPaymentPending.php | 4 +- src/Models/Statushandlers/OnPaymentReview.php | 4 +- .../Transactionlog/Reader/Heidelpay.php | 4 +- src/Models/Transactionlog/Reader/Mgw.php | 4 +- .../Exception/AgbNotAcceptedException.php | 4 +- .../CheckSessionChallengeException.php | 4 +- ...ustomerinformationNotAcceptedException.php | 4 +- .../Verify/Exception/NotLoggedInException.php | 4 +- .../Verify/Exception/UnzerApiException.php | 4 +- src/Models/Verify/Input.php | 4 +- src/Models/Verify/OrderContext.php | 4 +- src/Models/Verify/PaymentSuccess.php | 4 +- src/Models/Verify/PreInputValidator.php | 4 +- src/Models/Verify/Verify.php | 4 +- src/Models/Viewconfig.php | 4 +- src/Models/Webhooks/Handler.php | 4 +- src/Models/Webhooks/ResponseHandler.php | 4 +- .../Webhooks/UnauthorizedCallException.php | 4 +- .../Webhooks/UnhandledEventException.php | 4 +- .../Webhooks/WebhookExceptionInterface.php | 4 +- .../Controller/OrderController.php | 88 ++++------- .../Controller/PaymentController.php | 145 ++++++++---------- src/Modules/Application/Model/Order.php | 22 +-- .../Application/Model/PaymentGateway.php | 4 +- src/Setup/InstallRoutine.php | 16 +- src/Setup/UpdateRoutine.php | 2 +- src/metadata.php | 3 +- src/public/Webhook.php | 5 +- src/public/hp_response.php | 7 +- src/public/notify.php | 6 +- src/views/admin/tpl/settings.tpl | 11 +- src/views/admin/tpl/settings/mgw.tpl | 20 +-- src/views/admin/tpl/settings/ngw.tpl | 4 +- tests/unittests/MC_Metrics.php | 4 +- tests/unittests/additional.inc.php | 4 +- tests/unittests/bootstrap.php | 4 +- tests/unittests/libs/d3heidelpayTestCase.php | 4 +- tests/unittests/unit/OxidCommand.php | 4 +- tests/unittests/unit/OxidTestCase.php | 4 +- .../unittests/unit/criticalerrorshandler.php | 4 +- tests/unittests/unit/dbMaintenance.php | 4 +- .../controllers/admin/order/heidelpayTest.php | 4 +- .../controllers/admin/settingsTest.php | 4 +- .../d3/d3heidelpay/controllers/orderTest.php | 4 +- .../controllers/paymentgatewayTest.php | 4 +- .../d3heidelpay/models/communicatorTest.php | 4 +- .../models/containers/parameterTest.php | 4 +- .../models/containers/skeletonTest.php | 4 +- .../d3heidelpay/models/d3_hp_responseTest.php | 4 +- .../models/d3hpprepaymentdataTest.php | 4 +- .../d3/d3heidelpay/models/factoryTest.php | 4 +- .../models/generators/basketTest.php | 4 +- .../models/generators/bodyTest.php | 4 +- ...tnotreferencedtoheidelpayexceptionTest.php | 4 +- .../models/payment/paymentTest.php | 4 +- .../invalidheidelpaydataexceptionTest.php | 4 +- .../exception/invalidtagnameexceptionTest.php | 4 +- .../exception/nobasketexceptionTest.php | 4 +- .../exception/noorderexceptionTest.php | 4 +- .../nopaymentmethodexceptionTest.php | 4 +- .../nopaymentoptionexceptionTest.php | 4 +- .../exception/notransactionuniqueidTest.php | 4 +- ...lpayonlinetransferpaymentexceptionTest.php | 4 +- .../models/request/pattern/patternTest.php | 4 +- .../d3/d3heidelpay/models/request/xmlTest.php | 4 +- .../d3/d3heidelpay/models/requestTest.php | 4 +- .../models/response/parserTest.php | 4 +- .../d3/d3heidelpay/models/responseTest.php | 4 +- .../exception/emptypasswordexceptionTest.php | 4 +- .../emptysecuritysenderexceptionTest.php | 4 +- .../exception/emptyusernameexceptionTest.php | 4 +- .../models/settings/heidelpayTest.php | 4 +- .../transactionlog/reader/heidelpayTest.php | 4 +- .../reader/testdata/PostData.php | 4 +- .../reader/testdata/xmlInPostData.php | 4 +- .../d3heidelpay/models/verify/inputTest.php | 4 +- .../models/verify/ordercontextTest.php | 4 +- .../models/verify/paymentsuccessTest.php | 4 +- .../d3/d3heidelpay/models/viewconfigTest.php | 4 +- .../controllers/d3_order_heidelpayTest.php | 4 +- .../controllers/d3_payment_heidelpayTest.php | 4 +- .../modules/core/d3_oxemail_heidelpayTest.php | 4 +- .../models/d3_d3counter_heidelpayTest.php | 4 +- .../d3_oxinputvalidator_heidelpayTest.php | 4 +- .../models/d3_oxorder_heidelpayTest.php | 4 +- .../d3_oxpaymentgateway_heidelpayTest.php | 4 +- tests/unittests/unit/oxPrinter.php | 4 +- tests/unittests/unit/test_config.inc.php | 4 +- tests/unittests/unit/test_utils.php | 4 +- 305 files changed, 691 insertions(+), 728 deletions(-) diff --git a/composer.json b/composer.json index 048cfb45..dd3b04ed 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "ext-simplexml": "*", "ext-bcmath": "*", "ext-json": "*", - "oxid-esales/oxideshop-ce": "6.5 - 6.12", + "oxid-esales/oxideshop-ce": "6.5 - 6.13", "d3/modcfg": "^5.3.6.000 || ^6", "unzerdev/php-sdk": "~1.2.0" }, diff --git a/docs/daux/changelog/010_Changelog.md b/docs/daux/changelog/010_Changelog.md index a6007346..6902fa33 100644 --- a/docs/daux/changelog/010_Changelog.md +++ b/docs/daux/changelog/010_Changelog.md @@ -7,7 +7,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://git.d3data.de/D3Private/Unzer/compare/6.4.0.2...rel_6.x_mgw) +## [Unreleased](https://git.d3data.de/D3Private/Unzer/compare/6.4.1.0...rel_6.x_mgw) + +## [6.4.1.0](https://git.d3data.de/D3Private/Unzer/compare/6.4.0.2...6.4.1.0) +### Added +- installable in OXID 6.5.1 +- show bank brand selector on iDeal payments + +### Changed +- move test mode from custom variable to log level +- update set log item calls +- catch Unzer API errors while handle remaining order + +### Fixed +- update debug switch + - prevents destroyed log levels, when debug were set + - update getting debug level ## [6.4.0.2](https://git.d3data.de/D3Private/Unzer/compare/6.4.0.1...6.4.0.2) ### Fixed diff --git a/docs/daux/config.json b/docs/daux/config.json index fe77324e..78e2debf 100644 --- a/docs/daux/config.json +++ b/docs/daux/config.json @@ -1,9 +1,9 @@ { "title": " unzer", - "moduleversion": "6.4.0.2", + "moduleversion": "6.4.1.0", "titledesc": "für den Oxid eShop", "author": "D³ Data Development", - "moduledate": "22.11.2022", + "moduledate": "16.12.2022", "editors": "", "tagline": "", "image": "", diff --git a/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md b/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md index 55457b13..d14e84f8 100644 --- a/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md +++ b/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md @@ -23,8 +23,8 @@ title: Systemanforderungen * wave * D3 Modul-Connector ([kostenfrei bei D3 erhältlich](https://www.oxidmodule.com/connector/)) ab Version 5.3.0.0 * Installation via [Composer](https://getcomposer.org) -* bei Verwendung der Zahlungsart „iDeal“ oder „Przelewy24“ wird ein freier Cronjob benötigt -* bei Verwendung der Zahlungsart „Vorkasse“ oder „Rechnungskauf“ wird ein freier Cronjob benötigt +* bei Verwendung der Zahlungsart "iDeal" oder "Przelewy24" wird ein freier Cronjob benötigt +* bei Verwendung der Zahlungsart "Vorkasse" oder "Rechnungskauf" wird ein freier Cronjob benötigt Beachten Sie, dass die Ihnen vorliegende Modulversion entsprechend für Ihre genutzte PHP-Version sowie dem auf Ihrem Server vorhandenen Decoder kompatibel ist. Im Zweifelsfall kontaktieren Sie uns und nennen den für Ihren Shop genutzten Decoder und die PHP-Version. diff --git a/docs/html/changelog/Changelog.html b/docs/html/changelog/Changelog.html index 47323a8f..ea9c55fe 100644 --- a/docs/html/changelog/Changelog.html +++ b/docs/html/changelog/Changelog.html @@ -91,17 +91,38 @@

Changelog

- 22.11.2022 + 16.12.2022

All notable changes to this project will be documented in this file.

The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.

-

Unreleased

-

6.4.0.2

+

Unreleased

+

6.4.1.0

+

Added

+ +

Changed

+

Fixed

+

6.4.0.2

+

Fixed

+

6.4.0.1

@@ -110,7 +131,7 @@ and this project adheres to fix wrong PHP dependency

6.4.0.0

-

Added

+

Added