Merge branch '5.1.x' into fix-3703-2

.github/workflows/php_documentor.yml

@@ -31,7 +31,7 @@ jobs:
           cp docker-compose.yml.default docker-compose.yml
           sed -i -e "s/basercms:php8.1/basercms:php${{ matrix.php-version }}/g" docker-compose.yml
           sed -i -e "s/XDEBUG_MODE: \"debug\"/XDEBUG_MODE: \"off\"/g" docker-compose.yml
-          docker-compose up -d
+          docker compose up -d
 
       - name: PhpDocumentor
         run: |

README.md

@@ -8,7 +8,7 @@
     <img alt="Software License" src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square">
 </a>
     <a href="https://github.com/baserproject/basercms/actions/workflows/test.yml" target="_blank">
-        <img alt="Build Status" src="https://github.com/baserproject/basercms/actions/workflows/test.yml/badge.svg?branch=dev-5">
+        <img alt="Build Status" src="https://github.com/baserproject/basercms/actions/workflows/test.yml/badge.svg?branch=5.1.x">
     </a>
 </p>
 
@@ -30,7 +30,7 @@ Some Handy Links
 - See [baserCMS Users Community](https://basercms.net/community/)
 - See [CakePHP - the rapid development PHP framework](https://cakephp.org)
 
-Get Support!
+Get Support
 -------------
 
 - See [baserCMS Users Forum](https://forum.basercms.net/)

composer.json

@@ -2,8 +2,8 @@
     "name": "baserproject/basercms",
     "description": "baserCMS plugin for CakePHP",
     "homepage": "https://basercms.net",
-    "type": "project",
     "license": "MIT",
+    "type": "project",
     "require": {
         "php": ">=8.1",
         "ext-gd": "*",
@@ -26,24 +26,18 @@
         "cakephp/cakephp-codesniffer": "^5.0",
         "cakephp/debug_kit": "^5.0.0",
         "josegonzalez/dotenv": "^4.0",
-        "phpunit/phpunit": "^10.1.0",
+        "phpunit/phpunit": "10.5.31",
         "symplify/monorepo-builder": "^11.2",
         "vierge-noire/cakephp-fixture-factories": "^3.0",
         "vierge-noire/cakephp-test-suite-light": "^3.0"
     },
-    "suggest": {
-        "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
-        "dereuromark/cakephp-ide-helper": "After baking your code, this keeps your annotations in sync with the code evolving from there on for maximum IDE and PHPStan/Psalm compatibility.",
-        "phpstan/phpstan": "PHPStan focuses on finding errors in your code without actually running it. It catches whole classes of bugs even before you write tests for the code.",
-        "cakephp/repl": "Console tools for a REPL interface for CakePHP applications."
-    },
     "autoload": {
         "psr-4": {
             "App\\": "src/",
             "BaserCore\\": "plugins/baser-core/src",
             "BcAdminThird\\": "plugins/bc-admin-third/src",
-            "BcColumn\\": "plugins/BcColumn/src/",
             "BcBlog\\": "plugins/bc-blog/src/",
+            "BcColumn\\": "plugins/BcColumn/src/",
             "BcContentLink\\": "plugins/bc-content-link/src/",
             "BcCustomContent\\": "plugins/bc-custom-content/src/",
             "BcEditorTemplate\\": "plugins/bc-editor-template/src/",
@@ -78,26 +72,6 @@
             "BcWidgetArea\\Test\\": "plugins/bc-widget-area/tests/"
         }
     },
-    "replace": {
-        "baserproject/baser-core": "5.1.0",
-        "baserproject/bc-admin-third": "5.1.0",
-        "baserproject/bc-blog": "5.1.0",
-        "baserproject/bc-column": "5.1.0",
-        "baserproject/bc-content-link": "5.1.0",
-        "baserproject/bc-custom-content": "5.1.0",
-        "baserproject/bc-editor-template": "5.1.0",
-        "baserproject/bc-favorite": "5.1.0",
-        "baserproject/bc-front": "5.1.0",
-        "baserproject/bc-installer": "5.1.0",
-        "baserproject/bc-mail": "5.1.0",
-        "baserproject/bc-plugin-sample": "5.1.0",
-        "baserproject/bc-search-index": "5.1.0",
-        "baserproject/bc-theme-config": "5.1.0",
-        "baserproject/bc-theme-file": "5.1.0",
-        "baserproject/bc-theme-sample": "5.1.0",
-        "baserproject/bc-uploader": "5.1.0",
-        "baserproject/bc-widget-area": "5.1.0"
-    },
     "scripts": {
         "post-install-cmd": "App\\Console\\Installer::postInstall",
         "post-update-cmd": "App\\Console\\Installer::postInstall",
@@ -120,11 +94,37 @@
             "vendor/bin/phpunit --colors=always"
         ]
     },
+    "suggest": {
+        "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
+        "dereuromark/cakephp-ide-helper": "After baking your code, this keeps your annotations in sync with the code evolving from there on for maximum IDE and PHPStan/Psalm compatibility.",
+        "phpstan/phpstan": "PHPStan focuses on finding errors in your code without actually running it. It catches whole classes of bugs even before you write tests for the code.",
+        "cakephp/repl": "Console tools for a REPL interface for CakePHP applications."
+    },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
             "cakephp/plugin-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
+    },
+    "replace": {
+        "baserproject/baser-core": "5.1.1",
+        "baserproject/bc-admin-third": "5.1.1",
+        "baserproject/bc-blog": "5.1.1",
+        "baserproject/bc-column": "5.1.1",
+        "baserproject/bc-content-link": "5.1.1",
+        "baserproject/bc-custom-content": "5.1.1",
+        "baserproject/bc-editor-template": "5.1.1",
+        "baserproject/bc-favorite": "5.1.1",
+        "baserproject/bc-front": "5.1.1",
+        "baserproject/bc-installer": "5.1.1",
+        "baserproject/bc-mail": "5.1.1",
+        "baserproject/bc-plugin-sample": "5.1.1",
+        "baserproject/bc-search-index": "5.1.1",
+        "baserproject/bc-theme-config": "5.1.1",
+        "baserproject/bc-theme-file": "5.1.1",
+        "baserproject/bc-theme-sample": "5.1.1",
+        "baserproject/bc-uploader": "5.1.1",
+        "baserproject/bc-widget-area": "5.1.1"
     }
 }