Merge pull request #95 from akeneo/fix-alias

ahocquard · web-flow · commit e61fe9e74343 · 2017-11-28T17:59:05.000+01:00
Fix alias in composer
diff --git a/composer.json b/composer.json
@@ -41,8 +41,10 @@
   "suggest": {
     "php-http/guzzle6-adapter": "In order to use Guzzle v6 as the HTTP client"
   },
-  "branch-alias": {
-    "dev-master": "1.1.x-dev",
-    "dev-1.0": "1.0.x-dev"
+  "extra": {
+      "branch-alias": {
+        "dev-master": "1.1.x-dev",
+        "dev-1.0": "1.0.x-dev"
+      }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,10 @@`
`41`	`41`	`"suggest": {`
`42`	`42`	`"php-http/guzzle6-adapter": "In order to use Guzzle v6 as the HTTP client"`
`43`	`43`	`},`
`44`		`- "branch-alias": {`
`45`		`- "dev-master": "1.1.x-dev",`
`46`		`- "dev-1.0": "1.0.x-dev"`
	`44`	`+ "extra": {`
	`45`	`+ "branch-alias": {`
	`46`	`+ "dev-master": "1.1.x-dev",`
	`47`	`+ "dev-1.0": "1.0.x-dev"`
	`48`	`+ }`
`47`	`49`	`}`
`48`	`50`	`}`