Merge branch 'dev-#2773' of github.com:baserproject/basercms into dev-#…

…2773
baserproject · Oct 9, 2023 · 1ed9f35 · 1ed9f35
2 parents c800c80 + 6d0e862
commit 1ed9f35
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/plugins/baser-core/src/Utility/BcFileUploader.php b/plugins/baser-core/src/Utility/BcFileUploader.php
@@ -12,13 +12,12 @@
 namespace BaserCore\Utility;
 
 use ArrayObject;
+use Cake\Filesystem\File;
 use Cake\Http\Session;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Cake\Routing\Router;
 use Cake\Utility\Hash;
-use Cake\Filesystem\File;
-use Cake\Filesystem\Folder;
 use BaserCore\Vendor\Imageresizer;
 use Cake\Datasource\EntityInterface;
 use BaserCore\Annotation\Note;
@@ -116,9 +115,8 @@ public function initialize(array $config, $table): void
         $this->settings = $this->getSettings($config);
         $this->savePath = $this->getSaveDir();
         if (!is_dir($this->savePath)) {
-            $Folder = new Folder();
-            $Folder->create($this->savePath);
-            $Folder->chmod($this->savePath, 0777, true);
+            $Folder = new BcFolder($this->savePath);
+            $Folder->create();
         }
         $this->existsCheckDirs = $this->getExistsCheckDirs();
         $this->Session = new Session();
@@ -466,9 +464,9 @@ public function moveFileSessionToTmp($data, $fieldName)
         }
 
         // ファイルを一時ファイルとして保存
-        $file = new File($tmpName, true, 0666);
+        $file = new BcFile($tmpName);
+        $file->create();
         $file->write($fileData);
-        $file->close();
 
         // アップロードされたデータとしてデータを復元する
         $uploadInfo['error'] = 0;
@@ -784,9 +782,8 @@ public function getFieldBasename($setting, $file, $entity)
             $subdir = str_replace('/', DS, $subdir);
             $path = $this->savePath . $subdir;
             if (!is_dir($path)) {
-                $Folder = new Folder();
-                $Folder->create($path);
-                $Folder->chmod($path, 0777);
+                $Folder = new BcFolder($path);
+                $Folder->create();
             }
         }
         if(empty($file['ext'])) {

diff --git a/plugins/baser-core/src/View/BcFrontAppView.php b/plugins/baser-core/src/View/BcFrontAppView.php
@@ -11,6 +11,7 @@
 
 namespace BaserCore\View;
 
+use BaserCore\Utility\BcFolder;
 use BaserCore\Utility\BcUtil;
 use BaserCore\View\Helper\BcTextHelper;
 use Cake\Core\Configure;
@@ -19,7 +20,6 @@
 use BaserCore\Annotation\Checked;
 use BaserCore\Annotation\Note;
 use Cake\Core\Plugin;
-use Cake\Filesystem\Folder;
 use Cake\Utility\Inflector;
 
 /**
@@ -61,11 +61,11 @@ protected function setThemeHelpers(): void
         $theme = BcUtil::getCurrentTheme();
         if(!$theme) return;
         $themeHelpersPath = Plugin::path($theme) . 'src' . DS . 'View' . DS . 'Helper';
-        $Folder = new Folder($themeHelpersPath);
-        $files = $Folder->read(true, true);
-        if (empty($files[1])) return;
+        $Folder = new BcFolder($themeHelpersPath);
+        $files = $Folder->getFiles();
+        if (empty($files)) return;
 
-        foreach($files[1] as $file) {
+        foreach($files as $file) {
             $this->loadHelper(Inflector::camelize($theme, '-') . '.' . basename($file, 'Helper.php'));
         }
     }

diff --git a/plugins/baser-core/tests/TestCase/Utility/BcFileUploaderTest.php b/plugins/baser-core/tests/TestCase/Utility/BcFileUploaderTest.php
@@ -12,10 +12,10 @@
 
 use ArrayObject;
 use BaserCore\Model\Entity\Content;
+use BaserCore\Utility\BcFile;
 use BaserCore\Utility\BcFileUploader;
 use Cake\ORM\Entity;
 use ReflectionClass;
-use Cake\Filesystem\File;
 use BaserCore\TestSuite\BcTestCase;
 use BaserCore\Utility\BcContainerTrait;
 use BaserCore\Model\Table\ContentsTable;
@@ -507,9 +507,9 @@ public function testMoveFileSessionToTmp()
         $this->uploadedData['eyecatch']['ext'] = $ext;
 
         // ダミーファイルの作成
-        $file = new File($tmpPath);
+        $file = new BcFile($tmpPath);
+        $file->create();
         $file->write('dummy');
-        $file->close();
 
         // セッションを設定
         $entity = $this->BcFileUploader->saveTmpFiles($this->uploadedData, $tmpId);