マーキング漏れを追加

baserproject · Oct 10, 2023 · e3a3c0c · e3a3c0c
1 parent e3e2cd2
commit e3a3c0c
Show file tree

Hide file tree

Showing 10 changed files with 233 additions and 115 deletions.
diff --git a/plugins/bc-custom-content/src/Model/Table/CustomFieldsTable.php b/plugins/bc-custom-content/src/Model/Table/CustomFieldsTable.php
@@ -49,6 +49,8 @@ public function initialize(array $config): void
      *
      * @param Validator $validator
      * @return Validator
+     * @checked
+     * @noTodo
      */
     public function validationDefault(Validator $validator): Validator
     {
@@ -79,7 +81,7 @@ public function validationDefault(Validator $validator): Validator
                     'rule' => ['checkSelectList'],
                     'message' => __d('baser_core', '選択リストに同じ項目を複数登録できません。')
                 ]
-        ]);
+            ]);
         return $validator;
     }
 
@@ -89,19 +91,20 @@ public function validationDefault(Validator $validator): Validator
      * @param EventInterface $event
      * @param ArrayObject $content
      * @param ArrayObject $options
+     * @checked
+     * @noTodo
      */
     public function beforeMarshal(EventInterface $event, ArrayObject $content, ArrayObject $options)
     {
         // beforeMarshal のタイミングで変換しないと配列が null になってしまう
-        if(!empty($content['meta'])) {
+        if (!empty($content['meta'])) {
             $content['meta'] = json_encode($content['meta'], JSON_UNESCAPED_UNICODE);
         }
-        if(!empty($content['validate'])) {
+        if (!empty($content['validate'])) {
             $content['validate'] = json_encode($content['validate'], JSON_UNESCAPED_UNICODE);
         }
     }
 
-
     /**
      * Find all
      *
@@ -110,14 +113,16 @@ public function beforeMarshal(EventInterface $event, ArrayObject $content, Array
      * @param Query $query
      * @param array $options
      * @return Query
+     * @checked
+     * @noTodo
      */
     public function findAll(Query $query, array $options = []): Query
     {
-        return $query->formatResults(function (\Cake\Collection\CollectionInterface $results) {
-            return $results->map(function ($row) {
-                if(!$row) return $row;
-                if(isset($row->meta) && $row->meta) $row->meta = json_decode($row->meta, true);
-                if(isset($row->validate) &&  $row->validate) $row->validate = json_decode($row->validate, true);
+        return $query->formatResults(function(\Cake\Collection\CollectionInterface $results) {
+            return $results->map(function($row) {
+                if (!$row) return $row;
+                if (isset($row->meta) && $row->meta) $row->meta = json_decode($row->meta, true);
+                if (isset($row->validate) && $row->validate) $row->validate = json_decode($row->validate, true);
                 return $row;
             });
         });

diff --git a/plugins/bc-custom-content/src/Model/Table/CustomLinksTable.php b/plugins/bc-custom-content/src/Model/Table/CustomLinksTable.php
@@ -16,7 +16,6 @@
 use BaserCore\Annotation\UnitTest;
 use BaserCore\Annotation\NoTodo;
 use BaserCore\Annotation\Checked;
-use BcCustomContent\Model\Entity\CustomField;
 use Cake\Core\Configure;
 use Cake\Datasource\EntityInterface;
 use Cake\Event\EventInterface;
@@ -128,6 +127,8 @@ public function setTreeScope(int $tableId): void
      * @param EntityInterface $entity
      * @param ArrayObject $options
      * @return bool|void
+     * @checked
+     * @noTodo
      */
     public function beforeSave(EventInterface $event, EntityInterface $entity, ArrayObject $options)
     {
@@ -143,6 +144,8 @@ public function beforeSave(EventInterface $event, EntityInterface $entity, Array
      * @param EventInterface $event
      * @param EntityInterface $entity
      * @param ArrayObject $options
+     * @checked
+     * @noTodo
      */
     public function beforeDelete(EventInterface $event, EntityInterface $entity, ArrayObject $options)
     {
@@ -154,6 +157,8 @@ public function beforeDelete(EventInterface $event, EntityInterface $entity, Arr
      * 並び順を更新する
      *
      * @param array $customLinks
+     * @checked
+     * @noTodo
      */
     public function updateSort(array $customLinks)
     {
@@ -232,6 +237,8 @@ public function moveOffset($field, $offset)
      * @param string $name
      * @param int $tableId
      * @return string
+     * @checked
+     * @noTodo
      */
     public function getUniqueName(string $name, int $tableId)
     {

diff --git a/plugins/bc-custom-content/src/Plugin.php b/plugins/bc-custom-content/src/Plugin.php
@@ -38,8 +38,10 @@ class Plugin extends BcPlugin
      * @param array $options
      *  - `plugin` : プラグイン名
      *  - `connection` : コネクション名
+     * @checked
+     * @noTodo
      */
-    public function install($options = []) : bool
+    public function install($options = []): bool
     {
         // ここに必要なインストール処理を記述
         $result = parent::install($options);
@@ -49,18 +51,6 @@ public function install($options = []) : bool
         return $result;
     }
 
-    /**
-     * プラグインをアンインストールする
-     *  - `plugin` : プラグイン名
-     *  - `connection` : コネクション名
-     *  - `target` : ロールバック対象バージョン
-     */
-    public function uninstall($options = []): bool
-    {
-        // ここに必要なアンインストール処理を記述
-        return parent::uninstall();
-    }
-
     /**
      * services
      * @param ContainerInterface $container
@@ -76,6 +66,8 @@ public function services(ContainerInterface $container): void
      * Bootstrap
      *
      * @param PluginApplicationInterface $app
+     * @checked
+     * @noTodo
      */
     public function bootstrap(PluginApplicationInterface $app): void
     {
@@ -97,25 +89,25 @@ public function loadPlugin(): void
             [$path]
         ));
 
-		$Folder = new Folder($path);
-		$files = $Folder->read(true, true, false);
-		if(empty($files[0])) return;
+        $Folder = new Folder($path);
+        $files = $Folder->read(true, true, false);
+        if (empty($files[0])) return;
 
-		if(Configure::read('BcRequest.asset')) {
-		    // TODO ucmitz 検証要
-			foreach($files[0] as $pluginName) {
-			    BcUtil::includePluginClass($pluginName);
-			}
-		} else {
-			foreach($files[0] as $pluginName) {
+        if (Configure::read('BcRequest.asset')) {
+            // TODO ucmitz 検証要
+            foreach($files[0] as $pluginName) {
+                BcUtil::includePluginClass($pluginName);
+            }
+        } else {
+            foreach($files[0] as $pluginName) {
                 // 設定ファイルを読み込む
-                if(!BcUtil::includePluginClass($pluginName)) continue;
+                if (!BcUtil::includePluginClass($pluginName)) continue;
                 $pluginCollection = CakePlugin::getCollection();
                 $plugin = $pluginCollection->create($pluginName);
                 $pluginCollection->add($plugin);
                 BcEvent::registerPluginEvent($pluginName);
-			}
-		}
+            }
+        }
     }
 
 }
diff --git a/plugins/bc-custom-content/src/Service/CustomEntriesService.php b/plugins/bc-custom-content/src/Service/CustomEntriesService.php
@@ -55,6 +55,8 @@ class CustomEntriesService implements CustomEntriesServiceInterface
 
     /**
      * Constructor
+     * @checked
+     * @noTodo
      */
     public function __construct()
     {
@@ -68,6 +70,8 @@ public function __construct()
      *
      * @param int $tableId
      * @return EntityInterface
+     * @checked
+     * @noTodo
      */
     public function getNew(int $tableId)
     {

diff --git a/plugins/bc-custom-content/src/Utility/CustomContentUtil.php b/plugins/bc-custom-content/src/Utility/CustomContentUtil.php
@@ -28,10 +28,12 @@ class CustomContentUtil
      * @param $plugin
      * @param string $name
      * @return mixed
+     * @checked
+     * @noTodo
      */
     public static function getPluginSetting(string $plugin, string $name = '')
     {
-        if($name) {
+        if ($name) {
             return Configure::read("BcCustomContent.fieldTypes.$plugin.$name");
         } else {
             return Configure::read("BcCustomContent.fieldTypes.$plugin");

diff --git a/plugins/bc-custom-content/src/View/Helper/BcCustomContentBaserHelper.php b/plugins/bc-custom-content/src/View/Helper/BcCustomContentBaserHelper.php
@@ -13,6 +13,9 @@
 
 use BaserCore\View\Helper\BcPluginBaserHelperInterface;
 use Cake\View\Helper;
+use BaserCore\Annotation\UnitTest;
+use BaserCore\Annotation\NoTodo;
+use BaserCore\Annotation\Checked;
 
 /**
  * MailBaserHelper
@@ -34,6 +37,8 @@ class BcCustomContentBaserHelper extends Helper implements BcPluginBaserHelperIn
      * メソッド一覧取得
      *
      * @return array[]
+     * @checked
+     * @noTodo
      */
     public function methods(): array
     {