Clean up sort packages logic

Author: balbuf

bin/composer-git-merge-driver

@@ -106,38 +106,37 @@ function merge($ancestor, $ours, $theirs) {
 }
 
 // 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));
-    });
+// adapted from https://github.com/composer/composer/blob/master/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';
+
+		if (preg_match($platformPackageRegexp, $requirement)) {
+			return preg_replace(
+				[
+					'/^php/',
+					'/^hhvm/',
+					'/^ext/',
+					'/^lib/',
+					'/^\D/',
+				],
+				[
+					'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
@@ -190,19 +189,19 @@ if ($isLock) {
 
 	$merged = json_encode($merged, JSON_ENCODE_OPTIONS);
 } else {
-    $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 = merge($ancestor, $ours, $theirs);
 
-            $merged[$section] = $packageArray;
-        }
-    }
+	if (isset($merged['config']['sort-packages']) && $merged['config']['sort-packages'] === true) {
+		foreach (['require', 'require-dev'] as $section) {
+			// skip if the section type doesn't exist
+			if (!isset($merged[$section])) {
+				continue;
+			}
+			sortPackages($merged[$section]);
+		}
+	}
 
-    $merged = json_encode($merged, JSON_ENCODE_OPTIONS);
+	$merged = json_encode($merged, JSON_ENCODE_OPTIONS);
 }
 
 // if we have conflicts, replace the conflict markers with the actual conflicting values