From 2568cd6fa40b7ec9ad542d131393aa604c38820f Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 3 Apr 2020 15:14:52 +0200 Subject: [PATCH] add 6.1.1.3 (ionCube for PHP 5.6 - 7.0) --- composer.json | 4 +- docs/daux/changelog/010_Changelog.md | 10 + docs/daux/config.json | 4 +- docs/html/changelog/Changelog.html | 17 +- .../changelog/Channel_Rekonfiguration.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 +- ...ungskauf_und_Vorkasse_anzeigen_lassen.html | 2 +- ...tomatische_Vorkasse_und_Rechnungskauf.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 | 2 +- .../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 | 2 +- .../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 +- docs/html/installation/Schnellstart.html | 2 +- .../Update/Aenderungen_kontrollieren.html | 2 +- .../installation/Update/Dateien_erneuern.html | 2 +- .../Update/Erweiterungen_anpassen.html | 2 +- .../Lizenzschluessel_aktualisieren.html | 2 +- .../Update/Modul_deaktivieren.html | 2 +- .../Modulinformationen_aktualisieren.html | 2 +- .../Update/Paketquelle_entfernen.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/Controllers/Admin/AdminList.php | 60 +- src/Controllers/Admin/Base.php | 40 +- src/Controllers/Admin/Channels/AdminList.php | 252 +-- src/Controllers/Admin/Channels/Base.php | 44 +- src/Controllers/Admin/Channels/Main.php | 397 ++--- src/Controllers/Admin/Channels/Payments.php | 304 ++-- src/Controllers/Admin/Log.php | 64 +- src/Controllers/Admin/LogList.php | 54 +- src/Controllers/Admin/Order/Heidelpay.php | 326 ++-- src/Controllers/Admin/Settings.php | 361 ++-- src/Controllers/Admin/Support.php | 45 +- src/Controllers/Admin/TransactionlogList.php | 263 +-- src/Controllers/ChannelProvider.php | 114 +- src/Controllers/ModuleProvider.php | 278 +-- src/Controllers/Notify.php | 405 ++--- src/Controllers/Order.php | 1042 +++++------ src/Controllers/Payment.php | 138 +- src/Controllers/PaymentCollector.php | 622 +++---- src/Controllers/PaymentGateway.php | 518 +++--- src/Controllers/Response.php | 1147 ++++++------ src/Interfaces/Config/ConstantInterface.php | 52 +- .../Criterion/ContainerInterface.php | 30 +- src/Interfaces/Parameter/GroupInterface.php | 28 +- src/Models/Actions/Action.php | 60 +- src/Models/Actions/Capture.php | 56 +- src/Models/Actions/Debit.php | 55 +- src/Models/Actions/Finalize.php | 56 +- src/Models/Actions/Preauthorization.php | 56 +- src/Models/Actions/Rebill.php | 62 +- src/Models/Actions/Refund.php | 65 +- src/Models/Actions/Reversal.php | 59 +- src/Models/Bankaccount.php | 531 +++--- src/Models/Communicator.php | 355 ++-- src/Models/Configuration/ModProfile.php | 46 +- src/Models/Containers/Criterions.php | 52 +- .../Containers/Criterions/Easycredit.php | 56 +- src/Models/Containers/Parameter.php | 774 ++++---- src/Models/Containers/PrepaymentData.php | 171 +- src/Models/Containers/Skeleton.php | 84 +- src/Models/Factory.php | 610 +++---- src/Models/Generators/Basket.php | 548 +++--- src/Models/Generators/Body.php | 62 +- src/Models/Mail.php | 100 +- src/Models/Ngw.php | 289 +-- src/Models/Parameter/Criterion.php | 38 +- src/Models/Parameter/Dynvalues.php | 84 +- src/Models/Parameter/Group/AccountData.php | 119 +- src/Models/Parameter/Group/CompanyData.php | 206 +-- src/Models/Parameter/Group/CustomerData.php | 134 +- src/Models/Parameter/Group/FrontendData.php | 93 +- src/Models/Parameter/Group/MandatoryData.php | 186 +- .../Parameter/Group/RiskInformationData.php | 72 +- src/Models/Payment/Btobbillpurchase.php | 298 ++-- src/Models/Payment/Creditcard.php | 82 +- src/Models/Payment/Debitcard.php | 84 +- src/Models/Payment/Directdebit.php | 82 +- src/Models/Payment/Directdebit/Secured.php | 84 +- src/Models/Payment/Easycredit.php | 102 +- src/Models/Payment/Eps.php | 80 +- ...ymentNotReferencedToHeidelpayException.php | 66 +- .../UnknownRedirectParameterException.php | 64 +- src/Models/Payment/Giropay.php | 82 +- src/Models/Payment/Ideal.php | 82 +- src/Models/Payment/Invoice/Secured.php | 96 +- src/Models/Payment/Invoice/Unsecured.php | 82 +- src/Models/Payment/Masterpass.php | 95 +- src/Models/Payment/Payment.php | 142 +- src/Models/Payment/Paypal.php | 80 +- src/Models/Payment/Postfinance.php | 83 +- src/Models/Payment/Prepayment.php | 84 +- src/Models/Payment/Przelewy24.php | 83 +- src/Models/Payment/Sofortueberweisung.php | 82 +- src/Models/Redirect.php | 82 +- src/Models/Request.php | 106 +- .../InvalidHeidelpayDataException.php | 64 +- .../Exception/InvalidTagNameException.php | 64 +- .../Request/Exception/NoBasketException.php | 58 +- .../Request/Exception/NoOrderException.php | 58 +- .../Exception/NoPaymentMethodException.php | 58 +- .../Exception/NoPaymentOptionException.php | 58 +- .../Exception/NoTransactionUniqueId.php | 60 +- ...eidelpayOnlinetransferPaymentException.php | 66 +- .../Request/Pattern/BankAccountCheck.php | 48 +- src/Models/Request/Pattern/Creditcard.php | 48 +- src/Models/Request/Pattern/Debitcard.php | 42 +- src/Models/Request/Pattern/Directdebit.php | 42 +- src/Models/Request/Pattern/Hip.php | 46 +- src/Models/Request/Pattern/Onlinetransfer.php | 50 +- .../Request/Pattern/OnlinetransferCheck.php | 60 +- src/Models/Request/Pattern/Pattern.php | 30 +- src/Models/Request/Pattern/Prepayment.php | 47 +- src/Models/Request/Xml.php | 1122 ++++++------ src/Models/Response.php | 156 +- src/Models/Response/Parser.php | 278 +-- .../Settings/Channels/BToBBillPurchase.php | 44 +- src/Models/Settings/Channels/Cards.php | 54 +- src/Models/Settings/Channels/Channels.php | 236 +-- src/Models/Settings/Channels/CreditCard.php | 54 +- src/Models/Settings/Channels/DebitCard.php | 54 +- .../Settings/Channels/Directdebit/Secured.php | 52 +- .../Channels/Directdebit/Unsecured.php | 46 +- src/Models/Settings/Channels/EasyCredit.php | 56 +- src/Models/Settings/Channels/Eps.php | 42 +- src/Models/Settings/Channels/Giropay.php | 44 +- src/Models/Settings/Channels/Ideal.php | 68 +- .../Settings/Channels/Invoice/Secured.php | 58 +- .../Settings/Channels/Invoice/Unsecured.php | 45 +- src/Models/Settings/Channels/Masterpass.php | 52 +- .../Settings/Channels/OnlineTransfer.php | 42 +- src/Models/Settings/Channels/Paypal.php | 51 +- src/Models/Settings/Channels/Postfinance.php | 44 +- src/Models/Settings/Channels/Prepayment.php | 42 +- src/Models/Settings/Channels/Przelewy24.php | 68 +- src/Models/Settings/Channels/Sofort.php | 44 +- .../Exception/EmptyPasswordException.php | 57 +- .../EmptySecuritySenderException.php | 58 +- .../Exception/EmptyUsernameException.php | 58 +- src/Models/Settings/Heidelpay.php | 370 ++-- .../Transactionlog/Reader/Heidelpay.php | 574 +++--- .../Exception/AgbNotAcceptedException.php | 44 +- .../CheckSessionChallengeException.php | 45 +- ...ustomerinformationNotAcceptedException.php | 46 +- .../Verify/Exception/NotLoggedInException.php | 42 +- src/Models/Verify/Input.php | 176 +- src/Models/Verify/OrderContext.php | 133 +- src/Models/Verify/PaymentSuccess.php | 52 +- src/Models/Verify/Verify.php | 40 +- src/Models/Viewconfig.php | 508 +++--- src/Modules/Application/Model/Order.php | 43 +- src/Setup/InstallRoutine.php | 16 +- src/metadata.php | 2 +- tests/unittests/MC_Metrics.php | 619 ++++--- tests/unittests/additional.inc.php | 53 +- tests/unittests/bootstrap.php | 99 +- tests/unittests/libs/d3heidelpayTestCase.php | 154 +- tests/unittests/libs/vfsStream/vfsStream.php | 296 ++-- .../vfsStream/vfsStreamAbstractContent.php | 218 +-- .../libs/vfsStream/vfsStreamContainer.php | 70 +- .../vfsStream/vfsStreamContainerIterator.php | 84 +- .../libs/vfsStream/vfsStreamContent.php | 115 +- .../libs/vfsStream/vfsStreamDirectory.php | 221 ++- .../libs/vfsStream/vfsStreamException.php | 26 +- .../libs/vfsStream/vfsStreamFile.php | 222 +-- .../libs/vfsStream/vfsStreamWrapper.php | 669 +++---- .../visitor/vfsStreamAbstractVisitor.php | 74 +- .../visitor/vfsStreamPrintVisitor.php | 111 +- .../visitor/vfsStreamStructureVisitor.php | 104 +- .../vfsStream/visitor/vfsStreamVisitor.php | 60 +- tests/unittests/unit/OxidCommand.php | 82 +- tests/unittests/unit/OxidTestCase.php | 660 +++---- .../unittests/unit/criticalerrorshandler.php | 78 +- tests/unittests/unit/dbMaintenance.php | 244 +-- .../controllers/admin/order/heidelpayTest.php | 409 +++-- .../controllers/admin/settingsTest.php | 79 +- .../d3/d3heidelpay/controllers/orderTest.php | 458 ++--- .../controllers/paymentgatewayTest.php | 908 +++++----- .../d3heidelpay/models/communicatorTest.php | 154 +- .../models/containers/parameterTest.php | 102 +- .../models/containers/skeletonTest.php | 104 +- .../d3heidelpay/models/d3_hp_responseTest.php | 954 +++++----- .../models/d3hpprepaymentdataTest.php | 280 +-- .../d3/d3heidelpay/models/factoryTest.php | 416 ++--- .../models/generators/basketTest.php | 327 ++-- .../models/generators/bodyTest.php | 96 +- ...tnotreferencedtoheidelpayexceptionTest.php | 83 +- .../models/payment/paymentTest.php | 266 +-- .../invalidheidelpaydataexceptionTest.php | 81 +- .../exception/invalidtagnameexceptionTest.php | 81 +- .../exception/nobasketexceptionTest.php | 76 +- .../exception/noorderexceptionTest.php | 77 +- .../nopaymentmethodexceptionTest.php | 78 +- .../nopaymentoptionexceptionTest.php | 77 +- .../exception/notransactionuniqueidTest.php | 78 +- ...lpayonlinetransferpaymentexceptionTest.php | 82 +- .../models/request/pattern/patternTest.php | 86 +- .../d3/d3heidelpay/models/request/xmlTest.php | 1562 +++++++++-------- .../d3/d3heidelpay/models/requestTest.php | 236 +-- .../models/response/parserTest.php | 346 ++-- .../d3/d3heidelpay/models/responseTest.php | 130 +- .../exception/emptypasswordexceptionTest.php | 78 +- .../emptysecuritysenderexceptionTest.php | 80 +- .../exception/emptyusernameexceptionTest.php | 79 +- .../models/settings/heidelpayTest.php | 490 +++--- .../transactionlog/reader/heidelpayTest.php | 354 ++-- .../reader/testdata/PostData.php | 124 +- .../reader/testdata/xmlInPostData.php | 254 +-- .../d3heidelpay/models/verify/inputTest.php | 138 +- .../models/verify/ordercontextTest.php | 195 +- .../models/verify/paymentsuccessTest.php | 78 +- .../d3/d3heidelpay/models/viewconfigTest.php | 654 +++---- .../controllers/d3_order_heidelpayTest.php | 1193 +++++++------ .../controllers/d3_payment_heidelpayTest.php | 427 ++--- .../modules/core/d3_oxemail_heidelpayTest.php | 188 +- .../models/d3_d3counter_heidelpayTest.php | 119 +- .../d3_oxinputvalidator_heidelpayTest.php | 157 +- .../models/d3_oxorder_heidelpayTest.php | 503 +++--- .../d3_oxpaymentgateway_heidelpayTest.php | 1000 +++++------ tests/unittests/unit/oxPrinter.php | 202 +-- tests/unittests/unit/test_config.inc.php | 234 +-- tests/unittests/unit/test_utils.php | 1253 +++++++------ 257 files changed, 19778 insertions(+), 19747 deletions(-) diff --git a/composer.json b/composer.json index 44bbb76..1386e9d 100644 --- a/composer.json +++ b/composer.json @@ -44,8 +44,8 @@ "ext-simplexml": "*", "ext-bcmath": "*", "ext-json": "*", - "oxid-esales/oxideshop-metapackage-ce": "~6.0.1 || ~6.1.0", - "d3/modcfg": ">=5.2.0.2 <5.3" + "oxid-esales/oxideshop-ce": "6.0 - 6.3", + "d3/modcfg": ">=5.2.0.2 < 5.4" }, "autoload": { "psr-4": { diff --git a/docs/daux/changelog/010_Changelog.md b/docs/daux/changelog/010_Changelog.md index 6141fa9..c4551a6 100644 --- a/docs/daux/changelog/010_Changelog.md +++ b/docs/daux/changelog/010_Changelog.md @@ -2,6 +2,16 @@ title: Changelog --- +## 6.1.1.3 - (2020-04-03) +### changed +- ermöglicht Einsatz mit ModulConnector 5.3 +- ermöglicht Installation in Projekten ohne "oxid-esales/oxideshop-metapackage-ce" + +### fixed +- Abbruch bei Verwendung nicht zu Heidelpay zugewiesener Zahlart korrigiert + +--- + ## 6.1.1.2 - (2020-03-19) ### fixed - 0009550: Manipulationsprävention bei Zahlung mit abgesichertem Rechnungskauf integriert diff --git a/docs/daux/config.json b/docs/daux/config.json index 7d73396..b1ce717 100644 --- a/docs/daux/config.json +++ b/docs/daux/config.json @@ -1,9 +1,9 @@ { "title": " heidelpay", - "moduleversion": "6.1.1.2", + "moduleversion": "6.1.1.3", "titledesc": "für den Oxid eShop", "author": "D³ Data Development", - "moduledate": "16.03.2020", + "moduledate": "03.04.2020", "editors": "", "tagline": "", "image": "", diff --git a/docs/html/changelog/Changelog.html b/docs/html/changelog/Changelog.html index d677401..7355d78 100644 --- a/docs/html/changelog/Changelog.html +++ b/docs/html/changelog/Changelog.html @@ -91,13 +91,24 @@

Changelog

- 19.03.2020 + 03.04.2020
-

6.1.1.2 - (2020-03-19)

+

6.1.1.3 - (2020-04-03)

+

changed

+

fixed

+
+

6.1.1.2 - (2020-03-19)

+

fixed

+