Merge pull request #8 from ihor-sviziev/patch-2

Add package sorting when sort-packages flag is enabled

Author: balbuf

bin/composer-git-merge-driver

@@ -105,6 +105,41 @@ function merge($ancestor, $ours, $theirs) {
 	return $ours;
 }
 
+// Sort composer packages
+// Method was taken from https://github.com/composer/composer/blob/master/src/Composer/Json/JsonManipulator.php#L117-L146
+function sortPackages(&$packages)
+{
+    $prefix = function ($requirement) {
+        // value was taken from https://github.com/composer/composer/blob/master/src/Composer/Repository/PlatformRepository.php#L27
+        $platformPackageRegexp = '{^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[^/ ]+)$}i';
+
+        if (preg_match($platformPackageRegexp, $requirement)) {
+            return preg_replace(
+                array(
+                    '/^php/',
+                    '/^hhvm/',
+                    '/^ext/',
+                    '/^lib/',
+                    '/^\D/',
+                ),
+                array(
+                    '0-$0',
+                    '1-$0',
+                    '2-$0',
+                    '3-$0',
+                    '4-$0',
+                ),
+                $requirement
+            );
+        }
+        return '5-'.$requirement;
+    };
+
+    uksort($packages, function ($a, $b) use ($prefix) {
+        return strnatcmp($prefix($a), $prefix($b));
+    });
+}
+
 // special handling for lock files
 if ($isLock) {
 	// @todo handle alias property as well
@@ -155,7 +190,19 @@ if ($isLock) {
 
 	$merged = json_encode($merged, JSON_ENCODE_OPTIONS);
 } else {
-	$merged = json_encode(merge($ancestor, $ours, $theirs), JSON_ENCODE_OPTIONS);
+    $merged = merge($ancestor, $ours, $theirs);
+
+    if (isset($merged['config']['sort-packages']) && $merged['config']['sort-packages'] === true) {
+        foreach (['require', 'require-dev'] as $section) {
+            $packageArray = $merged[$section];
+
+            sortPackages($packageArray);
+
+            $merged[$section] = $packageArray;
+        }
+    }
+
+    $merged = json_encode($merged, JSON_ENCODE_OPTIONS);
 }
 
 // if we have conflicts, replace the conflict markers with the actual conflicting values