Merge pull request FriendsOfSymfony#2827 from localheinz/feature/normalize

Enhancement: Normalize composer.json

Author: XWB

composer.json

@@ -2,7 +2,9 @@
     "name": "friendsofsymfony/user-bundle",
     "type": "symfony-bundle",
     "description": "Symfony FOSUserBundle",
-    "keywords": ["User management"],
+    "keywords": [
+        "User management"
+    ],
     "homepage": "http://friendsofsymfony.github.com",
     "license": "MIT",
     "authors": [
@@ -29,18 +31,26 @@
         "symfony/validator": "^2.8 || ^3.0 || ^4.0",
         "twig/twig": "^1.28 || ^2.0"
     },
+    "conflict": {
+        "doctrine/doctrine-bundle": "<1.3",
+        "symfony/doctrine-bridge": "<2.7"
+    },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.3",
         "friendsofphp/php-cs-fixer": "^2.2",
-        "phpunit/phpunit": "^4.8.35|^5.7.11|^6.5",
+        "phpunit/phpunit": "^4.8.35 || ^5.7.11 || ^6.5",
         "swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
         "symfony/console": "^2.8 || ^3.0 || ^4.0",
         "symfony/phpunit-bridge": "^2.8 || ^3.0 || ^4.0",
         "symfony/yaml": "^2.8 || ^3.0 || ^4.0"
     },
-    "conflict": {
-        "doctrine/doctrine-bundle": "<1.3",
-        "symfony/doctrine-bridge": "<2.7"
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1.x-dev"
+        }
     },
     "autoload": {
         "psr-4": {
@@ -55,15 +65,7 @@
             "FOS\\UserBundle\\Tests\\": "/Tests/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1.x-dev"
-        }
-    },
     "support": {
         "docs": "https://symfony.com/doc/master/bundles/FOSUserBundle/index.html"
-    },
-    "config": {
-        "sort-packages": true
     }
 }