Merge pull request #8681 from paulbalandan/imagemagick-getversion

refactor: simplify ImageMagickHandler::getVersion()
codeigniter4 · Mar 30, 2024 · 7ca24b2 · 7ca24b2
2 parents f22b8cf + d272bfe
commit 7ca24b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
@@ -181,12 +181,10 @@ protected function _flip(string $direction)
      */
     public function getVersion(): string
     {
-        $result = $this->process('-version');
+        $versionString = $this->process('-version')[0];
+        preg_match('/ImageMagick\s(?P<version>[\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
@@ -108,11 +108,10 @@ public static function provideNonexistentLibraryPathTerminatesProcessing(): iter
     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