From b51610ed6e8c16a0f2a9f62a8ba7e0173dbbe3ff Mon Sep 17 00:00:00 2001 From: yaza Date: Sun, 10 Jul 2022 14:02:36 +0800 Subject: [PATCH 1/4] fixing ensureDirectory --- src/helpers/Search.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/helpers/Search.php b/src/helpers/Search.php index e0e15bc..5c5cc39 100644 --- a/src/helpers/Search.php +++ b/src/helpers/Search.php @@ -5,6 +5,7 @@ use function League\Flysystem\Local\ensureDirectoryExists; +use Illuminate\Filesystem\Filesystem; class Search { @@ -15,7 +16,7 @@ class Search */ static function file($folder, $pattern_array) { // check directory exsist - ensureDirectoryExists($folder); + app()->make(Filesystem::class)->ensureDirectoryExists($folder); $return = array(); $iti = new \RecursiveDirectoryIterator($folder); From 2e3774534b7204a0e6571fb8d25bb34f126e4ec9 Mon Sep 17 00:00:00 2001 From: yaza Date: Sun, 10 Jul 2022 14:06:55 +0800 Subject: [PATCH 2/4] fix first init directory --- src/Commands/MakeRepository.php | 1 + src/Commands/MakeService.php | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Commands/MakeRepository.php b/src/Commands/MakeRepository.php index 816f806..cf6fb7d 100644 --- a/src/Commands/MakeRepository.php +++ b/src/Commands/MakeRepository.php @@ -169,6 +169,7 @@ private function getRepositoryPath($className, $isDefault) private function checkIfRequiredDirectoriesExist(string $className) { $this->ensureDirectoryExists(config("easy-repository.repository_directory")); + $this->ensureDirectoryExists(config("easy-repository.service_directory")); $this->ensureDirectoryExists(config("easy-repository.repository_directory") . "/". $className); $this->ensureDirectoryExists(config("easy-repository.repository_directory") . "/" . $className); } diff --git a/src/Commands/MakeService.php b/src/Commands/MakeService.php index e81e12c..4eaa098 100644 --- a/src/Commands/MakeService.php +++ b/src/Commands/MakeService.php @@ -176,6 +176,7 @@ private function getRepositoryName(string $className) { */ private function checkIfRequiredDirectoriesExist() { + $this->ensureDirectoryExists(config("easy-repository.repository_directory")); $this->ensureDirectoryExists(config("easy-repository.service_directory")); } From 76b808dee9b3bd95ccec856d17ddccac12d76f81 Mon Sep 17 00:00:00 2001 From: yaza Date: Sun, 10 Jul 2022 14:26:35 +0800 Subject: [PATCH 3/4] fixing folder --- src/Commands/MakeRepository.php | 9 +++++---- src/Commands/MakeService.php | 5 +++-- src/helpers/FolderHandler.php | 18 ++++++++++++++++++ src/helpers/Search.php | 6 +----- tests/Unit/FolderTest.php | 1 - 5 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 src/helpers/FolderHandler.php diff --git a/src/Commands/MakeRepository.php b/src/Commands/MakeRepository.php index cf6fb7d..fcc2e44 100644 --- a/src/Commands/MakeRepository.php +++ b/src/Commands/MakeRepository.php @@ -7,6 +7,7 @@ use Illuminate\Support\Str; use LaravelEasyRepository\AssistCommand; use LaravelEasyRepository\CreateFile; +use LaravelEasyRepository\helpers\FolderHandler; class MakeRepository extends Command { @@ -168,9 +169,9 @@ private function getRepositoryPath($className, $isDefault) */ private function checkIfRequiredDirectoriesExist(string $className) { - $this->ensureDirectoryExists(config("easy-repository.repository_directory")); - $this->ensureDirectoryExists(config("easy-repository.service_directory")); - $this->ensureDirectoryExists(config("easy-repository.repository_directory") . "/". $className); - $this->ensureDirectoryExists(config("easy-repository.repository_directory") . "/" . $className); + $base_path = app()->basePath()."/"; + FolderHandler::createFolder($base_path.config("easy-repository.repository_directory")); + FolderHandler::createFolder($base_path.config("easy-repository.repository_directory") . "/". $className); + FolderHandler::createFolder($base_path.config("easy-repository.repository_directory") . "/" . $className); } } diff --git a/src/Commands/MakeService.php b/src/Commands/MakeService.php index 4eaa098..3f9c51c 100644 --- a/src/Commands/MakeService.php +++ b/src/Commands/MakeService.php @@ -7,6 +7,7 @@ use LaravelEasyRepository\AssistCommand; use LaravelEasyRepository\CreateFile; use File; +use LaravelEasyRepository\helpers\FolderHandler; class MakeService extends Command { @@ -176,8 +177,8 @@ private function getRepositoryName(string $className) { */ private function checkIfRequiredDirectoriesExist() { - $this->ensureDirectoryExists(config("easy-repository.repository_directory")); - $this->ensureDirectoryExists(config("easy-repository.service_directory")); + $path = app()->basePath(). "/" .config("easy-repository.service_directory"); + FolderHandler::createFolder($path); } /** diff --git a/src/helpers/FolderHandler.php b/src/helpers/FolderHandler.php new file mode 100644 index 0000000..7ede8b0 --- /dev/null +++ b/src/helpers/FolderHandler.php @@ -0,0 +1,18 @@ +make(Filesystem::class)->ensureDirectoryExists($folder); + FolderHandler::createFolder($folder); $return = array(); $iti = new \RecursiveDirectoryIterator($folder); diff --git a/tests/Unit/FolderTest.php b/tests/Unit/FolderTest.php index a6c5abb..a4b7dfb 100644 --- a/tests/Unit/FolderTest.php +++ b/tests/Unit/FolderTest.php @@ -7,7 +7,6 @@ use LaravelEasyRepository\Tests\TestCase; class FolderTest extends TestCase { - /** * @group folder_test */ From 5931fbd8125ed55ab0dc8903f6226b7e1c3e6178 Mon Sep 17 00:00:00 2001 From: yaza Date: Sun, 10 Jul 2022 14:33:28 +0800 Subject: [PATCH 4/4] add init directory --- src/Commands/MakeRepository.php | 8 +++----- src/Commands/MakeService.php | 4 +--- src/RepositoryServiceProvider.php | 5 +++++ src/helpers/FolderHandler.php | 18 ------------------ src/helpers/Search.php | 5 ++++- 5 files changed, 13 insertions(+), 27 deletions(-) delete mode 100644 src/helpers/FolderHandler.php diff --git a/src/Commands/MakeRepository.php b/src/Commands/MakeRepository.php index fcc2e44..816f806 100644 --- a/src/Commands/MakeRepository.php +++ b/src/Commands/MakeRepository.php @@ -7,7 +7,6 @@ use Illuminate\Support\Str; use LaravelEasyRepository\AssistCommand; use LaravelEasyRepository\CreateFile; -use LaravelEasyRepository\helpers\FolderHandler; class MakeRepository extends Command { @@ -169,9 +168,8 @@ private function getRepositoryPath($className, $isDefault) */ private function checkIfRequiredDirectoriesExist(string $className) { - $base_path = app()->basePath()."/"; - FolderHandler::createFolder($base_path.config("easy-repository.repository_directory")); - FolderHandler::createFolder($base_path.config("easy-repository.repository_directory") . "/". $className); - FolderHandler::createFolder($base_path.config("easy-repository.repository_directory") . "/" . $className); + $this->ensureDirectoryExists(config("easy-repository.repository_directory")); + $this->ensureDirectoryExists(config("easy-repository.repository_directory") . "/". $className); + $this->ensureDirectoryExists(config("easy-repository.repository_directory") . "/" . $className); } } diff --git a/src/Commands/MakeService.php b/src/Commands/MakeService.php index 3f9c51c..e81e12c 100644 --- a/src/Commands/MakeService.php +++ b/src/Commands/MakeService.php @@ -7,7 +7,6 @@ use LaravelEasyRepository\AssistCommand; use LaravelEasyRepository\CreateFile; use File; -use LaravelEasyRepository\helpers\FolderHandler; class MakeService extends Command { @@ -177,8 +176,7 @@ private function getRepositoryName(string $className) { */ private function checkIfRequiredDirectoriesExist() { - $path = app()->basePath(). "/" .config("easy-repository.service_directory"); - FolderHandler::createFolder($path); + $this->ensureDirectoryExists(config("easy-repository.service_directory")); } /** diff --git a/src/RepositoryServiceProvider.php b/src/RepositoryServiceProvider.php index 312513c..4387c7f 100644 --- a/src/RepositoryServiceProvider.php +++ b/src/RepositoryServiceProvider.php @@ -26,6 +26,11 @@ class RepositoryServiceProvider extends ServiceProvider */ public function register() { + // check ensure main folder services + $this->app->make(Filesystem::class)->ensureDirectoryExists(config("easy-repository.service_directory")); + // check ensure main folder repository + $this->app->make(Filesystem::class)->ensureDirectoryExists(config("easy-repository.repository_directory")); + $this->files = $this->app->make(Filesystem::class); if ($this->isConfigPublished()) { $this->bindAllRepositories(); diff --git a/src/helpers/FolderHandler.php b/src/helpers/FolderHandler.php deleted file mode 100644 index 7ede8b0..0000000 --- a/src/helpers/FolderHandler.php +++ /dev/null @@ -1,18 +0,0 @@ -make(Filesystem::class)->ensureDirectoryExists($folder); $return = array(); $iti = new \RecursiveDirectoryIterator($folder);