From 9bc8fd4d4d539274892519aecb2717598af620a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 15 Apr 2019 11:12:44 +0300 Subject: [PATCH] never link to branches; update $platformPackageRegexp from 1.8.5 --- bin/composer-git-merge-driver | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/composer-git-merge-driver b/bin/composer-git-merge-driver index 17b8c44..17b6f64 100755 --- a/bin/composer-git-merge-driver +++ b/bin/composer-git-merge-driver @@ -106,11 +106,11 @@ function merge($ancestor, $ours, $theirs) { } // Sort composer packages -// adapted from https://github.com/composer/composer/blob/master/src/Composer/Json/JsonManipulator.php#L117-L146 +// adapted from https://github.com/composer/composer/blob/1.8.5/src/Composer/Json/JsonManipulator.php#L117-L146 function sortPackages(&$packages) { $prefix = function ($requirement) { - // value from https://github.com/composer/composer/blob/master/src/Composer/Repository/PlatformRepository.php#L27 - $platformPackageRegexp = '{^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[^/ ]+)$}i'; + // value from https://github.com/composer/composer/blob/1.8.5/src/Composer/Repository/PlatformRepository.php#L30 + $platformPackageRegexp = '{^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[a-z0-9](?:[_.-]?[a-z0-9]+)*|composer-plugin-api)$}iD'; if (preg_match($platformPackageRegexp, $requirement)) { return preg_replace(