public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

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

Fix support for imagemagick <3.3
pull/7835/head
Jordi Boggiano 2018-11-27 16:52:09 +01:00 committed by GitHub
parent 489e0d4b12 5ce5560040
commit 1970e97b47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/Repository/PlatformRepository.php
View File

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