From 8f548bf24f7f21cc747e62cf4765e9facde10dc9 Mon Sep 17 00:00:00 2001 From: Simon Lindsay Date: Mon, 26 Sep 2022 13:28:20 +0930 Subject: [PATCH 1/3] Add in delete function as pert of the file scaffolding. --- src/actions/ScaffoldFiles.php | 4 ++++ src/tasks/DeleteFile.php | 44 +++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/tasks/DeleteFile.php diff --git a/src/actions/ScaffoldFiles.php b/src/actions/ScaffoldFiles.php index feb3055..eb27366 100644 --- a/src/actions/ScaffoldFiles.php +++ b/src/actions/ScaffoldFiles.php @@ -8,6 +8,7 @@ use Symfony\Component\Filesystem\Filesystem; use UniversityOfAdelaide\ShepherdDrupalScaffold\ScaffoldTrait; use UniversityOfAdelaide\ShepherdDrupalScaffold\tasks\CopyFile; +use UniversityOfAdelaide\ShepherdDrupalScaffold\tasks\DeleteFile; /** * Updates the Shepherd scaffold files. @@ -25,6 +26,9 @@ public function onEvent(Event $event): void foreach (static::tasks($this->filesystem, $scaffoldPath, $projectPath) as $task) { $task->execute(); } + + $delete = new DeleteFile($this->filesystem, 'core/web', 'install.php'); + $delete->execute(); } /** diff --git a/src/tasks/DeleteFile.php b/src/tasks/DeleteFile.php new file mode 100644 index 0000000..cd1c7db --- /dev/null +++ b/src/tasks/DeleteFile.php @@ -0,0 +1,44 @@ +filesystem = $filesystem; + $this->path = $path; + $this->filename = $filename; + } + + public function getFilename(): string + { + return $this->filename; + } + + /** + * @throws \Symfony\Component\Filesystem\Exception\FileNotFoundException + * When original file doesn't exist + * @throws \Symfony\Component\Filesystem\Exception\IOException + * When copy fails + */ + public function execute(): void + { + // Skip copying files that already exist at the destination. + if (!$this->filesystem->exists($this->path . '/' . $this->filename)) { + return; + } + + $this->filesystem->remove( + $this->path . '/' . $this->filename + ); + } +} From 3fe3b2fd1b33d199760b8b7d935eba23e52938f3 Mon Sep 17 00:00:00 2001 From: Simon Lindsay Date: Tue, 27 Sep 2022 15:08:35 +0930 Subject: [PATCH 2/3] Output a message. --- src/actions/ScaffoldFiles.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/actions/ScaffoldFiles.php b/src/actions/ScaffoldFiles.php index eb27366..2d9d5f2 100644 --- a/src/actions/ScaffoldFiles.php +++ b/src/actions/ScaffoldFiles.php @@ -27,6 +27,7 @@ public function onEvent(Event $event): void $task->execute(); } + $event->getIO()->write('Deleting install.php'); $delete = new DeleteFile($this->filesystem, 'core/web', 'install.php'); $delete->execute(); } From 96352f2d545538ae014af6af964c76b779efce45 Mon Sep 17 00:00:00 2001 From: Simon Lindsay Date: Wed, 28 Sep 2022 09:15:55 +0930 Subject: [PATCH 3/3] Sigh. --- src/actions/ScaffoldFiles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/actions/ScaffoldFiles.php b/src/actions/ScaffoldFiles.php index 2d9d5f2..d314f23 100644 --- a/src/actions/ScaffoldFiles.php +++ b/src/actions/ScaffoldFiles.php @@ -28,7 +28,7 @@ public function onEvent(Event $event): void } $event->getIO()->write('Deleting install.php'); - $delete = new DeleteFile($this->filesystem, 'core/web', 'install.php'); + $delete = new DeleteFile($this->filesystem, 'web/core', 'install.php'); $delete->execute(); }