Merge branch 'dev-5' into dev-#2773

baserproject · Oct 9, 2023 · c800c80 · c800c80
2 parents dac78cd + 75afa7c
commit c800c80
Show file tree

Hide file tree

Showing 130 changed files with 1,949 additions and 1,537 deletions.
diff --git a/...core/src/Middleware/BcCacheDispatcher.php → ...core/src/Middleware/BcCacheDispatcher.php b/...core/src/Middleware/BcCacheDispatcher.php → ...core/src/Middleware/BcCacheDispatcher.php
@@ -9,8 +9,10 @@
  * @license       https://basercms.net/license/index.html MIT License
  */
 
-namespace BaserCore\Middleware;
+namespace Middleware;
 
+use BaserCore\Middleware\Configure;
+use BaserCore\Middleware\View;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;

diff --git a/composer.lock b/composer.lock
diff --git a/config/.env.example b/config/.env.example
@@ -13,7 +13,7 @@
 # In development .env files are parsed by PHP
 # and set into the environment. This provides a simpler
 # development workflow over standard environment variables.
-export APP_NAME="ucmitz"
+export APP_NAME="baserCMS"
 export DEBUG="false"
 export APP_ENCODING="UTF-8"
 export APP_DEFAULT_LOCALE="ja_JP"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,17 +1,17 @@
 {
-  "name": "ucmitz",
+  "name": "basercms",
   "version": "2.0.0",
-  "description": "Project to migrate baserCMS to CakePHP4",
+  "description": "baserCMS Project",
   "author": "NPO baser foundation",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/baserproject/ucmitz.git"
+    "url": "git+https://github.com/baserproject/basercms.git"
   },
   "bugs": {
-    "url": "https://github.com/baserproject/ucmitz/issues"
+    "url": "https://github.com/baserproject/basercms/issues"
   },
