diff --git a/.github/workflows/split_monorepo.yml b/.github/workflows/split_monorepo.yml
index c02b00173a..14bfcfa7cb 100644
--- a/.github/workflows/split_monorepo.yml
+++ b/.github/workflows/split_monorepo.yml
@@ -1,95 +1,95 @@
name: 'Packages Split'
on:
- push:
- branches:
- - master
- tags:
- - '*'
+ push:
+ branches:
+ - 5.0.x
+ - 5.1.x
+ tags:
+ - '*'
jobs:
- packages_split:
- runs-on: ubuntu-latest
- environment: develop
- strategy:
- fail-fast: false
- matrix:
- package:
- -
- local_path: 'baser-core'
- split_repository: 'baser-core'
- -
- local_path: 'bc-admin-third'
- split_repository: 'bc-admin-third'
- -
- local_path: 'bc-blog'
- split_repository: 'bc-blog'
- -
- local_path: 'BcColumn'
- split_repository: 'bc-column'
- -
- local_path: 'bc-content-link'
- split_repository: 'bc-content-link'
- -
- local_path: 'bc-custom-content'
- split_repository: 'bc-custom-content'
- -
- local_path: 'bc-editor-template'
- split_repository: 'bc-editor-template'
- -
- local_path: 'bc-favorite'
- split_repository: 'bc-favorite'
- -
- local_path: 'bc-front'
- split_repository: 'bc-front'
- -
- local_path: 'bc-installer'
- split_repository: 'bc-installer'
- -
- local_path: 'bc-mail'
- split_repository: 'bc-mail'
- -
- local_path: 'bc-search-index'
- split_repository: 'bc-search-index'
- -
- local_path: 'bc-theme-config'
- split_repository: 'bc-theme-config'
- -
- local_path: 'bc-theme-file'
- split_repository: 'bc-theme-file'
- -
- local_path: 'bc-uploader'
- split_repository: 'bc-uploader'
- -
- local_path: 'bc-widget-area'
- split_repository: 'bc-widget-area'
- steps:
- - uses: actions/checkout@v3
- # no tag
- -
- if: "!startsWith(github.ref, 'refs/tags/')"
- name: Monorepo Split of ${{ matrix.package }}
- uses: "symplify/monorepo-split-github-action@v2.3.0"
- env:
- GITHUB_TOKEN: ${{ secrets.TOKEN }}
- with:
- package_directory: 'plugins/${{ matrix.package.local_path }}'
- repository_organization: 'baserproject'
- repository_name: '${{ matrix.package.split_repository }}'
- branch: "master"
- user_name: "ryuring"
- user_email: "ryuring55@gmail.com"
- # with tag
- -
- if: "startsWith(github.ref, 'refs/tags/')"
- name: Monorepo Tagged Split of ${{ matrix.package }}
- uses: "symplify/monorepo-split-github-action@v2.3.0"
- env:
- GITHUB_TOKEN: ${{ secrets.TOKEN }}
- with:
- tag: ${GITHUB_REF#refs/tags/}
- package_directory: 'plugins/${{ matrix.package.local_path }}'
- repository_organization: 'baserproject'
- repository_name: '${{ matrix.package.split_repository }}'
- branch: "master"
- user_name: "ryuring"
- user_email: "ryuring55@gmail.com"
+ packages_split:
+ runs-on: ubuntu-latest
+ environment: develop
+ strategy:
+ fail-fast: false
+ matrix:
+ package:
+ - local_path: 'baser-core'
+ split_repository: 'baser-core'
+ - local_path: 'bc-admin-third'
+ split_repository: 'bc-admin-third'
+ - local_path: 'bc-blog'
+ split_repository: 'bc-blog'
+ - local_path: 'BcColumn'
+ split_repository: 'bc-column'
+ - local_path: 'bc-content-link'
+ split_repository: 'bc-content-link'
+ - local_path: 'bc-custom-content'
+ split_repository: 'bc-custom-content'
+ - local_path: 'bc-editor-template'
+ split_repository: 'bc-editor-template'
+ - local_path: 'bc-favorite'
+ split_repository: 'bc-favorite'
+ - local_path: 'bc-front'
+ split_repository: 'bc-front'
+ - local_path: 'bc-installer'
+ split_repository: 'bc-installer'
+ - local_path: 'bc-mail'
+ split_repository: 'bc-mail'
+ - local_path: 'bc-search-index'
+ split_repository: 'bc-search-index'
+ - local_path: 'bc-theme-config'
+ split_repository: 'bc-theme-config'
+ - local_path: 'bc-theme-file'
+ split_repository: 'bc-theme-file'
+ - local_path: 'bc-uploader'
+ split_repository: 'bc-uploader'
+ - local_path: 'bc-widget-area'
+ split_repository: 'bc-widget-area'
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Monorepo Tagged Split Stable
+ # タグと安定版のブランチを分割する
+ if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref, '-')
+ uses: symplify/monorepo-split-github-action@v2.3.0
+ env:
+ GITHUB_TOKEN: ${{ secrets.TOKEN }}
+ with:
+ tag: ${GITHUB_REF#refs/tags/}
+ package_directory: 'plugins/${{ matrix.package.local_path }}'
+ repository_organization: 'baserproject'
+ repository_name: '${{ matrix.package.split_repository }}'
+ branch: "master"
+ user_name: "ryuring"
+ user_email: "ryuring55@gmail.com"
+
+ - name: Monorepo Tagged Split Alpha or Beta or Rc
+ # タグと開発版のブランチを分割する
+ if: startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-')
+ uses: symplify/monorepo-split-github-action@v2.3.0
+ env:
+ GITHUB_TOKEN: ${{ secrets.TOKEN }}
+ with:
+ tag: ${GITHUB_REF#refs/tags/}
+ package_directory: 'plugins/${{ matrix.package.local_path }}'
+ repository_organization: 'baserproject'
+ repository_name: '${{ matrix.package.split_repository }}'
+ branch: "dev-5"
+ user_name: "ryuring"
+ user_email: "ryuring55@gmail.com"
+
+ - name: Monorepo Split Develop
+ # 開発版のブランチのみを分割する
+ if: "!startsWith(github.ref, 'refs/tags/')"
+ uses: symplify/monorepo-split-github-action@v2.3.0
+ env:
+ GITHUB_TOKEN: ${{ secrets.TOKEN }}
+ with:
+ package_directory: 'plugins/${{ matrix.package.local_path }}'
+ repository_organization: 'baserproject'
+ repository_name: '${{ matrix.package.split_repository }}'
+ branch: ${{ github.ref_name }}
+ user_name: "ryuring"
+ user_email: "ryuring55@gmail.com"
diff --git a/composer.json b/composer.json
index 1a4bbfff7b..2bc221554b 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
"cakephp/cakephp-codesniffer": "^5.0",
"cakephp/debug_kit": "^5.0.0",
"phpunit/phpunit": "^10.1.0",
- "symplify/monorepo-builder": "^10.2",
+ "symplify/monorepo-builder": "^11.2",
"vierge-noire/cakephp-fixture-factories": "^3.0",
"vierge-noire/cakephp-test-suite-light": "^3.0"
},
@@ -51,13 +51,11 @@
"BcInstaller\\": "plugins/bc-installer/src/",
"BcMail\\": "plugins/bc-mail/src/",
"BcSearchIndex\\": "plugins/bc-search-index/src/",
- "BcSpaSample\\": "plugins/BcSpaSample/src/",
"BcThemeConfig\\": "plugins/bc-theme-config/src/",
"BcThemeFile\\": "plugins/bc-theme-file/src/",
"BcUploader\\": "plugins/bc-uploader/src/",
"BcWidgetArea\\": "plugins/bc-widget-area/src/",
- "Cake\\Routing\\": "plugins/baser-core/src/Routing",
- "SoftDelete\\": "plugins/cakephp-soft-delete/src"
+ "Cake\\Routing\\": "plugins/baser-core/src/Routing"
}
},
"autoload-dev": {
@@ -74,26 +72,25 @@
"BcThemeConfig\\Test\\": "plugins/bc-theme-config/tests/",
"BcThemeFile\\Test\\": "plugins/bc-theme-file/tests/",
"BcUploader\\Test\\": "plugins/bc-uploader/tests/",
- "BcWidgetArea\\Test\\": "plugins/bc-widget-area/tests/",
- "SoftDelete\\Test\\": "plugins/cakephp-soft-delete/tests"
+ "BcWidgetArea\\Test\\": "plugins/bc-widget-area/tests/"
}
},
"replace": {
- "baserproject/baser-core": "5.0.8",
- "baserproject/bc-admin-third": "5.0.8",
- "baserproject/bc-blog": "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"
+ "baserproject/baser-core": "5.0.19",
+ "baserproject/bc-admin-third": "5.0.19",
+ "baserproject/bc-blog": "5.0.19",
+ "baserproject/bc-content-link": "5.0.19",
+ "baserproject/bc-custom-content": "5.0.19",
+ "baserproject/bc-editor-template": "5.0.19",
+ "baserproject/bc-favorite": "5.0.19",
+ "baserproject/bc-front": "5.0.19",
+ "baserproject/bc-installer": "5.0.19",
+ "baserproject/bc-mail": "5.0.19",
+ "baserproject/bc-search-index": "5.0.19",
+ "baserproject/bc-theme-config": "5.0.19",
+ "baserproject/bc-theme-file": "5.0.19",
+ "baserproject/bc-uploader": "5.0.19",
+ "baserproject/bc-widget-area": "5.0.19"
},
"scripts": {
"post-install-cmd": "App\\Console\\Installer::postInstall",
@@ -123,7 +120,5 @@
"cakephp/plugin-installer": true,
"dealerdirect/phpcodesniffer-composer-installer": true
}
- },
- "minimum-stability": "dev",
- "prefer-stable": true
+ }
}
diff --git a/composer.lock b/composer.lock
index 575cfabeab..a776d7e895 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "fcf92a897ab19a065529bd8518c4275d",
+ "content-hash": "cdf6bae9f605f177c1eb7d1b7da875b0",
"packages": [
{
"name": "cakephp/authentication",
@@ -76,16 +76,16 @@
},
{
"name": "cakephp/cakephp",
- "version": "5.0.6",
+ "version": "5.0.8",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cakephp.git",
- "reference": "3f26c5bbbae99164852ba9607d11ff1b36fda1c9"
+ "reference": "160652e0b2c824c52b9a5bddbb7f84e7e1325927"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/cakephp/zipball/3f26c5bbbae99164852ba9607d11ff1b36fda1c9",
- "reference": "3f26c5bbbae99164852ba9607d11ff1b36fda1c9",
+ "url": "https://api.github.com/repos/cakephp/cakephp/zipball/160652e0b2c824c52b9a5bddbb7f84e7e1325927",
+ "reference": "160652e0b2c824c52b9a5bddbb7f84e7e1325927",
"shasum": ""
},
"require": {
@@ -193,7 +193,7 @@
"issues": "https://github.com/cakephp/cakephp/issues",
"source": "https://github.com/cakephp/cakephp"
},
- "time": "2024-03-09T03:36:26+00:00"
+ "time": "2024-05-11T02:52:43+00:00"
},
{
"name": "cakephp/chronos",
@@ -252,23 +252,23 @@
},
{
"name": "cakephp/migrations",
- "version": "4.2.0",
+ "version": "4.3.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/migrations.git",
- "reference": "2a5f996fb2accabf0635eb4125f369b542f2b943"
+ "reference": "c3eef97e5d214e7a859cce51f631cc50dd4e635d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/migrations/zipball/2a5f996fb2accabf0635eb4125f369b542f2b943",
- "reference": "2a5f996fb2accabf0635eb4125f369b542f2b943",
+ "url": "https://api.github.com/repos/cakephp/migrations/zipball/c3eef97e5d214e7a859cce51f631cc50dd4e635d",
+ "reference": "c3eef97e5d214e7a859cce51f631cc50dd4e635d",
"shasum": ""
},
"require": {
"cakephp/cache": "^5.0",
"cakephp/orm": "^5.0",
"php": ">=8.1",
- "robmorgan/phinx": "^0.15.3 || ^0.16.0"
+ "robmorgan/phinx": "^0.16.0"
},
"require-dev": {
"cakephp/bake": "^3.0",
@@ -308,7 +308,7 @@
"issues": "https://github.com/cakephp/migrations/issues",
"source": "https://github.com/cakephp/migrations"
},
- "time": "2024-02-20T23:13:52+00:00"
+ "time": "2024-05-13T15:47:20+00:00"
},
{
"name": "cakephp/plugin-installer",
@@ -1266,20 +1266,20 @@
},
{
"name": "psr/http-factory",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-factory.git",
- "reference": "e616d01114759c4c489f93b099585439f795fe35"
+ "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
- "reference": "e616d01114759c4c489f93b099585439f795fe35",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+ "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
"shasum": ""
},
"require": {
- "php": ">=7.0.0",
+ "php": ">=7.1",
"psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
@@ -1303,7 +1303,7 @@
"homepage": "https://www.php-fig.org/"
}
],
- "description": "Common interfaces for PSR-7 HTTP message factories",
+ "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
"keywords": [
"factory",
"http",
@@ -1315,9 +1315,9 @@
"response"
],
"support": {
- "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+ "source": "https://github.com/php-fig/http-factory"
},
- "time": "2023-04-10T20:10:41+00:00"
+ "time": "2024-04-15T12:06:14+00:00"
},
{
"name": "psr/http-message",
@@ -1588,16 +1588,16 @@
},
{
"name": "robmorgan/phinx",
- "version": "0.16.0",
+ "version": "0.16.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/phinx.git",
- "reference": "e039a723e9fe33e406102ac1c3dc0a54c031152f"
+ "reference": "6e522d638413bb20e42b17a65508784201bbc83e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/phinx/zipball/e039a723e9fe33e406102ac1c3dc0a54c031152f",
- "reference": "e039a723e9fe33e406102ac1c3dc0a54c031152f",
+ "url": "https://api.github.com/repos/cakephp/phinx/zipball/6e522d638413bb20e42b17a65508784201bbc83e",
+ "reference": "6e522d638413bb20e42b17a65508784201bbc83e",
"shasum": ""
},
"require": {
@@ -1668,22 +1668,22 @@
],
"support": {
"issues": "https://github.com/cakephp/phinx/issues",
- "source": "https://github.com/cakephp/phinx/tree/0.16.0"
+ "source": "https://github.com/cakephp/phinx/tree/0.16.1"
},
- "time": "2024-01-24T05:06:44+00:00"
+ "time": "2024-06-03T14:23:41+00:00"
},
{
"name": "symfony/config",
- "version": "v6.4.4",
+ "version": "v6.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "6ea4affc27f2086c9d16b92ab5429ce1e3c38047"
+ "reference": "12e7e52515ce37191b193cf3365903c4f3951e35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/6ea4affc27f2086c9d16b92ab5429ce1e3c38047",
- "reference": "6ea4affc27f2086c9d16b92ab5429ce1e3c38047",
+ "url": "https://api.github.com/repos/symfony/config/zipball/12e7e52515ce37191b193cf3365903c4f3951e35",
+ "reference": "12e7e52515ce37191b193cf3365903c4f3951e35",
"shasum": ""
},
"require": {
@@ -1729,7 +1729,7 @@
"description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/config/tree/v6.4.4"
+ "source": "https://github.com/symfony/config/tree/v6.4.8"
},
"funding": [
{
@@ -1745,20 +1745,20 @@
"type": "tidelift"
}
],
- "time": "2024-02-26T07:52:26+00:00"
+ "time": "2024-05-31T14:49:08+00:00"
},
{
"name": "symfony/console",
- "version": "v6.4.4",
+ "version": "v6.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "0d9e4eb5ad413075624378f474c4167ea202de78"
+ "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78",
- "reference": "0d9e4eb5ad413075624378f474c4167ea202de78",
+ "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91",
+ "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91",
"shasum": ""
},
"require": {
@@ -1823,7 +1823,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.4.4"
+ "source": "https://github.com/symfony/console/tree/v6.4.8"
},
"funding": [
{
@@ -1839,20 +1839,20 @@
"type": "tidelift"
}
],
- "time": "2024-02-22T20:27:10+00:00"
+ "time": "2024-05-31T14:49:08+00:00"
},
{
"name": "symfony/deprecation-contracts",
- "version": "v3.4.0",
+ "version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+ "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
- "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+ "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
"shasum": ""
},
"require": {
@@ -1861,7 +1861,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.4-dev"
+ "dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -1890,7 +1890,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
},
"funding": [
{
@@ -1906,20 +1906,20 @@
"type": "tidelift"
}
],
- "time": "2023-05-23T14:45:45+00:00"
+ "time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v6.4.3",
+ "version": "v6.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb"
+ "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
- "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d37529150e7081c51b3c5d5718c55a04a9503f3",
+ "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3",
"shasum": ""
},
"require": {
@@ -1927,6 +1927,9 @@
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.8"
},
+ "require-dev": {
+ "symfony/process": "^5.4|^6.4|^7.0"
+ },
"type": "library",
"autoload": {
"psr-4": {
@@ -1953,7 +1956,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v6.4.3"
+ "source": "https://github.com/symfony/filesystem/tree/v6.4.8"
},
"funding": [
{
@@ -1969,20 +1972,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-23T14:51:35+00:00"
+ "time": "2024-05-31T14:49:08+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.29.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+ "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
+ "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
"shasum": ""
},
"require": {
@@ -2032,7 +2035,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
},
"funding": [
{
@@ -2048,20 +2051,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.29.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+ "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
+ "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
"shasum": ""
},
"require": {
@@ -2110,7 +2113,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
},
"funding": [
{
@@ -2126,20 +2129,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.29.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+ "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+ "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
"shasum": ""
},
"require": {
@@ -2191,7 +2194,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
},
"funding": [
{
@@ -2207,20 +2210,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.29.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+ "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+ "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
"shasum": ""
},
"require": {
@@ -2271,7 +2274,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
},
"funding": [
{
@@ -2287,25 +2290,26 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-06-19T12:30:46+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v3.4.1",
+ "version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+ "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
- "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+ "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
"shasum": ""
},
"require": {
"php": ">=8.1",
- "psr/container": "^1.1|^2.0"
+ "psr/container": "^1.1|^2.0",
+ "symfony/deprecation-contracts": "^2.5|^3"
},
"conflict": {
"ext-psr": "<1.1|>=2"
@@ -2313,7 +2317,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.4-dev"
+ "dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -2353,7 +2357,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
},
"funding": [
{
@@ -2369,20 +2373,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-26T14:02:43+00:00"
+ "time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/string",
- "version": "v6.4.4",
+ "version": "v6.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9"
+ "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
- "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
+ "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d",
+ "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d",
"shasum": ""
},
"require": {
@@ -2439,7 +2443,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.4.4"
+ "source": "https://github.com/symfony/string/tree/v6.4.8"
},
"funding": [
{
@@ -2455,7 +2459,7 @@
"type": "tidelift"
}
],
- "time": "2024-02-01T13:16:41+00:00"
+ "time": "2024-05-31T14:49:08+00:00"
}
],
"packages-dev": [
@@ -2745,16 +2749,16 @@
},
{
"name": "composer/class-map-generator",
- "version": "1.1.1",
+ "version": "1.3.4",
"source": {
"type": "git",
"url": "https://github.com/composer/class-map-generator.git",
- "reference": "8286a62d243312ed99b3eee20d5005c961adb311"
+ "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8286a62d243312ed99b3eee20d5005c961adb311",
- "reference": "8286a62d243312ed99b3eee20d5005c961adb311",
+ "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
+ "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
"shasum": ""
},
"require": {
@@ -2798,7 +2802,7 @@
],
"support": {
"issues": "https://github.com/composer/class-map-generator/issues",
- "source": "https://github.com/composer/class-map-generator/tree/1.1.1"
+ "source": "https://github.com/composer/class-map-generator/tree/1.3.4"
},
"funding": [
{
@@ -2814,28 +2818,28 @@
"type": "tidelift"
}
],
- "time": "2024-03-15T12:53:41+00:00"
+ "time": "2024-06-12T14:13:04+00:00"
},
{
"name": "composer/composer",
- "version": "2.7.2",
+ "version": "2.7.7",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "b826edb791571ab1eaf281eb1bd6e181a1192adc"
+ "reference": "291942978f39435cf904d33739f98d7d4eca7b23"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/b826edb791571ab1eaf281eb1bd6e181a1192adc",
- "reference": "b826edb791571ab1eaf281eb1bd6e181a1192adc",
+ "url": "https://api.github.com/repos/composer/composer/zipball/291942978f39435cf904d33739f98d7d4eca7b23",
+ "reference": "291942978f39435cf904d33739f98d7d4eca7b23",
"shasum": ""
},
"require": {
"composer/ca-bundle": "^1.0",
- "composer/class-map-generator": "^1.0",
+ "composer/class-map-generator": "^1.3.3",
"composer/metadata-minifier": "^1.0",
"composer/pcre": "^2.1 || ^3.1",
- "composer/semver": "^3.2.5",
+ "composer/semver": "^3.3",
"composer/spdx-licenses": "^1.5.7",
"composer/xdebug-handler": "^2.0.2 || ^3.0.3",
"justinrainbow/json-schema": "^5.2.11",
@@ -2854,11 +2858,11 @@
"symfony/process": "^5.4 || ^6.0 || ^7"
},
"require-dev": {
- "phpstan/phpstan": "^1.9.3",
- "phpstan/phpstan-deprecation-rules": "^1",
- "phpstan/phpstan-phpunit": "^1.0",
- "phpstan/phpstan-strict-rules": "^1",
- "phpstan/phpstan-symfony": "^1.2.10",
+ "phpstan/phpstan": "^1.11.0",
+ "phpstan/phpstan-deprecation-rules": "^1.2.0",
+ "phpstan/phpstan-phpunit": "^1.4.0",
+ "phpstan/phpstan-strict-rules": "^1.6.0",
+ "phpstan/phpstan-symfony": "^1.4.0",
"symfony/phpunit-bridge": "^6.4.1 || ^7.0.1"
},
"suggest": {
@@ -2912,7 +2916,7 @@
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"security": "https://github.com/composer/composer/security/policy",
- "source": "https://github.com/composer/composer/tree/2.7.2"
+ "source": "https://github.com/composer/composer/tree/2.7.7"
},
"funding": [
{
@@ -2928,7 +2932,7 @@
"type": "tidelift"
}
],
- "time": "2024-03-11T16:12:18+00:00"
+ "time": "2024-06-10T20:11:12+00:00"
},
{
"name": "composer/metadata-minifier",
@@ -3001,16 +3005,16 @@
},
{
"name": "composer/pcre",
- "version": "3.1.3",
+ "version": "3.1.4",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
+ "reference": "04229f163664973f68f38f6f73d917799168ef24"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
- "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24",
+ "reference": "04229f163664973f68f38f6f73d917799168ef24",
"shasum": ""
},
"require": {
@@ -3052,7 +3056,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.3"
+ "source": "https://github.com/composer/pcre/tree/3.1.4"
},
"funding": [
{
@@ -3068,7 +3072,7 @@
"type": "tidelift"
}
],
- "time": "2024-03-19T10:26:25+00:00"
+ "time": "2024-05-27T13:40:54+00:00"
},
{
"name": "composer/semver",
@@ -3233,16 +3237,16 @@
},
{
"name": "composer/xdebug-handler",
- "version": "3.0.3",
+ "version": "3.0.5",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+ "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
- "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+ "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
"shasum": ""
},
"require": {
@@ -3253,7 +3257,7 @@
"require-dev": {
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-strict-rules": "^1.1",
- "symfony/phpunit-bridge": "^6.0"
+ "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
},
"type": "library",
"autoload": {
@@ -3277,9 +3281,9 @@
"performance"
],
"support": {
- "irc": "irc://irc.freenode.org/composer",
+ "irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/xdebug-handler/issues",
- "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+ "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
},
"funding": [
{
@@ -3295,7 +3299,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-25T21:32:43+00:00"
+ "time": "2024-05-06T16:37:16+00:00"
},
{
"name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -3377,23 +3381,26 @@
},
{
"name": "doctrine/sql-formatter",
- "version": "1.2.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/sql-formatter.git",
- "reference": "a321d114e0a18e6497f8a2cd6f890e000cc17ecc"
+ "reference": "d1ac84aef745c69ea034929eb6d65a6908b675cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/a321d114e0a18e6497f8a2cd6f890e000cc17ecc",
- "reference": "a321d114e0a18e6497f8a2cd6f890e000cc17ecc",
+ "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/d1ac84aef745c69ea034929eb6d65a6908b675cc",
+ "reference": "d1ac84aef745c69ea034929eb6d65a6908b675cc",
"shasum": ""
},
"require": {
- "php": "^7.1 || ^8.0"
+ "php": "^8.1"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.4"
+ "doctrine/coding-standard": "^12",
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^10.5",
+ "vimeo/psalm": "^5.24"
},
"bin": [
"bin/sql-formatter"
@@ -3423,9 +3430,9 @@
],
"support": {
"issues": "https://github.com/doctrine/sql-formatter/issues",
- "source": "https://github.com/doctrine/sql-formatter/tree/1.2.0"
+ "source": "https://github.com/doctrine/sql-formatter/tree/1.4.0"
},
- "time": "2023-08-16T21:49:04+00:00"
+ "time": "2024-05-08T08:12:09+00:00"
},
{
"name": "fakerphp/faker",
@@ -3559,12 +3566,12 @@
"version": "v5.2.13",
"source": {
"type": "git",
- "url": "https://github.com/justinrainbow/json-schema.git",
+ "url": "https://github.com/jsonrainbow/json-schema.git",
"reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
+ "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
"reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
"shasum": ""
},
@@ -3619,23 +3626,23 @@
"schema"
],
"support": {
- "issues": "https://github.com/justinrainbow/json-schema/issues",
- "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+ "issues": "https://github.com/jsonrainbow/json-schema/issues",
+ "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13"
},
"time": "2023-09-26T02:20:38+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.11.1",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+ "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+ "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
"shasum": ""
},
"require": {
@@ -3643,11 +3650,12 @@
},
"conflict": {
"doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ "doctrine/common": "<2.13.3 || >=3 <3.2.2"
},
"require-dev": {
"doctrine/collections": "^1.6.8",
"doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpspec/prophecy": "^1.10",
"phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"type": "library",
@@ -3673,7 +3681,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
},
"funding": [
{
@@ -3681,7 +3689,7 @@
"type": "tidelift"
}
],
- "time": "2023-03-08T13:26:56+00:00"
+ "time": "2024-06-12T14:39:25+00:00"
},
{
"name": "nikic/php-parser",
@@ -3859,16 +3867,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.27.0",
+ "version": "1.29.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757"
+ "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757",
- "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4",
+ "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4",
"shasum": ""
},
"require": {
@@ -3900,9 +3908,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1"
},
- "time": "2024-03-21T13:14:53+00:00"
+ "time": "2024-05-31T08:52:43+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -4227,16 +4235,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "10.5.15",
+ "version": "10.5.23",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "86376e05e8745ed81d88232ff92fee868247b07b"
+ "reference": "12826591cc32fa0959b7e7577a90c3f527e377b2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86376e05e8745ed81d88232ff92fee868247b07b",
- "reference": "86376e05e8745ed81d88232ff92fee868247b07b",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12826591cc32fa0959b7e7577a90c3f527e377b2",
+ "reference": "12826591cc32fa0959b7e7577a90c3f527e377b2",
"shasum": ""
},
"require": {
@@ -4308,7 +4316,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.15"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.23"
},
"funding": [
{
@@ -4324,20 +4332,20 @@
"type": "tidelift"
}
],
- "time": "2024-03-22T04:17:47+00:00"
+ "time": "2024-06-20T07:29:28+00:00"
},
{
"name": "react/promise",
- "version": "v3.1.0",
+ "version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
- "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c"
+ "reference": "8a164643313c71354582dc850b42b33fa12a4b63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c",
- "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c",
+ "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63",
+ "reference": "8a164643313c71354582dc850b42b33fa12a4b63",
"shasum": ""
},
"require": {
@@ -4389,7 +4397,7 @@
],
"support": {
"issues": "https://github.com/reactphp/promise/issues",
- "source": "https://github.com/reactphp/promise/tree/v3.1.0"
+ "source": "https://github.com/reactphp/promise/tree/v3.2.0"
},
"funding": [
{
@@ -4397,7 +4405,7 @@
"type": "open_collective"
}
],
- "time": "2023-11-16T16:21:57+00:00"
+ "time": "2024-05-24T10:39:05+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -5555,16 +5563,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.9.0",
+ "version": "3.10.1",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
+ "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
- "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
+ "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
"shasum": ""
},
"require": {
@@ -5631,20 +5639,20 @@
"type": "open_collective"
}
],
- "time": "2024-02-16T15:06:51+00:00"
+ "time": "2024-05-22T21:24:41+00:00"
},
{
"name": "symfony/finder",
- "version": "v6.4.0",
+ "version": "v6.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
+ "reference": "3ef977a43883215d560a2cecb82ec8e62131471c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
- "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c",
+ "reference": "3ef977a43883215d560a2cecb82ec8e62131471c",
"shasum": ""
},
"require": {
@@ -5679,7 +5687,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v6.4.0"
+ "source": "https://github.com/symfony/finder/tree/v6.4.8"
},
"funding": [
{
@@ -5695,20 +5703,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-31T17:30:12+00:00"
+ "time": "2024-05-31T14:49:08+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.29.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
+ "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
- "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/ec444d3f3f6505bb28d11afa41e75faadebc10a1",
+ "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1",
"shasum": ""
},
"require": {
@@ -5755,7 +5763,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.30.0"
},
"funding": [
{
@@ -5771,20 +5779,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.29.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+ "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
- "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
+ "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
"shasum": ""
},
"require": {
@@ -5835,7 +5843,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
},
"funding": [
{
@@ -5851,20 +5859,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.29.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
+ "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
- "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
+ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af",
+ "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af",
"shasum": ""
},
"require": {
@@ -5911,7 +5919,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0"
},
"funding": [
{
@@ -5927,20 +5935,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-06-19T12:30:46+00:00"
},
{
"name": "symfony/process",
- "version": "v6.4.4",
+ "version": "v6.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "710e27879e9be3395de2b98da3f52a946039f297"
+ "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297",
- "reference": "710e27879e9be3395de2b98da3f52a946039f297",
+ "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5",
+ "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5",
"shasum": ""
},
"require": {
@@ -5972,7 +5980,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v6.4.4"
+ "source": "https://github.com/symfony/process/tree/v6.4.8"
},
"funding": [
{
@@ -5988,20 +5996,20 @@
"type": "tidelift"
}
],
- "time": "2024-02-20T12:31:00+00:00"
+ "time": "2024-05-31T14:49:08+00:00"
},
{
"name": "symplify/monorepo-builder",
- "version": "10.3.3",
+ "version": "11.2.20",
"source": {
"type": "git",
"url": "https://github.com/symplify/monorepo-builder.git",
- "reference": "5f97613a2015b74aa86a7330b47a88c283877fd4"
+ "reference": "444efe08701776cb1a03b9f3600e715697519aa6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symplify/monorepo-builder/zipball/5f97613a2015b74aa86a7330b47a88c283877fd4",
- "reference": "5f97613a2015b74aa86a7330b47a88c283877fd4",
+ "url": "https://api.github.com/repos/symplify/monorepo-builder/zipball/444efe08701776cb1a03b9f3600e715697519aa6",
+ "reference": "444efe08701776cb1a03b9f3600e715697519aa6",
"shasum": ""
},
"require": {
@@ -6016,13 +6024,19 @@
"dev-main": "10.3-dev"
}
},
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ]
+ },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Prefixed version of Not only Composer tools to build a Monorepo.",
"support": {
- "source": "https://github.com/symplify/monorepo-builder/tree/10.3.3"
+ "issues": "https://github.com/symplify/monorepo-builder/issues",
+ "source": "https://github.com/symplify/monorepo-builder/tree/11.2.20"
},
"funding": [
{
@@ -6034,7 +6048,7 @@
"type": "github"
}
],
- "time": "2022-06-13T14:01:16+00:00"
+ "time": "2023-11-17T08:30:16+00:00"
},
{
"name": "theseer/tokenizer",
@@ -6088,20 +6102,21 @@
},
{
"name": "twig/markdown-extra",
- "version": "v3.8.0",
+ "version": "v3.10.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/markdown-extra.git",
- "reference": "b6e4954ab60030233df5d293886b5404558daac8"
+ "reference": "e4bf2419df819dcf9dc7a0b25dd8cd1092cbd86d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/b6e4954ab60030233df5d293886b5404558daac8",
- "reference": "b6e4954ab60030233df5d293886b5404558daac8",
+ "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/e4bf2419df819dcf9dc7a0b25dd8cd1092cbd86d",
+ "reference": "e4bf2419df819dcf9dc7a0b25dd8cd1092cbd86d",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
+ "symfony/deprecation-contracts": "^2.5|^3",
"twig/twig": "^3.0"
},
"require-dev": {
@@ -6113,6 +6128,9 @@
},
"type": "library",
"autoload": {
+ "files": [
+ "Resources/functions.php"
+ ],
"psr-4": {
"Twig\\Extra\\Markdown\\": ""
},
@@ -6140,7 +6158,7 @@
"twig"
],
"support": {
- "source": "https://github.com/twigphp/markdown-extra/tree/v3.8.0"
+ "source": "https://github.com/twigphp/markdown-extra/tree/v3.10.0"
},
"funding": [
{
@@ -6152,34 +6170,41 @@
"type": "tidelift"
}
],
- "time": "2023-11-21T14:02:01+00:00"
+ "time": "2024-05-11T07:35:57+00:00"
},
{
"name": "twig/twig",
- "version": "v3.8.0",
+ "version": "v3.10.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d"
+ "reference": "67f29781ffafa520b0bbfbd8384674b42db04572"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
- "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572",
+ "reference": "67f29781ffafa520b0bbfbd8384674b42db04572",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
+ "symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-php80": "^1.22"
},
"require-dev": {
"psr/container": "^1.0|^2.0",
- "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0"
+ "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
},
"type": "library",
"autoload": {
+ "files": [
+ "src/Resources/core.php",
+ "src/Resources/debug.php",
+ "src/Resources/escaper.php",
+ "src/Resources/string_loader.php"
+ ],
"psr-4": {
"Twig\\": "src/"
}
@@ -6212,7 +6237,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v3.8.0"
+ "source": "https://github.com/twigphp/Twig/tree/v3.10.3"
},
"funding": [
{
@@ -6224,7 +6249,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-21T18:54:41+00:00"
+ "time": "2024-05-16T10:04:27+00:00"
},
{
"name": "vierge-noire/cakephp-fixture-factories",
@@ -6345,9 +6370,9 @@
}
],
"aliases": [],
- "minimum-stability": "dev",
+ "minimum-stability": "stable",
"stability-flags": [],
- "prefer-stable": true,
+ "prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": ">=8.1",
diff --git a/config/bootstrap.php b/config/bootstrap.php
index 48a880120f..8bf0f4aa6a 100644
--- a/config/bootstrap.php
+++ b/config/bootstrap.php
@@ -49,8 +49,11 @@
/**
* Load global functions.
*/
-require CAKE . 'functions.php';
-
+if(file_exists(CAKE . 'functions.php')) {
+ require CAKE . 'functions.php';
+} else {
+ trigger_error('フレームワーク「CakePHP」がインストールされていないか、古いバージョンを利用しています。処理を終了します。', E_USER_ERROR);
+}
/*
* See https://github.com/josegonzalez/php-dotenv for API details.
*
diff --git a/monorepo-builder.php b/monorepo-builder.php
index 7fe8b55173..e553068a8b 100644
--- a/monorepo-builder.php
+++ b/monorepo-builder.php
@@ -2,47 +2,43 @@
declare(strict_types=1);
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection;
-use Symplify\MonorepoBuilder\Release\ReleaseWorker\AddTagToChangelogReleaseWorker;
-use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushNextDevReleaseWorker;
-use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushTagReleaseWorker;
+use Symplify\MonorepoBuilder\ComposerJsonManipulator\ValueObject\ComposerJsonSection;
+use Symplify\MonorepoBuilder\Config\MBConfig;
use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetCurrentMutualDependenciesReleaseWorker;
-use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetNextMutualDependenciesReleaseWorker;
-use Symplify\MonorepoBuilder\Release\ReleaseWorker\TagVersionReleaseWorker;
-use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateBranchAliasReleaseWorker;
use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateReplaceReleaseWorker;
-use Symplify\MonorepoBuilder\ValueObject\Option;
-return static function (ContainerConfigurator $containerConfigurator): void {
- $parameters = $containerConfigurator->parameters();
-
- $parameters->set(Option::PACKAGE_DIRECTORIES, [
- // custom
- __DIR__ . '/plugins',
- ]);
-
- $parameters->set(Option::PACKAGE_DIRECTORIES_EXCLUDES, [
+return static function (MBConfig $mbConfig): void {
+ $mbConfig->packageDirectories([__DIR__ . '/plugins']);
+ $version = (!empty($_SERVER['argv'][2]))? $_SERVER['argv'][2] : '';
+ if(!$version) return;
+ $mbConfig->packageDirectoriesExcludes([
__DIR__ . '/plugins/BcThemeSample',
__DIR__ . '/plugins/BcPluginSample',
+ __DIR__ . '/plugins/BcColumn',
]);
-
// for "merge" command
- $parameters->set(Option::DATA_TO_APPEND, [
+ $mbConfig->dataToAppend([
ComposerJsonSection::REQUIRE_DEV => [
'phpunit/phpunit' => '^10.1.0',
+ 'symplify/monorepo-builder' => '^11.2',
],
]);
- $services = $containerConfigurator->services();
-
- # release workers - in order to execute
- $services->set(UpdateReplaceReleaseWorker::class);
- $services->set(SetCurrentMutualDependenciesReleaseWorker::class);
- $services->set(AddTagToChangelogReleaseWorker::class);
- $services->set(TagVersionReleaseWorker::class);
- $services->set(PushTagReleaseWorker::class);
- $services->set(SetNextMutualDependenciesReleaseWorker::class);
- $services->set(UpdateBranchAliasReleaseWorker::class);
- $services->set(PushNextDevReleaseWorker::class);
+ if(preg_match('/^([0-9]+\.[0-9]+\.[0-9]+|patch)$/', $version)) {
+ /**
+ * 正式リリース
+ * タグの送信とマスタの送信
+ */
+ $mbConfig->defaultBranch('master');
+ $mbConfig->workers([
+ UpdateReplaceReleaseWorker::class,
+ SetCurrentMutualDependenciesReleaseWorker::class,
+ ]);
+ } elseif(preg_match('/^[0-9]+\.[0-9]+\.[0-9]+-(alpha|beta|rc)/', $version)) {
+ /**
+ * alpha / beta / rc
+ * タグの送信のみ
+ */
+ $mbConfig->defaultBranch('dev-5');
+ }
};
diff --git a/plugins/BcColumn/composer.json b/plugins/BcColumn/composer.json
deleted file mode 100755
index 1de2387731..0000000000
--- a/plugins/BcColumn/composer.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "name": "baserproject/bc-column",
- "description": "BcContentLink plugin for baserCMS",
- "homepage": "https://basercms.net",
- "type": "cakephp-plugin",
- "license": "MIT",
- "vendor-dir": "../../vendor",
- "autoload": {
- "psr-4": {
- "BcColumn\\": "src/"
- }
- }
-}
diff --git a/plugins/BcColumn/config/data/default/BaserCore/pages.csv b/plugins/BcColumn/config/data/default/BaserCore/pages.csv
index c17f90cbd6..2154f8e8f5 100755
--- a/plugins/BcColumn/config/data/default/BaserCore/pages.csv
+++ b/plugins/BcColumn/config/data/default/BaserCore/pages.csv
@@ -88,6 +88,12 @@ id,contents,draft,page_template,modified,created
そして、基本的なパーツレイアウトが揃っているので、簡単にブログや固定ページを追加することができます。
パーツデザインのページをご参考ください。
+
+
+
+コピーライトの変更について
+
+フッターに記載しているコピーライトについては自由に変更が可能です。
",,,,
3,"見出し２
diff --git a/plugins/BcColumn/config/data/default/BcThemeConfig/theme_configs.csv b/plugins/BcColumn/config/data/default/BcThemeConfig/theme_configs.csv
index adde17dd74..49b4df85d8 100755
--- a/plugins/BcColumn/config/data/default/BcThemeConfig/theme_configs.csv
+++ b/plugins/BcColumn/config/data/default/BcThemeConfig/theme_configs.csv
@@ -1,24 +1,24 @@
id,name,value,created,modified
-1,logo,logo.png,,
+1,logo,,,
2,logo_alt,baserCMS,,
3,logo_link,/,,
-4,main_image_1,main_image_1.jpg,,
+4,main_image_1,,,
5,main_image_alt_1,コーポレートサイトにちょうどいい国産CMS,,
6,main_image_link_1,/,,
-7,main_image_2,main_image_2.jpg,,
+7,main_image_2,,,
8,main_image_alt_2,全て日本語の国産CMSだから、設置も更新も簡単、わかりやすい。,,
9,main_image_link_2,/,,
-10,main_image_3,main_image_3.jpg,,
+10,main_image_3,,,
11,main_image_alt_3,標準的なWebサイトに必要な基本機能を全て装備,,
12,main_image_link_3,/,,
-13,main_image_4,main_image_4.jpg,,
+13,main_image_4,,,
14,main_image_alt_4,デザインも自由自在にカスタマイズ可能！,,
15,main_image_link_4,/,,
16,main_image_5,,,
17,main_image_alt_5,質問・ご相談はユーザーズフォーラムへ,,
18,main_image_link_5,/,,
-19,color_main,0,,
+19,color_main,000000,,
20,color_sub,95979e,,
-21,color_link,,,
-22,color_hover,,,
+21,color_link,000000,,
+22,color_hover,666666,,
23,logo_delete,0,,
diff --git a/plugins/BcColumn/src/Plugin.php b/plugins/BcColumn/src/BcColumnPlugin.php
similarity index 91%
rename from plugins/BcColumn/src/Plugin.php
rename to plugins/BcColumn/src/BcColumnPlugin.php
index 29a55b57a1..084c6f176d 100644
--- a/plugins/BcColumn/src/Plugin.php
+++ b/plugins/BcColumn/src/BcColumnPlugin.php
@@ -17,4 +17,4 @@
/**
* plugin for BcColumn
*/
-class Plugin extends BcPlugin {}
+class BcColumnPlugin extends BcPlugin {}
diff --git a/plugins/BcColumn/templates/element/blog_comments.php b/plugins/BcColumn/templates/element/blog_comments.php
index cf5fb05d0d..d6b0035505 100644
--- a/plugins/BcColumn/templates/element/blog_comments.php
+++ b/plugins/BcColumn/templates/element/blog_comments.php
@@ -1,6 +1,8 @@
comment_use) return;
$captchaId = mt_rand(0, 99999999);
@@ -27,7 +29,6 @@
?>
-comment_use): ?>