From 16d34e7e9f9cf962d91784b3d05f1f8a7e48ac3f Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 4 Sep 2026 08:37:35 +0000 Subject: [PATCH 1/3] =?UTF-8?q?fix=20#3908=20mobiledetect/mobiledetectlib?= =?UTF-8?q?=20=E3=81=AE=E8=A6=81=E6=B1=82=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=20^4.8.03=20=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cakephp/app の最新に合わせて 3.74.4 系から 4.x 系へ更新する。 Detection\MobileDetect の isMobile()/isTablet() は引き続き利用可能で、 既存のモバイル/タブレット判定処理に変更は不要。 Co-Authored-By: Claude Sonnet 5 --- composer.json | 2 +- composer.lock | 32 ++++++++++++++++---------------- plugins/baser-core/composer.json | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 6b4ab50003..2cfa5df6ea 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/composer.lock b/composer.lock index 99807f66cb..9502ea7004 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": "80cd980b6461e29399a8145f4d316722", + "content-hash": "87edb7b36b7ee9e8b18d913fe639c73a", "packages": [ { "name": "cakephp/authentication", @@ -2496,34 +2496,34 @@ }, { "name": "mobiledetect/mobiledetectlib", - "version": "3.74.4", + "version": "4.9.0", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "e72098eba91e5f16278b17d42ca193ae71e4ae0a" + "reference": "992cc85e34887b090b073b46bde6d5087c908e10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/e72098eba91e5f16278b17d42ca193ae71e4ae0a", - "reference": "e72098eba91e5f16278b17d42ca193ae71e4ae0a", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/992cc85e34887b090b073b46bde6d5087c908e10", + "reference": "992cc85e34887b090b073b46bde6d5087c908e10", "shasum": "" }, "require": { - "php": ">=7.4" + "php": ">=8.0", + "psr/simple-cache": "3.0.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.14", - "phpunit/phpunit": "^9.6", - "squizlabs/php_codesniffer": "^3.7" + "friendsofphp/php-cs-fixer": "3.95.1", + "phpbench/phpbench": "1.6.1", + "phpstan/phpstan": "2.1.47", + "phpunit/phpunit": "9.6.34", + "squizlabs/php_codesniffer": "3.13.5" }, "type": "library", "autoload": { "psr-4": { "Detection\\": "src/" - }, - "classmap": [ - "src/MobileDetect.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2533,7 +2533,7 @@ { "name": "Serban Ghita", "email": "serbanghita@gmail.com", - "homepage": "https://mobiledetect.net", + "homepage": "http://mobiledetect.net", "role": "Developer" } ], @@ -2548,7 +2548,7 @@ ], "support": { "issues": "https://github.com/serbanghita/Mobile-Detect/issues", - "source": "https://github.com/serbanghita/Mobile-Detect/tree/3.74.4" + "source": "https://github.com/serbanghita/Mobile-Detect/tree/4.9.0" }, "funding": [ { @@ -2556,7 +2556,7 @@ "type": "github" } ], - "time": "2026-04-15T08:43:14+00:00" + "time": "2026-04-23T12:32:05+00:00" }, { "name": "nikic/php-parser", diff --git a/plugins/baser-core/composer.json b/plugins/baser-core/composer.json index e90a43703a..d08455bfe2 100644 --- a/plugins/baser-core/composer.json +++ b/plugins/baser-core/composer.json @@ -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": "*", From bb3290973d65013eb1d0b3f3c3d114a45c850e91 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 10 Sep 2026 01:16:56 +0000 Subject: [PATCH 2/3] =?UTF-8?q?fix=20#3908=20mobiledetect/mobiledetectlib?= =?UTF-8?q?=20=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=82=92=E3=83=91=E3=83=83=E3=83=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E3=81=AE=E3=81=BF=E3=81=AB=E5=88=B6=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit レビュー指摘により、^4.8.03 だとマイナーバージョンまで自動で 上がってしまうため、パッチバージョンまでしか上がらない ~4.8.03 に変更する。 Co-Authored-By: Claude Sonnet 5 --- composer.json | 2 +- composer.lock | 26 +++++++++++++------------- plugins/baser-core/composer.json | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 2cfa5df6ea..5e708545b9 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "josegonzalez/dotenv": "~4.0.0", "league/oauth2-server": "^8.5", "logiscape/mcp-sdk-php": "^2.0", - "mobiledetect/mobiledetectlib": "^4.8.03", + "mobiledetect/mobiledetectlib": "~4.8.03", "nikic/php-parser": "~5.8.0", "nyholm/psr7": "^1.8", "psr/http-message": "~1.1", diff --git a/composer.lock b/composer.lock index 9502ea7004..1046b6d379 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": "87edb7b36b7ee9e8b18d913fe639c73a", + "content-hash": "5222a64f5f5496f0ecd5ecd6083c5deb", "packages": [ { "name": "cakephp/authentication", @@ -2496,28 +2496,28 @@ }, { "name": "mobiledetect/mobiledetectlib", - "version": "4.9.0", + "version": "4.8.10", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "992cc85e34887b090b073b46bde6d5087c908e10" + "reference": "96b1e1fa9a968de7660a031106ab529f659d0192" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/992cc85e34887b090b073b46bde6d5087c908e10", - "reference": "992cc85e34887b090b073b46bde6d5087c908e10", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/96b1e1fa9a968de7660a031106ab529f659d0192", + "reference": "96b1e1fa9a968de7660a031106ab529f659d0192", "shasum": "" }, "require": { "php": ">=8.0", - "psr/simple-cache": "3.0.0" + "psr/simple-cache": "^3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "3.95.1", - "phpbench/phpbench": "1.6.1", - "phpstan/phpstan": "2.1.47", - "phpunit/phpunit": "9.6.34", - "squizlabs/php_codesniffer": "3.13.5" + "friendsofphp/php-cs-fixer": "^v3.75.0", + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^2.1.11", + "phpunit/phpunit": "^9.6.22", + "squizlabs/php_codesniffer": "^3.12.1" }, "type": "library", "autoload": { @@ -2548,7 +2548,7 @@ ], "support": { "issues": "https://github.com/serbanghita/Mobile-Detect/issues", - "source": "https://github.com/serbanghita/Mobile-Detect/tree/4.9.0" + "source": "https://github.com/serbanghita/Mobile-Detect/tree/4.8.10" }, "funding": [ { @@ -2556,7 +2556,7 @@ "type": "github" } ], - "time": "2026-04-23T12:32:05+00:00" + "time": "2026-01-09T16:21:59+00:00" }, { "name": "nikic/php-parser", diff --git a/plugins/baser-core/composer.json b/plugins/baser-core/composer.json index d08455bfe2..229f3fe698 100644 --- a/plugins/baser-core/composer.json +++ b/plugins/baser-core/composer.json @@ -15,7 +15,7 @@ "firebase/php-jwt": "~7.0.2", "ezyang/htmlpurifier": "~4.19.0", "robmorgan/phinx": "0.16.10", - "mobiledetect/mobiledetectlib": "^4.8.03", + "mobiledetect/mobiledetectlib": "~4.8.03", "nikic/php-parser": "~5.8.0", "cakephp/debug_kit": "~5.2.4", "ext-json": "*", From 36f5130f72404480b3c4f2815861715e6895c269 Mon Sep 17 00:00:00 2001 From: ryuring Date: Sat, 26 Sep 2026 14:54:33 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20#3908=20BcComposerTest=20=E3=81=A7=20?= =?UTF-8?q?baserCMS=205.1=20=E7=B3=BB=E3=81=AB=E6=88=BB=E3=81=99=E9=9A=9B?= =?UTF-8?q?=E3=81=AB=20mobiledetect=20=E3=81=AE=E5=88=B6=E7=B4=84=E3=82=82?= =?UTF-8?q?=E7=B7=A9=E5=92=8C=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit baserCMS 5.1 系（baser-core 5.1.1 / 5.1.2）は mobiledetect/mobiledetectlib ^3.74 を要求するため、 root の ~4.8.03 のままだと composer require が失敗していた。 Co-Authored-By: Claude Opus 5.5 --- plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php b/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php index eea0c01669..ec6df13f09 100644 --- a/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php +++ b/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php @@ -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'); @@ -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');