2 Commits

Author SHA1 Message Date
ab916d8135 add symlink patch 2022-07-07 14:32:38 +02:00
509ede35e8 change source path to renamed branch 2021-05-01 21:41:40 +02:00
3 changed files with 36 additions and 34 deletions

View File

@ -1,5 +1,6 @@
# oxid_patches # oxid_patches
permission error while deleting the generated unified namespace helper in vagrant shared folder when running unit tests How many times you have thought about OXID and "Do you want to ..." -> YES
Don't do it again!
# first add this to your main composer file # first add this to your main composer file
composer require cweagans/composer-patches composer require cweagans/composer-patches
@ -7,9 +8,9 @@ composer require cweagans/composer-patches
# add this to your main composer file # add this to your main composer file
"extra": { "extra": {
"patches": { "patches": {
"oxid-esales/testing-library": { "oxid-esales/oxideshop-composer-plugin": {
"unifiled issues in vagrant": "don't copy module files to source, symlink it only":
"https://git.d3data.de/D3Public/oxid_patches/raw/branch/unifiedIssuesInVagrant/unifiedIssuesInVagrant.patch" "https://git.d3data.de/D3Public/oxid_patches/raw/branch/symlinksInSource/symlinkmodules.patch"
} }
}, },
"enable-patching": true "enable-patching": true

31
symlinkmodules.patch Normal file
View File

@ -0,0 +1,31 @@
From 84a2fb615a64f4a52ef44adbb19eda48e9e1b1f3 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Thu, 7 Jul 2022 14:16:51 +0200
Subject: [PATCH 1/1] create symlinks in source folder instead of copying
module files
---
.../Module/Install/Service/ModuleFilesInstaller.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/source/Internal/Framework/Module/Install/Service/ModuleFilesInstaller.php b/source/Internal/Framework/Module/Install/Service/ModuleFilesInstaller.php
index dff8629e6..d6a96be59 100644
--- a/source/Internal/Framework/Module/Install/Service/ModuleFilesInstaller.php
+++ b/source/Internal/Framework/Module/Install/Service/ModuleFilesInstaller.php
@@ -52,11 +52,9 @@ class ModuleFilesInstaller implements ModuleFilesInstallerInterface
{
$finder = $this->getFinder($package->getPackageSourcePath(), $package->getBlackListFilters());
- $this->fileSystemService->mirror(
+ $this->fileSystemService->symlink(
$package->getPackageSourcePath(),
- $this->getTargetPath($package),
- $finder,
- ['override' => true]
+ $this->getTargetPath($package)
);
}
--
2.26.1.windows.1

View File

@ -1,30 +0,0 @@
From d908c1e550c6262271ed6ac770e3e89a2419ffdf Mon Sep 17 00:00:00 2001
From: Daniel Seifert <git@daniel-seifert.com>
Date: Fri, 19 Aug 2022 22:29:11 +0200
Subject: [PATCH 1/1] adjust generated directory outside of shared vagrant
folders because of permission issues
---
library/TestConfig.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/library/TestConfig.php b/library/TestConfig.php
index 48f5915..3553732 100644
--- a/library/TestConfig.php
+++ b/library/TestConfig.php
@@ -55,7 +55,11 @@ class TestConfig
{
$facts = new \OxidEsales\Facts\Facts();
$unifiedNameSpaceClassMapProvider = new \OxidEsales\UnifiedNameSpaceGenerator\UnifiedNameSpaceClassMapProvider($facts);
- $generator = new \OxidEsales\UnifiedNameSpaceGenerator\Generator($facts, $unifiedNameSpaceClassMapProvider);
+ $generator = new \OxidEsales\UnifiedNameSpaceGenerator\Generator(
+ $facts,
+ $unifiedNameSpaceClassMapProvider,
+ '/home/vagrant/unifiedNameSpaceGenerator/'
+ );
$generator->cleanupOutputDirectory();
$generator->generate();
}
--
2.25.1