From 136ce2c8c96a4acb4b630a1d267581a6d46baba5 Mon Sep 17 00:00:00 2001 From: takeuji <8424850+takeuji@users.noreply.github.com> Date: Sat, 27 Aug 2022 18:00:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?void=E3=81=AE=E3=83=A1=E3=82=BD=E3=83=83?= =?UTF-8?q?=E3=83=89=E3=81=A7=E3=83=AA=E3=82=BF=E3=83=BC=E3=83=B3=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/Composer/ComposerProcessService.php | 4 ++-- tests/Eccube/Tests/Service/PluginServiceTest.php | 2 +- .../Tests/Service/PluginServiceWithEntityExtensionTest.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Eccube/Service/Composer/ComposerProcessService.php b/src/Eccube/Service/Composer/ComposerProcessService.php index fdeece5b163..7a5b0085c65 100644 --- a/src/Eccube/Service/Composer/ComposerProcessService.php +++ b/src/Eccube/Service/Composer/ComposerProcessService.php @@ -141,11 +141,11 @@ public function execConfig($key, $value = null) public function configureRepository(BaseInfo $BaseInfo) { - return $this->composerApiService->configureRepository($BaseInfo); + composerApiService->configureRepository($BaseInfo); } public function foreachRequires($packageName, $version, $callback, $typeFilter = null, $level = 0) { - return $this->composerApiService->foreachRequires($packageName, $version, $callback, $typeFilter, $level); + composerApiService->foreachRequires($packageName, $version, $callback, $typeFilter, $level); } } diff --git a/tests/Eccube/Tests/Service/PluginServiceTest.php b/tests/Eccube/Tests/Service/PluginServiceTest.php index 757ab1c9ccd..410830d4dae 100644 --- a/tests/Eccube/Tests/Service/PluginServiceTest.php +++ b/tests/Eccube/Tests/Service/PluginServiceTest.php @@ -100,7 +100,7 @@ public function deleteFile($path) { $f = new Filesystem(); - return $f->remove($path); + $f->remove($path); } // 必要最小限のファイルのプラグインのインストールとアンインストールを検証 diff --git a/tests/Eccube/Tests/Service/PluginServiceWithEntityExtensionTest.php b/tests/Eccube/Tests/Service/PluginServiceWithEntityExtensionTest.php index c86c88fffaa..e55a241c724 100644 --- a/tests/Eccube/Tests/Service/PluginServiceWithEntityExtensionTest.php +++ b/tests/Eccube/Tests/Service/PluginServiceWithEntityExtensionTest.php @@ -90,7 +90,7 @@ public function deleteFile($path) { $f = new Filesystem(); - return $f->remove($path); + $f->remove($path); } /** From a4110b69204412577b921c0e59619122d1686613 Mon Sep 17 00:00:00 2001 From: takeuji <8424850+takeuji@users.noreply.github.com> Date: Wed, 31 Aug 2022 17:08:32 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=ABthis?= =?UTF-8?q?=E3=81=8C=E3=81=AA=E3=81=84=E4=B8=8D=E5=82=99=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/Composer/ComposerProcessService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Service/Composer/ComposerProcessService.php b/src/Eccube/Service/Composer/ComposerProcessService.php index 7a5b0085c65..e409b545704 100644 --- a/src/Eccube/Service/Composer/ComposerProcessService.php +++ b/src/Eccube/Service/Composer/ComposerProcessService.php @@ -141,11 +141,11 @@ public function execConfig($key, $value = null) public function configureRepository(BaseInfo $BaseInfo) { - composerApiService->configureRepository($BaseInfo); + $this->composerApiService->configureRepository($BaseInfo); } public function foreachRequires($packageName, $version, $callback, $typeFilter = null, $level = 0) { - composerApiService->foreachRequires($packageName, $version, $callback, $typeFilter, $level); + $this->composerApiService->foreachRequires($packageName, $version, $callback, $typeFilter, $level); } }