From d272bfe1e4060be71b3da2917bb7517eb6b06fab Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Fri, 29 Mar 2024 23:37:47 +0800 Subject: [PATCH] refactor: simplify ImageMagickHandler::getVersion() --- system/Images/Handlers/ImageMagickHandler.php | 8 +++----- tests/system/Images/ImageMagickHandlerTest.php | 9 ++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php index cb8ce9bae763..0291fe784740 100644 --- a/system/Images/Handlers/ImageMagickHandler.php +++ b/system/Images/Handlers/ImageMagickHandler.php @@ -167,12 +167,10 @@ protected function _flip(string $direction) */ public function getVersion(): string { - $result = $this->process('-version'); + $versionString = $this->process('-version')[0]; + preg_match('/ImageMagick\s(?P[\S]+)/', $versionString, $matches); - // The first line has the version in it... - preg_match('/(ImageMagick\s[\S]+)/', $result[0], $matches); - - return str_replace('ImageMagick ', '', $matches[0]); + return $matches['version']; } /** diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php index b313fef96275..e02836693b44 100644 --- a/tests/system/Images/ImageMagickHandlerTest.php +++ b/tests/system/Images/ImageMagickHandlerTest.php @@ -80,11 +80,10 @@ protected function setUp(): void public function testGetVersion(): void { $version = $this->handler->getVersion(); - // make sure that the call worked - $this->assertNotFalse($version); - // we should have a numeric version, greater than 6 - $this->assertGreaterThanOrEqual(0, version_compare($version, '6.0.0')); - $this->assertLessThan(0, version_compare($version, '99.0.0')); + + $this->assertNotSame('', $version); + $this->assertTrue(version_compare($version, '6.0.0', '>')); + $this->assertTrue(version_compare($version, '99.0.0', '<')); } public function testImageProperties(): void