Compare commits

..

No commits in common. "main" and "Patch_EE65" have entirely different histories.

2 changed files with 50 additions and 14 deletions

View File

@ -0,0 +1,26 @@
From 5b1d95de5bc7f6ca096da5513273eca8933b4375 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Thu, 25 Aug 2022 11:51:41 +0200
Subject: [PATCH 1/1] remove unnecessary Unzer SDK dependency
see https://bugs.oxid-esales.com/view.php?id=7349
---
composer.json | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/composer.json b/composer.json
index 7f0e73c..7875a53 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,6 @@
"psr/http-client": "1.0.1",
"psr/http-factory": "1.0.1",
"psr/http-message": "1.0.1",
- "ralouphie/getallheaders": "3.0.3",
- "unzerdev/php-sdk": "1.2.0.0"
+ "ralouphie/getallheaders": "3.0.3"
}
}
--
2.26.1.windows.1

View File

@ -1,16 +1,26 @@
# Unzer
# Patch to install the D3 Unzer plugin in OXID EE 6.5
- 6.2.x
- [for ionCube from PHP 5.6](https://git.d3data.de/D3Public/Unzer/src/branch/rel_6.2_ionCube_from_PHP5.6)
- [for ionCube from PHP 7.1](https://git.d3data.de/D3Public/Unzer/src/branch/rel_6.2_ionCube_from_PHP7.1)
- [for SourceGuardian from PHP 8.0](https://git.d3data.de/D3Public/Unzer/src/branch/rel_6.2_sourceGuardian_from_PHP8.0)
- 6.3.x
- [for ionCube from PHP 7.1](https://git.d3data.de/D3Public/Unzer/src/branch/rel_6.3_ionCube_from_PHP7.1)
- [for SourceGuardian from PHP 8.0](https://git.d3data.de/D3Public/Unzer/src/branch/rel_6.3_sourceGuardian_from_PHP8.0)
- 6.4.x
- [for ionCube from PHP 7.1](https://git.d3data.de/D3Public/Unzer/src/branch/rel_6.4_ionCube_from_PHP7.1)
- [for SourceGuardian from PHP 8.0](https://git.d3data.de/D3Public/Unzer/src/branch/rel_6.4_sourceGuardian_from_PHP8.0)
- 7.x - OXID 7.x
- [for SourceGuardian from PHP 8.0](https://github.com/d3datadevelopment/Unzer/tree/rel_7.x_sourceGuardian_from_PHP8.0)
Due to an error in the Enterprise Metapackage (https://bugs.oxid-esales.com/view.php?id=7349), the D3 Unzer plugin may not be installed. Composer then reports a version conflict with the `unzerdev/php-sdk` package.
** main branch left blank **
## first add this to your main composer file
```composer require cweagans/composer-patches```
## add this to your main composer file
```
"extra": {
"patches": {
"oxid-esales/oxideshop-metapackage-ee": {
"Fixes dependencies bug for D3 Unzer plugin in OXID Metapackage EE 6.5":
"https://git.d3data.de/D3Public/Unzer/raw/branch/Patch_EE65/0007349_Unzer_dependency.patch"
}
},
"enable-patching": true
},
```
## run this command
```composer install```
Run the D3 Unzer installation steps again.