From 8aae98fae3b6beae31416c1c484829f576b586e7 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Sat, 1 May 2021 21:41:40 +0200 Subject: [PATCH] change source path to renamed branch --- OxidAskYes.patch | 13 ------------- README.md | 9 ++++----- unifiedIssuesInVagrant.patch | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 18 deletions(-) delete mode 100644 OxidAskYes.patch create mode 100644 unifiedIssuesInVagrant.patch diff --git a/OxidAskYes.patch b/OxidAskYes.patch deleted file mode 100644 index 087b7df..0000000 --- a/OxidAskYes.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Installer/Package/AbstractPackageInstaller_Original.php 2021-04-12 16:59:26.000000000 +0200 -+++ src/Installer/Package/AbstractPackageInstaller.php 2021-04-29 16:16:31.000000000 +0200 -@@ -198,9 +198,7 @@ - */ - protected function askQuestion($messageToAsk) - { -- $userInput = $this->getIO()->ask($messageToAsk, 'N'); -- -- return $this->isPositiveUserInput($userInput); -+ return true; - } - - /** diff --git a/README.md b/README.md index 3429676..6e403e4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # oxid_patches -How many times you have thought about OXID and "Do you want to ..." -> YES -Don't do it again! +permission error while deleting the generated unified namespace helper in vagrant shared folder when running unit tests # first add this to your main composer file composer require cweagans/composer-patches @@ -8,9 +7,9 @@ composer require cweagans/composer-patches # add this to your main composer file "extra": { "patches": { - "oxid-esales/oxideshop-composer-plugin": { - "Don't ask, simple install all new": - "https://git.d3data.de/D3Public/oxid_patches/raw/branch/main/OxidAskYes.patch" + "oxid-esales/testing-library": { + "unifiled issues in vagrant": + "https://git.d3data.de/D3Public/oxid_patches/raw/branch/unifiedIssuesInVagrant/unifiedIssuesInVagrant.patch" } }, "enable-patching": true diff --git a/unifiedIssuesInVagrant.patch b/unifiedIssuesInVagrant.patch new file mode 100644 index 0000000..f527e69 --- /dev/null +++ b/unifiedIssuesInVagrant.patch @@ -0,0 +1,30 @@ +From d908c1e550c6262271ed6ac770e3e89a2419ffdf Mon Sep 17 00:00:00 2001 +From: Daniel Seifert +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 +