Merge remote-tracking branch 'origin/dev-#2773' into dev-baserproject…

…#2773
nghiem-mb · Nov 21, 2023 · 7c524f4 · 7c524f4
2 parents e420577 + f33c4ad
commit 7c524f4
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/plugins/baser-core/src/Command/CreateReleaseCommand.php b/plugins/baser-core/src/Command/CreateReleaseCommand.php
@@ -11,12 +11,12 @@
 
 namespace BaserCore\Command;
 
+use BaserCore\Utility\BcFile;
+use BaserCore\Utility\BcFolder;
 use Cake\Command\Command;
 use Cake\Console\Arguments;
 use Cake\Console\ConsoleIo;
 use Cake\Core\Configure;
-use Cake\Filesystem\File;
-use Cake\Filesystem\Folder;
 use Composer\Package\Archiver\ZipArchiver;
 use BaserCore\Annotation\UnitTest;
 use BaserCore\Annotation\NoTodo;
@@ -59,8 +59,7 @@ public function execute(Arguments $args, ConsoleIo $io)
     {
         $packagePath = TMP . 'basercms' . DS;
         if(is_dir($packagePath)) {
-            $folder = new Folder($packagePath);
-            $folder->delete();
+            (new BcFolder($packagePath))->delete();
         }
 
         $io->out(__d('baser_core', 'リリースパッケージを作成します。', TMP));
@@ -82,8 +81,7 @@ public function execute(Arguments $args, ConsoleIo $io)
         $this->createZip($packagePath);
 
         $io->out(__d('baser_core', '- クリーニング処理を実行します。'));
-        $folder = new Folder($packagePath);
-        $folder->delete();
+        (new BcFolder($packagePath))->delete();
 
         $io->out();
         $io->out(__d('baser_core', 'リリースパッケージの作成が完了しました。/tmp/basercms.zip を確認してください。'));
@@ -99,7 +97,7 @@ public function execute(Arguments $args, ConsoleIo $io)
     public function setupComposer(string $packagePath)
     {
         $composer = $packagePath . 'composer.json';
-        $file = new File($composer);
+        $file = new BcFile($composer);
         $data = $file->read();
         $regex = '/^(.+?)    "replace": {.+?},\n(.+?)/s';
         $data = preg_replace($regex, "$1$2", $data);
@@ -136,13 +134,12 @@ public function clonePackage(string $packagePath, string $branch)
     public function deletePlugins(string $packagePath)
     {
         $excludes = ['BcThemeSample', 'BcPluginSample'];
-        $folder = new Folder($packagePath . 'plugins');
-        $files = $folder->read(true, true, true);
-        foreach($files[0] as $path) {
+        $folder = new BcFolder($packagePath . 'plugins');
+        $files = $folder->getFolders(['full'=>true]);
+        foreach($files as $path) {
             if(in_array(basename($path), $excludes)) continue;
-            $folder->delete($path);
+            (new BcFolder($path))->delete();
         }
-        new File($packagePath . 'plugins' . DS . '.gitkeep');
     }
 
     /**
@@ -175,9 +172,9 @@ public function deleteExcludeFiles(string $packagePath)
         foreach($excludeFiles as $file) {
             $file = $packagePath . $file;
             if(is_dir($file)) {
-                (new Folder($file))->delete();
+                (new BcFolder($file))->delete();
             } elseif(file_exists($file)) {
-                (new File($file))->delete();
+                (new BcFile($file))->delete();
             }
         }
     }