Merge pull request #1606 from lyrixx/sort-packages

dunglas · web-flow · commit 8c24b7197213 · 2017-12-26T14:22:05.000+01:00
[Composer] Sort packages
diff --git a/composer.json b/composer.json
@@ -31,9 +31,9 @@
         "behat/mink-extension": "^2.2",
         "behat/symfony2-extension": "^2.1",
         "behatch/contexts": "^2.6",
+        "doctrine/annotations": "^1.2",
         "doctrine/doctrine-bundle": "^1.6.3",
         "doctrine/orm": "^2.5",
-        "doctrine/annotations": "^1.2",
         "friendsofsymfony/user-bundle": "^2.0",
         "nelmio/api-doc-bundle": "^2.11.2",
         "php-mock/php-mock-phpunit": "^2.0",
@@ -71,5 +71,8 @@
         "branch-alias": {
             "dev-master": "2.0.x-dev"
         }
+    },
+    "config": {
+        "sort-packages": true
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@`
`31`	`31`	`"behat/mink-extension": "^2.2",`
`32`	`32`	`"behat/symfony2-extension": "^2.1",`
`33`	`33`	`"behatch/contexts": "^2.6",`
	`34`	`+ "doctrine/annotations": "^1.2",`
`34`	`35`	`"doctrine/doctrine-bundle": "^1.6.3",`
`35`	`36`	`"doctrine/orm": "^2.5",`
`36`		`- "doctrine/annotations": "^1.2",`
`37`	`37`	`"friendsofsymfony/user-bundle": "^2.0",`
`38`	`38`	`"nelmio/api-doc-bundle": "^2.11.2",`
`39`	`39`	`"php-mock/php-mock-phpunit": "^2.0",`
`@@ -71,5 +71,8 @@`
`71`	`71`	`"branch-alias": {`
`72`	`72`	`"dev-master": "2.0.x-dev"`
`73`	`73`	`}`
	`74`	`+ },`
	`75`	`+ "config": {`
	`76`	`+ "sort-packages": true`
`74`	`77`	`}`
`75`	`78`	`}`