Merge branch 'dev-5' into dev5-baserproject#3010

katokaisya · Feb 2, 2024 · d18aec6 · d18aec6
2 parents 379e653 + 2eb1954
commit d18aec6
Show file tree

Hide file tree

Showing 238 changed files with 3,847 additions and 3,936 deletions.
diff --git a/.github/workflows/split_monorepo.yml b/.github/workflows/split_monorepo.yml
@@ -24,7 +24,7 @@ jobs:
                         local_path: 'bc-blog'
                         split_repository: 'bc-blog'
                     -
-                        local_path: 'bc-column'
+                        local_path: 'BcColumn'
                         split_repository: 'bc-column'
                     -
                         local_path: 'bc-content-link'

diff --git a/.gitignore b/.gitignore
@@ -75,6 +75,7 @@ nbproject/*
 !/plugins/bc-column
 !/plugins/BcPluginSample
 !/plugins/BcThemeSample
+!/plugins/BcColumn
 /plugins/*/vendor
 /plugins/*/composer.lock
 # vagrant

diff --git a/composer.json b/composer.json
@@ -6,9 +6,12 @@
     "license": "MIT",
     "require": {
         "php": ">=8.0",
+        "ext-gd": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*",
+        "ext-sqlite3": "*",
+        "ext-zip": "*",
         "cakephp/authentication": "^2.9",
         "cakephp/cakephp": "4.4.*",
         "cakephp/migrations": "^3.2",
@@ -19,6 +22,7 @@
         "mobiledetect/mobiledetectlib": "^2.8"
     },
     "require-dev": {
+        "ext-xdebug": "*",
         "cakephp/bake": "^2.6",
         "cakephp/debug_kit": "^4.5",
         "phpunit/phpunit": "^9.5",
@@ -38,7 +42,10 @@
             "BaserCore\\": "plugins/baser-core/src",
             "BcAdminThird\\": "plugins/bc-admin-third/src",
             "BcBlog\\": "plugins/bc-blog/src/",
-            "BcColumn\\": "plugins/bc-column/src/",
+            "BcColumn\\": [
+                "plugins/BcColumn/src/",
+                "plugins/bc-column/src/"
+            ],
             "BcContentLink\\": "plugins/bc-content-link/src/",
             "BcCustomContent\\": "plugins/bc-custom-content/src/",
             "BcEditorTemplate\\": "plugins/bc-editor-template/src/",
@@ -73,22 +80,22 @@
         }
     },
     "replace": {
-        "baserproject/baser-core": "5.0.7",
-        "baserproject/bc-admin-third": "5.0.7",
-        "baserproject/bc-blog": "5.0.7",
-        "baserproject/bc-column": "5.0.7",
-        "baserproject/bc-content-link": "5.0.7",
-        "baserproject/bc-custom-content": "5.0.7",
-        "baserproject/bc-editor-template": "5.0.7",
-        "baserproject/bc-favorite": "5.0.7",
-        "baserproject/bc-front": "5.0.7",
-        "baserproject/bc-installer": "5.0.7",
-        "baserproject/bc-mail": "5.0.7",
-        "baserproject/bc-search-index": "5.0.7",
-        "baserproject/bc-theme-config": "5.0.7",
-        "baserproject/bc-theme-file": "5.0.7",
-        "baserproject/bc-uploader": "5.0.7",
-        "baserproject/bc-widget-area": "5.0.7"
+        "baserproject/baser-core": "5.0.8",
+        "baserproject/bc-admin-third": "5.0.8",
+        "baserproject/bc-blog": "5.0.8",
+        "baserproject/bc-column": "5.0.8",
+        "baserproject/bc-content-link": "5.0.8",
+        "baserproject/bc-custom-content": "5.0.8",
+        "baserproject/bc-editor-template": "5.0.8",
+        "baserproject/bc-favorite": "5.0.8",
+        "baserproject/bc-front": "5.0.8",
+        "baserproject/bc-installer": "5.0.8",
+        "baserproject/bc-mail": "5.0.8",
+        "baserproject/bc-search-index": "5.0.8",
+        "baserproject/bc-theme-config": "5.0.8",
+        "baserproject/bc-theme-file": "5.0.8",
+        "baserproject/bc-uploader": "5.0.8",
+        "baserproject/bc-widget-area": "5.0.8"
     },
     "scripts": {
         "post-install-cmd": "App\\Console\\Installer::postInstall",