Merge branch 'dev-5.1' into 5.1.x

baserproject · Jun 22, 2024 · 7f7a0c3 · 7f7a0c3
2 parents a2a4f22 + 45a47a9
commit 7f7a0c3
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 1,304 deletions.
diff --git a/plugins/baser-core/composer.json b/plugins/baser-core/composer.json
@@ -16,20 +16,20 @@
         "josegonzalez/dotenv": "^3.2",
         "mobiledetect/mobiledetectlib": "^4.8.03",
         "ext-json": "*",
-        "baserproject/bc-admin-third": "^5.1",
-        "baserproject/bc-blog": "^5.1",
-        "baserproject/bc-content-link": "^5.1",
-        "baserproject/bc-custom-content": "^5.1",
-        "baserproject/bc-editor-template": "^5.1",
-        "baserproject/bc-favorite": "^5.1",
-        "baserproject/bc-front": "^5.1",
-        "baserproject/bc-installer": "^5.1",
-        "baserproject/bc-mail": "^5.1",
-        "baserproject/bc-search-index": "^5.1",
-        "baserproject/bc-theme-config": "^5.1",
-        "baserproject/bc-theme-file": "^5.1",
-        "baserproject/bc-uploader": "^5.1",
-        "baserproject/bc-widget-area": "^5.1",
+        "baserproject/bc-admin-third": "5.1.x",
+        "baserproject/bc-blog": "5.1.x",
+        "baserproject/bc-content-link": "5.1.x",
+        "baserproject/bc-custom-content": "5.1.x",
+        "baserproject/bc-editor-template": "5.1.x",
+        "baserproject/bc-favorite": "5.1.x",
+        "baserproject/bc-front": "5.1.x",
+        "baserproject/bc-installer": "5.1.x",
+        "baserproject/bc-mail": "5.1.x",
+        "baserproject/bc-search-index": "5.1.x",
+        "baserproject/bc-theme-config": "5.1.x",
+        "baserproject/bc-theme-file": "5.1.x",
+        "baserproject/bc-uploader": "5.1.x",
+        "baserproject/bc-widget-area": "5.1.x",
         "ext-mbstring": "*",
         "ext-zip": "*",
         "ext-gd": "*"

diff --git a/plugins/baser-core/config/update/5.1.0/src/Application.php b/plugins/baser-core/config/update/5.1.0/src/Application.php
diff --git a/plugins/baser-core/src/Error/MissingColumnException.php b/plugins/baser-core/src/Error/MissingColumnException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * baserCMS :  Based Website Development Project <https://basercms.net>
+ * Copyright (c) NPO baser foundation <https://baserfoundation.org/>
+ *
+ * @copyright     Copyright (c) NPO baser foundation
+ * @link          https://basercms.net baserCMS Project
+ * @since         5.0.0
+ * @license       https://basercms.net/license/index.html MIT License
+ */
+namespace BaserCore\Error;
+
+use Cake\Core\Exception\CakeException;
+
+/**
+ * MissingColumnException
+ */
+class MissingColumnException extends CakeException
+{
+}
diff --git a/plugins/baser-core/src/Model/Table/ContentsTable.php b/plugins/baser-core/src/Model/Table/ContentsTable.php
@@ -26,7 +26,6 @@
 use BaserCore\Model\Entity\Content;
 use Cake\Datasource\EntityInterface;
 use Cake\Datasource\ConnectionManager;
-use SoftDelete\Model\Table\SoftDeleteTrait;
 
 /**
  * Class ContentsTable

diff --git a/...elete/src/Model/Table/SoftDeleteTrait.php → ...-core/src/Model/Table/SoftDeleteTrait.php b/...elete/src/Model/Table/SoftDeleteTrait.php → ...-core/src/Model/Table/SoftDeleteTrait.php
@@ -1,18 +1,31 @@
 <?php
-namespace SoftDelete\Model\Table;
+/**
+ * baserCMS :  Based Website Development Project <https://basercms.net>
+ * Copyright (c) NPO baser foundation <https://baserfoundation.org/>
+ *
+ * @copyright     Copyright (c) NPO baser foundation
+ * @link          https://basercms.net baserCMS Project
+ * @since         5.0.0
+ * @license       https://basercms.net/license/index.html MIT License
+ */
+
+namespace BaserCore\Model\Table;
 
 use Cake\ORM\RulesChecker;
 use Cake\Datasource\EntityInterface;
-use SoftDelete\Error\MissingColumnException;
-use SoftDelete\ORM\SelectQuery;
+use BaserCore\Error\MissingColumnException;
+use BaserCore\ORM\SelectQuery;
 
+/**
+ * SoftDeleteTrait
+ */
 trait SoftDeleteTrait
 {
     /**
      * Get the configured deletion field
      *
      * @return string
-     * @throws \SoftDelete\Error\MissingColumnException
+     * @throws \BaserCore\Error\MissingColumnException
      */
     public function getSoftDeleteField()
     {
@@ -41,7 +54,7 @@ public function getSoftDeleteField()
      * Fatal error: Declaration of SoftDelete\Model\Table\SoftDeleteTrait::query(): SoftDelete\ORM\Query must be compatible with Cake\ORM\Table::query(): Cake\ORM\Query
      * 上記エラー回避のため戻り値の型宣言では実体と異なるがCakePHP本体のquery()で定義されている上書き元の型（\Cake\ORM\Query）を明示する
      *
-     * @return \SoftDelete\ORM\SelectQuery
+     * @return \BaserCore\ORM\SelectQuery
      */
     public function SelectQuery(): SelectQuery
     {

diff --git a/...kephp-soft-delete/src/ORM/SelectQuery.php → plugins/baser-core/src/ORM/SelectQuery.php b/...kephp-soft-delete/src/ORM/SelectQuery.php → plugins/baser-core/src/ORM/SelectQuery.php
@@ -1,5 +1,5 @@
 <?php
-namespace SoftDelete\ORM;
+namespace BaserCore\ORM;
 
 use Cake\ORM\Query\SelectQuery as CakeQuery;
 

diff --git a/plugins/bc-blog/src/Model/Table/BlogCategoriesTable.php b/plugins/bc-blog/src/Model/Table/BlogCategoriesTable.php
@@ -22,7 +22,6 @@
 use BaserCore\Annotation\NoTodo;
 use BaserCore\Annotation\Checked;
 use BaserCore\Annotation\UnitTest;
-use SoftDelete\ORM\SelectQuery;
 
 /**
  * BlogCategoriesTable

diff --git a/plugins/cakephp-soft-delete/.gitignore b/plugins/cakephp-soft-delete/.gitignore
diff --git a/plugins/cakephp-soft-delete/.travis.yml b/plugins/cakephp-soft-delete/.travis.yml