-  "homepage": "https://github.com/baserproject/ucmitz#readme",
+  "homepage": "https://github.com/baserproject/basercms#readme",
   "workspaces": [
     "plugins/bc-admin-third",
     "plugins/bc-front",

diff --git a/phpstan.neon b/phpstan.neon
diff --git a/plugins/baser-core/composer.json b/plugins/baser-core/composer.json
@@ -30,15 +30,18 @@
         "baserproject/bc-uploader": "^5.1",
         "baserproject/bc-widget-area": "^5.1",
         "imo-tikuwa/cakephp-soft-delete": "^2.0",
-        "ext-mbstring": "*"
+        "ext-mbstring": "*",
+        "ext-zip": "*",
+        "ext-gd": "*"
     },
     "require-dev": {
         "cakephp/bake": "^2.6",
         "cakephp/debug_kit": "^4.5",
         "phpunit/phpunit": "^9.5",
         "symplify/monorepo-builder": "^10.2",
         "vierge-noire/cakephp-fixture-factories": "^2.5",
-        "vierge-noire/cakephp-test-suite-light": "^2.0"
+        "vierge-noire/cakephp-test-suite-light": "^2.0",
+        "ext-xdebug": "*"
     },
     "autoload": {
         "psr-4": {

diff --git a/plugins/baser-core/src/BcPlugin.php b/plugins/baser-core/src/BcPlugin.php
@@ -72,9 +72,11 @@ public function initialize(): void
     /**
      * bootstrap
      *
-     * @param PluginApplicationInterface $application
+     * @param PluginApplicationInterface $app
+     * @checked
+     * @noTodo
      */
-    public function bootstrap(PluginApplicationInterface $application): void
+    public function bootstrap(PluginApplicationInterface $app): void
     {
         $pluginPath = BcUtil::getPluginPath($this->name);
         if (file_exists($pluginPath . 'config' . DS . 'setting.php')) {
@@ -86,7 +88,7 @@ public function bootstrap(PluginApplicationInterface $application): void
         }
         // 親の bootstrap は、setting の読み込みの後でなければならない
         // bootstrap 内で、setting の値を参照する場合があるため
-        parent::bootstrap($application);
+        parent::bootstrap($app);
     }
 
     /**
@@ -149,6 +151,8 @@ public function install($options = []): bool
      * マイグレーションを実行する
      *
      * @param array $options
+     * @checked
+     * @noTodo
      */
     public function migrate($options = [])
     {
@@ -163,6 +167,8 @@ public function migrate($options = [])
 
     /**
      * アップデートプログラムを実行する
+     * @checked
+     * @noTodo
      */
     public function execUpdater()
     {
@@ -437,6 +443,8 @@ public function routes(RouteBuilder $routes): void
      * @param RouteBuilder $routes
      * @param string $plugin
      * @return RouteBuilder
+     * @checked
+     * @noTodo
      */
     public function contentsRoutingForReverse(RouteBuilder $routes, string $plugin)
     {
@@ -463,6 +471,8 @@ function(RouteBuilder $routes) {
      * @param RouteBuilder $routes
      * @param string $plugin
      * @return RouteBuilder
+     * @checked
+     * @noTodo
      */
     public function frontPageRouting(RouteBuilder $routes, string $plugin)
     {
@@ -488,6 +498,8 @@ function(RouteBuilder $routes) {
      * @param RouteBuilder $routes
      * @param string $plugin
      * @return RouteBuilder
+     * @checked
+     * @noTodo
      */
     public function prefixRouting(RouteBuilder $routes, string $plugin)
     {
@@ -535,6 +547,8 @@ function(RouteBuilder $routes) use($isApi) {
      * @param RouteBuilder $routes
      * @param string $plugin
      * @return RouteBuilder
+     * @checked
+     * @noTodo
      */
     public function siteRouting(RouteBuilder $routes, string $plugin)
     {

diff --git a/plugins/baser-core/src/Command/ComposerCommand.php b/plugins/baser-core/src/Command/ComposerCommand.php
@@ -16,6 +16,9 @@
 use Cake\Console\Arguments;
 use Cake\Console\ConsoleIo;
 use Psr\Log\LogLevel;
+use BaserCore\Annotation\UnitTest;
+use BaserCore\Annotation\NoTodo;
+use BaserCore\Annotation\Checked;
 
 /**
  * ComposerCommand
@@ -28,6 +31,8 @@ class ComposerCommand extends Command
      *
      * @param \Cake\Console\ConsoleOptionParser $parser
      * @return \Cake\Console\ConsoleOptionParser
+     * @checked
+     * @noTodo
      */
     protected function buildOptionParser(\Cake\Console\ConsoleOptionParser $parser): \Cake\Console\ConsoleOptionParser
     {
@@ -49,6 +54,8 @@ protected function buildOptionParser(\Cake\Console\ConsoleOptionParser $parser):
      * @param Arguments $args
      * @param ConsoleIo $io
      * @return int|void|null
+     * @checked
+     * @noTodo
      */
     public function execute(Arguments $args, ConsoleIo $io)
     {

diff --git a/plugins/baser-core/src/Command/CreateReleaseCommand.php b/plugins/baser-core/src/Command/CreateReleaseCommand.php
@@ -33,6 +33,8 @@ class CreateReleaseCommand extends Command
      *
      * @param \Cake\Console\ConsoleOptionParser $parser
      * @return \Cake\Console\ConsoleOptionParser
+     * @checked
+     * @noTodo
      */
     protected function buildOptionParser(\Cake\Console\ConsoleOptionParser $parser): \Cake\Console\ConsoleOptionParser
     {
@@ -50,6 +52,8 @@ protected function buildOptionParser(\Cake\Console\ConsoleOptionParser $parser):
      * @param Arguments $args
      * @param ConsoleIo $io
      * @return int|void|null
+     * @checked
+     * @noTodo
      */
     public function execute(Arguments $args, ConsoleIo $io)
     {
@@ -89,6 +93,8 @@ public function execute(Arguments $args, ConsoleIo $io)
      * composer.json を配布用にセットアップする
      *
      * @param string $packagePath
+     * @checked
+     * @noTodo
      */
     public function setupComposer(string $packagePath)
     {
@@ -108,6 +114,8 @@ public function setupComposer(string $packagePath)
      * パッケージを GitHub よりクローンする
      *
      * @param string $packagePath
+     * @checked
+     * @noTodo
      */
     public function clonePackage(string $packagePath, string $branch)
     {
@@ -122,6 +130,8 @@ public function clonePackage(string $packagePath, string $branch)
      *
      * インストール時、　composer で vendor に配置するため
      * @param string $packagePath
+     * @checked
+     * @noTodo
      */
     public function deletePlugins(string $packagePath)
     {
@@ -139,6 +149,8 @@ public function deletePlugins(string $packagePath)
      * Zip ファイルに固める
      *
      * @param string $packagePath
+     * @checked
+     * @noTodo
      */
     public function createZip(string $packagePath)
     {
@@ -154,6 +166,8 @@ public function createZip(string $packagePath)
      * 配布用に不要なファイルを削除する
      *
      * @param string $packagePath
+     * @checked
+     * @noTodo
      */
     public function deleteExcludeFiles(string $packagePath)
     {

diff --git a/plugins/baser-core/src/Command/SetupInstallCommand.php b/plugins/baser-core/src/Command/SetupInstallCommand.php
@@ -17,6 +17,9 @@
 use Cake\Console\Arguments;
 use Cake\Console\ConsoleIo;
 use Cake\Filesystem\Folder;
+use BaserCore\Annotation\UnitTest;
+use BaserCore\Annotation\NoTodo;
+use BaserCore\Annotation\Checked;
 
 /**
  * SetupInstallCommand
@@ -35,6 +38,8 @@ class SetupInstallCommand extends Command
      * @param Arguments $args
      * @param ConsoleIo $io
      * @return int|void|null
+     * @checked
+     * @noTodo
      */
     public function execute(Arguments $args, ConsoleIo $io)
     {

diff --git a/plugins/baser-core/src/Command/SetupTestCommand.php b/plugins/baser-core/src/Command/SetupTestCommand.php
@@ -16,6 +16,9 @@
 use Cake\Command\Command;
 use Cake\Console\Arguments;
 use Cake\Console\ConsoleIo;
+use BaserCore\Annotation\UnitTest;
+use BaserCore\Annotation\NoTodo;
+use BaserCore\Annotation\Checked;
 
 /**
  * SetupTestCommand
@@ -34,6 +37,8 @@ class SetupTestCommand extends Command
      * @param Arguments $args
      * @param ConsoleIo $io
      * @return int|void|null
+     * @checked
+     * @noTodo
      */
     public function execute(Arguments $args, ConsoleIo $io)
     {

diff --git a/plugins/baser-core/src/Command/UpdateCommand.php b/plugins/baser-core/src/Command/UpdateCommand.php
@@ -37,6 +37,8 @@ class UpdateCommand extends Command
      *
      * @param \Cake\Console\ConsoleOptionParser $parser
      * @return \Cake\Console\ConsoleOptionParser
+     * @checked
+     * @noTodo
      */
     protected function buildOptionParser(\Cake\Console\ConsoleOptionParser $parser): \Cake\Console\ConsoleOptionParser
     {
@@ -53,6 +55,8 @@ protected function buildOptionParser(\Cake\Console\ConsoleOptionParser $parser):
      * @param Arguments $args
      * @param ConsoleIo $io
      * @return int|void|null
+     * @checked
+     * @noTodo
      */
     public function execute(Arguments $args, ConsoleIo $io)
     {

diff --git a/plugins/baser-core/src/Controller/Admin/BcAdminAppController.php b/plugins/baser-core/src/Controller/Admin/BcAdminAppController.php
@@ -61,6 +61,8 @@ public function initialize(): void
      * Before Filter
      * @param EventInterface $event
      * @return Response|void|null
+     * @checked
+     * @noTodo
      */
     public function beforeFilter(EventInterface $event)
     {
@@ -107,6 +109,8 @@ public function beforeRender(EventInterface $event): void
      * 初回アクセスメッセージ用のフラグを更新する
      *
      * @return void
+     * @checked
+     * @noTodo
      */
     private function __updateFirstAccess()
     {

diff --git a/plugins/baser-core/src/Controller/Api/Admin/BcAdminApiController.php b/plugins/baser-core/src/Controller/Api/Admin/BcAdminApiController.php
@@ -112,6 +112,8 @@ public function isAdminApiEnabled()
      * ない場合は、 true を返却する
      *
      * @return bool
+     * @noTodo
+     * @checked
      */
     public function isAvailableUser(): bool
     {

diff --git a/plugins/baser-core/src/Controller/Api/Admin/ContentsController.php b/plugins/baser-core/src/Controller/Api/Admin/ContentsController.php
@@ -119,6 +119,8 @@ public function index(ContentsServiceInterface $service)
      *
      * @param ContentsService $service
      * @return void
+     * @checked
+     * @noTodo
      */
     public function index_trash(ContentsServiceInterface $service)
     {

diff --git a/plugins/baser-core/src/Controller/Api/Admin/JwksController.php b/plugins/baser-core/src/Controller/Api/Admin/JwksController.php
@@ -25,6 +25,8 @@ class JwksController extends BcAdminApiController
 
     /**
      * Initialize
+     * @checked
+     * @noTodo
      */
     public function initialize(): void
     {
@@ -37,6 +39,8 @@ public function initialize(): void
      *
      * # PHPでの検証コード例
      * JWT::decode($jwt, JWK::parseKeySet($keys), [Configure::read('Jwt.algorithm')])
+     * @checked
+     * @noTodo
      */
     public function index()
     {

diff --git a/plugins/baser-core/src/Controller/Api/Admin/PluginsController.php b/plugins/baser-core/src/Controller/Api/Admin/PluginsController.php
@@ -368,6 +368,8 @@ public function batch(PluginsServiceInterface $service)
      * 取得可能なコアのバージョン情報を取得
      *
      * @param PluginsServiceInterface $service
+     * @checked
+     * @noTodo
      */
     public function get_available_core_version_info(PluginsServiceInterface $service)
     {

diff --git a/plugins/baser-core/src/Controller/Api/Admin/SiteConfigsController.php b/plugins/baser-core/src/Controller/Api/Admin/SiteConfigsController.php
@@ -42,6 +42,8 @@ public function view(SiteConfigsServiceInterface $service) {
     /**
      * システム基本設定を編集する
      * @param SiteConfigsServiceInterface $service
+     * @checked
+     * @noTodo
      */
     public function edit(SiteConfigsServiceInterface $service)
     {

diff --git a/plugins/baser-core/src/Controller/Api/Admin/ThemesController.php b/plugins/baser-core/src/Controller/Api/Admin/ThemesController.php
@@ -165,6 +165,7 @@ public function copy(ThemesServiceInterface $service, $theme)
      * [API] テーマの初期データを読み込むAPIを実装
      * @param ThemesServiceInterface $service
      * @noTodo
+     * @checked
      */
     public function load_default_data(ThemesServiceInterface $service)
     {

diff --git a/plugins/baser-core/src/Controller/AppController.php b/plugins/baser-core/src/Controller/AppController.php
@@ -191,6 +191,8 @@ public function beforeFilter(EventInterface $event)
      * 現在アクセスしているURLについて権限があるかどうかを確認する。
      *
      * @return bool
+     * @noTodo
+     * @checked
      */
     private function checkPermission()
     {