From 228ebb5c90b8e32ac71e842183766fc71b12c8e9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 21 Aug 2022 07:39:46 +0900 Subject: [PATCH 1/3] test: extract setUp() --- tests/AutoReview/ComposerJsonTest.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/AutoReview/ComposerJsonTest.php b/tests/AutoReview/ComposerJsonTest.php index 2d205c5fc872..fd69aa71226d 100644 --- a/tests/AutoReview/ComposerJsonTest.php +++ b/tests/AutoReview/ComposerJsonTest.php @@ -24,25 +24,30 @@ */ final class ComposerJsonTest extends TestCase { - public function testFrameworkRequireIsTheSameWithDevRequire(): void + private array $devComposer; + private array $frameworkComposer; + + protected function setUp(): void { - $devComposer = $this->getComposerJson(dirname(__DIR__, 2) . '/composer.json'); - $frameworkComposer = $this->getComposerJson(dirname(__DIR__, 2) . '/admin/framework/composer.json'); + parent::setUp(); + + $this->devComposer = $this->getComposerJson(dirname(__DIR__, 2) . '/composer.json'); + $this->frameworkComposer = $this->getComposerJson(dirname(__DIR__, 2) . '/admin/framework/composer.json'); + } + public function testFrameworkRequireIsTheSameWithDevRequire(): void + { $this->assertSame( - $devComposer['require'], - $frameworkComposer['require'], + $this->devComposer['require'], + $this->frameworkComposer['require'], 'The framework\'s "require" section is not updated with the main composer.json.' ); } public function testFrameworkRequireDevIsTheSameWithDevRequireDev(): void { - $devComposer = $this->getComposerJson(dirname(__DIR__, 2) . '/composer.json'); - $frameworkComposer = $this->getComposerJson(dirname(__DIR__, 2) . '/admin/framework/composer.json'); - - $devRequireDev = $devComposer['require-dev']; - $fwRequireDev = $frameworkComposer['require-dev']; + $devRequireDev = $this->devComposer['require-dev']; + $fwRequireDev = $this->frameworkComposer['require-dev']; foreach ($devRequireDev as $dependency => $expectedVersion) { if (! isset($fwRequireDev[$dependency])) { From 0d14a5388593ffa22449faf4ae98073b1acd0248 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 21 Aug 2022 07:49:09 +0900 Subject: [PATCH 2/3] test: add check for "suggest" --- tests/AutoReview/ComposerJsonTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/AutoReview/ComposerJsonTest.php b/tests/AutoReview/ComposerJsonTest.php index fd69aa71226d..27044861b72f 100644 --- a/tests/AutoReview/ComposerJsonTest.php +++ b/tests/AutoReview/ComposerJsonTest.php @@ -67,6 +67,15 @@ public function testFrameworkRequireDevIsTheSameWithDevRequireDev(): void } } + public function testFrameworkSuggestIsTheSameWithDevSuggest(): void + { + $this->assertSame( + $this->devComposer['suggest'], + $this->frameworkComposer['suggest'], + 'The framework\'s "suggest" section is not updated with the main composer.json.' + ); + } + private function getComposerJson(string $path): array { try { From 2de8ab452a3adfc3e94e6b9e5128ad36d5e864f5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 21 Aug 2022 07:50:25 +0900 Subject: [PATCH 3/3] chore: update framework/composer.json --- admin/framework/composer.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index 95ea60802e1c..78bd71deb0c0 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -24,7 +24,18 @@ "predis/predis": "^1.1 || ^2.0" }, "suggest": { - "ext-fileinfo": "Improves mime type detection for files" + "ext-imagick": "If you use Image class ImageMagickHandler", + "ext-simplexml": "If you format XML", + "ext-mysqli": "If you use MySQL", + "ext-oci8": "If you use Oracle Database", + "ext-pgsql": "If you use PostgreSQL", + "ext-sqlsrv": "If you use SQL Server", + "ext-sqlite3": "If you use SQLite3", + "ext-memcache": "If you use Cache class MemcachedHandler with Memcache", + "ext-memcached": "If you use Cache class MemcachedHandler with Memcached", + "ext-redis": "If you use Cache class RedisHandler", + "ext-fileinfo": "Improves mime type detection for files", + "ext-readline": "Improves CLI::input() usability" }, "autoload": { "psr-4": {