Sfoglia il codice sorgente

Use natural sort to sort packages, refs #3872

Jordi Boggiano 10 anni fa
parent
commit
ab02867015

+ 1 - 1
src/Composer/Json/JsonManipulator.php

@@ -137,7 +137,7 @@ class JsonManipulator
         };
 
         uksort($packages, function ($a, $b) use ($prefix) {
-            return strcmp($prefix($a), $prefix($b));
+            return strnatcmp($prefix($a), $prefix($b));
         });
     }
 

+ 4 - 4
tests/Composer/Test/Json/JsonManipulatorTest.php

@@ -336,8 +336,8 @@ class JsonManipulatorTest extends \PHPUnit_Framework_TestCase
                 '{
     "require": {
         "foo": "baz",
-        "ext-mcrypt": "*",
-        "ext-gd": "*",
+        "ext-10gd": "*",
+        "ext-2mcrypt": "*",
         "lib-foo": "*",
         "hhvm": "*",
         "php": ">=5.5"
@@ -351,8 +351,8 @@ class JsonManipulatorTest extends \PHPUnit_Framework_TestCase
     "require": {
         "php": ">=5.5",
         "hhvm": "*",
-        "ext-gd": "*",
-        "ext-mcrypt": "*",
+        "ext-2mcrypt": "*",
+        "ext-10gd": "*",
         "lib-foo": "*",
         "foo": "baz",
         "igorw/retry": "*"