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

Fix support for imagemagick <3.3
6 years ago · 1970e97b47
parent 489e0d4b12 5ce5560040
commit 1970e97b47
1 changed files with 3 additions and 8 deletions
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/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':