瀏覽代碼

Merge pull request #7806 from meyerbaptiste/fix/lib-imagick

Fix support for imagemagick <3.3
Jordi Boggiano 6 年之前
父節點
當前提交
1970e97b47
共有 1 個文件被更改,包括 3 次插入8 次删除
  1. 3 8
      src/Composer/Repository/PlatformRepository.php

+ 3 - 8
src/Composer/Repository/PlatformRepository.php

@@ -158,15 +158,10 @@ class PlatformRepository extends ArrayRepository
                     break;
 
                 case 'imagick':
-                    $reflector = new \ReflectionExtension('imagick');
-
-                    ob_start();
-                    $reflector->info();
-                    $output = ob_get_clean();
-
-                    preg_match('/^(Imagick using ImageMagick library version|ImageMagick version) => ImageMagick ([\d.]+)-(\d+)/m', $output, $matches);
+                    $imagick = new \Imagick();
+                    $imageMagickVersion = $imagick->getVersion();
+                    preg_match('/^ImageMagick ([\d.]+)-(\d+)/', $imageMagickVersion['versionString'], $matches);
                     $prettyVersion = "{$matches[1]}.{$matches[2]}";
-
                     break;
 
                 case 'libxml':