Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"josegonzalez/dotenv": "~4.0.0",
"league/oauth2-server": "^8.5",
"logiscape/mcp-sdk-php": "^2.0",
"mobiledetect/mobiledetectlib": "~3.74.4",
"mobiledetect/mobiledetectlib": "~4.8.03",
"nikic/php-parser": "~5.8.0",
"nyholm/psr7": "^1.8",
"psr/http-message": "~1.1",
Expand Down
32 changes: 16 additions & 16 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/baser-core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"firebase/php-jwt": "~7.0.2",
"ezyang/htmlpurifier": "~4.19.0",
"robmorgan/phinx": "0.16.10",
"mobiledetect/mobiledetectlib": "~3.74.4",
"mobiledetect/mobiledetectlib": "~4.8.03",
"nikic/php-parser": "~5.8.0",
"cakephp/debug_kit": "~5.2.4",
"ext-json": "*",
Expand Down
4 changes: 4 additions & 0 deletions plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ public function test_require()
$data = str_replace('"cakephp/migrations": "~4.9.7"', '"cakephp/migrations": "^4.0.0"', $data);
// CakePHP5.0.10 と共存できる cakephp/bake(3.0.1〜3.1.1)は nikic/php-parser 4系を要求するため緩和する
$data = str_replace('"nikic/php-parser": "~5.8.0"', '"nikic/php-parser": "^4.13.2 || ^5.0"', $data);
// baserCMS5.1系は mobiledetect/mobiledetectlib 3系を要求するため緩和する
$data = str_replace('"mobiledetect/mobiledetectlib": "~4.8.03"', '"mobiledetect/mobiledetectlib": "^3.74 || ^4.8"', $data);
$data = preg_replace($regex, '', $data);
$file->write($data);
BcComposer::setup('php');
Expand Down Expand Up @@ -205,6 +207,8 @@ public function testUpdate()
$data = str_replace('"cakephp/migrations": "~4.9.7"', '"cakephp/migrations": "^4.0.0"', $data);
// CakePHP5.0.10 と共存できる cakephp/bake(3.0.1〜3.1.1)は nikic/php-parser 4系を要求するため緩和する
$data = str_replace('"nikic/php-parser": "~5.8.0"', '"nikic/php-parser": "^4.13.2 || ^5.0"', $data);
// baserCMS5.1系は mobiledetect/mobiledetectlib 3系を要求するため緩和する
$data = str_replace('"mobiledetect/mobiledetectlib": "~4.8.03"', '"mobiledetect/mobiledetectlib": "^3.74 || ^4.8"', $data);
$data = preg_replace($regex, '', $data);
$file->write($data);
BcComposer::setup('php');
Expand Down
Loading